summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2003-05-07 16:14:40 (UTC)
committer mickeyl <mickeyl>2003-05-07 16:14:40 (UTC)
commit1e9e3371d61cfc404329a8bad51f8b061c1ad73d (patch) (unidiff)
treeede98f5b571543cef4047c3a33e314ffee91a94c
parent7c8110d568ac60517916114ac5fc4e850156d4e5 (diff)
downloadopie-1e9e3371d61cfc404329a8bad51f8b061c1ad73d.zip
opie-1e9e3371d61cfc404329a8bad51f8b061c1ad73d.tar.gz
opie-1e9e3371d61cfc404329a8bad51f8b061c1ad73d.tar.bz2
reenable sounds now that they work on the Z again
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/camera/gui/mainwindow.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/noncore/multimedia/camera/gui/mainwindow.cpp b/noncore/multimedia/camera/gui/mainwindow.cpp
index 49c7cbf..0854f0d 100644
--- a/noncore/multimedia/camera/gui/mainwindow.cpp
+++ b/noncore/multimedia/camera/gui/mainwindow.cpp
@@ -447,33 +447,33 @@ void CameraMainWindow::performCapture( const QString& format )
447 bool result = im.save( name, format, quality ); 447 bool result = im.save( name, format, quality );
448 if ( !result ) 448 if ( !result )
449 { 449 {
450 oerr << "imageio-Problem while writing." << oendl; 450 oerr << "imageio-Problem while writing." << oendl;
451 Global::statusMessage( "Error!" ); 451 Global::statusMessage( "Error!" );
452 } 452 }
453 else 453 else
454 { 454 {
455 odebug << captureFormat << "-image has been successfully captured" << oendl; 455 odebug << captureFormat << "-image has been successfully captured" << oendl;
456 Global::statusMessage( "Ok." ); 456 Global::statusMessage( "Ok." );
457 } 457 }
458} 458}
459 459
460 460
461void CameraMainWindow::startVideoCapture() 461void CameraMainWindow::startVideoCapture()
462{ 462{
463 //ODevice::inst()->touchSound(); 463 ODevice::inst()->touchSound();
464 ODevice::inst()->setLedState( Led_Mail, Led_BlinkSlow ); 464 ODevice::inst()->setLedState( Led_Mail, Led_BlinkSlow );
465 465
466 _capturefd = ::open( CAPTUREFILE, O_WRONLY | O_CREAT | O_TRUNC ); 466 _capturefd = ::open( CAPTUREFILE, O_WRONLY | O_CREAT | O_TRUNC );
467 if ( _capturefd == -1 ) 467 if ( _capturefd == -1 )
468 { 468 {
469 owarn << "can't open capture file: " << strerror(errno) << oendl; 469 owarn << "can't open capture file: " << strerror(errno) << oendl;
470 return; 470 return;
471 } 471 }
472 472
473 _capturebuf = new unsigned char[captureX*captureY*2]; 473 _capturebuf = new unsigned char[captureX*captureY*2];
474 _capturing = true; 474 _capturing = true;
475 _videopics = 0; 475 _videopics = 0;
476 _framerate = 0; 476 _framerate = 0;
477 updateCaption(); 477 updateCaption();
478 _time.start(); 478 _time.start();
479 preview->setRefreshingRate( 1000 ); 479 preview->setRefreshingRate( 1000 );
@@ -489,33 +489,33 @@ void CameraMainWindow::timerEvent( QTimerEvent* )
489 return; 489 return;
490 } 490 }
491 491
492 odebug << "timer event during video - now capturing frame #" << _videopics+1 << oendl; 492 odebug << "timer event during video - now capturing frame #" << _videopics+1 << oendl;
493 493
494 ZCameraIO::instance()->captureFrame( captureX, captureY, zoom, _capturebuf ); 494 ZCameraIO::instance()->captureFrame( captureX, captureY, zoom, _capturebuf );
495 _videopics++; 495 _videopics++;
496 ::write( _capturefd, _capturebuf, captureX*captureY*2 ); 496 ::write( _capturefd, _capturebuf, captureX*captureY*2 );
497 setCaption( QString().sprintf( "Capturing %dx%d @ %.2f fps %d", 497 setCaption( QString().sprintf( "Capturing %dx%d @ %.2f fps %d",
498 captureX, captureY, 1000.0 / (_time.elapsed()/_videopics), _videopics ) ); 498 captureX, captureY, 1000.0 / (_time.elapsed()/_videopics), _videopics ) );
499} 499}
500 500
501 501
502void CameraMainWindow::stopVideoCapture() 502void CameraMainWindow::stopVideoCapture()
503{ 503{
504 killTimers(); 504 killTimers();
505 //ODevice::inst()->touchSound(); 505 ODevice::inst()->touchSound();
506 ODevice::inst()->setLedState( Led_Mail, Led_Off ); 506 ODevice::inst()->setLedState( Led_Mail, Led_Off );
507 _capturing = false; 507 _capturing = false;
508 updateCaption(); 508 updateCaption();
509 ::close( _capturefd ); 509 ::close( _capturefd );
510 _framerate = 1000.0 / (_time.elapsed()/_videopics); 510 _framerate = 1000.0 / (_time.elapsed()/_videopics);
511 511
512 QString name; 512 QString name;
513 if ( outputTo == "Documents Folder" ) 513 if ( outputTo == "Documents Folder" )
514 { 514 {
515 name.sprintf( "%s/Documents/video/%s/", (const char*) QDir::homeDirPath(), (const char*) captureFormat.lower() ); 515 name.sprintf( "%s/Documents/video/%s/", (const char*) QDir::homeDirPath(), (const char*) captureFormat.lower() );
516 if ( !QDir( name ).exists() ) 516 if ( !QDir( name ).exists() )
517 { 517 {
518 odebug << "creating directory " << name << oendl; 518 odebug << "creating directory " << name << oendl;
519 QString msg = "mkdir -p " + name; 519 QString msg = "mkdir -p " + name;
520 system( msg.latin1() ); 520 system( msg.latin1() );
521 } 521 }