author | zecke <zecke> | 2002-07-08 21:04:49 (UTC) |
---|---|---|
committer | zecke <zecke> | 2002-07-08 21:04:49 (UTC) |
commit | 6fc7de0c8dba90b84d65574e9d3022e10e41ddb3 (patch) (unidiff) | |
tree | 6c7e3f29b1732294cbe3d40ccdec70315a1a77f3 /noncore/multimedia | |
parent | e00668875d989edba269732cffe4e3ea8da4aa77 (diff) | |
download | opie-6fc7de0c8dba90b84d65574e9d3022e10e41ddb3.zip opie-6fc7de0c8dba90b84d65574e9d3022e10e41ddb3.tar.gz opie-6fc7de0c8dba90b84d65574e9d3022e10e41ddb3.tar.bz2 |
Compile fixes
-rw-r--r-- | noncore/multimedia/opieplayer2/nullvideo.c | 8 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/opieplayer2.pro | 10 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/xinecontrol.h | 4 |
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 | |||
@@ -3,10 +3,10 @@ | |||
3 | #include <stdlib.h> | 3 | #include <stdlib.h> |
4 | #include <stdio.h> | 4 | #include <stdio.h> |
5 | 5 | ||
6 | #include <xine/video_out.h> | 6 | #include <video_out.h> |
7 | #include <xine/xine_internal.h> | 7 | #include <xine_internal.h> |
8 | #include <xine/xineutils.h> | 8 | #include <xineutils.h> |
9 | #include <xine/configfile.h> | 9 | #include <configfile.h> |
10 | 10 | ||
11 | typedef struct null_driver_s null_driver_t; | 11 | typedef struct null_driver_s null_driver_t; |
12 | 12 | ||
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 | |||
@@ -3,13 +3,15 @@ CONFIG = qt warn_on release | |||
3 | #release | 3 | #release |
4 | DESTDIR = $(OPIEDIR)/bin | 4 | DESTDIR = $(OPIEDIR)/bin |
5 | HEADERS = playlistselection.h mediaplayerstate.h xinecontrol.h\ | 5 | HEADERS = playlistselection.h mediaplayerstate.h xinecontrol.h\ |
6 | videowidget.h audiowidget.h playlistwidget.h mediaplayer.h inputDialog.h | 6 | videowidget.h audiowidget.h playlistwidget.h mediaplayer.h inputDialog.h \ |
7 | frame.h lib.h | ||
7 | SOURCES = main.cpp \ | 8 | SOURCES = main.cpp \ |
8 | playlistselection.cpp mediaplayerstate.cpp xinecontrol.cpp\ | 9 | playlistselection.cpp mediaplayerstate.cpp xinecontrol.cpp\ |
9 | videowidget.cpp audiowidget.cpp playlistwidget.cpp mediaplayer.cpp inputDialog.cpp | 10 | videowidget.cpp audiowidget.cpp playlistwidget.cpp mediaplayer.cpp inputDialog.cpp \ |
11 | frame.cpp lib.cpp nullvideo.c | ||
10 | TARGET = opieplayer | 12 | TARGET = opieplayer |
11 | INCLUDEPATH += $(OPIEDIR)/include /usr/include | 13 | INCLUDEPATH += $(OPIEDIR)/include |
12 | DEPENDPATH += $(OPIEDIR)/include /usr/include | 14 | DEPENDPATH += $(OPIEDIR)/include |
13 | LIBS += -lqpe -lpthread -lopie -lxine -lxineutils | 15 | LIBS += -lqpe -lpthread -lopie -lxine -lxineutils |
14 | 16 | ||
15 | INCLUDEPATH += $(OPIEDIR)/include | 17 | INCLUDEPATH += $(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 | |||
@@ -8,10 +8,10 @@ | |||
8 | class XineControl : public QObject { | 8 | class XineControl : public QObject { |
9 | Q_OBJECT | 9 | Q_OBJECT |
10 | public: | 10 | public: |
11 | XineControl( QObject *parent, const char *name ); | 11 | XineControl( QObject *parent = 0, const char *name =0 ); |
12 | ~XineControl(); | 12 | ~XineControl(); |
13 | 13 | ||
14 | private slots: | 14 | public slots: |
15 | void play( const QString& fileName ); | 15 | void play( const QString& fileName ); |
16 | void stop(); | 16 | void stop(); |
17 | void pause( bool ); | 17 | void pause( bool ); |