summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/lib.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/noncore/multimedia/opieplayer2/lib.cpp b/noncore/multimedia/opieplayer2/lib.cpp
index 4b13f00..123ca91 100644
--- a/noncore/multimedia/opieplayer2/lib.cpp
+++ b/noncore/multimedia/opieplayer2/lib.cpp
@@ -4,17 +4,19 @@
4//#include <qpe/qpeapplication.h> 4//#include <qpe/qpeapplication.h>
5 5
6#include <qfile.h> 6#include <qfile.h>
7 7
8#include "frame.h" 8#include "frame.h"
9#include "lib.h" 9#include "lib.h"
10 10
11 11
12 12extern "C" {
13vo_driver_t* init_video_out_plugin( config_values_t* conf, void* video);
14}
13 15
14using namespace XINE; 16using namespace XINE;
15 17
16Lib::Lib() { 18Lib::Lib() {
17 printf("Lib"); 19 printf("Lib");
18 QCString str( getenv("HOME") ); 20 QCString str( getenv("HOME") );
19 str += "/Settings/opiexine.cf"; 21 str += "/Settings/opiexine.cf";
20 // get the configuration 22 // get the configuration
@@ -39,16 +41,18 @@ Lib::Lib() {
39 int i = 0; 41 int i = 0;
40 while ( ( out = files[i] ) != 0 ) { 42 while ( ( out = files[i] ) != 0 ) {
41 printf("Audio %s\n", out ); 43 printf("Audio %s\n", out );
42 i++; 44 i++;
43 } 45 }
44 m_xine = xine_init( m_videoOutput, 46 m_xine = xine_init( m_videoOutput,
45 m_audioOutput, 47 m_audioOutput,
46 m_config ); 48 m_config );
49 // test loading
50 m_videoOutput = ::init_video_out_plugin( m_config, NULL );
47} 51}
48 52
49Lib::~Lib() { 53Lib::~Lib() {
50 delete m_config; 54 delete m_config;
51 xine_exit( m_xine ); 55 xine_exit( m_xine );
52 delete m_videoOutput; 56 delete m_videoOutput;
53 //delete m_audioOutput; 57 //delete m_audioOutput;
54 58
@@ -60,16 +64,17 @@ QCString Lib::version() {
60}; 64};
61 65
62int Lib::majorVersion() { 66int Lib::majorVersion() {
63 return xine_get_major_version(); 67 return xine_get_major_version();
64} 68}
65int Lib::minorVersion() { 69int Lib::minorVersion() {
66 return xine_get_minor_version(); 70 return xine_get_minor_version();
67}; 71};
72
68int Lib::subVersion() { 73int Lib::subVersion() {
69 return xine_get_sub_version(); 74 return xine_get_sub_version();
70} 75}
71int Lib::play( const QString& fileName, 76int Lib::play( const QString& fileName,
72 int startPos, 77 int startPos,
73 int start_time ) { 78 int start_time ) {
74 QString str = fileName; 79 QString str = fileName;
75 return xine_play( m_xine, QFile::encodeName(str.utf8() ).data(), 80 return xine_play( m_xine, QFile::encodeName(str.utf8() ).data(),