make buffersize user config BufferSize, default 1024, remove some mishmash

1 files changed, 23 insertions, 19 deletions

diff --git a/core/applets/vmemo/vmemo.cpp b/core/applets/vmemo/vmemo.cpp
index 622b1df..1ead4dd 100644
--- a/core/applets/vmemo/vmemo.cpp
+++ b/core/applets/vmemo/vmemo.cpp
@@ -212,9 +212,10 @@ VMemo::VMemo( QWidget *parent, const char *_name )
     useADPCM = vmCfg.readBoolEntry("use_ADPCM", 0);
 
     odebug << "toggleKey " << toggleKey << "" << oendl;
-    if ( QFile::exists ( "/dev/sharp_buz" ) || QFile::exists ( "/dev/sharp_led" ))
-         systemZaurus=TRUE;
-    else
+
+//     if ( QFile::exists ( "/dev/sharp_buz" ) || QFile::exists ( "/dev/sharp_led" ))
+//          systemZaurus=TRUE;
+//     else
       systemZaurus=FALSE;
 
     myChannel = new QCopChannel( "QPE/VMemo", this );
@@ -222,7 +223,7 @@ VMemo::VMemo( QWidget *parent, const char *_name )
              this, SLOT(receive(const QCString&,const QByteArray&)) );
 
     if( toggleKey != -1 ) {
-      // keyRegister(key, channel, message)
+				qDebug("Register key %d", toggleKey);
       QCopEnvelope e("QPE/Launcher", "keyRegister(int,QCString,QCString)");
       //           e << 4096; // Key_Escape
       //          e << Key_F5; //4148
@@ -234,8 +235,8 @@ VMemo::VMemo( QWidget *parent, const char *_name )
         usingIcon=TRUE;
     else
         usingIcon=FALSE;
-    if( vmCfg.readNumEntry("hideIcon",0) == 1)
-      hide();
+//     if( vmCfg.readNumEntry("hideIcon",0) == 1)
+//       hide();
     recording = FALSE;
     // }
 }
@@ -249,7 +250,7 @@ int VMemo::position()
 }
 
 void VMemo::receive( const QCString &msg, const QByteArray &data ) {
-  odebug << "receive" << oendl;
+  odebug << "Vmemo receive" << oendl;
   QDataStream stream( data, IO_ReadOnly );
 
   if (msg == "toggleRecord()")  {
@@ -385,8 +386,8 @@ void VMemo::stopRecording() {
     t_timer->stop();
     Config cfg("Vmemo");
     cfg.setGroup("Defaults");
-    if( cfg.readNumEntry("hideIcon",0) == 1 )
-        hide();
+//     if( cfg.readNumEntry("hideIcon",0) == 1 )
+//         hide();
 }
 
 int VMemo::openDSP() {
@@ -500,21 +501,24 @@ bool VMemo::record() {
     msg.sprintf("Recording format other");
     odebug << msg << oendl;
 
-    int bufsize=1024;
+
     int bytesWritten=0;
-    signed short sound[1024], monoBuffer[1024];
-    char abuf[bufsize/2];
-    short sbuf[bufsize];
+
     Config vmCfg("Vmemo");
     vmCfg.setGroup("Defaults");
     useADPCM = vmCfg.readBoolEntry("use_ADPCM", 0);
 
+	int bufsize = vmCfg.readNumEntry("BufferSize",1024);
+	signed short sound[bufsize], monoBuffer[bufsize];
+    char abuf[bufsize / 2];
+    short sbuf[bufsize];
+
     while(recording)  {
 
         if(useADPCM)
-            result = read( dsp, sbuf, bufsize); // 8192
+            result = ::read(dsp, sbuf, bufsize); // 8192
         else
-            result = read(dsp, sound, 1024); // 8192
+            result = ::read(dsp, sound, bufsize); // 8192
         if( result <= 0) {
           perror("recording error ");
 //          odebug << currentFileName << oendl;
@@ -529,11 +533,11 @@ bool VMemo::record() {
             bytesWritten =  ::write(wav, abuf, result/4);
 
         } else {
-            for (int i = 0; i < result; i++) { //since Z is mono do normally
-                monoBuffer[i] = sound[i];
-            }
+//             for (int i = 0; i < result; i++) { //since Z is mono do normally
+//                 monoBuffer[i] = sound[i];
+//             }
 
-            length+=write(wav, monoBuffer, result);
+            length += write(wav, sound, result);
         }
         length +=bytesWritten;