summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/vmemo/vmemo.cpp26
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
@@ -254,9 +254,11 @@ void VMemo::mousePressEvent( QMouseEvent *me )
254 No mousePress/mouseRelease recording on the iPAQ. The REC button on the iPAQ calls these functions 254 No mousePress/mouseRelease recording on the iPAQ. The REC button on the iPAQ calls these functions
255 mousePressEvent and mouseReleaseEvent with a NULL parameter. 255 mousePressEvent and mouseReleaseEvent with a NULL parameter.
256 */ 256 */
257 if (!systemZaurus && me != NULL) 257#if defined(QT_QWS_IPAQ) || defined(QT_QWS_EBX)
258 return; 258 if (!systemZaurus )
259 259 return;
260#endif
261
260 Config config( "Sound" ); 262 Config config( "Sound" );
261 config.setGroup( "System" ); 263 config.setGroup( "System" );
262 useAlerts = config.readBoolEntry("Alert"); 264 useAlerts = config.readBoolEntry("Alert");
@@ -265,6 +267,7 @@ void VMemo::mousePressEvent( QMouseEvent *me )
265// QMessageBox::message("VMemo","Really Record?");//) ==1) 267// QMessageBox::message("VMemo","Really Record?");//) ==1)
266// return; 268// return;
267// } else { 269// } else {
270 if (!systemZaurus )
268 QSound::play(Resource::findSound("vmemob")); 271 QSound::play(Resource::findSound("vmemob"));
269// } 272// }
270 qDebug("Start recording"); 273 qDebug("Start recording");
@@ -283,17 +286,16 @@ void VMemo::mousePressEvent( QMouseEvent *me )
283 QString fName; 286 QString fName;
284 Config cfg( "Sound" ); 287 Config cfg( "Sound" );
285 cfg.setGroup( "System" ); 288 cfg.setGroup( "System" );
286 fileName = cfg.readEntry("RecLocation",QPEApplication::documentDir() ); 289 fName = QPEApplication::documentDir() ;
290 fileName = cfg.readEntry("RecLocation", fName);
287 291
288 int s; 292 int s;
289 s=fileName.find(':'); 293 s=fileName.find(':');
290 if(s) 294 if(s)
291 fileName=fileName.right(fileName.length()-s-2)+"/"; 295 fileName=fileName.right(fileName.length()-s-2);
292 296 qDebug("filename will be "+fileName);
293// if( !fileName.right(1).find('/') == -1) 297 if( !fileName.right(1).find('/') == -1)
294// fileName+="/audio/"; 298 fileName+="/";
295// else
296// fileName+="audio/";
297 299
298// if(systemZaurus) 300// if(systemZaurus)
299// fileName=vmCfg.readEntry("Dir", "/mnt/cf/"); // zaurus does not have /mnt/ramfs 301// fileName=vmCfg.readEntry("Dir", "/mnt/cf/"); // zaurus does not have /mnt/ramfs
@@ -301,6 +303,7 @@ void VMemo::mousePressEvent( QMouseEvent *me )
301// fileName=vmCfg.readEntry("Dir", "/mnt/ramfs/"); 303// fileName=vmCfg.readEntry("Dir", "/mnt/ramfs/");
302 304
303 fName = "vm_"+ dt.toString()+ ".wav"; 305 fName = "vm_"+ dt.toString()+ ".wav";
306
304 fileName+=fName; 307 fileName+=fName;
305 qDebug("filename is "+fileName); 308 qDebug("filename is "+fileName);
306 // No spaces in the filename 309 // No spaces in the filename
@@ -363,7 +366,6 @@ int VMemo::openDSP()
363 366
364 if(dsp == -1) { 367 if(dsp == -1) {
365 perror("open(\"/dev/dsp\")"); 368 perror("open(\"/dev/dsp\")");
366
367 errorMsg="open(\"/dev/dsp\")\n "+(QString)strerror(errno); 369 errorMsg="open(\"/dev/dsp\")\n "+(QString)strerror(errno);
368 return -1; 370 return -1;
369 } 371 }
@@ -514,7 +516,9 @@ void VMemo::record(void)
514 if( ioctl( dsp, SNDCTL_DSP_RESET,0) == -1) 516 if( ioctl( dsp, SNDCTL_DSP_RESET,0) == -1)
515 perror("ioctl(\"SNDCTL_DSP_RESET\")"); 517 perror("ioctl(\"SNDCTL_DSP_RESET\")");
516 ::close(dsp); 518 ::close(dsp);
519 fileName = fileName.left(fileName.length()-4);
517 if(useAlerts) 520 if(useAlerts)
518 QMessageBox::message("Vmemo"," Done recording\n"+ fileName); 521 QMessageBox::message("Vmemo"," Done recording\n"+ fileName);
522 qDebug("done recording "+fileName);
519 QSound::play(Resource::findSound("vmemoe")); 523 QSound::play(Resource::findSound("vmemoe"));
520} 524}