summaryrefslogtreecommitdiff
authordrw <drw>2004-03-02 15:53:09 (UTC)
committer drw <drw>2004-03-02 15:53:09 (UTC)
commit1e88bf8b55fa51d9b7989930f29f404e5ec50bc1 (patch) (side-by-side diff)
treeebabdb360606426dfa02df6b32acbf9b5f27977f
parent270a76fbf653df353476ddf17835d532ceb6b6c2 (diff)
downloadopie-1e88bf8b55fa51d9b7989930f29f404e5ec50bc1.zip
opie-1e88bf8b55fa51d9b7989930f29f404e5ec50bc1.tar.gz
opie-1e88bf8b55fa51d9b7989930f29f404e5ec50bc1.tar.bz2
OpieRec: libopie -> libopie2
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opierec/config.in2
-rw-r--r--noncore/multimedia/opierec/main.cpp4
-rw-r--r--noncore/multimedia/opierec/opierec.control2
-rw-r--r--noncore/multimedia/opierec/opierec.pro6
4 files changed, 8 insertions, 6 deletions
diff --git a/noncore/multimedia/opierec/config.in b/noncore/multimedia/opierec/config.in
index fe195bc..36a87c9 100644
--- a/noncore/multimedia/opierec/config.in
+++ b/noncore/multimedia/opierec/config.in
@@ -1,4 +1,4 @@
config OPIEREC
boolean "opie-rec (simple audio recording/playing app)"
default "n"
- depends ( LIBQPE || LIBQPE-X11 )
+ depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE
diff --git a/noncore/multimedia/opierec/main.cpp b/noncore/multimedia/opierec/main.cpp
index 74a175b..bb51446 100644
--- a/noncore/multimedia/opierec/main.cpp
+++ b/noncore/multimedia/opierec/main.cpp
@@ -1,29 +1,31 @@
/***************************************************************************
main.cpp - main routine
***************************************************************************/
//// main.cpp
//// copyright 2001, 2002, by L. J. Potter <ljp@llornkcor.com>
/***************************************************************************
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
***************************************************************************/
#include "qtrec.h"
#ifdef PDAUDIO
int main(int argc, char* argv[]) {
QPEApplication a(argc, argv);
QtRec qtrec;
a.showMainWidget( &qtrec);
return a.exec();
}
#else
-#include <opie/oapplicationfactory.h>
+
+#include <opie2/oapplicationfactory.h>
+
OPIE_EXPORT_APP( OApplicationFactory<QtRec> )
#endif
diff --git a/noncore/multimedia/opierec/opierec.control b/noncore/multimedia/opierec/opierec.control
index eb7e5d1..5ac3513 100644
--- a/noncore/multimedia/opierec/opierec.control
+++ b/noncore/multimedia/opierec/opierec.control
@@ -1,10 +1,10 @@
Package: opierec
Files: bin/opierec pics/opierec apps/Applications/opierec.desktop
Priority: optional
Section: opie/multimedia
Maintainer: L.J. Potter <lpotter@trolltech.com>
Architecture: arm
-Depends: task-opie-minimal
+Depends: task-opie-minimal, libopiecore2
Description: audio sampling recorder
A simple audio recording/playing application.
Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/multimedia/opierec/opierec.pro b/noncore/multimedia/opierec/opierec.pro
index 8b06edb..6393252 100644
--- a/noncore/multimedia/opierec/opierec.pro
+++ b/noncore/multimedia/opierec/opierec.pro
@@ -1,41 +1,41 @@
#CONFIG = qt qtopia warn_on release pdaudio
CONFIG = qt warn_on release opie
#CONFIG = qt warn_on release quick-app
HEADERS = adpcm.h \
pixmaps.h \
helpwindow.h \
qtrec.h \
device.h \
wavFile.h \
waveform.h
SOURCES = adpcm.c \
helpwindow.cpp \
main.cpp \
qtrec.cpp \
device.cpp \
wavFile.cpp \
waveform.cpp
INTERFACES =
contains(CONFIG, pdaudio) {
# LIBS += -L/opt/buildroot-opie/output/staging/target/lib -lqpe -lpthread -ljpeg -lpng -lz
- LIBS += -L$(QPEDIR)/lib -lqpe -lpthread -ljpeg -lpng -lz
+ LIBS += -L$(QPEDIR)/lib -lqpe -lpthread -ljpeg -lpng -lz -lopiecore2
INCLUDEPATH += $(QPEDIR)/include
DEPENDPATH += $(QPEDIR)/include
- DEFINES += PDAUDIO
+ DEFINES += PDAUDIO
DEFINES += THREADED
TARGET = qperec
# DESTDIR=$(QPEDIR)/bin
}
contains(CONFIG, opie) {
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include
DESTDIR=$(OPIEDIR)/bin
- LIBS += -lqpe -lpthread
+ LIBS += -lqpe -lopiecore2 -lpthread
TARGET = opierec
include ( $(OPIEDIR)/include.pro )
}