summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/lib.cpp34
-rw-r--r--noncore/multimedia/opieplayer2/lib.h4
2 files changed, 32 insertions, 6 deletions
diff --git a/noncore/multimedia/opieplayer2/lib.cpp b/noncore/multimedia/opieplayer2/lib.cpp
index 9f7a9c5..4ae8490 100644
--- a/noncore/multimedia/opieplayer2/lib.cpp
+++ b/noncore/multimedia/opieplayer2/lib.cpp
@@ -265,70 +265,98 @@ int Lib::currentTime() const {
265 265
266 if ( xine_get_pos_length( m_stream, &pos, &time, &length ) ) 266 if ( xine_get_pos_length( m_stream, &pos, &time, &length ) )
267 return time/1000; 267 return time/1000;
268 else 268 else
269 return 0; 269 return 0;
270} 270}
271 271
272int Lib::length() const { 272int Lib::length() const {
273 assert( m_initialized ); 273 assert( m_initialized );
274 274
275 int pos, time, length; 275 int pos, time, length;
276/* dilb: patch to solve the wrong stream length reported to the GUI*/ 276/* dilb: patch to solve the wrong stream length reported to the GUI*/
277 int iRetVal=0, iTestLoop=0; 277 int iRetVal=0, iTestLoop=0;
278 278
279 do 279 do
280 { 280 {
281 iRetVal = xine_get_pos_length( m_stream, &pos, &time, &length ); 281 iRetVal = xine_get_pos_length( m_stream, &pos, &time, &length );
282 if (iRetVal) 282 if (iRetVal)
283 {/* if the function didn't return 0, then pos, time and length are valid.*/ 283 {/* if the function didn't return 0, then pos, time and length are valid.*/
284 return length/1000; 284 return length/1000;
285 } 285 }
286 /*don't poll too much*/ 286 /*don't poll too much*/
287 usleep(100000); 287 usleep(100000);
288 iTestLoop++; 288 iTestLoop++;
289 } 289 }
290 while ( iTestLoop < 10 ); /* if after 1s, we still don't have any 290 while ( iTestLoop < 10 ); /* if after 1s, we still don't have any
291valid stream, then return -1 (this value could be used to make the stream 291valid stream, then return -1 (this value could be used to make the stream
292unseekable, but it should never occur!! Mr. Murphy ? :) ) */ 292unseekable, but it should never occur!! Mr. Murphy ? :) ) */
293 293
294 return -1; 294 return -1;
295} 295}
296 296
297/* info about current stream */
298QSize Lib::videoSize()const
299{
300 if (!m_initialized||!hasVideo()) return QSize(0,0);
301 int width = xine_get_stream_info(m_stream,XINE_STREAM_INFO_VIDEO_WIDTH);
302 int height = xine_get_stream_info(m_stream,XINE_STREAM_INFO_VIDEO_HEIGHT);
303 return QSize(width,height);
304}
305
306
297bool Lib::isSeekable() const { 307bool Lib::isSeekable() const {
298 assert( m_initialized ); 308 assert( m_initialized );
299 309
300 return xine_get_stream_info( m_stream, XINE_STREAM_INFO_SEEKABLE ); 310 return xine_get_stream_info( m_stream, XINE_STREAM_INFO_SEEKABLE );
301} 311}
302 312
313bool Lib::hasVideo() const {
314 assert( m_initialized );
315
316 return xine_get_stream_info( m_stream, XINE_STREAM_INFO_HAS_VIDEO);
317}
318
319int Lib::audioBitrate()const
320{
321 if (!m_initialized) return 0;
322 return xine_get_stream_info( m_stream, XINE_STREAM_INFO_AUDIO_BITRATE);
323}
324int Lib::videoBitrate()const
325{
326 if (!m_initialized||!hasVideo()) return 0;
327 return xine_get_stream_info( m_stream, XINE_STREAM_INFO_VIDEO_BITRATE);
328}
329/* end info block */
330
303void Lib::seekTo( int time ) { 331void Lib::seekTo( int time ) {
304 assert( m_initialized ); 332 assert( m_initialized );
305 333
306 odebug << "Seeking to second " << time << oendl; 334 odebug << "Seeking to second " << time << oendl;
307 //Keep it paused if it was in that state 335 //Keep it paused if it was in that state
308 if ( xine_get_param( m_stream, XINE_PARAM_SPEED ) ) { 336 if ( xine_get_param( m_stream, XINE_PARAM_SPEED ) ) {
309 xine_play( m_stream, 0, time*1000 ); 337 xine_play( m_stream, 0, time*1000 );
310 } 338 }
311 339
312 else { 340 else {
313 xine_play( m_stream, 0, time*1000 ); 341 xine_play( m_stream, 0, time*1000 );
314 xine_set_param( m_stream, XINE_PARAM_SPEED, XINE_SPEED_PAUSE ); 342 xine_set_param( m_stream, XINE_PARAM_SPEED, XINE_SPEED_PAUSE );
315 } 343 }
316 344
317} 345}
318 346
319 347
320QString Lib::metaInfo( int number) const { 348QString Lib::metaInfo( int number) const {
321 assert( m_initialized ); 349 assert( m_initialized );
322 350
323 return xine_get_meta_info( m_stream, number ); 351 return xine_get_meta_info( m_stream, number );
324} 352}
325 353
326int Lib::error() const { 354int Lib::error() const {
327 assert( m_initialized ); 355 assert( m_initialized );
328 356
329 return xine_get_error( m_stream ); 357 return xine_get_error( m_stream );
330}; 358};
331 359
332void Lib::ensureInitialized() 360void Lib::ensureInitialized()
333{ 361{
334 if ( m_initialized ) 362 if ( m_initialized )
@@ -362,70 +390,64 @@ void Lib::handleXineEvent( const xine_event_t* t ) {
362 prog = pt->percent; 390 prog = pt->percent;
363 name = pt->description; 391 name = pt->description;
364 } 392 }
365 393
366 send( new ThreadUtil::ChannelMessage( t->type, prog, name ), OneWay ); 394 send( new ThreadUtil::ChannelMessage( t->type, prog, name ), OneWay );
367} 395}
368 396
369void Lib::handleXineEvent( int type, int data, const char* name ) { 397void Lib::handleXineEvent( int type, int data, const char* name ) {
370 assert( m_initialized ); 398 assert( m_initialized );
371 399
372 if ( type == XINE_EVENT_UI_PLAYBACK_FINISHED ) { 400 if ( type == XINE_EVENT_UI_PLAYBACK_FINISHED ) {
373 emit stopped(); 401 emit stopped();
374 }else if ( type == XINE_EVENT_PROGRESS ) { 402 }else if ( type == XINE_EVENT_PROGRESS ) {
375 QString str = name == 0 ? QString::null : QString::fromUtf8( name ); 403 QString str = name == 0 ? QString::null : QString::fromUtf8( name );
376 Global::statusMessage( tr( "Progress: %1 %2" ).arg( name, data ) );; 404 Global::statusMessage( tr( "Progress: %1 %2" ).arg( name, data ) );;
377 } 405 }
378} 406}
379 407
380 408
381void Lib::setShowVideo( bool video ) { 409void Lib::setShowVideo( bool video ) {
382 assert( m_initialized ); 410 assert( m_initialized );
383 411
384 m_video = video; 412 m_video = video;
385 ::null_set_show_video( m_videoOutput, video ); 413 ::null_set_show_video( m_videoOutput, video );
386} 414}
387 415
388bool Lib::isShowingVideo() const { 416bool Lib::isShowingVideo() const {
389 assert( m_initialized ); 417 assert( m_initialized );
390 418
391 return ::null_is_showing_video( m_videoOutput ); 419 return ::null_is_showing_video( m_videoOutput );
392} 420}
393 421
394bool Lib::hasVideo() const {
395 assert( m_initialized );
396
397 return xine_get_stream_info( m_stream, 18 );
398}
399
400void Lib::showVideoFullScreen( bool fullScreen ) { 422void Lib::showVideoFullScreen( bool fullScreen ) {
401 assert( m_initialized ); 423 assert( m_initialized );
402 424
403 ::null_set_fullscreen( m_videoOutput, fullScreen ); 425 ::null_set_fullscreen( m_videoOutput, fullScreen );
404} 426}
405 427
406bool Lib::isVideoFullScreen() const { 428bool Lib::isVideoFullScreen() const {
407 assert( m_initialized ); 429 assert( m_initialized );
408 430
409 return ::null_is_fullscreen( m_videoOutput ); 431 return ::null_is_fullscreen( m_videoOutput );
410} 432}
411 433
412void Lib::setScaling( bool scale ) { 434void Lib::setScaling( bool scale ) {
413 assert( m_initialized ); 435 assert( m_initialized );
414 436
415 ::null_set_scaling( m_videoOutput, scale ); 437 ::null_set_scaling( m_videoOutput, scale );
416} 438}
417 439
418void Lib::setGamma( int value ) { 440void Lib::setGamma( int value ) {
419 assert( m_initialized ); 441 assert( m_initialized );
420 442
421 ::null_set_videoGamma( m_videoOutput, value ); 443 ::null_set_videoGamma( m_videoOutput, value );
422} 444}
423 445
424bool Lib::isScaling() const { 446bool Lib::isScaling() const {
425 assert( m_initialized ); 447 assert( m_initialized );
426 448
427 return ::null_is_scaling( m_videoOutput ); 449 return ::null_is_scaling( m_videoOutput );
428} 450}
429 451
430void Lib::xine_event_handler( void* user_data, const xine_event_t* t ) { 452void Lib::xine_event_handler( void* user_data, const xine_event_t* t ) {
431 ( (Lib*)user_data)->handleXineEvent( t ); 453 ( (Lib*)user_data)->handleXineEvent( t );
diff --git a/noncore/multimedia/opieplayer2/lib.h b/noncore/multimedia/opieplayer2/lib.h
index 2f5bf86..2607193 100644
--- a/noncore/multimedia/opieplayer2/lib.h
+++ b/noncore/multimedia/opieplayer2/lib.h
@@ -142,64 +142,68 @@ namespace XINE {
142 void seekTo( int time ); 142 void seekTo( int time );
143 143
144 /** 144 /**
145 * 145 *
146 * @return is media stream has video 146 * @return is media stream has video
147 */ 147 */
148 bool hasVideo() const; 148 bool hasVideo() const;
149 149
150 /** 150 /**
151 * 151 *
152 */ 152 */
153 void setScaling( bool ); 153 void setScaling( bool );
154 154
155 /** 155 /**
156 * Set the Gamma value for video output 156 * Set the Gamma value for video output
157 * @param int the value between -100 and 100, 0 is original 157 * @param int the value between -100 and 100, 0 is original
158 */ 158 */
159 void setGamma( int ); 159 void setGamma( int );
160 160
161 /** 161 /**
162 * Returns the error code 162 * Returns the error code
163 * XINE_ERROR_NONE 0 163 * XINE_ERROR_NONE 0
164 * XINE_ERROR_NO_INPUT_PLUGIN 1 164 * XINE_ERROR_NO_INPUT_PLUGIN 1
165 * XINE_ERROR_NO_DEMUXER_PLUGIN 2 165 * XINE_ERROR_NO_DEMUXER_PLUGIN 2
166 * XINE_ERROR_DEMUXER_FAILED 3 166 * XINE_ERROR_DEMUXER_FAILED 3
167 */ 167 */
168 int error() const; 168 int error() const;
169 169
170 void ensureInitialized(); 170 void ensureInitialized();
171 171
172 void setWidget( XineVideoWidget *widget ); 172 void setWidget( XineVideoWidget *widget );
173 173
174 QSize videoSize()const;
175 int audioBitrate()const;
176 int videoBitrate()const;
177
174 signals: 178 signals:
175 179
176 void stopped(); 180 void stopped();
177 181
178 void initialized(); 182 void initialized();
179 183
180 protected: 184 protected:
181 virtual void receiveMessage( ThreadUtil::ChannelMessage *msg, SendType sendType ); 185 virtual void receiveMessage( ThreadUtil::ChannelMessage *msg, SendType sendType );
182 186
183 virtual void run(); 187 virtual void run();
184 188
185 private: 189 private:
186 void initialize(); 190 void initialize();
187 191
188 int m_bytes_per_pixel; 192 int m_bytes_per_pixel;
189 bool m_initialized:1; 193 bool m_initialized:1;
190 bool m_duringInitialization:1; 194 bool m_duringInitialization:1;
191 bool m_video:1; 195 bool m_video:1;
192 XineVideoWidget *m_wid; 196 XineVideoWidget *m_wid;
193 xine_t *m_xine; 197 xine_t *m_xine;
194 xine_stream_t *m_stream; 198 xine_stream_t *m_stream;
195 xine_cfg_entry_t *m_config; 199 xine_cfg_entry_t *m_config;
196 xine_vo_driver_t *m_videoOutput; 200 xine_vo_driver_t *m_videoOutput;
197 xine_ao_driver_t* m_audioOutput; 201 xine_ao_driver_t* m_audioOutput;
198 xine_event_queue_t *m_queue; 202 xine_event_queue_t *m_queue;
199 203
200 void handleXineEvent( const xine_event_t* t ); 204 void handleXineEvent( const xine_event_t* t );
201 void handleXineEvent( int type, int data, const char* name ); 205 void handleXineEvent( int type, int data, const char* name );
202 void drawFrame( uint8_t* frame, int width, int height, int bytes ); 206 void drawFrame( uint8_t* frame, int width, int height, int bytes );
203 // C -> C++ bridge for the event system 207 // C -> C++ bridge for the event system
204 static void xine_event_handler( void* user_data, const xine_event_t* t); 208 static void xine_event_handler( void* user_data, const xine_event_t* t);
205 static void xine_display_frame( void* user_data, uint8_t* frame , 209 static void xine_display_frame( void* user_data, uint8_t* frame ,