1 files changed, 4 insertions, 2 deletions

diff --git a/core/applets/vmemo/vmemo.cpp b/core/applets/vmemo/vmemo.cpp
index 7cc4062..f5d2b20 100644
--- a/core/applets/vmemo/vmemo.cpp
+++ b/core/applets/vmemo/vmemo.cpp
@@ -177,258 +177,260 @@ static char * vmemo_xpm[] = {
 "*. 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;
         Config vmCfg("VMemo");
         vmCfg.setGroup("Defaults");
         int toggleKey = vmCfg.readNumEntry("toggleKey", -1);
   
         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&)) );
 
         if( toggleKey != -1 ) {
             QCopEnvelope e("QPE/Desktop", "keyRegister(int key, QString channel, QString message)");
 //           e << 4096; // Key_Escape
 //          e << Key_F5; //4148
             e << toggleKey;
             e << QString("QPE/VMemo");
             e << QString("toggleRecord()");
         }
         if( vmCfg.readNumEntry("hideIcon",0) == 1)
             hide();
     }
 }
 
 VMemo::~VMemo()
 {
 }
 
 void VMemo::receive( const QCString &msg, const QByteArray &data )
 {
     QDataStream stream( data, IO_ReadOnly );
     if (msg == "toggleRecord()")  {
         if (recording) {
             fromToggle = TRUE;
             stopRecording();
         }  else {
             fromToggle = TRUE;
             startRecording();
         }
     }
 }
 
 void VMemo::paintEvent( QPaintEvent* )
 {
   QPainter p(this);
   p.drawPixmap( 0, 1,( const char** )  vmemo_xpm );
 }
 
 void VMemo::mousePressEvent( QMouseEvent * )
 {
     startRecording();
 }
 
 void VMemo::mouseReleaseEvent( QMouseEvent * )
 {
     stopRecording();
 }
 
 bool VMemo::startRecording() {
 
     if ( recording)
         return FALSE;;    
      Config config( "Vmemo" );
      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 FALSE;
     }
   
   config.setGroup("Defaults");
   
   QDateTime dt = QDateTime::currentDateTime();
 
   QString fName;
    config.setGroup( "System" );
    fName = QPEApplication::documentDir() ;
   fileName = config.readEntry("RecLocation", fName);
 
   int s;
   s=fileName.find(':');
   if(s)
      fileName=fileName.right(fileName.length()-s-2);
   qDebug("filename will be "+fileName);   
-   if( fileName.right(1).find('/') == -1)
-           fileName+="/";
+    if( fileName.left(1).find('/') == -1)
+            fileName="/"+fileName;
+    if( fileName.right(1).find('/') == -1)
+            fileName+="/";
   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 FALSE;
   }
   
   QArray<int> cats(1);
   cats[0] = config.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();
   return TRUE;
 }
 
 void VMemo::stopRecording() {
   recording = FALSE;
 }
 
 int VMemo::openDSP()
 {
     Config cfg("Vmemo");
     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\")");
         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)) {
       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)  {