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
@@ -143,25 +143,25 @@ VMemo::VMemo( QWidget *parent, const char *name )
   
   struct utsname name; /* check for embedix kernel running on the zaurus*/
   if (uname(&name) != -1) {
       QString release=name.release;
       if(release.find("embedix",0,TRUE) !=-1)
           systemZaurus=TRUE;
       else {
           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()");
       }
   }
 }
 
 VMemo::~VMemo()
 {
 }
 
@@ -266,21 +266,21 @@ int VMemo::openDSP()
   cfg.setGroup("Record");
   
   speed = cfg.readNumEntry("SampleRate", 22050);
   channels = cfg.readNumEntry("Stereo", 1) ? 2 : 1; // 1 = stereo(2), 0 = mono(1)
   if (cfg.readNumEntry("SixteenBit", 1)==1)  {
     format = AFMT_S16_LE;
     resolution = 16;
   }
-//    else  {
-//      format = AFMT_U8;
-//      resolution = 8;
-//    }
-  
+    else  {
+      format = AFMT_S8;
+      resolution = 8;
+    }
+
   if(systemZaurus) {
     dsp = open("/dev/dsp1", O_RDWR); //Zaurus needs /dev/dsp1
     channels=1; //zaurus has one input channel
   }  else {
   dsp = open("/dev/dsp", O_RDWR);
   }
   
   if(dsp == -1)  {
@@ -312,17 +312,17 @@ int VMemo::openWAV(const char *filename)
 {
   track.setName(filename);
   if(!track.open(IO_WriteOnly|IO_Truncate|IO_Raw)) 
     return -1;
 
   wav=track.handle();
   
   WaveHeader wh;
-  
+
   wh.main_chunk = RIFF;
   wh.length=0; 
   wh.chunk_type = WAVE;
   wh.sub_chunk  = FMT;
   wh.sc_len     = 16;
   wh.format     = PCM_CODE;
   wh.modus      = channels;
   wh.sample_fq  = speed;
@@ -338,18 +338,20 @@ int VMemo::openWAV(const char *filename)
   return 1;
 }
 
 void VMemo::record(void)
 {
   int length=0, result, value;
   qDebug("Recording");
 
-  if(format==AFMT_S16_LE)  {
+  if(systemZaurus) {
     signed short sound[512], monoBuffer[512];
+
+  if(format==AFMT_S16_LE)  {
     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];
              }
@@ -362,73 +364,71 @@ void VMemo::record(void)
             }
             qApp->processEvents();
             length+=write(wav, monoBuffer, result/2);
         }
      printf("%d\r",length);
      fflush(stdout);
    }
   }
-  // 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",
 //         length, (( length / speed) / channels) / 2 );
 // medialplayer states wrong length in secs
-  
-  
+}
+
   value = length+36;
   lseek(wav, 4, SEEK_SET);
   write(wav, &value, 4);
   lseek(wav, 40, SEEK_SET);
   write(wav, &length, 4);
   track.close();
   
   if( ioctl( dsp, SNDCTL_DSP_RESET,0) == -1)
   perror("ioctl(\"SNDCTL_DSP_RESET\")");
   ::close(dsp);
-//  if(systemZaurus)
+  if(systemZaurus)
         QMessageBox::message("Vmemo"," Done recording");
   
   QSound::play(Resource::findSound("vmemoe"));
 }