-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.cpp | 9 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.h | 20 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/nullvideo.c | 142 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/playlistwidget.cpp | 5 |
4 files changed, 81 insertions, 95 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp index e21b0b1..6ccf206 100644 --- a/noncore/multimedia/opieplayer2/audiowidget.cpp +++ b/noncore/multimedia/opieplayer2/audiowidget.cpp | |||
@@ -149,6 +149,11 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) : | |||
149 | 149 | ||
150 | // Config cofg("qpe"); | ||
151 | // cofg.setGroup("Appearance"); | ||
152 | // QColor backgroundcolor = QColor( cofg.readEntry( "Background", "#E5E1D5" ) ); | ||
153 | |||
150 | time.setFocusPolicy( QWidget::NoFocus ); | 154 | time.setFocusPolicy( QWidget::NoFocus ); |
151 | time.setAlignment( Qt::AlignCenter ); | 155 | time.setAlignment( Qt::AlignCenter ); |
152 | time.setFrame(FALSE); | 156 | |
153 | changeTextColor( &time ); | 157 | // time.setFrame(FALSE); |
158 | // changeTextColor( &time ); | ||
154 | 159 | ||
diff --git a/noncore/multimedia/opieplayer2/audiowidget.h b/noncore/multimedia/opieplayer2/audiowidget.h index bcd941e..7cb1d79 100644 --- a/noncore/multimedia/opieplayer2/audiowidget.h +++ b/noncore/multimedia/opieplayer2/audiowidget.h | |||
@@ -45,2 +45,3 @@ | |||
45 | 45 | ||
46 | #include <opie/oticker.h> | ||
46 | 47 | ||
@@ -64,19 +65,2 @@ enum AudioButtons { | |||
64 | 65 | ||
65 | class Ticker : public QFrame { | ||
66 | Q_OBJECT | ||
67 | |||
68 | public: | ||
69 | Ticker( QWidget* parent=0 ); | ||
70 | ~Ticker(); | ||
71 | void setText( const QString& text ) ; | ||
72 | |||
73 | protected: | ||
74 | void timerEvent( QTimerEvent * ); | ||
75 | void drawContents( QPainter *p ); | ||
76 | private: | ||
77 | QString scrollText; | ||
78 | int pos, pixelLen; | ||
79 | }; | ||
80 | |||
81 | |||
82 | class AudioWidget : public QWidget { | 66 | class AudioWidget : public QWidget { |
@@ -140,3 +124,3 @@ private: | |||
140 | QPixmap *pixmaps[4]; | 124 | QPixmap *pixmaps[4]; |
141 | Ticker songInfo; | 125 | OTicker songInfo; |
142 | QSlider slider; | 126 | QSlider slider; |
diff --git a/noncore/multimedia/opieplayer2/nullvideo.c b/noncore/multimedia/opieplayer2/nullvideo.c index 707efeb..9c285a0 100644 --- a/noncore/multimedia/opieplayer2/nullvideo.c +++ b/noncore/multimedia/opieplayer2/nullvideo.c | |||
@@ -56,3 +56,3 @@ | |||
56 | typedef void (*display_xine_frame_t) (void *user_data, uint8_t* frame, | 56 | typedef void (*display_xine_frame_t) (void *user_data, uint8_t* frame, |
57 | int width, int height,int bytes ); | 57 | int width, int height,int bytes ); |
58 | 58 | ||
@@ -76,3 +76,3 @@ struct null_driver_s { | |||
76 | vo_overlay_t *overlay; | 76 | vo_overlay_t *overlay; |
77 | vo_scale_t sc; | 77 | vo_scale_t sc; |
78 | 78 | ||
@@ -124,3 +124,3 @@ static void null_frame_copy (vo_frame_t *vo_img, uint8_t **src) { | |||
124 | frame->yuv2rgb->yuv2rgb_fun (frame->yuv2rgb, frame->rgb_dst, | 124 | frame->yuv2rgb->yuv2rgb_fun (frame->yuv2rgb, frame->rgb_dst, |
125 | src[0], src[1], src[2]); | 125 | src[0], src[1], src[2]); |
126 | } else { | 126 | } else { |
@@ -128,4 +128,4 @@ static void null_frame_copy (vo_frame_t *vo_img, uint8_t **src) { | |||
128 | frame->yuv2rgb->yuy22rgb_fun (frame->yuv2rgb, frame->rgb_dst, | 128 | frame->yuv2rgb->yuy22rgb_fun (frame->yuv2rgb, frame->rgb_dst, |
129 | src[0]); | 129 | src[0]); |
130 | } | 130 | } |
131 | 131 | ||
@@ -198,4 +198,4 @@ static vo_frame_t* null_alloc_frame( xine_vo_driver_t* self ){ | |||
198 | static void null_update_frame_format( xine_vo_driver_t* self, vo_frame_t* img, | 198 | static void null_update_frame_format( xine_vo_driver_t* self, vo_frame_t* img, |
199 | uint32_t width, uint32_t height, | 199 | uint32_t width, uint32_t height, |
200 | int ratio_code, int format, int flags ){ | 200 | int ratio_code, int format, int flags ){ |
201 | null_driver_t* this = (null_driver_t*) self; | 201 | null_driver_t* this = (null_driver_t*) self; |
@@ -234,7 +234,7 @@ static void null_update_frame_format( xine_vo_driver_t* self, vo_frame_t* img, | |||
234 | 234 | ||
235 | #ifdef LOG | 235 | #ifdef LOG |
236 | fprintf (stderr, "nullvideo: gui %dx%d delivered %dx%d output %dx%d\n", | 236 | fprintf (stderr, "nullvideo: gui %dx%d delivered %dx%d output %dx%d\n", |
237 | frame->sc.gui_width, frame->sc.gui_height, | 237 | frame->sc.gui_width, frame->sc.gui_height, |
238 | frame->sc.delivered_width, frame->sc.delivered_height, | 238 | frame->sc.delivered_width, frame->sc.delivered_height, |
239 | frame->sc.output_width, frame->sc.output_height); | 239 | frame->sc.output_width, frame->sc.output_height); |
240 | #endif | 240 | #endif |
@@ -246,12 +246,12 @@ static void null_update_frame_format( xine_vo_driver_t* self, vo_frame_t* img, | |||
246 | if( frame->chunk[0] ){ | 246 | if( frame->chunk[0] ){ |
247 | free( frame->chunk[0] ); | 247 | free( frame->chunk[0] ); |
248 | frame->chunk[0] = NULL; | 248 | frame->chunk[0] = NULL; |
249 | } | 249 | } |
250 | if( frame->chunk[1] ){ | 250 | if( frame->chunk[1] ){ |
251 | free ( frame->chunk[1] ); | 251 | free ( frame->chunk[1] ); |
252 | frame->chunk[1] = NULL; | 252 | frame->chunk[1] = NULL; |
253 | } | 253 | } |
254 | if( frame->chunk[2] ){ | 254 | if( frame->chunk[2] ){ |
255 | free ( frame->chunk[2] ); | 255 | free ( frame->chunk[2] ); |
256 | frame->chunk[2] = NULL; | 256 | frame->chunk[2] = NULL; |
257 | } | 257 | } |
@@ -261,4 +261,4 @@ static void null_update_frame_format( xine_vo_driver_t* self, vo_frame_t* img, | |||
261 | frame->data = xine_xmalloc (frame->sc.output_width | 261 | frame->data = xine_xmalloc (frame->sc.output_width |
262 | * frame->sc.output_height | 262 | * frame->sc.output_height |
263 | * this->bytes_per_pixel ); | 263 | * this->bytes_per_pixel ); |
264 | 264 | ||
@@ -274,5 +274,5 @@ static void null_update_frame_format( xine_vo_driver_t* self, vo_frame_t* img, | |||
274 | frame->frame.pitches[0] = 8*((width + 3) / 4); | 274 | frame->frame.pitches[0] = 8*((width + 3) / 4); |
275 | 275 | ||
276 | frame->frame.base[0] = xine_xmalloc_aligned (16, frame->frame.pitches[0] * height, | 276 | frame->frame.base[0] = xine_xmalloc_aligned (16, frame->frame.pitches[0] * height, |
277 | (void **)&frame->chunk[0]); | 277 | (void **)&frame->chunk[0]); |
278 | frame->chunk[1] = NULL; | 278 | frame->chunk[1] = NULL; |
@@ -292,9 +292,9 @@ static void null_update_frame_format( xine_vo_driver_t* self, vo_frame_t* img, | |||
292 | frame->yuv2rgb->configure (frame->yuv2rgb, | 292 | frame->yuv2rgb->configure (frame->yuv2rgb, |
293 | frame->sc.delivered_width, | 293 | frame->sc.delivered_width, |
294 | 16, | 294 | 16, |
295 | 2*frame->frame.pitches[0], | 295 | 2*frame->frame.pitches[0], |
296 | 2*frame->frame.pitches[1], | 296 | 2*frame->frame.pitches[1], |
297 | frame->sc.output_width, | 297 | frame->sc.output_width, |
298 | frame->stripe_height, | 298 | frame->stripe_height, |
299 | frame->bytes_per_line*2); | 299 | frame->bytes_per_line*2); |
300 | frame->yuv_stride = frame->bytes_per_line*2; | 300 | frame->yuv_stride = frame->bytes_per_line*2; |
@@ -303,9 +303,9 @@ static void null_update_frame_format( xine_vo_driver_t* self, vo_frame_t* img, | |||
303 | frame->yuv2rgb->configure (frame->yuv2rgb, | 303 | frame->yuv2rgb->configure (frame->yuv2rgb, |
304 | frame->sc.delivered_width, | 304 | frame->sc.delivered_width, |
305 | 16, | 305 | 16, |
306 | frame->frame.pitches[0], | 306 | frame->frame.pitches[0], |
307 | frame->frame.pitches[1], | 307 | frame->frame.pitches[1], |
308 | frame->sc.output_width, | 308 | frame->sc.output_width, |
309 | frame->stripe_height, | 309 | frame->stripe_height, |
310 | frame->bytes_per_line); | 310 | frame->bytes_per_line); |
311 | frame->yuv_stride = frame->bytes_per_line; | 311 | frame->yuv_stride = frame->bytes_per_line; |
@@ -350,4 +350,4 @@ static void null_display_frame( xine_vo_driver_t* self, vo_frame_t *frame_gen ){ | |||
350 | (*display)(this->caller, frame->data, | 350 | (*display)(this->caller, frame->data, |
351 | frame->sc.output_width, frame->sc.output_height, | 351 | frame->sc.output_width, frame->sc.output_height, |
352 | frame->bytes_per_line ); | 352 | frame->bytes_per_line ); |
353 | } | 353 | } |
@@ -360,4 +360,4 @@ static void null_display_frame( xine_vo_driver_t* self, vo_frame_t *frame_gen ){ | |||
360 | static void null_overlay_clut_yuv2rgb (null_driver_t *this, | 360 | static void null_overlay_clut_yuv2rgb (null_driver_t *this, |
361 | vo_overlay_t *overlay, | 361 | vo_overlay_t *overlay, |
362 | opie_frame_t *frame) { | 362 | opie_frame_t *frame) { |
363 | int i; | 363 | int i; |
@@ -367,4 +367,4 @@ static void null_overlay_clut_yuv2rgb (null_driver_t *this, | |||
367 | *((uint32_t *)&clut[i]) = | 367 | *((uint32_t *)&clut[i]) = |
368 | frame->yuv2rgb->yuv2rgb_single_pixel_fun (frame->yuv2rgb, | 368 | frame->yuv2rgb->yuv2rgb_single_pixel_fun (frame->yuv2rgb, |
369 | clut[i].y, clut[i].cb, clut[i].cr); | 369 | clut[i].y, clut[i].cb, clut[i].cr); |
370 | } | 370 | } |
@@ -376,4 +376,4 @@ static void null_overlay_clut_yuv2rgb (null_driver_t *this, | |||
376 | *((uint32_t *)&clut[i]) = | 376 | *((uint32_t *)&clut[i]) = |
377 | frame->yuv2rgb->yuv2rgb_single_pixel_fun(frame->yuv2rgb, | 377 | frame->yuv2rgb->yuv2rgb_single_pixel_fun(frame->yuv2rgb, |
378 | clut[i].y, clut[i].cb, clut[i].cr); | 378 | clut[i].y, clut[i].cb, clut[i].cr); |
379 | } | 379 | } |
@@ -399,4 +399,4 @@ static void null_overlay_blend ( xine_vo_driver_t *this_gen, vo_frame_t *frame_g | |||
399 | blend_rgb16( (uint8_t *)frame->data, overlay, | 399 | blend_rgb16( (uint8_t *)frame->data, overlay, |
400 | frame->sc.output_width, frame->sc.output_height, | 400 | frame->sc.output_width, frame->sc.output_height, |
401 | frame->sc.delivered_width, frame->sc.delivered_height); | 401 | frame->sc.delivered_width, frame->sc.delivered_height); |
402 | break; | 402 | break; |
@@ -404,4 +404,4 @@ static void null_overlay_blend ( xine_vo_driver_t *this_gen, vo_frame_t *frame_g | |||
404 | blend_rgb24( (uint8_t *)frame->data, overlay, | 404 | blend_rgb24( (uint8_t *)frame->data, overlay, |
405 | frame->sc.output_width, frame->sc.output_height, | 405 | frame->sc.output_width, frame->sc.output_height, |
406 | frame->sc.delivered_width, frame->sc.delivered_height); | 406 | frame->sc.delivered_width, frame->sc.delivered_height); |
407 | break; | 407 | break; |
@@ -409,4 +409,4 @@ static void null_overlay_blend ( xine_vo_driver_t *this_gen, vo_frame_t *frame_g | |||
409 | blend_rgb32( (uint8_t *)frame->data, overlay, | 409 | blend_rgb32( (uint8_t *)frame->data, overlay, |
410 | frame->sc.output_width, frame->sc.output_height, | 410 | frame->sc.output_width, frame->sc.output_height, |
411 | frame->sc.delivered_width, frame->sc.delivered_height); | 411 | frame->sc.delivered_width, frame->sc.delivered_height); |
412 | break; | 412 | break; |
@@ -421,3 +421,3 @@ static void null_overlay_blend ( xine_vo_driver_t *this_gen, vo_frame_t *frame_g | |||
421 | static int null_get_property( xine_vo_driver_t* self, | 421 | static int null_get_property( xine_vo_driver_t* self, |
422 | int property ){ | 422 | int property ){ |
423 | return 0; | 423 | return 0; |
@@ -425,4 +425,4 @@ static int null_get_property( xine_vo_driver_t* self, | |||
425 | static int null_set_property( xine_vo_driver_t* self, | 425 | static int null_set_property( xine_vo_driver_t* self, |
426 | int property, | 426 | int property, |
427 | int value ){ | 427 | int value ){ |
428 | return value; | 428 | return value; |
@@ -430,4 +430,4 @@ static int null_set_property( xine_vo_driver_t* self, | |||
430 | static void null_get_property_min_max( xine_vo_driver_t* self, | 430 | static void null_get_property_min_max( xine_vo_driver_t* self, |
431 | int property, int *min, | 431 | int property, int *min, |
432 | int *max ){ | 432 | int *max ){ |
433 | *max = 0; | 433 | *max = 0; |
@@ -436,4 +436,4 @@ static void null_get_property_min_max( xine_vo_driver_t* self, | |||
436 | static int null_gui_data_exchange( xine_vo_driver_t* self, | 436 | static int null_gui_data_exchange( xine_vo_driver_t* self, |
437 | int data_type, | 437 | int data_type, |
438 | void *data ){ | 438 | void *data ){ |
439 | return 0; | 439 | return 0; |
@@ -448,6 +448,6 @@ static int null_redraw_needed( xine_vo_driver_t* self ){ | |||
448 | } | 448 | } |
449 | 449 | ||
450 | 450 | ||
451 | xine_vo_driver_t* init_video_out_plugin( config_values_t* conf, | 451 | xine_vo_driver_t* init_video_out_plugin( config_values_t* conf, |
452 | void* video ){ | 452 | void* video ){ |
453 | null_driver_t *vo; | 453 | null_driver_t *vo; |
@@ -487,3 +487,3 @@ xine_vo_driver_t* init_video_out_plugin( config_values_t* conf, | |||
487 | vo->yuv2rgb_factory = yuv2rgb_factory_init (MODE_16_RGB, vo->yuv2rgb_swap, | 487 | vo->yuv2rgb_factory = yuv2rgb_factory_init (MODE_16_RGB, vo->yuv2rgb_swap, |
488 | vo->yuv2rgb_cmap); | 488 | vo->yuv2rgb_cmap); |
489 | 489 | ||
@@ -560,10 +560,10 @@ void null_set_mode( xine_vo_driver_t* self, int depth, int rgb ) { | |||
560 | this->yuv2rgb_mode = MODE_32_RGB; | 560 | this->yuv2rgb_mode = MODE_32_RGB; |
561 | else | 561 | else |
562 | this->yuv2rgb_mode = MODE_32_BGR; | 562 | this->yuv2rgb_mode = MODE_32_BGR; |
563 | case 24: | 563 | case 24: |
564 | if( this->bpp == 32 ) { | 564 | if( this->bpp == 32 ) { |
565 | if( rgb == 0 ) { | 565 | if( rgb == 0 ) { |
566 | this->yuv2rgb_mode = MODE_32_RGB; | 566 | this->yuv2rgb_mode = MODE_32_RGB; |
567 | } else { | 567 | } else { |
568 | this->yuv2rgb_mode = MODE_32_BGR; | 568 | this->yuv2rgb_mode = MODE_32_BGR; |
569 | } | 569 | } |
@@ -571,5 +571,5 @@ void null_set_mode( xine_vo_driver_t* self, int depth, int rgb ) { | |||
571 | if( rgb == 0 ) | 571 | if( rgb == 0 ) |
572 | this->yuv2rgb_mode = MODE_24_RGB; | 572 | this->yuv2rgb_mode = MODE_24_RGB; |
573 | else | 573 | else |
574 | this->yuv2rgb_mode = MODE_24_BGR; | 574 | this->yuv2rgb_mode = MODE_24_BGR; |
575 | }; | 575 | }; |
@@ -600,3 +600,3 @@ void null_set_mode( xine_vo_driver_t* self, int depth, int rgb ) { | |||
600 | // this->yuv2rgb_factory = yuv2rgb_factory_init (this->yuv2rgb_mode, this->yuv2rgb_swap, | 600 | // this->yuv2rgb_factory = yuv2rgb_factory_init (this->yuv2rgb_mode, this->yuv2rgb_swap, |
601 | // this->yuv2rgb_cmap); | 601 | // this->yuv2rgb_cmap); |
602 | }; | 602 | }; |
@@ -604,3 +604,3 @@ void null_set_mode( xine_vo_driver_t* self, int depth, int rgb ) { | |||
604 | void null_display_handler( xine_vo_driver_t* self, display_xine_frame_t t, | 604 | void null_display_handler( xine_vo_driver_t* self, display_xine_frame_t t, |
605 | void* user_data ) { | 605 | void* user_data ) { |
606 | null_driver_t* this = (null_driver_t*) self; | 606 | null_driver_t* this = (null_driver_t*) self; |
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp index 040ef71..8e88e9b 100644 --- a/noncore/multimedia/opieplayer2/playlistwidget.cpp +++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp | |||
@@ -793,6 +793,3 @@ void PlayListWidget::readm3u( const QString &filename ) { | |||
793 | lnk.setIcon("opieplayer2/musicfile"); | 793 | lnk.setIcon("opieplayer2/musicfile"); |
794 | // if(s.right(4) != '.' || s.right(5) != '.') | 794 | lnk.setFile( s ); //sets file name |
795 | // lnk.setFile( s+"/"); //if url with no extension | ||
796 | // else | ||
797 | lnk.setFile( s ); //sets file name | ||
798 | 795 | ||