summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2002-06-23 18:53:51 (UTC)
committer llornkcor <llornkcor>2002-06-23 18:53:51 (UTC)
commit616f8cef3111756cac0240be10aea38d4f38ad8e (patch) (unidiff)
tree4d4e5adc2faf9d901b6a3204f3eefa9799eb6c97
parenta27191487361a43e3240a144176688c75e54b868 (diff)
downloadopie-616f8cef3111756cac0240be10aea38d4f38ad8e.zip
opie-616f8cef3111756cac0240be10aea38d4f38ad8e.tar.gz
opie-616f8cef3111756cac0240be10aea38d4f38ad8e.tar.bz2
hide again, one more fix to go..
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/vmemo/vmemo.cpp16
1 files changed, 10 insertions, 6 deletions
diff --git a/core/applets/vmemo/vmemo.cpp b/core/applets/vmemo/vmemo.cpp
index 63ee0b8..84d53e0 100644
--- a/core/applets/vmemo/vmemo.cpp
+++ b/core/applets/vmemo/vmemo.cpp
@@ -228,18 +228,18 @@ VMemo::VMemo( QWidget *parent, const char *_name )
228 // QPEApplication::grabKeyboard(); 228 // QPEApplication::grabKeyboard();
229 QCopEnvelope e("QPE/Desktop", "keyRegister(int key, QString channel, QString message)"); 229 QCopEnvelope e("QPE/Desktop", "keyRegister(int key, QString channel, QString message)");
230 // e << 4096; // Key_Escape 230 // e << 4096; // Key_Escape
231 // e << Key_F5; //4148 231 // e << Key_F5; //4148
232 e << toggleKey; 232 e << toggleKey;
233 e << QString("QPE/VMemo"); 233 e << QString("QPE/VMemo");
234 e << QString("toggleRecord()"); 234 e << QString("toggleRecord()");
235 } 235 }
236 // if( vmCfg.readNumEntry("hideIcon",0) == 1 || toggleKey > 0) 236 if( vmCfg.readNumEntry("hideIcon",0) == 1 || toggleKey > 0)
237 // hide(); 237 hide();
238 } 238 }
239} 239}
240 240
241VMemo::~VMemo() 241VMemo::~VMemo()
242{ 242{
243} 243}
244 244
245void VMemo::receive( const QCString &msg, const QByteArray &data ) 245void VMemo::receive( const QCString &msg, const QByteArray &data )
@@ -358,16 +358,17 @@ bool VMemo::startRecording() {
358 // delete msgLabel; 358 // delete msgLabel;
359 return TRUE; 359 return TRUE;
360} 360}
361 361
362void VMemo::stopRecording() { 362void VMemo::stopRecording() {
363 recording = FALSE; 363 recording = FALSE;
364 if(useAlerts) 364 if(useAlerts)
365 if( msgLabel) delete msgLabel; 365 if( msgLabel) delete msgLabel;
366 t_timer->stop();
366} 367}
367 368
368int VMemo::openDSP() 369int VMemo::openDSP()
369{ 370{
370 Config cfg("Vmemo"); 371 Config cfg("Vmemo");
371 cfg.setGroup("Record"); 372 cfg.setGroup("Record");
372 373
373 speed = cfg.readNumEntry("SampleRate", 22050); 374 speed = cfg.readNumEntry("SampleRate", 22050);
@@ -451,33 +452,36 @@ int VMemo::openWAV(const char *filename)
451} 452}
452 453
453void VMemo::record(void) 454void VMemo::record(void)
454{ 455{
455 int length=0, result, value; 456 int length=0, result, value;
456 QString msg; 457 QString msg;
457 msg.sprintf("Recording format %d", format); 458 msg.sprintf("Recording format %d", format);
458 qDebug(msg); 459 qDebug(msg);
460 Config config("Vmemo");
461 config.setGroup("Record");
462 int sRate=config.readNumEntry("SizeLimit", 30);
459 463
460 t_timer->start( 30 * 1000+1000, TRUE); 464 t_timer->start( sRate * 1000+1000, TRUE);
461 465
462 if(systemZaurus) { 466 if(systemZaurus) {
463 467
464 msg.sprintf("Recording format zaurus"); 468 msg.sprintf("Recording format zaurus");
465 qDebug(msg); 469 qDebug(msg);
466 signed short sound[512], monoBuffer[512]; 470 signed short sound[512], monoBuffer[512];
467 471
468 if(format==AFMT_S16_LE) { 472 if(format==AFMT_S16_LE) {
469 473
470 474
471 475
472 while(recording) { 476 while(recording) {
473 477
474 result = read(dsp, sound, 512); // 8192 478 result = read(dsp, sound, 512); // 8192
475 int j=0; 479 // int j=0;
476 480
477 for (int i = 0; i < result; i++) { //since Z is mono do normally 481 for (int i = 0; i < result; i++) { //since Z is mono do normally
478 monoBuffer[i] = sound[i]; 482 monoBuffer[i] = sound[i];
479 } 483 }
480 484
481 length+=write(wav, monoBuffer, result); 485 length+=write(wav, monoBuffer, result);
482 if(length<0) 486 if(length<0)
483 recording=false; 487 recording=false;
@@ -493,17 +497,17 @@ void VMemo::record(void)
493 // fflush(stdout); 497 // fflush(stdout);
494 } 498 }
495 499
496 } else { //AFMT_U8 500 } else { //AFMT_U8
497 // 8bit unsigned 501 // 8bit unsigned
498 unsigned short sound[512], monoBuffer[512]; 502 unsigned short sound[512], monoBuffer[512];
499 while(recording) { 503 while(recording) {
500 result = read(dsp, sound, 512); // 8192 504 result = read(dsp, sound, 512); // 8192
501 int j=0; 505 // int j=0;
502 506
503 // if(systemZaurus) { 507 // if(systemZaurus) {
504 508
505 for (int i = 0; i < result; i++) { //since Z is mono do normally 509 for (int i = 0; i < result; i++) { //since Z is mono do normally
506 monoBuffer[i] = sound[i]; 510 monoBuffer[i] = sound[i];
507 } 511 }
508 512
509 length+=write(wav, monoBuffer, result); 513 length+=write(wav, monoBuffer, result);
@@ -522,17 +526,17 @@ void VMemo::record(void)
522 } 526 }
523 527
524 } else { // 16 bit only capabilities 528 } else { // 16 bit only capabilities
525 529
526 530
527 msg.sprintf("Recording format other"); 531 msg.sprintf("Recording format other");
528 qDebug(msg); 532 qDebug(msg);
529 533
530 signed short sound[512], monoBuffer[512]; 534 signed short sound[512];//, monoBuffer[512];
531 535
532 while(recording) { 536 while(recording) {
533 537
534 result = read(dsp, sound, 512); // 8192 538 result = read(dsp, sound, 512); // 8192
535 539
536 write(wav, sound, result); 540 write(wav, sound, result);
537 length += result; 541 length += result;
538 if(length<0) { 542 if(length<0) {