summaryrefslogtreecommitdiff
path: root/noncore/multimedia/opieplayer2/lib.cpp
authorsimon <simon>2002-12-02 11:29:43 (UTC)
committer simon <simon>2002-12-02 11:29:43 (UTC)
commitfcee8216cade787e0099c0aa43a5b8f90b24a85b (patch) (unidiff)
tree612f8c1b263747b2ea2b2e2b0df3ca960e663766 /noncore/multimedia/opieplayer2/lib.cpp
parent5a7c8386e4d526558becf2553912eb42a42107ee (diff)
downloadopie-fcee8216cade787e0099c0aa43a5b8f90b24a85b.zip
opie-fcee8216cade787e0099c0aa43a5b8f90b24a85b.tar.gz
opie-fcee8216cade787e0099c0aa43a5b8f90b24a85b.tar.bz2
- Holger asked for removal of the QCString version() method (the one that
returns "test" :)
Diffstat (limited to 'noncore/multimedia/opieplayer2/lib.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/lib.cpp6
1 files changed, 0 insertions, 6 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
@@ -111,54 +111,48 @@ Lib::Lib( XineVideoWidget* widget ) {
111 111
112 m_wid->repaint(); 112 m_wid->repaint();
113 } 113 }
114 114
115 m_queue = xine_event_new_queue (m_stream); 115 m_queue = xine_event_new_queue (m_stream);
116 116
117 xine_event_create_listener_thread (m_queue, xine_event_handler, this); 117 xine_event_create_listener_thread (m_queue, xine_event_handler, this);
118} 118}
119 119
120Lib::~Lib() { 120Lib::~Lib() {
121// free( m_config ); 121// free( m_config );
122 xine_exit( m_xine ); 122 xine_exit( m_xine );
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
128void Lib::resize ( const QSize &s ) { 128void 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
135QCString Lib::version() {
136 // QCString str( xine_get_str_version() );
137 // return str;
138 return "test";
139}
140
141int Lib::majorVersion() { 135int 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
147int Lib::minorVersion() { 141int 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
153int Lib::subVersion() { 147int Lib::subVersion() {
154 int major, minor, sub; 148 int major, minor, sub;
155 xine_get_version ( &major, &minor, &sub ); 149 xine_get_version ( &major, &minor, &sub );
156 return sub; 150 return sub;
157} 151}
158 152
159int Lib::play( const QString& fileName, int startPos, int start_time ) { 153int Lib::play( const QString& fileName, int startPos, int start_time ) {
160 QString str = fileName.stripWhiteSpace(); 154 QString str = fileName.stripWhiteSpace();
161 if ( !xine_open( m_stream, QFile::encodeName(str.utf8() ).data() ) ) { 155 if ( !xine_open( m_stream, QFile::encodeName(str.utf8() ).data() ) ) {
162 return 0; 156 return 0;
163 } 157 }
164 return xine_play( m_stream, startPos, start_time); 158 return xine_play( m_stream, startPos, start_time);