summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/lib.cpp3
-rw-r--r--noncore/multimedia/opieplayer2/lib.h4
2 files changed, 5 insertions, 2 deletions
diff --git a/noncore/multimedia/opieplayer2/lib.cpp b/noncore/multimedia/opieplayer2/lib.cpp
index 69ff492..3f2eea6 100644
--- a/noncore/multimedia/opieplayer2/lib.cpp
+++ b/noncore/multimedia/opieplayer2/lib.cpp
@@ -2,12 +2,13 @@
2#include <stdio.h> 2#include <stdio.h>
3#include <stdlib.h> 3#include <stdlib.h>
4//#include <qpe/qpeapplication.h> 4//#include <qpe/qpeapplication.h>
5 5
6#include <qfile.h> 6#include <qfile.h>
7 7
8#include "xinevideowidget.h"
8#include "frame.h" 9#include "frame.h"
9#include "lib.h" 10#include "lib.h"
10 11
11 12
12extern "C" { 13extern "C" {
13 vo_driver_t* init_video_out_plugin( config_values_t* conf, void* video); 14 vo_driver_t* init_video_out_plugin( config_values_t* conf, void* video);
@@ -19,13 +20,13 @@ extern "C" {
19 void null_set_scaling( vo_driver_t* self, int scale ); 20 void null_set_scaling( vo_driver_t* self, int scale );
20 21
21} 22}
22 23
23using namespace XINE; 24using namespace XINE;
24 25
25Lib::Lib() { 26Lib::Lib(XineVideoWidget* /*widget*/) {
26 printf("Lib"); 27 printf("Lib");
27 QCString str( getenv("HOME") ); 28 QCString str( getenv("HOME") );
28 str += "/Settings/opiexine.cf"; 29 str += "/Settings/opiexine.cf";
29 // get the configuration 30 // get the configuration
30 m_config = xine_config_file_init( str.data() ); 31 m_config = xine_config_file_init( str.data() );
31 32
diff --git a/noncore/multimedia/opieplayer2/lib.h b/noncore/multimedia/opieplayer2/lib.h
index 00a1248..1d0d3af 100644
--- a/noncore/multimedia/opieplayer2/lib.h
+++ b/noncore/multimedia/opieplayer2/lib.h
@@ -6,12 +6,14 @@
6#include <qcstring.h> 6#include <qcstring.h>
7#include <qstring.h> 7#include <qstring.h>
8#include <qobject.h> 8#include <qobject.h>
9 9
10#include <xine.h> 10#include <xine.h>
11 11
12class XineVideoWidget;
13
12namespace XINE { 14namespace XINE {
13 15
14 /** 16 /**
15 * Lib wrapps the simple interface 17 * Lib wrapps the simple interface
16 * of libxine for easy every day use 18 * of libxine for easy every day use
17 * This will become a full C++ Wrapper 19 * This will become a full C++ Wrapper
@@ -19,13 +21,13 @@ namespace XINE {
19 * stooping, seeking. 21 * stooping, seeking.
20 */ 22 */
21 class Frame; 23 class Frame;
22 class Lib : public QObject { 24 class Lib : public QObject {
23 Q_OBJECT 25 Q_OBJECT
24 public: 26 public:
25 Lib(); 27 Lib(XineVideoWidget* = 0);
26 ~Lib(); 28 ~Lib();
27 QCString version(); 29 QCString version();
28 int majorVersion()/*const*/; 30 int majorVersion()/*const*/;
29 int minorVersion()/*const*/; 31 int minorVersion()/*const*/;
30 int subVersion()/*const*/; 32 int subVersion()/*const*/;
31 33