author | llornkcor <llornkcor> | 2004-04-22 08:33:56 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2004-04-22 08:33:56 (UTC) |
commit | 731e459a8621fb359ca39ccf4d11bffcc024dcfa (patch) (unidiff) | |
tree | 0b6e6ab404dfa323e7b714f3926996f0bf82a2d1 /core/applets/vmemo/vmemo.cpp | |
parent | a0952719afc122e5a16d81253a9de86ee7e608b8 (diff) | |
download | opie-731e459a8621fb359ca39ccf4d11bffcc024dcfa.zip opie-731e459a8621fb359ca39ccf4d11bffcc024dcfa.tar.gz opie-731e459a8621fb359ca39ccf4d11bffcc024dcfa.tar.bz2 |
make buffersize user config BufferSize, default 1024, remove some mishmash
Diffstat (limited to 'core/applets/vmemo/vmemo.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/applets/vmemo/vmemo.cpp | 178 |
1 files changed, 91 insertions, 87 deletions
diff --git a/core/applets/vmemo/vmemo.cpp b/core/applets/vmemo/vmemo.cpp index 622b1df..1ead4dd 100644 --- a/core/applets/vmemo/vmemo.cpp +++ b/core/applets/vmemo/vmemo.cpp | |||
@@ -214,6 +214,7 @@ VMemo::VMemo( QWidget *parent, const char *_name ) | |||
214 | odebug << "toggleKey " << toggleKey << "" << oendl; | 214 | odebug << "toggleKey " << toggleKey << "" << oendl; |
215 | if ( QFile::exists ( "/dev/sharp_buz" ) || QFile::exists ( "/dev/sharp_led" )) | 215 | |
216 | systemZaurus=TRUE; | 216 | // if ( QFile::exists ( "/dev/sharp_buz" ) || QFile::exists ( "/dev/sharp_led" )) |
217 | else | 217 | // systemZaurus=TRUE; |
218 | systemZaurus=FALSE; | 218 | // else |
219 | systemZaurus = FALSE; | ||
219 | 220 | ||
@@ -224,3 +225,3 @@ VMemo::VMemo( QWidget *parent, const char *_name ) | |||
224 | if( toggleKey != -1 ) { | 225 | if( toggleKey != -1 ) { |
225 | // keyRegister(key, channel, message) | 226 | qDebug("Register key %d", toggleKey); |
226 | QCopEnvelope e("QPE/Launcher", "keyRegister(int,QCString,QCString)"); | 227 | QCopEnvelope e("QPE/Launcher", "keyRegister(int,QCString,QCString)"); |
@@ -233,7 +234,7 @@ VMemo::VMemo( QWidget *parent, const char *_name ) | |||
233 | if(toggleKey == 1) | 234 | if(toggleKey == 1) |
234 | usingIcon=TRUE; | 235 | usingIcon = TRUE; |
235 | else | 236 | else |
236 | usingIcon=FALSE; | 237 | usingIcon = FALSE; |
237 | if( vmCfg.readNumEntry("hideIcon",0) == 1) | 238 | // if( vmCfg.readNumEntry("hideIcon",0) == 1) |
238 | hide(); | 239 | // hide(); |
239 | recording = FALSE; | 240 | recording = FALSE; |
@@ -251,3 +252,3 @@ int VMemo::position() | |||
251 | void VMemo::receive( const QCString &msg, const QByteArray &data ) { | 252 | void VMemo::receive( const QCString &msg, const QByteArray &data ) { |
252 | odebug << "receive" << oendl; | 253 | odebug << "Vmemo receive" << oendl; |
253 | QDataStream stream( data, IO_ReadOnly ); | 254 | QDataStream stream( data, IO_ReadOnly ); |
@@ -330,6 +331,6 @@ bool VMemo::startRecording() { | |||
330 | fileName+="/"; | 331 | fileName+="/"; |
331 | fName = "vm_"+ date+ ".wav"; | 332 | fName = "vm_"+ date + ".wav"; |
332 | 333 | ||
333 | fileName+=fName; | 334 | fileName+=fName; |
334 | odebug << "filename is "+fileName << oendl; | 335 | odebug << "filename is " + fileName << oendl; |
335 | // open tmp file here | 336 | // open tmp file here |
@@ -387,4 +388,4 @@ void VMemo::stopRecording() { | |||
387 | cfg.setGroup("Defaults"); | 388 | cfg.setGroup("Defaults"); |
388 | if( cfg.readNumEntry("hideIcon",0) == 1 ) | 389 | // if( cfg.readNumEntry("hideIcon",0) == 1 ) |
389 | hide(); | 390 | // hide(); |
390 | } | 391 | } |
@@ -485,12 +486,12 @@ int VMemo::openWAV(const char *filename) { | |||
485 | bool VMemo::record() { | 486 | bool VMemo::record() { |
486 | length=0; | 487 | length = 0; |
487 | int result, value; | 488 | int result, value; |
488 | QString msg; | 489 | QString msg; |
489 | msg.sprintf("Recording format %d", format); | 490 | msg.sprintf("Recording format %d", format); |
490 | odebug << msg << oendl; | 491 | odebug << msg << oendl; |
491 | Config config("Vmemo"); | 492 | Config config("Vmemo"); |
492 | config.setGroup("Record"); | 493 | config.setGroup("Record"); |
493 | int sRate=config.readNumEntry("SizeLimit", 30); | 494 | int sRate=config.readNumEntry("SizeLimit", 30); |
494 | if(sRate > 0) | 495 | if(sRate > 0) |
495 | t_timer->start( sRate * 1000+1000, TRUE); | 496 | t_timer->start( sRate * 1000+1000, TRUE); |
496 | 497 | ||
@@ -502,7 +503,5 @@ bool VMemo::record() { | |||
502 | 503 | ||
503 | int bufsize=1024; | 504 | |
504 | int bytesWritten=0; | 505 | int bytesWritten = 0; |
505 | signed short sound[1024], monoBuffer[1024]; | 506 | |
506 | char abuf[bufsize/2]; | ||
507 | short sbuf[bufsize]; | ||
508 | Config vmCfg("Vmemo"); | 507 | Config vmCfg("Vmemo"); |
@@ -511,2 +510,7 @@ bool VMemo::record() { | |||
511 | 510 | ||
511 | int bufsize = vmCfg.readNumEntry("BufferSize",1024); | ||
512 | signed short sound[bufsize], monoBuffer[bufsize]; | ||
513 | char abuf[bufsize / 2]; | ||
514 | short sbuf[bufsize]; | ||
515 | |||
512 | while(recording) { | 516 | while(recording) { |
@@ -514,12 +518,12 @@ bool VMemo::record() { | |||
514 | if(useADPCM) | 518 | if(useADPCM) |
515 | result = read( dsp, sbuf, bufsize); // 8192 | 519 | result = ::read(dsp, sbuf, bufsize); // 8192 |
516 | else | 520 | else |
517 | result = read(dsp, sound, 1024); // 8192 | 521 | result = ::read(dsp, sound, bufsize); // 8192 |
518 | if( result <= 0) { | 522 | if( result <= 0) { |
519 | perror("recording error "); | 523 | perror("recording error "); |
520 | // odebug << currentFileName << oendl; | 524 | // odebug << currentFileName << oendl; |
521 | QMessageBox::message(tr("Note"),tr("error recording")); | 525 | QMessageBox::message(tr("Note"),tr("error recording")); |
522 | recording=FALSE; | 526 | recording = FALSE; |
523 | break; | 527 | break; |
524 | return FALSE; | 528 | return FALSE; |
525 | } | 529 | } |
@@ -528,75 +532,75 @@ bool VMemo::record() { | |||
528 | adpcm_coder( sbuf, abuf, result/2, &encoder_state); | 532 | adpcm_coder( sbuf, abuf, result/2, &encoder_state); |
529 | bytesWritten = ::write(wav, abuf, result/4); | 533 | bytesWritten = ::write(wav, abuf, result/4); |
530 | 534 | ||
531 | } else { | 535 | } else { |
532 | for (int i = 0; i < result; i++) { //since Z is mono do normally | 536 | // for (int i = 0; i < result; i++) { //since Z is mono do normally |
533 | monoBuffer[i] = sound[i]; | 537 | // monoBuffer[i] = sound[i]; |
534 | } | 538 | // } |
535 | 539 | ||
536 | length+=write(wav, monoBuffer, result); | 540 | length += write(wav, sound, result); |
537 | } | 541 | } |
538 | length +=bytesWritten; | 542 | length += bytesWritten; |
539 | 543 | ||
540 | if(length<0) { | 544 | if(length<0) { |
541 | recording=false; | 545 | recording = false; |
542 | perror("dev/dsp's is a lookin' messy"); | 546 | perror("dev/dsp's is a lookin' messy"); |
543 | QMessageBox::message("Vmemo","Error writing to file\n"+ fileName); | 547 | QMessageBox::message("Vmemo","Error writing to file\n"+ fileName); |
544 | break; | 548 | break; |
545 | return FALSE; | 549 | return FALSE; |
546 | } | 550 | } |
547 | // odebug << "" << length << "\r" << oendl; | 551 | // odebug << "" << length << "\r" << oendl; |
548 | // fflush(stdout); | 552 | // fflush(stdout); |
549 | qApp->processEvents(); | 553 | qApp->processEvents(); |
550 | } | 554 | } |
551 | // qDebug("file has length of %d lasting %d seconds", | 555 | // qDebug("file has length of %d lasting %d seconds", |
552 | // length, (( length / speed) / channels) / 2 ); | 556 | // length, (( length / speed) / channels) / 2 ); |
553 | // } | 557 | // } |
554 | 558 | ||
555 | //>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>><<<<<<<<<<<<<<<<<<<<<<<<<<<<// | 559 | //>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>><<<<<<<<<<<<<<<<<<<<<<<<<<<<// |
556 | 560 | ||
557 | value = length+36; | 561 | value = length + 36; |
558 | 562 | ||
559 | lseek(wav, 4, SEEK_SET); | 563 | lseek(wav, 4, SEEK_SET); |
560 | write(wav, &value, 4); | 564 | write(wav, &value, 4); |
561 | lseek(wav, 40, SEEK_SET); | 565 | lseek(wav, 40, SEEK_SET); |
562 | 566 | ||
563 | write(wav, &length, 4); | 567 | write(wav, &length, 4); |
564 | 568 | ||
565 | track.close(); | 569 | track.close(); |
566 | odebug << "Track closed" << oendl; | 570 | odebug << "Track closed" << oendl; |
567 | 571 | ||
568 | if( ioctl( dsp, SNDCTL_DSP_RESET,0) == -1) | 572 | if( ioctl( dsp, SNDCTL_DSP_RESET,0) == -1) |
569 | perror("ioctl(\"SNDCTL_DSP_RESET\")"); | 573 | perror("ioctl(\"SNDCTL_DSP_RESET\")"); |
570 | 574 | ||
571 | ::close(dsp); | 575 | ::close(dsp); |
572 | 576 | ||
573 | Config cfgO("OpieRec"); | 577 | Config cfgO("OpieRec"); |
574 | cfgO.setGroup("Sounds"); | 578 | cfgO.setGroup("Sounds"); |
575 | 579 | ||
576 | int nFiles = cfgO.readNumEntry( "NumberofFiles",0); | 580 | int nFiles = cfgO.readNumEntry( "NumberofFiles",0); |
577 | 581 | ||
578 | QString currentFileName = fileName; | 582 | QString currentFileName = fileName; |
579 | QString currentFile = "vm_"+ date; | 583 | QString currentFile = "vm_"+ date; |
580 | 584 | ||
581 | float numberOfRecordedSeconds=(float) length / (float)speed * (float)2; | 585 | float numberOfRecordedSeconds=(float) length / (float)speed * (float)2; |
582 | 586 | ||
583 | cfgO.writeEntry( "NumberofFiles", nFiles + 1); | 587 | cfgO.writeEntry( "NumberofFiles", nFiles + 1); |
584 | cfgO.writeEntry( QString::number( nFiles + 1), currentFile); | 588 | cfgO.writeEntry( QString::number( nFiles + 1), currentFile); |
585 | cfgO.writeEntry( currentFile, currentFileName); | 589 | cfgO.writeEntry( currentFile, currentFileName); |
586 | 590 | ||
587 | QString time; | 591 | QString time; |
588 | time.sprintf("%.2f", numberOfRecordedSeconds); | 592 | time.sprintf("%.2f", numberOfRecordedSeconds); |
589 | cfgO.writeEntry( currentFileName, time ); | 593 | cfgO.writeEntry( currentFileName, time ); |
590 | // odebug << "writing config numberOfRecordedSeconds "+time << oendl; | 594 | // odebug << "writing config numberOfRecordedSeconds "+time << oendl; |
591 | 595 | ||
592 | cfgO.write(); | 596 | cfgO.write(); |
593 | 597 | ||
594 | odebug << "done recording "+fileName << oendl; | 598 | odebug << "done recording "+fileName << oendl; |
595 | 599 | ||
596 | Config cfg("qpe"); | 600 | Config cfg("qpe"); |
597 | cfg.setGroup("Volume"); | 601 | cfg.setGroup("Volume"); |
598 | QString foo = cfg.readEntry("Mute","TRUE"); | 602 | QString foo = cfg.readEntry("Mute","TRUE"); |
599 | if(foo.find("TRUE",0,TRUE) != -1) | 603 | if(foo.find("TRUE",0,TRUE) != -1) |
600 | QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << TRUE; //mute | 604 | QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << TRUE; //mute |
601 | return TRUE; | 605 | return TRUE; |
602 | } | 606 | } |