summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/multimedia/camera/cmd/cmd.pro2
-rw-r--r--noncore/multimedia/camera/config.in6
-rw-r--r--noncore/multimedia/camera/gui/gui.pro4
-rw-r--r--noncore/multimedia/camera/gui/mainwindow.cpp28
-rw-r--r--noncore/multimedia/camera/lib/lib.pro4
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,5 +1,3 @@
-MOC_DIR = ./moc
-OBJECTS_DIR = ./obj
DESTDIR = $(OPIEDIR)/bin
TEMPLATE = app
CONFIG += qt warn_on debug
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,5 +1,3 @@
-MOC_DIR = ./moc
-OBJECTS_DIR = ./obj
DESTDIR = $(OPIEDIR)/bin
TEMPLATE = app
CONFIG += qt warn_on debug
@@ -13,7 +11,7 @@ SOURCES = previewwidget.cpp \
INCLUDEPATH += $(OPIEDIR)/include ../lib
DEPENDPATH += $(OPIEDIR)/include ../lib
-LIBS += -lqpe -lopie -lopiecore2 -lopiecam
+LIBS += -lopiecore2 -lopieui2 -lopiecam
INTERFACES =
TARGET = opiecam
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
@@ -19,6 +19,18 @@
#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>
@@ -36,16 +48,8 @@
#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>
@@ -438,7 +442,7 @@ void CameraMainWindow::shutterClicked()
qApp->processEvents();
odebug << "Shutter has been pressed" << oendl;
- ODevice::inst()->touchSound();
+ ODevice::inst()->playTouchSound();
performCapture( captureFormat );
}
@@ -492,7 +496,7 @@ void CameraMainWindow::performCapture( const QString& format )
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 );
@@ -534,7 +538,7 @@ void CameraMainWindow::timerEvent( QTimerEvent* )
void CameraMainWindow::stopVideoCapture()
{
killTimers();
- ODevice::inst()->touchSound();
+ ODevice::inst()->playTouchSound();
ODevice::inst()->setLedState( Led_Mail, Led_Off );
_capturing = false;
updateCaption();
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,5 +1,3 @@
-MOC_DIR = ./moc
-OBJECTS_DIR = ./obj
DESTDIR = $(OPIEDIR)/lib
TEMPLATE = lib
CONFIG += qt warn_on debug
@@ -14,7 +12,7 @@ SOURCES = avi.c \
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include
-LIBS += -lqpe -lopie -lopiecore2
+LIBS += -lopiecore2
INTERFACES =
VERSION = 1.0.0
TARGET = opiecam