Diffstat (limited to 'core/applets/vmemo/vmemo.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/applets/vmemo/vmemo.cpp | 44 |
1 files changed, 26 insertions, 18 deletions
diff --git a/core/applets/vmemo/vmemo.cpp b/core/applets/vmemo/vmemo.cpp index b5239eb..035965e 100644 --- a/core/applets/vmemo/vmemo.cpp +++ b/core/applets/vmemo/vmemo.cpp | |||
@@ -260,16 +260,18 @@ VMemo::~VMemo() { | |||
260 | void VMemo::receive( const QCString &msg, const QByteArray &data ) { | 260 | void VMemo::receive( const QCString &msg, const QByteArray &data ) { |
261 | qDebug("receive"); | 261 | qDebug("receive"); |
262 | QDataStream stream( data, IO_ReadOnly ); | 262 | QDataStream stream( data, IO_ReadOnly ); |
263 | |||
263 | if (msg == "toggleRecord()") { | 264 | if (msg == "toggleRecord()") { |
264 | if (recording) { | 265 | |
265 | fromToggle = TRUE; | 266 | if (recording) { |
266 | mouseReleaseEvent(NULL); | 267 | fromToggle = TRUE; |
267 | // stopRecording(); | 268 | mouseReleaseEvent(NULL); |
268 | } else { | 269 | stopRecording(); |
269 | fromToggle = TRUE; | 270 | } else { |
270 | // mousePressEvent(NULL); | 271 | fromToggle = TRUE; |
271 | startRecording(); | 272 | // mousePressEvent(NULL); |
272 | } | 273 | startRecording(); |
274 | } | ||
273 | } | 275 | } |
274 | } | 276 | } |
275 | 277 | ||
@@ -359,13 +361,13 @@ bool VMemo::startRecording() { | |||
359 | fName = "vm_"+ dt.toString()+ ".wav"; | 361 | fName = "vm_"+ dt.toString()+ ".wav"; |
360 | 362 | ||
361 | fileName+=fName; | 363 | fileName+=fName; |
362 | qDebug("filename is "+fileName); | ||
363 | // No spaces in the filename | 364 | // No spaces in the filename |
364 | fileName.replace(QRegExp("'"),""); | 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 | 369 | ||
370 | qDebug("filename is "+fileName); | ||
369 | // open tmp file here | 371 | // open tmp file here |
370 | char *pointer; | 372 | char *pointer; |
371 | pointer=tmpnam(NULL); | 373 | pointer=tmpnam(NULL); |
@@ -380,7 +382,7 @@ bool VMemo::startRecording() { | |||
380 | ::close(dsp); | 382 | ::close(dsp); |
381 | return FALSE; | 383 | return FALSE; |
382 | } | 384 | } |
383 | record(); | 385 | if( record() ) { |
384 | 386 | ||
385 | QString cmd; | 387 | QString cmd; |
386 | cmd.sprintf("mv %s "+fileName, pointer); | 388 | cmd.sprintf("mv %s "+fileName, pointer); |
@@ -398,8 +400,10 @@ bool VMemo::startRecording() { | |||
398 | l.setType("audio/x-wav"); | 400 | l.setType("audio/x-wav"); |
399 | l.setCategories(cats); | 401 | l.setCategories(cats); |
400 | l.writeLink(); | 402 | l.writeLink(); |
401 | |||
402 | return TRUE; | 403 | return TRUE; |
404 | } else | ||
405 | return FALSE; | ||
406 | |||
403 | } | 407 | } |
404 | 408 | ||
405 | void VMemo::stopRecording() { | 409 | void VMemo::stopRecording() { |
@@ -504,16 +508,17 @@ int VMemo::openWAV(const char *filename) { | |||
504 | return 1; | 508 | return 1; |
505 | } | 509 | } |
506 | 510 | ||
507 | void VMemo::record(void) { | 511 | bool VMemo::record() { |
508 | int length=0, result, value; | 512 | |
513 | int length=0, result, value; | ||
509 | QString msg; | 514 | QString msg; |
510 | msg.sprintf("Recording format %d", format); | 515 | msg.sprintf("Recording format %d", format); |
511 | qDebug(msg); | 516 | qDebug(msg); |
512 | Config config("Vmemo"); | 517 | Config config("Vmemo"); |
513 | config.setGroup("Record"); | 518 | config.setGroup("Record"); |
514 | int sRate=config.readNumEntry("SizeLimit", 30); | 519 | int sRate=config.readNumEntry("SizeLimit", 30); |
515 | 520 | if(sRate > 0) | |
516 | t_timer->start( sRate * 1000+1000, TRUE); | 521 | t_timer->start( sRate * 1000+1000, TRUE); |
517 | 522 | ||
518 | // if(systemZaurus) { | 523 | // if(systemZaurus) { |
519 | // } else { // 16 bit only capabilities | 524 | // } else { // 16 bit only capabilities |
@@ -537,8 +542,9 @@ void VMemo::record(void) { | |||
537 | perror("recording error "); | 542 | perror("recording error "); |
538 | // qDebug(currentFileName); | 543 | // qDebug(currentFileName); |
539 | QMessageBox::message(tr("Note"),tr("error recording")); | 544 | QMessageBox::message(tr("Note"),tr("error recording")); |
540 | recording=FALSE;; | 545 | recording=FALSE; |
541 | break; | 546 | break; |
547 | return FALSE; | ||
542 | } | 548 | } |
543 | 549 | ||
544 | if(useADPCM) { | 550 | if(useADPCM) { |
@@ -558,6 +564,8 @@ void VMemo::record(void) { | |||
558 | recording=false; | 564 | recording=false; |
559 | perror("dev/dsp's is a lookin' messy"); | 565 | perror("dev/dsp's is a lookin' messy"); |
560 | QMessageBox::message("Vmemo"," Done1 recording\n"+ fileName); | 566 | QMessageBox::message("Vmemo"," Done1 recording\n"+ fileName); |
567 | break; | ||
568 | return FALSE; | ||
561 | } | 569 | } |
562 | // printf("%d\r",length); | 570 | // printf("%d\r",length); |
563 | // fflush(stdout); | 571 | // fflush(stdout); |
@@ -597,7 +605,7 @@ void VMemo::record(void) { | |||
597 | QString foo = cfg.readEntry("Mute","TRUE"); | 605 | QString foo = cfg.readEntry("Mute","TRUE"); |
598 | if(foo.find("TRUE",0,TRUE) != -1) | 606 | if(foo.find("TRUE",0,TRUE) != -1) |
599 | QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << TRUE; //mute | 607 | QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << TRUE; //mute |
600 | 608 | return TRUE; | |
601 | } | 609 | } |
602 | 610 | ||
603 | int VMemo::setToggleButton(int tog) { | 611 | int VMemo::setToggleButton(int tog) { |