-rw-r--r-- | noncore/multimedia/camera/imageio.cpp | 4 | ||||
-rw-r--r-- | noncore/multimedia/camera/mainwindow.cpp | 46 | ||||
-rw-r--r-- | noncore/multimedia/camera/opie-camera.control | 2 |
3 files changed, 40 insertions, 12 deletions
diff --git a/noncore/multimedia/camera/imageio.cpp b/noncore/multimedia/camera/imageio.cpp index f8f5dd0..ed0d39f 100644 --- a/noncore/multimedia/camera/imageio.cpp +++ b/noncore/multimedia/camera/imageio.cpp @@ -45,11 +45,11 @@ void imageToFile( QImage* i, const QString& name, const QString& format, int qua QImage im = i->convertDepth( 32 ); bool result = im.save( name, format, quality ); if ( !result ) { - oerr << "imageio-Problem while writing." << oendl; + oerr << "imageio-Problem while writing to " << name << oendl; } else { odebug << format << "-image has been successfully captured" << oendl; } -}
\ No newline at end of file +} diff --git a/noncore/multimedia/camera/mainwindow.cpp b/noncore/multimedia/camera/mainwindow.cpp index 16ee8bc..49c7cbf 100644 --- a/noncore/multimedia/camera/mainwindow.cpp +++ b/noncore/multimedia/camera/mainwindow.cpp @@ -157,11 +157,11 @@ void CameraMainWindow::init() new QAction( "* (always both)", 0, 0, flipg, 0, true ); outputTog = new QActionGroup( 0, "output", true ); outputTog->setToggleAction( true ); - new QAction( "/tmp", 0, 0, outputTog, 0, true ); + new QAction( "/tmp/", 0, 0, outputTog, 0, true ); new QAction( "/mnt/card/", 0, 0, outputTog, 0, true ); - new QAction( "/mnt/sd/", 0, 0, outputTog, 0, true ); + new QAction( "/mnt/cf/", 0, 0, outputTog, 0, true ); docfolder = new QAction( "Documents Folder", 0, 0, outputTog, 0, true ); docfolder->setOn( true ); custom = new QAction( "&Custom...", 0, 0, outputTog, 0, true ); @@ -421,9 +421,17 @@ void CameraMainWindow::performCapture( const QString& format ) { QString name; if ( outputTo == "Documents Folder" ) - name.sprintf( "%s/Documents/image/%s/", (const char*) QDir::homeDirPath(), (const char*) captureFormat.lower() ); + { + name.sprintf( "%s/Documents/image/%s/", (const char*) QDir::homeDirPath(), (const char*) captureFormat.lower() ); + if ( !QDir( name ).exists() ) + { + odebug << "creating directory " << name << oendl; + QString msg = "mkdir -p " + name; + system( msg.latin1() ); + } + } else name = outputTo; name.append( prefix ); @@ -500,10 +508,24 @@ void CameraMainWindow::stopVideoCapture() updateCaption(); ::close( _capturefd ); _framerate = 1000.0 / (_time.elapsed()/_videopics); - QString name( outputTo ); - name.append( "/prefix" ); + QString name; + if ( outputTo == "Documents Folder" ) + { + name.sprintf( "%s/Documents/video/%s/", (const char*) QDir::homeDirPath(), (const char*) captureFormat.lower() ); + if ( !QDir( name ).exists() ) + { + odebug << "creating directory " << name << oendl; + QString msg = "mkdir -p " + name; + system( msg.latin1() ); + } + } + else + name = outputTo; + + name.append( "/" ); // sure is sure and safe is safe ;-) + name.append( prefix ); if ( appendSettings ) name.append( QString().sprintf( "_%d_%d_q%d_%dfps", captureX, captureY, quality, _framerate ) ); name.append( QString().sprintf( "-%d.%s", _videos++, (const char*) captureFormat.lower() ) ); postProcessVideo( CAPTUREFILE, name ); @@ -518,8 +540,10 @@ void CameraMainWindow::stopVideoCapture() } void CameraMainWindow::postProcessVideo( const QString& infile, const QString& outfile ) { + odebug << "post processing " << infile << " --> " << outfile << oendl; + preview->setRefreshingRate( 0 ); /* unsigned char buf[153600]; @@ -595,9 +619,9 @@ void CameraMainWindow::postProcessVideo( const QString& infile, const QString& o preview->setPixmap( p ); preview->repaint(); qApp->processEvents(); - #ifndef QT_NO_DEBUG + #ifdef CAMERA_EXTRA_DEBUG QString tmpfilename; tmpfilename.sprintf( "/tmp/test/%04d.jpg", i ); #else QString tmpfilename( "/tmp/tempfile" ); @@ -620,15 +644,18 @@ void CameraMainWindow::postProcessVideo( const QString& infile, const QString& o avi_add( outfd, tempbuffer, filesize ); delete tempbuffer; framefile.close(); - odebug << "deleting temporary capturefile " << infile << oendl; - ::close( infd ); - QFile::remove( infile ); } avi_end( outfd, captureX, captureY, _framerate ); ::close( outfd ); + ::close( infd ); + + label->setText( "deleting temp files..." ); + qApp->processEvents(); + odebug << "deleting temporary capturefile " << infile << oendl; + QFile::remove( infile ); fr->hide(); delete fr; @@ -642,8 +669,9 @@ void CameraMainWindow::updateCaption() if ( !_capturing ) setCaption( QString().sprintf( "Opie-Camera: %dx%d %s q%d z%d (%s)", captureX, captureY, (const char*) captureFormat.lower(), quality, zoom, (const char*) flip ) ); else setCaption( "Opie-Camera: => CAPTURING <=" ); + qApp->processEvents(); } #ifndef QT_NO_DEBUG diff --git a/noncore/multimedia/camera/opie-camera.control b/noncore/multimedia/camera/opie-camera.control index a33de38..1731ad2 100644 --- a/noncore/multimedia/camera/opie-camera.control +++ b/noncore/multimedia/camera/opie-camera.control @@ -3,8 +3,8 @@ Files: bin/opiecam pics/camera apps/Applications/camera.desktop Priority: optional Section: opie/applications Maintainer: Michael 'Mickey' Lauer <mickeyl@handhelds.org> Architecture: arm -Version: $QPE_VERSION-$SUB_VERSION +Version: 1.0 Depends: task-opie-minimal, libopie2 (1.8.1) Description: A Camera Application A Camera Application to use with the Sharp CE-AG06. |