summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/vmemo/vmemo.cpp12
1 files changed, 10 insertions, 2 deletions
diff --git a/core/applets/vmemo/vmemo.cpp b/core/applets/vmemo/vmemo.cpp
index 577db75..4b398ad 100644
--- a/core/applets/vmemo/vmemo.cpp
+++ b/core/applets/vmemo/vmemo.cpp
@@ -363,13 +363,13 @@ bool VMemo::startRecording() {
363 fileName+=fName; 363 fileName+=fName;
364 // No spaces in the filename 364 // No spaces in the filename
365 fileName.replace(QRegExp("'"),""); 365 fileName.replace(QRegExp("'"),"");
366 fileName.replace(QRegExp(" "),"_"); 366 fileName.replace(QRegExp(" "),"_");
367 fileName.replace(QRegExp(":"),"."); 367 fileName.replace(QRegExp(":"),".");
368 fileName.replace(QRegExp(","),""); 368 fileName.replace(QRegExp(","),"");
369 fileName += ".wav"; 369
370 370
371 qDebug("filename is "+fileName); 371 qDebug("filename is "+fileName);
372// open tmp file here 372// open tmp file here
373 char *pointer; 373 char *pointer;
374 pointer=tmpnam(NULL); 374 pointer=tmpnam(NULL);
375 qDebug("Opening tmp file %s",pointer); 375 qDebug("Opening tmp file %s",pointer);
@@ -383,14 +383,18 @@ bool VMemo::startRecording() {
383 ::close(dsp); 383 ::close(dsp);
384 return FALSE; 384 return FALSE;
385 } 385 }
386 if( record() ) { 386 if( record() ) {
387 387
388 QString cmd; 388 QString cmd;
389 if( fileName.find(".wav",0,TRUE) == -1)
390 fileName += ".wav";
391
389 cmd.sprintf("mv %s "+fileName, pointer); 392 cmd.sprintf("mv %s "+fileName, pointer);
390// move tmp file to regular file here 393// move tmp file to regular file here
394
391 system(cmd.latin1()); 395 system(cmd.latin1());
392 396
393 QArray<int> cats(1); 397 QArray<int> cats(1);
394 cats[0] = config.readNumEntry("Category", 0); 398 cats[0] = config.readNumEntry("Category", 0);
395 399
396 QString dlName("vm_"); 400 QString dlName("vm_");
@@ -480,12 +484,14 @@ int VMemo::openWAV(const char *filename) {
480 if(!track.open(IO_WriteOnly|IO_Truncate|IO_Raw)) { 484 if(!track.open(IO_WriteOnly|IO_Truncate|IO_Raw)) {
481 errorMsg=filename; 485 errorMsg=filename;
482 return -1; 486 return -1;
483 } 487 }
484 488
485 wav=track.handle(); 489 wav=track.handle();
490 Config vmCfg("Vmemo");
491 vmCfg.setGroup("Defaults");
486 useADPCM = vmCfg.readBoolEntry("use_ADPCM", 0); 492 useADPCM = vmCfg.readBoolEntry("use_ADPCM", 0);
487 493
488 WaveHeader wh; 494 WaveHeader wh;
489 495
490 wh.main_chunk = RIFF; 496 wh.main_chunk = RIFF;
491 wh.length=0; 497 wh.length=0;
@@ -530,12 +536,14 @@ bool VMemo::record() {
530 536
531 int bufsize=1024; 537 int bufsize=1024;
532 int bytesWritten=0; 538 int bytesWritten=0;
533 signed short sound[1024], monoBuffer[1024]; 539 signed short sound[1024], monoBuffer[1024];
534 char abuf[bufsize/2]; 540 char abuf[bufsize/2];
535 short sbuf[bufsize]; 541 short sbuf[bufsize];
542 Config vmCfg("Vmemo");
543 vmCfg.setGroup("Defaults");
536 useADPCM = vmCfg.readBoolEntry("use_ADPCM", 0); 544 useADPCM = vmCfg.readBoolEntry("use_ADPCM", 0);
537 545
538 while(recording) { 546 while(recording) {
539 547
540 if(useADPCM) 548 if(useADPCM)
541 result = read( dsp, sbuf, bufsize); // 8192 549 result = read( dsp, sbuf, bufsize); // 8192
@@ -592,13 +600,13 @@ bool VMemo::record() {
592 qDebug("Track closed"); 600 qDebug("Track closed");
593 601
594 if( ioctl( dsp, SNDCTL_DSP_RESET,0) == -1) 602 if( ioctl( dsp, SNDCTL_DSP_RESET,0) == -1)
595 perror("ioctl(\"SNDCTL_DSP_RESET\")"); 603 perror("ioctl(\"SNDCTL_DSP_RESET\")");
596 604
597 ::close(dsp); 605 ::close(dsp);
598 fileName = fileName.left(fileName.length()-4); 606
599 // if(useAlerts) 607 // if(useAlerts)
600 // QMessageBox::message("Vmemo"," Done1 recording\n"+ fileName); 608 // QMessageBox::message("Vmemo"," Done1 recording\n"+ fileName);
601 qDebug("done recording "+fileName); 609 qDebug("done recording "+fileName);
602 610
603// QSound::play(Resource::findSound("vmemoe")); 611// QSound::play(Resource::findSound("vmemoe"));
604 612