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,33 +1,33 @@
 
 /*#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;
     int version;
     int m_width;
     int m_height;
     uint8_t *chunk[3];
     null_driver_t *output;
 };
 
 static uint32_t null_get_capabilities(vo_driver_t *self ){   
     null_driver_t* this = (null_driver_t*)self;
     printf("capabilities\n");
     return this->m_capabilities;
 }
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,38 +1,38 @@
 
 #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:
     XINE::Lib *libXine;
     int m_length;
     int m_currentTime;
     int m_position;
 
 signals:
     void positionChanged( int position  );
 
 };
 
 
 #endif