summaryrefslogtreecommitdiff
authorzecke <zecke>2002-07-08 21:04:49 (UTC)
committer zecke <zecke>2002-07-08 21:04:49 (UTC)
commit6fc7de0c8dba90b84d65574e9d3022e10e41ddb3 (patch) (side-by-side diff)
tree6c7e3f29b1732294cbe3d40ccdec70315a1a77f3
parente00668875d989edba269732cffe4e3ea8da4aa77 (diff)
downloadopie-6fc7de0c8dba90b84d65574e9d3022e10e41ddb3.zip
opie-6fc7de0c8dba90b84d65574e9d3022e10e41ddb3.tar.gz
opie-6fc7de0c8dba90b84d65574e9d3022e10e41ddb3.tar.bz2
Compile fixes
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/nullvideo.c8
-rw-r--r--noncore/multimedia/opieplayer2/opieplayer2.pro10
-rw-r--r--noncore/multimedia/opieplayer2/xinecontrol.h4
3 files changed, 12 insertions, 10 deletions
diff --git a/noncore/multimedia/opieplayer2/nullvideo.c b/noncore/multimedia/opieplayer2/nullvideo.c
index 5224862..877e49a 100644
--- a/noncore/multimedia/opieplayer2/nullvideo.c
+++ b/noncore/multimedia/opieplayer2/nullvideo.c
@@ -1,21 +1,21 @@
/*#include <xine.h>*/
#include <stdlib.h>
#include <stdio.h>
-#include <xine/video_out.h>
-#include <xine/xine_internal.h>
-#include <xine/xineutils.h>
-#include <xine/configfile.h>
+#include <video_out.h>
+#include <xine_internal.h>
+#include <xineutils.h>
+#include <configfile.h>
typedef struct null_driver_s null_driver_t;
struct null_driver_s {
vo_driver_t vo_driver;
uint32_t m_capabilities;
};
typedef struct opie_frame_s opie_frame_t;
struct opie_frame_s {
vo_frame_t frame;
char* name;
diff --git a/noncore/multimedia/opieplayer2/opieplayer2.pro b/noncore/multimedia/opieplayer2/opieplayer2.pro
index a6c7c2b..bcd9b92 100644
--- a/noncore/multimedia/opieplayer2/opieplayer2.pro
+++ b/noncore/multimedia/opieplayer2/opieplayer2.pro
@@ -1,17 +1,19 @@
TEMPLATE = app
CONFIG = qt warn_on release
#release
DESTDIR = $(OPIEDIR)/bin
HEADERS = playlistselection.h mediaplayerstate.h xinecontrol.h\
- videowidget.h audiowidget.h playlistwidget.h mediaplayer.h inputDialog.h
+ videowidget.h audiowidget.h playlistwidget.h mediaplayer.h inputDialog.h \
+ frame.h lib.h
SOURCES = main.cpp \
playlistselection.cpp mediaplayerstate.cpp xinecontrol.cpp\
- videowidget.cpp audiowidget.cpp playlistwidget.cpp mediaplayer.cpp inputDialog.cpp
+ videowidget.cpp audiowidget.cpp playlistwidget.cpp mediaplayer.cpp inputDialog.cpp \
+ frame.cpp lib.cpp nullvideo.c
TARGET = opieplayer
-INCLUDEPATH += $(OPIEDIR)/include /usr/include
-DEPENDPATH += $(OPIEDIR)/include /usr/include
+INCLUDEPATH += $(OPIEDIR)/include
+DEPENDPATH += $(OPIEDIR)/include
LIBS += -lqpe -lpthread -lopie -lxine -lxineutils
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include
diff --git a/noncore/multimedia/opieplayer2/xinecontrol.h b/noncore/multimedia/opieplayer2/xinecontrol.h
index cba83c0..58ad8ec 100644
--- a/noncore/multimedia/opieplayer2/xinecontrol.h
+++ b/noncore/multimedia/opieplayer2/xinecontrol.h
@@ -1,26 +1,26 @@
#ifndef XINECONTROL_H
#define XINECONTROL_H
#include "lib.h"
#include <qobject.h>
class XineControl : public QObject {
Q_OBJECT
public:
- XineControl( QObject *parent, const char *name );
+ XineControl( QObject *parent = 0, const char *name =0 );
~XineControl();
-private slots:
+public slots:
void play( const QString& fileName );
void stop();
void pause( bool );
int currentTime();
// get length of media file and set it
void length();
int position();
private: