-rw-r--r-- | noncore/multimedia/opieplayer2/lib.cpp | 6 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/lib.h | 1 |
2 files changed, 0 insertions, 7 deletions
diff --git a/noncore/multimedia/opieplayer2/lib.cpp b/noncore/multimedia/opieplayer2/lib.cpp index 77dab9a..96bdb21 100644 --- a/noncore/multimedia/opieplayer2/lib.cpp +++ b/noncore/multimedia/opieplayer2/lib.cpp | |||
@@ -123,30 +123,24 @@ Lib::~Lib() { | |||
123 | /* FIXME either free or delete but valgrind bitches against both */ | 123 | /* FIXME either free or delete but valgrind bitches against both */ |
124 | //free( m_videoOutput ); | 124 | //free( m_videoOutput ); |
125 | //delete m_audioOutput; | 125 | //delete m_audioOutput; |
126 | } | 126 | } |
127 | 127 | ||
128 | void Lib::resize ( const QSize &s ) { | 128 | void Lib::resize ( const QSize &s ) { |
129 | if ( s. width ( ) && s. height ( ) ) { | 129 | if ( s. width ( ) && s. height ( ) ) { |
130 | ::null_set_gui_width( m_videoOutput, s. width() ); | 130 | ::null_set_gui_width( m_videoOutput, s. width() ); |
131 | ::null_set_gui_height( m_videoOutput, s. height() ); | 131 | ::null_set_gui_height( m_videoOutput, s. height() ); |
132 | } | 132 | } |
133 | } | 133 | } |
134 | 134 | ||
135 | QCString Lib::version() { | ||
136 | // QCString str( xine_get_str_version() ); | ||
137 | // return str; | ||
138 | return "test"; | ||
139 | } | ||
140 | |||
141 | int Lib::majorVersion() { | 135 | int Lib::majorVersion() { |
142 | int major, minor, sub; | 136 | int major, minor, sub; |
143 | xine_get_version ( &major, &minor, &sub ); | 137 | xine_get_version ( &major, &minor, &sub ); |
144 | return major; | 138 | return major; |
145 | } | 139 | } |
146 | 140 | ||
147 | int Lib::minorVersion() { | 141 | int Lib::minorVersion() { |
148 | int major, minor, sub; | 142 | int major, minor, sub; |
149 | xine_get_version ( &major, &minor, &sub ); | 143 | xine_get_version ( &major, &minor, &sub ); |
150 | return minor; | 144 | return minor; |
151 | } | 145 | } |
152 | 146 | ||
diff --git a/noncore/multimedia/opieplayer2/lib.h b/noncore/multimedia/opieplayer2/lib.h index a7e51fb..3224cb9 100644 --- a/noncore/multimedia/opieplayer2/lib.h +++ b/noncore/multimedia/opieplayer2/lib.h | |||
@@ -51,25 +51,24 @@ namespace XINE { | |||
51 | * Lib wrapps the simple interface | 51 | * Lib wrapps the simple interface |
52 | * of libxine for easy every day use | 52 | * of libxine for easy every day use |
53 | * This will become a full C++ Wrapper | 53 | * This will become a full C++ Wrapper |
54 | * It supports playing, pausing, info, | 54 | * It supports playing, pausing, info, |
55 | * stooping, seeking. | 55 | * stooping, seeking. |
56 | */ | 56 | */ |
57 | class Frame; | 57 | class Frame; |
58 | class Lib : public ThreadUtil::Channel { | 58 | class Lib : public ThreadUtil::Channel { |
59 | Q_OBJECT | 59 | Q_OBJECT |
60 | public: | 60 | public: |
61 | Lib(XineVideoWidget* = 0); | 61 | Lib(XineVideoWidget* = 0); |
62 | ~Lib(); | 62 | ~Lib(); |
63 | QCString version(); | ||
64 | static int majorVersion(); | 63 | static int majorVersion(); |
65 | static int minorVersion(); | 64 | static int minorVersion(); |
66 | static int subVersion(); | 65 | static int subVersion(); |
67 | 66 | ||
68 | 67 | ||
69 | void resize ( const QSize &s ); | 68 | void resize ( const QSize &s ); |
70 | 69 | ||
71 | int play( const QString& fileName, | 70 | int play( const QString& fileName, |
72 | int startPos = 0, | 71 | int startPos = 0, |
73 | int start_time = 0 ); | 72 | int start_time = 0 ); |
74 | void stop(); | 73 | void stop(); |
75 | void pause(); | 74 | void pause(); |