| -rw-r--r-- | core/applets/vmemo/vmemo.cpp | 22 |
1 files changed, 13 insertions, 9 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 @@ -255,6 +255,8 @@ void VMemo::mousePressEvent( QMouseEvent *me ) mousePressEvent and mouseReleaseEvent with a NULL parameter. */ - if (!systemZaurus && me != NULL) +#if defined(QT_QWS_IPAQ) || defined(QT_QWS_EBX) + if (!systemZaurus ) return; +#endif Config config( "Sound" ); @@ -266,4 +268,5 @@ void VMemo::mousePressEvent( QMouseEvent *me ) // return; // } else { + if (!systemZaurus ) QSound::play(Resource::findSound("vmemob")); // } @@ -284,15 +287,14 @@ void VMemo::mousePressEvent( QMouseEvent *me ) 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) @@ -302,4 +304,5 @@ void VMemo::mousePressEvent( QMouseEvent *me ) fName = "vm_"+ dt.toString()+ ".wav"; + fileName+=fName; qDebug("filename is "+fileName); @@ -364,5 +367,4 @@ int VMemo::openDSP() if(dsp == -1) { perror("open(\"/dev/dsp\")"); - errorMsg="open(\"/dev/dsp\")\n "+(QString)strerror(errno); return -1; @@ -515,6 +517,8 @@ void VMemo::record(void) 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")); } |