bug fix

1 files changed, 15 insertions, 11 deletions

diff --git a/core/applets/vmemo/vmemo.cpp b/core/applets/vmemo/vmemo.cpp
index 4c55dc7..22cb276 100644
--- a/core/applets/vmemo/vmemo.cpp
+++ b/core/applets/vmemo/vmemo.cpp
@@ -251,23 +251,26 @@ 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 defined(QT_QWS_IPAQ) || defined(QT_QWS_EBX)
+        if (!systemZaurus )
+            return;
+#endif
+    
      Config config( "Sound" );
      config.setGroup( "System" );
      useAlerts = config.readBoolEntry("Alert");
 
 //      if(useAlerts) 
 //  QMessageBox::message("VMemo","Really Record?");//) ==1)
 //             return;
 //     } else {
+        if (!systemZaurus )
     QSound::play(Resource::findSound("vmemob"));
 //     }
     qDebug("Start recording");
     recording = TRUE;
     if (openDSP() == -1)  {
         QMessageBox::critical(0, "VMemo", "Could not open dsp device.\n"+errorMsg, "Abort");
@@ -280,30 +283,30 @@ void VMemo::mousePressEvent( QMouseEvent *me )
   
   QDateTime dt = QDateTime::currentDateTime();
 
   QString fName;
   Config cfg( "Sound" );
   cfg.setGroup( "System" );
-  fileName = cfg.readEntry("RecLocation",QPEApplication::documentDir() );
+   fName = QPEApplication::documentDir() ;
+  fileName = cfg.readEntry("RecLocation", fName);
 
   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/";
+     fileName=fileName.right(fileName.length()-s-2);
+  qDebug("filename will be "+fileName);   
+   if( !fileName.right(1).find('/') == -1)
+           fileName+="/";
 
 //   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(":"),".");
@@ -360,13 +363,12 @@ int VMemo::openDSP()
     }  else {
         dsp = open("/dev/dsp", O_RDWR);
     }
   
     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\")");
@@ -511,10 +513,12 @@ void VMemo::record(void)
     write(wav, &length, 4);
     track.close();
   
     if( ioctl( dsp, SNDCTL_DSP_RESET,0) == -1)
         perror("ioctl(\"SNDCTL_DSP_RESET\")");
     ::close(dsp);
+    fileName = fileName.left(fileName.length()-4);
     if(useAlerts) 
         QMessageBox::message("Vmemo"," Done recording\n"+ fileName);
+    qDebug("done recording "+fileName);
     QSound::play(Resource::findSound("vmemoe"));
 }