2 files changed, 70 insertions, 47 deletions

diff --git a/core/applets/vmemo/vmemo.cpp b/core/applets/vmemo/vmemo.cpp
index 4d4d598..4c55dc7 100644
--- a/core/applets/vmemo/vmemo.cpp
+++ b/core/applets/vmemo/vmemo.cpp
@@ -24,8 +24,10 @@
 #include <sys/ioctl.h>
 #include <linux/soundcard.h>
 #include <string.h>
 #include <stdlib.h>
+#include <errno.h>
+#include <string.h>
 
 typedef struct _waveheader {
   u_long  main_chunk; /* 'RIFF'  */
   u_long  length;     /* filelen */
@@ -205,17 +207,17 @@ VMemo::VMemo( QWidget *parent, const char *_name )
       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()");
       }
   }
 }
 
@@ -251,54 +253,66 @@ void VMemo::mousePressEvent( QMouseEvent *me )
       /* 
          No mousePress/mouseRelease recording on the iPAQ. The REC button on the iPAQ calls these functions
          mousePressEvent and mouseReleaseEvent with a NULL parameter.
       */
-     if (!systemZaurus && me != NULL)
-         return;
+       if (!systemZaurus && me != NULL)
+           return;
 
-//     Config config( "Sound" );
-//     config.setGroup( "System" );
-//     useAlerts = config.readBoolEntry("Alert");
+     Config config( "Sound" );
+     config.setGroup( "System" );
+     useAlerts = config.readBoolEntry("Alert");
 
-//     if(useAlerts) {
-//         if( QMessageBox::warning(this,"VMemo","Really Record?","Yes","No",0,0,1) ==1)
+//      if(useAlerts) 
+//  QMessageBox::message("VMemo","Really Record?");//) ==1)
 //             return;
 //     } else {
     QSound::play(Resource::findSound("vmemob"));
 //     }
     qDebug("Start recording");
     recording = TRUE;
     if (openDSP() == -1)  {
-        QMessageBox::critical(0, "VMemo", "Could not open dsp device.", "Abort");
+        QMessageBox::critical(0, "VMemo", "Could not open dsp device.\n"+errorMsg, "Abort");
         recording = FALSE;
         return;
     }
   
   Config vmCfg("VMemo");
   vmCfg.setGroup("Defaults");
   
   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";
+  QString fName;
+  Config cfg( "Sound" );
+  cfg.setGroup( "System" );
+  fileName = cfg.readEntry("RecLocation",QPEApplication::documentDir() );
+
+  int s;
+  s=fileName.find(':');
+  if(s)
+     fileName=fileName.right(fileName.length()-s-2)+"/";
+     
+//   if( !fileName.right(1).find('/') == -1)
+//           fileName+="/audio/";
+//       else
+//           fileName+="audio/";
+
+//   if(systemZaurus) 
+//   fileName=vmCfg.readEntry("Dir", "/mnt/cf/"); // zaurus does not have /mnt/ramfs
+//   else
+//   fileName=vmCfg.readEntry("Dir", "/mnt/ramfs/");
   
+  fName = "vm_"+ dt.toString()+ ".wav";
+  fileName+=fName;
+     qDebug("filename is "+fileName);
   // 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: ");
+    QString err("Could not open the output file\n");
     err += fileName;
-
     QMessageBox::critical(0, "VMemo", err, "Abort");
     close(dsp);
     return;
   }
@@ -333,12 +347,13 @@ int VMemo::openDSP()
     if (cfg.readNumEntry("SixteenBit", 1)==1)  {
         format = AFMT_S16_LE;
         resolution = 16;
     } else {
-        format = AFMT_S8;
+        format = AFMT_U8;
         resolution = 8;
     }
-  
+
+    qDebug("samplerate: %d, channels %d, resolution %d", speed, channels, resolution);  
 
     if(systemZaurus) {
         dsp = open("/dev/dsp1", O_RDWR); //Zaurus needs /dev/dsp1
         channels=1; //zaurus has one input channel
@@ -347,25 +362,31 @@ int VMemo::openDSP()
     }
   
     if(dsp == -1)  {
         perror("open(\"/dev/dsp\")");
+        
+        errorMsg="open(\"/dev/dsp\")\n "+(QString)strerror(errno);
         return -1;
     }
   
     if(ioctl(dsp, SNDCTL_DSP_SETFMT , &format)==-1)  {
         perror("ioctl(\"SNDCTL_DSP_SETFMT\")");
+        errorMsg="ioctl(\"SNDCTL_DSP_SETFMT\")\n%d\n"+(QString)strerror(errno),format;
         return -1;
     }
     if(ioctl(dsp, SNDCTL_DSP_CHANNELS , &channels)==-1)  {
         perror("ioctl(\"SNDCTL_DSP_CHANNELS\")");
+        errorMsg="ioctl(\"SNDCTL_DSP_CHANNELS\")\n%d\n"+(QString)strerror(errno),channels;
         return -1;
     }
     if(ioctl(dsp, SNDCTL_DSP_SPEED , &speed)==-1)  {
         perror("ioctl(\"SNDCTL_DSP_SPEED\")");
+        errorMsg="ioctl(\"SNDCTL_DSP_SPEED\")\n%d\n"+(QString)strerror(errno),speed;
         return -1;
     }
     if(ioctl(dsp, SOUND_PCM_READ_RATE , &rate)==-1)  {
         perror("ioctl(\"SOUND_PCM_READ_RATE\")");
+        errorMsg="ioctl(\"SOUND_PCM_READ_RATE\")\n%d\n"+(QString)strerror(errno),rate;
         return -1;
     }
   
     return 1;
@@ -373,10 +394,12 @@ int VMemo::openDSP()
 
 int VMemo::openWAV(const char *filename)
 {
   track.setName(filename);
-  if(!track.open(IO_WriteOnly|IO_Truncate|IO_Raw)) 
+  if(!track.open(IO_WriteOnly|IO_Truncate|IO_Raw)) {
+      errorMsg=filename;
     return -1;
+  }
 
   wav=track.handle();
   
   WaveHeader wh;
@@ -429,29 +452,29 @@ void VMemo::record(void)
                 }
                 printf("%d\r",length);
                 fflush(stdout);
             }
-        }  else { //AFMT_S8 
+        }  else { //AFMT_U8 
 // 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);
-                  }
+                    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);
 
@@ -490,9 +513,8 @@ void VMemo::record(void)
   
     if( ioctl( dsp, SNDCTL_DSP_RESET,0) == -1)
         perror("ioctl(\"SNDCTL_DSP_RESET\")");
     ::close(dsp);
-//     if(useAlerts) 
-//        QMessageBox::message("Vmemo"," Done recording");
-//     else
-        QSound::play(Resource::findSound("vmemoe"));
+    if(useAlerts) 
+        QMessageBox::message("Vmemo"," Done recording\n"+ fileName);
+    QSound::play(Resource::findSound("vmemoe"));
 }
diff --git a/core/applets/vmemo/vmemo.h b/core/applets/vmemo/vmemo.h
index f30476f..3972877 100644
--- a/core/applets/vmemo/vmemo.h
+++ b/core/applets/vmemo/vmemo.h
@@ -29,8 +29,9 @@ class VMemo : public QWidget
 public:
   VMemo( QWidget *parent, const char *name = NULL);
   ~VMemo();
   QFile track;  
+  QString fileName, errorMsg;
 
 public slots:
   void record();
   void mousePressEvent( QMouseEvent * );