From 6fc7de0c8dba90b84d65574e9d3022e10e41ddb3 Mon Sep 17 00:00:00 2001 From: zecke Date: Mon, 08 Jul 2002 21:04:49 +0000 Subject: Compile fixes --- 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 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include typedef struct null_driver_s null_driver_t; 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 #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 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 @@ 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 ); -- cgit v0.9.0.2