fixed my blunder, I hope

1 files changed, 59 insertions, 59 deletions

diff --git a/core/applets/vmemo/vmemo.cpp b/core/applets/vmemo/vmemo.cpp
index 9d69130..fea673c 100644
--- a/core/applets/vmemo/vmemo.cpp
+++ b/core/applets/vmemo/vmemo.cpp
@@ -150,11 +150,11 @@ VMemo::VMemo( QWidget *parent, const char *name )
           systemZaurus=FALSE;
-//            myChannel = new QCopChannel( "QPE/VMemo", this );
-//            connect( myChannel, SIGNAL(received(const QCString&, const QByteArray&)),
-//                     this, SLOT(receive(const QCString&, const QByteArray&)) );
-      
+            myChannel = new QCopChannel( "QPE/VMemo", this );
+            connect( myChannel, SIGNAL(received(const QCString&, const QByteArray&)),
+                     this, SLOT(receive(const QCString&, const QByteArray&)) );
+
 //              // Register the REC key press, for ipaq only
-//            QCopEnvelope e("QPE/Desktop", "keyRegister(int key, QString channel, QString message)");
-//            e << 4096;
-//            e << QString("QPE/VMemo");
-//            e << QString("toggleRecord()");
+            QCopEnvelope e("QPE/Desktop", "keyRegister(int key, QString channel, QString message)");
+            e << 4096;
+            e << QString("QPE/VMemo");
+            e << QString("toggleRecord()");
       }
@@ -273,7 +273,7 @@ int VMemo::openDSP()
   }
-//    else  {
-//      format = AFMT_U8;
-//      resolution = 8;
-//    }
-  
+    else  {
+      format = AFMT_S8;
+      resolution = 8;
+    }
+
   if(systemZaurus) {
@@ -319,3 +319,3 @@ int VMemo::openWAV(const char *filename)
   WaveHeader wh;
-  
+
   wh.main_chunk = RIFF;
@@ -345,4 +345,6 @@ void VMemo::record(void)
 
-  if(format==AFMT_S16_LE)  {
+  if(systemZaurus) {
     signed short sound[512], monoBuffer[512];
+
+  if(format==AFMT_S16_LE)  {
     while(recording)   {
@@ -369,47 +371,45 @@ void VMemo::record(void)
   }
-  // else { //AFMT_U8 // don't try this yet.. as player doesn't understand
-// 8bit unsigned
- //       unsigned short sound[512], monoBuffer[512];
-//       while(recording)
-//   {
-//     result = read(dsp, sound, 512); // 8192
-//     qApp->processEvents();
-//     int j=0;
-//       if(systemZaurus) 
-//         {
-//             for (int i = 0; i < result; i++) { //since Z is mono do normally
-//               monoBuffer[i] = sound[i];
-//           }
-//             qApp->processEvents();
-//             length+=write(wav, monoBuffer, result);
-//         } else { //ipaq /stereo inputs
-//             for (int i = 0; i < result; i+=2) {
-//                 monoBuffer[j] = (sound[i]+sound[i+1])/2;
-//                 j++;
-//             }
-//             qApp->processEvents();
-//             length+=write(wav, monoBuffer, result/2);
-//         }
-// //    length += result;
-//     printf("%d\r",length);
-//     fflush(stdout);
-
-//      qApp->processEvents();
-//    }
-//  }
+ else { //AFMT_S8 // don't try this yet.. as player doesn't understand 8bit unsigned
+     while(recording)
+ {
+   result = read(dsp, sound, 512); // 8192
+   qApp->processEvents();
+   int j=0;
+     if(systemZaurus) 
+       {
+           for (int i = 0; i < result; i++) { //since Z is mono do normally
+             monoBuffer[i] = sound[i];
+         }
+           qApp->processEvents();
+           length+=write(wav, monoBuffer, result);
+       } else { //ipaq /stereo inputs
+           for (int i = 0; i < result; i+=2) {
+               monoBuffer[j] = (sound[i]+sound[i+1])/2;
+               j++;
+           }
+           qApp->processEvents();
+           length+=write(wav, monoBuffer, result/2);
+       }
+  length += result;
+   printf("%d\r",length);
+   fflush(stdout);
+
+    qApp->processEvents();
+  }
+}
 
+} else {
 
-  
-//   char sound[512]; //char is 8 bit
-  
-//   while(recording)
-//  {
-//    result = read(dsp, sound, 512); // 8192
-//    qApp->processEvents();
+ char sound[512]; //char is 8 bit
 
-//    write(wav, sound, result);
-//    length += result;
+ while(recording)
+{
+  result = read(dsp, sound, 512); // 8192
+  qApp->processEvents();
+
+  write(wav, sound, result);
+  length += result;
 
-//    qApp->processEvents();
-//  }
+  qApp->processEvents();
+}
 //  qDebug("file has length of %d lasting %d seconds",
@@ -417,4 +417,4 @@ void VMemo::record(void)
 // medialplayer states wrong length in secs
-  
-  
+}
+
   value = length+36;
@@ -429,3 +429,3 @@ void VMemo::record(void)
   ::close(dsp);
-//  if(systemZaurus)
+  if(systemZaurus)
         QMessageBox::message("Vmemo"," Done recording");