1 files changed, 77 insertions, 77 deletions

diff --git a/core/applets/vmemo/vmemo.cpp b/core/applets/vmemo/vmemo.cpp
index b3edbc1..ae5cf0c 100644
--- a/core/applets/vmemo/vmemo.cpp
+++ b/core/applets/vmemo/vmemo.cpp
@@ -215,220 +215,220 @@ void VMemo::mousePressEvent( QMouseEvent *me )
   QDateTime dt = QDateTime::currentDateTime();
   QString fileName;
 
   if(systemZaurus)
   fileName=vmCfg.readEntry("Dir", "/mnt/cf/"); // zaurus does not have /mnt/ramfs
   else
   fileName=vmCfg.readEntry("Dir", "/mnt/ramfs/");
   
   fileName += "vm_";
   fileName += dt.toString();
   fileName += ".wav";
   
   // No spaces in the filename
   fileName.replace(QRegExp("'"),"");
   fileName.replace(QRegExp(" "),"_");
   fileName.replace(QRegExp(":"),".");
   fileName.replace(QRegExp(","),"");
   
   if(openWAV(fileName.latin1()) == -1)
   {
     QString err("Could not open the output file: ");
     err += fileName;
 
     QMessageBox::critical(0, "VMemo", err, "Abort");
     close(dsp);
     return;
   }
   
   QArray<int> cats(1);
   cats[0] = vmCfg.readNumEntry("Category", 0);
   
   QString dlName("vm_");
   dlName += dt.toString();
   DocLnk l;
   l.setFile(fileName);
   l.setName(dlName);
   l.setType("audio/x-wav");
   l.setCategories(cats);
   l.writeLink();
   
   record();
 }
 
 void VMemo::mouseReleaseEvent( QMouseEvent * )
 {
   recording = FALSE;
 }
 
 int VMemo::openDSP()
 {
   Config cfg("Sound");
   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_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)  {
       perror("open(\"/dev/dsp\")");
       return -1;
   }
   
   if(ioctl(dsp, SNDCTL_DSP_SETFMT , &format)==-1)  {
     perror("ioctl(\"SNDCTL_DSP_SETFMT\")");
     return -1;
   }
   if(ioctl(dsp, SNDCTL_DSP_CHANNELS , &channels)==-1)  {
     perror("ioctl(\"SNDCTL_DSP_CHANNELS\")");
     return -1;
   }
   if(ioctl(dsp, SNDCTL_DSP_SPEED , &speed)==-1)  {
     perror("ioctl(\"SNDCTL_DSP_SPEED\")");
     return -1;
   }
   if(ioctl(dsp, SOUND_PCM_READ_RATE , &rate)==-1)  {
     perror("ioctl(\"SOUND_PCM_READ_RATE\")");
     return -1;
   }
   
   return 1;
 }
 
 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;
   wh.byte_p_sec = speed * channels *  resolution/8;
   wh.byte_p_spl = channels * (resolution / 8); 
   wh.bit_p_spl  = resolution;
   wh.data_chunk = DATA;
   wh.data_length= 0; 
   //    qDebug("Write header channels %d, speed %d, b/s %d, blockalign %d, bitrate %d"
   //           , wh.modus, wh.sample_fq, wh.byte_p_sec, wh.byte_p_spl, wh.bit_p_spl );
   write (wav, &wh, sizeof(WaveHeader));
   
   return 1;
 }
 
 void VMemo::record(void)
 {
-  int length=0, result, value;
-  qDebug("Recording");
+    int length=0, result, value;
+    qDebug("Recording");
 
-  if(systemZaurus) {
+    if(systemZaurus) {
     signed short sound[512], monoBuffer[512];
 
-  if(format==AFMT_S16_LE)  {
+    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];
-             }
-             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);
-        }
-     printf("%d\r",length);
-     fflush(stdout);
-   }
-  }
- 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);
+    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);
+    }
+    printf("%d\r",length);
+    fflush(stdout);
+    }
+    }
+    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 {
+    } else {
 
- char sound[512]; //char is 8 bit
+    char sound[512]; //char is 8 bit
 
- while(recording)
-{
-  result = read(dsp, sound, 512); // 8192
-  qApp->processEvents();
+    while(recording)
+    {
+    result = read(dsp, sound, 512); // 8192
+    qApp->processEvents();
 
-  write(wav, sound, result);
-  length += result;
+    write(wav, sound, result);
+    length += result;
 
-  qApp->processEvents();
-}
-//  qDebug("file has length of %d lasting %d seconds",
-//         length, (( length / speed) / channels) / 2 );
-// medialplayer states wrong length in secs
-}
+    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();
+    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)
-        QMessageBox::message("Vmemo"," Done recording");
+    if( ioctl( dsp, SNDCTL_DSP_RESET,0) == -1)
+    perror("ioctl(\"SNDCTL_DSP_RESET\")");
+    ::close(dsp);
+    if(systemZaurus)
+    QMessageBox::message("Vmemo"," Done recording");
   
-  QSound::play(Resource::findSound("vmemoe"));
+    QSound::play(Resource::findSound("vmemoe"));
 }