author | llornkcor <llornkcor> | 2002-07-26 01:14:13 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-07-26 01:14:13 (UTC) |
commit | 630a8f6e4ff5eddaee0089e383c42cc198c68ced (patch) (unidiff) | |
tree | 7d743e08c5964eb96f0fb5090d977fdf702c3f44 /core/applets/vmemo | |
parent | f3678966b4f08e9cc99b5f625c028e6f2d29a8ae (diff) | |
download | opie-630a8f6e4ff5eddaee0089e383c42cc198c68ced.zip opie-630a8f6e4ff5eddaee0089e383c42cc198c68ced.tar.gz opie-630a8f6e4ff5eddaee0089e383c42cc198c68ced.tar.bz2 |
made 2nd button release stop recording, and fixed umlimited time recording
-rw-r--r-- | core/applets/vmemo/vmemo.cpp | 24 | ||||
-rw-r--r-- | core/applets/vmemo/vmemo.h | 2 |
2 files changed, 17 insertions, 9 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 | |||
@@ -251,29 +251,31 @@ VMemo::VMemo( QWidget *parent, const char *_name ) | |||
251 | usingIcon=FALSE; | 251 | usingIcon=FALSE; |
252 | if( vmCfg.readNumEntry("hideIcon",0) == 1) | 252 | if( vmCfg.readNumEntry("hideIcon",0) == 1) |
253 | hide(); | 253 | hide(); |
254 | } | 254 | } |
255 | } | 255 | } |
256 | 256 | ||
257 | VMemo::~VMemo() { | 257 | VMemo::~VMemo() { |
258 | } | 258 | } |
259 | 259 | ||
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()") { |
265 | |||
264 | if (recording) { | 266 | if (recording) { |
265 | fromToggle = TRUE; | 267 | fromToggle = TRUE; |
266 | mouseReleaseEvent(NULL); | 268 | mouseReleaseEvent(NULL); |
267 | // stopRecording(); | 269 | stopRecording(); |
268 | } else { | 270 | } else { |
269 | fromToggle = TRUE; | 271 | fromToggle = TRUE; |
270 | // mousePressEvent(NULL); | 272 | // mousePressEvent(NULL); |
271 | startRecording(); | 273 | startRecording(); |
272 | } | 274 | } |
273 | } | 275 | } |
274 | } | 276 | } |
275 | 277 | ||
276 | void VMemo::paintEvent( QPaintEvent* ) { | 278 | void VMemo::paintEvent( QPaintEvent* ) { |
277 | QPainter p(this); | 279 | QPainter p(this); |
278 | p.drawPixmap( 0, 1,( const char** ) vmemo_xpm ); | 280 | p.drawPixmap( 0, 1,( const char** ) vmemo_xpm ); |
279 | } | 281 | } |
@@ -350,65 +352,67 @@ bool VMemo::startRecording() { | |||
350 | s=fileName.find(':'); | 352 | s=fileName.find(':'); |
351 | if(s) | 353 | if(s) |
352 | fileName=fileName.right(fileName.length()-s-2); | 354 | fileName=fileName.right(fileName.length()-s-2); |
353 | qDebug("pathname will be "+fileName); | 355 | qDebug("pathname will be "+fileName); |
354 | 356 | ||
355 | if( fileName.left(1).find('/') == -1) | 357 | if( fileName.left(1).find('/') == -1) |
356 | fileName="/"+fileName; | 358 | fileName="/"+fileName; |
357 | if( fileName.right(1).find('/') == -1) | 359 | if( fileName.right(1).find('/') == -1) |
358 | fileName+="/"; | 360 | fileName+="/"; |
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); |
372 | qDebug("Opening tmp file %s",pointer); | 374 | qDebug("Opening tmp file %s",pointer); |
373 | 375 | ||
374 | if(openWAV(pointer ) == -1) { | 376 | if(openWAV(pointer ) == -1) { |
375 | 377 | ||
376 | // if(openWAV(fileName.latin1()) == -1) { | 378 | // if(openWAV(fileName.latin1()) == -1) { |
377 | QString err("Could not open the temp file\n"); | 379 | QString err("Could not open the temp file\n"); |
378 | err += fileName; | 380 | err += fileName; |
379 | QMessageBox::critical(0, "vmemo", err, "Abort"); | 381 | QMessageBox::critical(0, "vmemo", err, "Abort"); |
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); |
387 | // move tmp file to regular file here | 389 | // move tmp file to regular file here |
388 | system(cmd.latin1()); | 390 | system(cmd.latin1()); |
389 | 391 | ||
390 | QArray<int> cats(1); | 392 | QArray<int> cats(1); |
391 | cats[0] = config.readNumEntry("Category", 0); | 393 | cats[0] = config.readNumEntry("Category", 0); |
392 | 394 | ||
393 | QString dlName("vm_"); | 395 | QString dlName("vm_"); |
394 | dlName += dt.toString(); | 396 | dlName += dt.toString(); |
395 | DocLnk l; | 397 | DocLnk l; |
396 | l.setFile(fileName); | 398 | l.setFile(fileName); |
397 | l.setName(dlName); | 399 | l.setName(dlName); |
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() { |
406 | show(); | 410 | show(); |
407 | qDebug("Stopped recording"); | 411 | qDebug("Stopped recording"); |
408 | recording = FALSE; | 412 | recording = FALSE; |
409 | if(useAlerts) { | 413 | if(useAlerts) { |
410 | msgLabel->close(); | 414 | msgLabel->close(); |
411 | msgLabel=0; | 415 | msgLabel=0; |
412 | delete msgLabel; | 416 | delete msgLabel; |
413 | } | 417 | } |
414 | t_timer->stop(); | 418 | t_timer->stop(); |
@@ -495,78 +499,82 @@ int VMemo::openWAV(const char *filename) { | |||
495 | wh.byte_p_sec = speed * channels * resolution/8; | 499 | wh.byte_p_sec = speed * channels * resolution/8; |
496 | wh.byte_p_spl = channels * (resolution / 8); | 500 | wh.byte_p_spl = channels * (resolution / 8); |
497 | wh.bit_p_spl = resolution; | 501 | wh.bit_p_spl = resolution; |
498 | wh.data_chunk = DATA; | 502 | wh.data_chunk = DATA; |
499 | wh.data_length= 0; | 503 | wh.data_length= 0; |
500 | // qDebug("Write header channels %d, speed %d, b/s %d, blockalign %d, bitrate %d" | 504 | // qDebug("Write header channels %d, speed %d, b/s %d, blockalign %d, bitrate %d" |
501 | // , wh.modus, wh.sample_fq, wh.byte_p_sec, wh.byte_p_spl, wh.bit_p_spl ); | 505 | // , wh.modus, wh.sample_fq, wh.byte_p_sec, wh.byte_p_spl, wh.bit_p_spl ); |
502 | write (wav, &wh, sizeof(WaveHeader)); | 506 | write (wav, &wh, sizeof(WaveHeader)); |
503 | 507 | ||
504 | return 1; | 508 | return 1; |
505 | } | 509 | } |
506 | 510 | ||
507 | void VMemo::record(void) { | 511 | bool VMemo::record() { |
512 | |||
508 | int length=0, result, value; | 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 |
520 | 525 | ||
521 | msg.sprintf("Recording format other"); | 526 | msg.sprintf("Recording format other"); |
522 | qDebug(msg); | 527 | qDebug(msg); |
523 | 528 | ||
524 | int bufsize=1024; | 529 | int bufsize=1024; |
525 | int bytesWritten=0; | 530 | int bytesWritten=0; |
526 | signed short sound[1024], monoBuffer[1024]; | 531 | signed short sound[1024], monoBuffer[1024]; |
527 | char abuf[bufsize/2]; | 532 | char abuf[bufsize/2]; |
528 | short sbuf[bufsize]; | 533 | short sbuf[bufsize]; |
529 | 534 | ||
530 | while(recording) { | 535 | while(recording) { |
531 | 536 | ||
532 | if(useADPCM) | 537 | if(useADPCM) |
533 | result = read( dsp, sbuf, bufsize); // 8192 | 538 | result = read( dsp, sbuf, bufsize); // 8192 |
534 | else | 539 | else |
535 | result = read(dsp, sound, 1024); // 8192 | 540 | result = read(dsp, sound, 1024); // 8192 |
536 | if( result <= 0) { | 541 | if( result <= 0) { |
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) { |
545 | adpcm_coder( sbuf, abuf, result/2, &encoder_state); | 551 | adpcm_coder( sbuf, abuf, result/2, &encoder_state); |
546 | bytesWritten = ::write(wav, abuf, result/4); | 552 | bytesWritten = ::write(wav, abuf, result/4); |
547 | 553 | ||
548 | } else { | 554 | } else { |
549 | for (int i = 0; i < result; i++) { //since Z is mono do normally | 555 | for (int i = 0; i < result; i++) { //since Z is mono do normally |
550 | monoBuffer[i] = sound[i]; | 556 | monoBuffer[i] = sound[i]; |
551 | } | 557 | } |
552 | 558 | ||
553 | length+=write(wav, monoBuffer, result); | 559 | length+=write(wav, monoBuffer, result); |
554 | } | 560 | } |
555 | length +=bytesWritten; | 561 | length +=bytesWritten; |
556 | 562 | ||
557 | if(length<0) { | 563 | if(length<0) { |
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); |
564 | qApp->processEvents(); | 572 | qApp->processEvents(); |
565 | } | 573 | } |
566 | // qDebug("file has length of %d lasting %d seconds", | 574 | // qDebug("file has length of %d lasting %d seconds", |
567 | // length, (( length / speed) / channels) / 2 ); | 575 | // length, (( length / speed) / channels) / 2 ); |
568 | // medialplayer states wrong length in secs | 576 | // medialplayer states wrong length in secs |
569 | // } | 577 | // } |
570 | 578 | ||
571 | //>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>><<<<<<<<<<<<<<<<<<<<<<<<<<<<// | 579 | //>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>><<<<<<<<<<<<<<<<<<<<<<<<<<<<// |
572 | 580 | ||
@@ -588,25 +596,25 @@ void VMemo::record(void) { | |||
588 | fileName = fileName.left(fileName.length()-4); | 596 | fileName = fileName.left(fileName.length()-4); |
589 | // if(useAlerts) | 597 | // if(useAlerts) |
590 | // QMessageBox::message("Vmemo"," Done1 recording\n"+ fileName); | 598 | // QMessageBox::message("Vmemo"," Done1 recording\n"+ fileName); |
591 | qDebug("done recording "+fileName); | 599 | qDebug("done recording "+fileName); |
592 | 600 | ||
593 | // QSound::play(Resource::findSound("vmemoe")); | 601 | // QSound::play(Resource::findSound("vmemoe")); |
594 | 602 | ||
595 | Config cfg("qpe"); | 603 | Config cfg("qpe"); |
596 | cfg.setGroup("Volume"); | 604 | cfg.setGroup("Volume"); |
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) { |
604 | 612 | ||
605 | for( int i=0; i < 10;i++) { | 613 | for( int i=0; i < 10;i++) { |
606 | switch (tog) { | 614 | switch (tog) { |
607 | case 0: | 615 | case 0: |
608 | return -1; | 616 | return -1; |
609 | break; | 617 | break; |
610 | case 1: | 618 | case 1: |
611 | return 0; | 619 | return 0; |
612 | break; | 620 | break; |
diff --git a/core/applets/vmemo/vmemo.h b/core/applets/vmemo/vmemo.h index 167af2a..9ee08ff 100644 --- a/core/applets/vmemo/vmemo.h +++ b/core/applets/vmemo/vmemo.h | |||
@@ -29,25 +29,25 @@ | |||
29 | class VMemo : public QWidget | 29 | class VMemo : public QWidget |
30 | { | 30 | { |
31 | Q_OBJECT | 31 | Q_OBJECT |
32 | public: | 32 | public: |
33 | VMemo( QWidget *parent, const char *name = NULL); | 33 | VMemo( QWidget *parent, const char *name = NULL); |
34 | ~VMemo(); | 34 | ~VMemo(); |
35 | QFile track; | 35 | QFile track; |
36 | QString fileName, errorMsg; | 36 | QString fileName, errorMsg; |
37 | QLabel* msgLabel; | 37 | QLabel* msgLabel; |
38 | QTimer *t_timer; | 38 | QTimer *t_timer; |
39 | bool usingIcon, useADPCM; | 39 | bool usingIcon, useADPCM; |
40 | public slots: | 40 | public slots: |
41 | void record(); | 41 | bool record(); |
42 | void mousePressEvent( QMouseEvent * ); | 42 | void mousePressEvent( QMouseEvent * ); |
43 | void mouseReleaseEvent( QMouseEvent * ); | 43 | void mouseReleaseEvent( QMouseEvent * ); |
44 | void receive( const QCString &msg, const QByteArray &data ); | 44 | void receive( const QCString &msg, const QByteArray &data ); |
45 | bool startRecording(); | 45 | bool startRecording(); |
46 | void stopRecording(); | 46 | void stopRecording(); |
47 | void timerBreak(); | 47 | void timerBreak(); |
48 | private: | 48 | private: |
49 | bool useAlerts; | 49 | bool useAlerts; |
50 | void paintEvent( QPaintEvent* ); | 50 | void paintEvent( QPaintEvent* ); |
51 | int setToggleButton(int); | 51 | int setToggleButton(int); |
52 | int openDSP(); | 52 | int openDSP(); |
53 | int openWAV(const char *filename); | 53 | int openWAV(const char *filename); |