author | llornkcor <llornkcor> | 2004-07-02 21:28:14 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2004-07-02 21:28:14 (UTC) |
commit | e46eb5eb8bb8a0a34dbc7f4749ff62633261aba0 (patch) (unidiff) | |
tree | 0f18b7d34ee6208b18afc45837098c4e11cc5ed5 /core/applets | |
parent | 558c37f440baa57213d40639992bd29eaed1e12f (diff) | |
download | opie-e46eb5eb8bb8a0a34dbc7f4749ff62633261aba0.zip opie-e46eb5eb8bb8a0a34dbc7f4749ff62633261aba0.tar.gz opie-e46eb5eb8bb8a0a34dbc7f4749ff62633261aba0.tar.bz2 |
fix
-rw-r--r-- | core/applets/vmemo/vmemo.cpp | 42 |
1 files changed, 26 insertions, 16 deletions
diff --git a/core/applets/vmemo/vmemo.cpp b/core/applets/vmemo/vmemo.cpp index b80b378..e747a19 100644 --- a/core/applets/vmemo/vmemo.cpp +++ b/core/applets/vmemo/vmemo.cpp | |||
@@ -227,25 +227,26 @@ VMemo::VMemo( QWidget *parent, const char *_name ) | |||
227 | QCopEnvelope e("QPE/Launcher", "keyRegister(int,QCString,QCString)"); | 227 | QCopEnvelope e("QPE/Launcher", "keyRegister(int,QCString,QCString)"); |
228 | // e << 4096; // Key_Escape | 228 | // e << 4096; // Key_Escape |
229 | // e << Key_F5; //4148 | 229 | // e << Key_F5; //4148 |
230 | e << toggleKey; | 230 | e << toggleKey; |
231 | e << QString("QPE/VMemo"); | 231 | e << QString("QPE/VMemo"); |
232 | e << QString("toggleRecord()"); | 232 | e << QString("toggleRecord()"); |
233 | } | 233 | } |
234 | if(toggleKey == 1) | 234 | if(toggleKey == 1) |
235 | usingIcon = TRUE; | 235 | usingIcon = TRUE; |
236 | else | 236 | else |
237 | usingIcon = FALSE; | 237 | usingIcon = FALSE; |
238 | // if( vmCfg.readNumEntry("hideIcon",0) == 1) | 238 | // if( vmCfg.readNumEntry("hideIcon",0) == 1) |
239 | // hide(); | 239 | if (!usingIcon) |
240 | hide(); | ||
240 | recording = FALSE; | 241 | recording = FALSE; |
241 | // } | 242 | // } |
242 | } | 243 | } |
243 | 244 | ||
244 | VMemo::~VMemo() { | 245 | VMemo::~VMemo() { |
245 | } | 246 | } |
246 | 247 | ||
247 | int VMemo::position() | 248 | int VMemo::position() |
248 | { | 249 | { |
249 | return 6; | 250 | return 6; |
250 | } | 251 | } |
251 | 252 | ||
@@ -366,25 +367,25 @@ bool VMemo::startRecording() { | |||
366 | l.setFile(fileName); | 367 | l.setFile(fileName); |
367 | l.setName(dlName); | 368 | l.setName(dlName); |
368 | l.setType("audio/x-wav"); | 369 | l.setType("audio/x-wav"); |
369 | l.setCategories(cats); | 370 | l.setCategories(cats); |
370 | l.writeLink(); | 371 | l.writeLink(); |
371 | return TRUE; | 372 | return TRUE; |
372 | } else | 373 | } else |
373 | return FALSE; | 374 | return FALSE; |
374 | 375 | ||
375 | } | 376 | } |
376 | 377 | ||
377 | void VMemo::stopRecording() { | 378 | void VMemo::stopRecording() { |
378 | show(); | 379 | // show(); |
379 | odebug << "Stopped recording" << oendl; | 380 | odebug << "Stopped recording" << oendl; |
380 | recording = FALSE; | 381 | recording = FALSE; |
381 | if(useAlerts) { | 382 | if(useAlerts) { |
382 | msgLabel->close(); | 383 | msgLabel->close(); |
383 | msgLabel=0; | 384 | msgLabel=0; |
384 | delete msgLabel; | 385 | delete msgLabel; |
385 | } | 386 | } |
386 | t_timer->stop(); | 387 | t_timer->stop(); |
387 | Config cfg("Vmemo"); | 388 | Config cfg("Vmemo"); |
388 | cfg.setGroup("Defaults"); | 389 | cfg.setGroup("Defaults"); |
389 | // if( cfg.readNumEntry("hideIcon",0) == 1 ) | 390 | // if( cfg.readNumEntry("hideIcon",0) == 1 ) |
390 | // hide(); | 391 | // hide(); |
@@ -476,99 +477,108 @@ int VMemo::openWAV(const char *filename) { | |||
476 | wh.bit_p_spl = resolution; | 477 | wh.bit_p_spl = resolution; |
477 | wh.data_chunk = DATA; | 478 | wh.data_chunk = DATA; |
478 | wh.data_length= 0; | 479 | wh.data_length= 0; |
479 | // odebug << "Write header channels " << wh.modus << ", speed " << wh.sample_fq << ", b/s " | 480 | // odebug << "Write header channels " << wh.modus << ", speed " << wh.sample_fq << ", b/s " |
480 | // << wh.byte_p_sec << ", blockalign " << wh.byte_p_spl << ", bitrate " << wh.bit_p_spl << oendl; | 481 | // << wh.byte_p_sec << ", blockalign " << wh.byte_p_spl << ", bitrate " << wh.bit_p_spl << oendl; |
481 | write (wav, &wh, sizeof(WaveHeader)); | 482 | write (wav, &wh, sizeof(WaveHeader)); |
482 | 483 | ||
483 | return 1; | 484 | return 1; |
484 | } | 485 | } |
485 | 486 | ||
486 | bool VMemo::record() { | 487 | bool VMemo::record() { |
487 | length = 0; | 488 | length = 0; |
488 | int bytesWritten = 0; | 489 | int bytesWritten = 0; |
489 | int result = 0; | 490 | int result = 0; |
490 | int value = 0; | 491 | int value = 0; |
492 | |||
491 | QString msg; | 493 | QString msg; |
492 | msg.sprintf("Recording format %d", format); | 494 | msg.sprintf("Recording format %d", format); |
493 | odebug << msg << oendl; | 495 | odebug << msg << oendl; |
496 | |||
494 | Config config("Vmemo"); | 497 | Config config("Vmemo"); |
495 | config.setGroup("Record"); | 498 | config.setGroup("Record"); |
496 | int sRate = config.readNumEntry("SizeLimit", 30); | 499 | int sRate = config.readNumEntry("SizeLimit", 30); |
497 | if(sRate > 0) | 500 | odebug << "VMEMO rate" << sRate << oendl; |
498 | t_timer->start( sRate * 1000+1000, TRUE); | ||
499 | 501 | ||
500 | msg.sprintf("Recording format other"); | 502 | if(sRate > 0) { |
501 | odebug << msg << oendl; | 503 | t_timer->start( sRate * 1000+1000, TRUE); |
504 | } | ||
505 | |||
506 | msg.sprintf("Recording format other"); | ||
507 | odebug << msg << oendl; | ||
502 | 508 | ||
503 | config.setGroup("Defaults"); | 509 | config.setGroup("Defaults"); |
504 | useADPCM = config.readBoolEntry("use_ADPCM", 0); | 510 | useADPCM = config.readBoolEntry("use_ADPCM", 0); |
505 | 511 | ||
506 | int bufsize = config.readNumEntry("BufferSize",1024); | 512 | int bufsize = config.readNumEntry("BufferSize",1024); |
507 | unsigned short sound[bufsize]; //, monoBuffer[bufsize]; | 513 | unsigned short sound[bufsize]; //, monoBuffer[bufsize]; |
508 | char abuf[bufsize / 2]; | 514 | char abuf[bufsize / 2]; |
509 | short sbuf[bufsize]; | 515 | short sbuf[bufsize]; |
510 | 516 | odebug << "ready to record"<< oendl; | |
511 | if(useADPCM) { | 517 | if(useADPCM) { |
518 | odebug << "usr ADPCM" << oendl; | ||
519 | |||
512 | while(recording) { | 520 | while(recording) { |
513 | result = ::read(dsp, sbuf, bufsize); // adpcm read | 521 | result = ::read(dsp, sbuf, bufsize); // adpcm read |
514 | if( result <= 0) { | 522 | if( result <= 0) { |
515 | perror("recording error "); | 523 | perror("recording error "); |
516 | QMessageBox::message(tr("Note"),tr("error recording")); | 524 | QMessageBox::message(tr("Note"),tr("error recording")); |
517 | recording = FALSE; | 525 | recording = FALSE; |
518 | break; | 526 | break; |
519 | return FALSE; | 527 | return FALSE; |
520 | } | 528 | } |
521 | adpcm_coder( sbuf, abuf, result/2, &encoder_state); | 529 | adpcm_coder( sbuf, abuf, result/2, &encoder_state); |
522 | bytesWritten = ::write(wav, abuf, result/4); // adpcm write | 530 | bytesWritten = ::write(wav, abuf, result/4); // adpcm write |
523 | length += bytesWritten; | 531 | length += bytesWritten; |
524 | 532 | ||
525 | if(length < 0) { | 533 | if(length < 0) { |
526 | recording = false; | 534 | recording = false; |
527 | perror("dev/dsp's is a lookin' messy"); | 535 | perror("dev/dsp's is a lookin' messy"); |
528 | QMessageBox::message("Vmemo","Error writing to file\n"+ fileName); | 536 | QMessageBox::message("Vmemo","Error writing to file\n"+ fileName); |
529 | break; | 537 | break; |
530 | return FALSE; | 538 | return FALSE; |
531 | } | 539 | } |
532 | // printf("%d\r", length); | 540 | printf("%d\r", length); |
533 | // fflush(stdout); | 541 | fflush(stdout); |
534 | qApp->processEvents(); | 542 | qApp->processEvents(); |
535 | } | 543 | } |
536 | } else { | 544 | } else { |
545 | odebug << "use regular wav" << oendl; | ||
537 | while(recording) { | 546 | while(recording) { |
538 | result = ::read(dsp, sound, bufsize); // read | 547 | result = ::read(dsp, sound, bufsize); // read |
539 | if( result <= 0) { | 548 | if( result <= 0) { |
540 | perror("recording error "); | 549 | perror("recording error "); |
541 | QMessageBox::message(tr("Note"),tr("error recording")); | 550 | QMessageBox::message(tr("Note"),tr("error recording")); |
542 | recording = FALSE; | 551 | recording = FALSE; |
543 | break; | 552 | break; |
544 | return FALSE; | 553 | return FALSE; |
554 | } | ||
545 | 555 | ||
546 | bytesWritten = ::write(wav, sound, result); // write | 556 | bytesWritten = ::write(wav, sound, result); // write |
547 | length += bytesWritten; | 557 | length += bytesWritten; |
548 | 558 | ||
549 | if(length < 0) { | 559 | if(length < 0) { |
550 | recording = false; | 560 | recording = false; |
551 | perror("dev/dsp's is a lookin' messy"); | 561 | perror("dev/dsp's is a lookin' messy"); |
552 | QMessageBox::message("Vmemo","Error writing to file\n"+ fileName); | 562 | QMessageBox::message("Vmemo","Error writing to file\n"+ fileName); |
553 | break; | 563 | break; |
554 | return FALSE; | 564 | return FALSE; |
555 | } | 565 | } |
556 | // printf("%d\r", length); | 566 | // printf("%d\r", length); |
557 | // fflush(stdout); | 567 | // fflush(stdout); |
558 | qApp->processEvents(); | 568 | qApp->processEvents(); |
559 | } | 569 | } |
570 | // odebug << "result is " << result << oendl; | ||
560 | } | 571 | } |
561 | } | 572 | odebug << "file has length of " << length << " lasting " << (( length / speed) / channels) / 2 << " seconds" << oendl; |
562 | // odebug << "file has length of " << length << " lasting " << (( length / speed) / channels) / 2 ) << " seconds" << oendl; | ||
563 | 573 | ||
564 | value = length + 36; | 574 | value = length + 36; |
565 | 575 | ||
566 | lseek(wav, 4, SEEK_SET); | 576 | lseek(wav, 4, SEEK_SET); |
567 | write(wav, &value, 4); | 577 | write(wav, &value, 4); |
568 | lseek(wav, 40, SEEK_SET); | 578 | lseek(wav, 40, SEEK_SET); |
569 | 579 | ||
570 | write(wav, &length, 4); | 580 | write(wav, &length, 4); |
571 | 581 | ||
572 | track.close(); | 582 | track.close(); |
573 | odebug << "Track closed" << oendl; | 583 | odebug << "Track closed" << oendl; |
574 | 584 | ||