5 files changed, 21 insertions, 23 deletions

diff --git a/noncore/multimedia/camera/cmd/cmd.pro b/noncore/multimedia/camera/cmd/cmd.pro
index 7981e82..b90289b 100644
--- a/noncore/multimedia/camera/cmd/cmd.pro
+++ b/noncore/multimedia/camera/cmd/cmd.pro
@@ -1,18 +1,16 @@
-MOC_DIR         = ./moc
-OBJECTS_DIR     = ./obj
 DESTDIR         = $(OPIEDIR)/bin
 TEMPLATE        = app
 CONFIG          += qt warn_on debug
 
 HEADERS         = capture.h
 
 SOURCES         = capture.cpp
 
 INCLUDEPATH     += $(OPIEDIR)/include ../lib
 DEPENDPATH      += $(OPIEDIR)/include ../lib
 LIBS            += -lqpe -lopiecore2 -lopiecam
 INTERFACES      =
 TARGET          = capture
 
 include ( $(OPIEDIR)/include.pro )
 
diff --git a/noncore/multimedia/camera/config.in b/noncore/multimedia/camera/config.in
index 861abcb..cfd71ad 100644
--- a/noncore/multimedia/camera/config.in
+++ b/noncore/multimedia/camera/config.in
@@ -1,7 +1,7 @@
   config CAMERA
     boolean "opie-camera (camera app to use with the Sharp CE-AG06)"
     default "n"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && LIBOPIE2CORE
-    comment "opie-camera needs a libqpe, libopie and libopie2core"
-    depends !(( LIBQPE || LIBQPE-X11 ) && LIBOPIE && LIBOPIE2CORE)
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE
+    comment "opie-camera needs a libqpe, libopie2core"
+    depends !(( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE)
 
diff --git a/noncore/multimedia/camera/gui/gui.pro b/noncore/multimedia/camera/gui/gui.pro
index f587b57..d74f4b6 100644
--- a/noncore/multimedia/camera/gui/gui.pro
+++ b/noncore/multimedia/camera/gui/gui.pro
@@ -1,21 +1,19 @@
-MOC_DIR         = ./moc
-OBJECTS_DIR     = ./obj
 DESTDIR         = $(OPIEDIR)/bin
 TEMPLATE        = app
 CONFIG          += qt warn_on debug
 
 HEADERS         = previewwidget.h \
                   mainwindow.h
 
 SOURCES         = previewwidget.cpp \
                   mainwindow.cpp \
                   main.cpp
 
 INCLUDEPATH     += $(OPIEDIR)/include ../lib
 DEPENDPATH      += $(OPIEDIR)/include ../lib
-LIBS            += -lqpe -lopie -lopiecore2 -lopiecam
+LIBS            += -lopiecore2 -lopieui2 -lopiecam
 INTERFACES      =
 TARGET          = opiecam
 
 include ( $(OPIEDIR)/include.pro )
 
diff --git a/noncore/multimedia/camera/gui/mainwindow.cpp b/noncore/multimedia/camera/gui/mainwindow.cpp
index 5da3757..2f42049 100644
--- a/noncore/multimedia/camera/gui/mainwindow.cpp
+++ b/noncore/multimedia/camera/gui/mainwindow.cpp
@@ -1,72 +1,76 @@
 /**********************************************************************
 ** Copyright (C) 2002 Michael 'Mickey' Lauer.  All rights reserved.
 **
 ** This file is part of Opie Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 **********************************************************************/
 
 #include "mainwindow.h"
 #include "previewwidget.h"
 #include "zcameraio.h"
 #include "imageio.h"
 #include "avi.h"
 
+/* OPIE */
+#include <opie2/ofiledialog.h>
+#include <opie2/odevice.h>
+#include <opie2/oapplication.h>
+#include <opie2/oconfig.h>
+#include <opie2/odebug.h>
+#include <qpe/global.h>
+#include <qpe/resource.h>
+#include <qpe/qcopenvelope_qws.h>
+using namespace Opie;
+
+/* QT */
 #include <qapplication.h>
 #include <qaction.h>
 #include <qvbox.h>
 #include <qcombobox.h>
 #include <qcursor.h>
 #include <qdatastream.h>
 #include <qdir.h>
 #include <qfile.h>
 #include <qimage.h>
 #include <qlabel.h>
 #include <qlineedit.h>
 #include <qpopupmenu.h>
 #include <qprogressbar.h>
 #include <qpushbutton.h>
 #include <qmessagebox.h>
 #include <qlayout.h>
 #include <qdirectpainter_qws.h>
-#include <qpe/global.h>
-#include <qpe/resource.h>
-#include <qpe/qcopenvelope_qws.h>
-#include <opie/ofiledialog.h>
-#include <opie/odevice.h>
-using namespace Opie;
-#include <opie2/oapplication.h>
-#include <opie2/oconfig.h>
-#include <opie2/odebug.h>
 
+/* STD */
 #include <assert.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <string.h>
 #include <errno.h>
 #include <unistd.h>
 
 #define CAPTUREFILE "/tmp/capture.dat"
 #define OUTPUTFILE  "/tmp/output.avi"
 
 #define OUTPUT_TO_CUSTOM 250
 #define OUTPUT_TO_DOCFOLDER 251
 
 CameraMainWindow::CameraMainWindow( QWidget * parent, const char * name, WFlags f )
            :QMainWindow( parent, name, f ),
            _rotation( 270 ), // FIXME: get this from current settings (ODevice?)
            _capturing( false ),
            _pics( 1 ), _videos( 1 )
 {
     #ifdef QT_NO_DEBUG
     if ( !ZCameraIO::instance()->isOpen() )
     {
         QVBox* v = new QVBox( this );
@@ -417,49 +421,49 @@ void CameraMainWindow::prefixItemChoosen()
     QLineEdit* le = new QLineEdit( prefix, d );
     v->addWidget( le );
     le->setFixedWidth( 150 ); //FIXME: 'tis a bit dirty
     if ( d->exec() == QDialog::Accepted )
         prefix = le->text();
     odebug << "Prefix now: " << prefix << oendl;
 }
 
 
 void CameraMainWindow::appendSettingsChoosen()
 {
     appendSettings = !appendSettings;
     odebug << "appendSettings now: " << appendSettings << oendl;
 }
 
 
 void CameraMainWindow::shutterClicked()
 {
     if ( captureFormat != "AVI" ) // capture one photo per shutterClick
     {
         Global::statusMessage( "CAPTURING..." );
         qApp->processEvents();
 
         odebug << "Shutter has been pressed" << oendl;
-        ODevice::inst()->touchSound();
+        ODevice::inst()->playTouchSound();
 
         performCapture( captureFormat );
     }
     else // capture video! start with one shutter click and stop with the next
     {
         !_capturing ? startVideoCapture() : stopVideoCapture();
     }
 }
 
 
 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() );
         if ( !QDir( name ).exists() )
         {
             odebug << "creating directory " << name << oendl;
             QString msg = "mkdir -p " + name;
             system( msg.latin1() );
         }
     }
@@ -471,91 +475,91 @@ void CameraMainWindow::performCapture( const QString& format )
     {
         name.append( QString().sprintf( "_%d_%d_q%d", captureX, captureY, quality ) );
     }
     name.append( QString().sprintf( "-%d.%s", _pics++, (const char*) captureFormat.lower() ) );
 
     QImage i;
     ZCameraIO::instance()->captureFrame( captureX, captureY, zoom, &i );
     QImage im = i.convertDepth( 32 );
     bool result = im.save( name, format, quality );
     if ( !result )
     {
         oerr << "imageio-Problem while writing." << oendl;
         Global::statusMessage( "Error!" );
     }
     else
     {
         odebug << captureFormat << "-image has been successfully captured" << oendl;
         Global::statusMessage( "Ok." );
     }
 }
 
 
 void CameraMainWindow::startVideoCapture()
 {
-    ODevice::inst()->touchSound();
+    ODevice::inst()->playTouchSound();
     ODevice::inst()->setLedState( Led_Mail, Led_BlinkSlow );
 
     _capturefd = ::open( CAPTUREFILE, O_WRONLY | O_CREAT | O_TRUNC );
     if ( _capturefd == -1 )
     {
         owarn << "can't open capture file: " << strerror(errno) << oendl;
         return;
     }
 
     _capturebuf = new unsigned char[captureX*captureY*2];
     _capturing = true;
     _videopics = 0;
     _framerate = 0;
     updateCaption();
     _time.start();
     preview->setRefreshingRate( 1000 );
     startTimer( 100 ); // too fast but that is ok
 }
 
 
 void CameraMainWindow::timerEvent( QTimerEvent* )
 {
     if ( !_capturing )
     {
         odebug << "timer event in CameraMainWindow without capturing video ?" << oendl;
         return;
     }
 
     odebug << "timer event during video - now capturing frame #" << _videopics+1 << oendl;
 
     ZCameraIO::instance()->captureFrame( captureX, captureY, zoom, _capturebuf );
     _videopics++;
     ::write( _capturefd, _capturebuf, captureX*captureY*2 );
     setCaption( QString().sprintf( "Capturing %dx%d @ %.2f fps %d",
         captureX, captureY, 1000.0 / (_time.elapsed()/_videopics), _videopics ) );
 }
 
 
 void CameraMainWindow::stopVideoCapture()
 {
     killTimers();
-    ODevice::inst()->touchSound();
+    ODevice::inst()->playTouchSound();
     ODevice::inst()->setLedState( Led_Mail, Led_Off );
     _capturing = false;
     updateCaption();
     ::close( _capturefd );
     _framerate = 1000.0 / (_time.elapsed()/_videopics);
 
     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 ) );
diff --git a/noncore/multimedia/camera/lib/lib.pro b/noncore/multimedia/camera/lib/lib.pro
index 3d2c59b..1e7346f 100644
--- a/noncore/multimedia/camera/lib/lib.pro
+++ b/noncore/multimedia/camera/lib/lib.pro
@@ -1,24 +1,22 @@
-MOC_DIR         = ./moc
-OBJECTS_DIR     = ./obj
 DESTDIR         = $(OPIEDIR)/lib
 TEMPLATE        = lib
 CONFIG          += qt warn_on debug
 
 HEADERS         = avi.h \
                   imageio.h \
                   zcameraio.h \
 
 SOURCES         = avi.c \
                   imageio.cpp \
                   zcameraio.cpp \
 
 INCLUDEPATH     += $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include
-LIBS            += -lqpe -lopie -lopiecore2
+LIBS            += -lopiecore2
 INTERFACES      =
 VERSION         = 1.0.0
 TARGET          = opiecam
 
 
 include ( $(OPIEDIR)/include.pro )