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
@@ -129,392 +129,396 @@ static char * vmemo_xpm[] = {
 "o  c #66666A",
 "p  c #505054",
 "q  c #838388",
 "r  c #A1A1A7",
 "s  c #A9A9AE",
 "t  c #A8A8B0",
 "u  c #5E5E63",
 "v  c #3A3A3E",
 "w  c #BDBDC6",
 "x  c #59595E",
 "y  c #76767C",
 "z  c #373738",
 "A  c #717174",
 "B  c #727278",
 "C  c #1C1C1E",
 "D  c #3C3C3F",
 "E  c #ADADB6",
 "F  c #54555A",
 "G  c #8B8C94",
 "H  c #5A5A5F",
 "I  c #BBBBC3",
 "J  c #C4C4CB",
 "K  c #909098",
 "L  c #737379",
 "M  c #343437",
 "N  c #8F8F98",
 "O  c #000407",
 "P  c #2D3137",
 "Q  c #B0B1BC",
 "R  c #3B3C40",
 "S  c #6E6E74",
 "T  c #95959C",
 "U  c #74747A",
 "V  c #1D1D1E",
 "W  c #91929A",
 "X  c #42444A",
 "Y  c #22282E",
 "Z  c #B0B2BC",
 "`  c #898A90",
 " . c #65656A",
 ".. c #999AA2",
 "+. c #52535A",
 "@. c #151B21",
 "#. c #515257",
 "$. c #B5B5BE",
 "%. c #616167",
 "&. c #1A1D22",
 "*. c #000713",
 "=. c #1F1F21",
 "                                ",
 "            . + @ #             ",
 "          $ % & * = -           ",
 "        ; > , ' ) ! ~           ",
 "        { ] ^ / ( _ :           ",
 "        < [ } | 1 2 3           ",
 "      4 5 6 7 8 9 0 a b c       ",
 "    d e f g h i j 3 k l m n     ",
 "      o p q r s t u v w n       ",
 "      o x y z A B C D E n       ",
 "      F G H I J K L M N O       ",
 "      P Q R S T U V W X         ",
 "        Y Z ` b  ...+.          ",
 "          @.#.$.%.&.            ",
 "            *.B =.              ",
 "      n n n n n n n n n         "};
 
 
 VMemo::VMemo( QWidget *parent, const char *_name )
     : QWidget( parent, _name )
 {
   setFixedHeight( 18 );
   setFixedWidth( 14 );
   
   recording = FALSE;
   
   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&)) );
 
 //              // 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()");
       }
   }
 }
 
 VMemo::~VMemo()
 {
 }
 
 void VMemo::receive( const QCString &msg, const QByteArray &data )
 {
   QDataStream stream( data, IO_ReadOnly );
   if (msg == "toggleRecord()")  {
     if (recording)
     mouseReleaseEvent(NULL);
     else
     mousePressEvent(NULL);
   }
 }
 
 void VMemo::paintEvent( QPaintEvent* )
 {
   QPainter p(this);
   p.drawPixmap( 0, 1,( const char** )  vmemo_xpm );
 }
 
 void VMemo::mousePressEvent( QMouseEvent *me )
 {
   // just to be safe
     if (recording) {
         recording = FALSE;
         return;
     }
 
       /* 
          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");
         recording = FALSE;
         return;
     }
   
   Config vmCfg("VMemo");
   vmCfg.setGroup("Defaults");
   
   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(":"),".");
   fileName.replace(QRegExp(","),"");
   
   if(openWAV(fileName.latin1()) == -1)  {
     QString err("Could not open the output file\n");
     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_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
     }  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\")");
         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;
 }
 
 int VMemo::openWAV(const char *filename)
 {
   track.setName(filename);
   if(!track.open(IO_WriteOnly|IO_Truncate|IO_Raw)) {
       errorMsg=filename;
     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");
 
     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];
                     }
                     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_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);
                 }
                 length += result;
                 printf("%d\r",length);
                 fflush(stdout);
 
                 qApp->processEvents();
             }
 
             qApp->processEvents();
         }
 
     } else {
 
         signed short sound[512], monoBuffer[512];
 
         while(recording)  {
             result = read(dsp, sound, 512); // 8192
             qApp->processEvents();
 
             write(wav, sound, result);
             length += result;
 
             qApp->processEvents();
         }
         printf("%d\r",length);
         fflush(stdout);
           //  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);
+    fileName = fileName.left(fileName.length()-4);
     if(useAlerts) 
         QMessageBox::message("Vmemo"," Done recording\n"+ fileName);
+    qDebug("done recording "+fileName);
     QSound::play(Resource::findSound("vmemoe"));
 }