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
@@ -214,5 +214,6 @@ VMemo::VMemo( QWidget *parent, const char *_name )
     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;
@@ -224,3 +225,3 @@ VMemo::VMemo( QWidget *parent, const char *_name )
     if( toggleKey != -1 ) {
-      // keyRegister(key, channel, message)
+				qDebug("Register key %d", toggleKey);
       QCopEnvelope e("QPE/Launcher", "keyRegister(int,QCString,QCString)");
@@ -236,4 +237,4 @@ VMemo::VMemo( QWidget *parent, const char *_name )
         usingIcon=FALSE;
-    if( vmCfg.readNumEntry("hideIcon",0) == 1)
-      hide();
+//     if( vmCfg.readNumEntry("hideIcon",0) == 1)
+//       hide();
     recording = FALSE;
@@ -251,3 +252,3 @@ int VMemo::position()
 void VMemo::receive( const QCString &msg, const QByteArray &data ) {
-  odebug << "receive" << oendl;
+  odebug << "Vmemo receive" << oendl;
   QDataStream stream( data, IO_ReadOnly );
@@ -387,4 +388,4 @@ void VMemo::stopRecording() {
     cfg.setGroup("Defaults");
-    if( cfg.readNumEntry("hideIcon",0) == 1 )
-        hide();
+//     if( cfg.readNumEntry("hideIcon",0) == 1 )
+//         hide();
 }
@@ -502,7 +503,5 @@ bool VMemo::record() {
 
-    int bufsize=1024;
+
     int bytesWritten=0;
-    signed short sound[1024], monoBuffer[1024];
-    char abuf[bufsize/2];
-    short sbuf[bufsize];
+
     Config vmCfg("Vmemo");
@@ -511,2 +510,7 @@ bool VMemo::record() {
 
+	int bufsize = vmCfg.readNumEntry("BufferSize",1024);
+	signed short sound[bufsize], monoBuffer[bufsize];
+    char abuf[bufsize / 2];
+    short sbuf[bufsize];
+
     while(recording)  {
@@ -514,5 +518,5 @@ bool VMemo::record() {
         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) {
@@ -531,7 +535,7 @@ bool VMemo::record() {
         } 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);
         }