*** empty log message ***

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) :
 
+//     Config cofg("qpe");
+//     cofg.setGroup("Appearance");
+//     QColor backgroundcolor = QColor( cofg.readEntry( "Background", "#E5E1D5" ) );
+
     time.setFocusPolicy( QWidget::NoFocus );
     time.setAlignment( Qt::AlignCenter );
-    time.setFrame(FALSE);
-    changeTextColor( &time );
+    
+//    time.setFrame(FALSE);
+//    changeTextColor( &time );
 
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 @@
 
+#include <opie/oticker.h>
 
@@ -64,19 +65,2 @@ enum AudioButtons {
 
-class Ticker : public QFrame {
-    Q_OBJECT
-
-public:
-    Ticker( QWidget* parent=0 );
-    ~Ticker();
-    void setText( const QString& text ) ;
-
-protected:
-    void timerEvent( QTimerEvent * );
-    void drawContents( QPainter *p );
-private:
-    QString scrollText;
-    int pos, pixelLen;
-};
-
-
 class AudioWidget : public QWidget {
@@ -140,3 +124,3 @@ private:
     QPixmap *pixmaps[4];
-    Ticker  songInfo;
+    OTicker  songInfo;
     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 @@
 typedef void (*display_xine_frame_t) (void *user_data, uint8_t* frame,
-				      int  width, int height,int bytes );
+              int  width, int height,int bytes );
 
@@ -76,3 +76,3 @@ struct null_driver_s {
   vo_overlay_t        *overlay;
-  vo_scale_t           sc;	
+  vo_scale_t           sc;  
 
@@ -124,3 +124,3 @@ static void null_frame_copy (vo_frame_t *vo_img, uint8_t **src) {
     frame->yuv2rgb->yuv2rgb_fun (frame->yuv2rgb, frame->rgb_dst,
-				 src[0], src[1], src[2]);
+         src[0], src[1], src[2]);
   } else {
@@ -128,4 +128,4 @@ static void null_frame_copy (vo_frame_t *vo_img, uint8_t **src) {
     frame->yuv2rgb->yuy22rgb_fun (frame->yuv2rgb, frame->rgb_dst,
-				  src[0]);
-  }	
+          src[0]);
+  } 
   
@@ -198,4 +198,4 @@ static vo_frame_t* null_alloc_frame( xine_vo_driver_t* self ){
 static void null_update_frame_format( xine_vo_driver_t* self, vo_frame_t* img,
-				      uint32_t width, uint32_t height,
-				      int ratio_code,  int format, int flags ){
+              uint32_t width, uint32_t height,
+              int ratio_code,  int format, int flags ){
   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,
 
-#ifdef LOG	
+#ifdef LOG  
     fprintf (stderr, "nullvideo: gui %dx%d delivered %dx%d output %dx%d\n",
-	     frame->sc.gui_width, frame->sc.gui_height,
-	     frame->sc.delivered_width, frame->sc.delivered_height,
-	     frame->sc.output_width, frame->sc.output_height);
+       frame->sc.gui_width, frame->sc.gui_height,
+       frame->sc.delivered_width, frame->sc.delivered_height,
+       frame->sc.output_width, frame->sc.output_height);
 #endif
@@ -246,12 +246,12 @@ static void null_update_frame_format( xine_vo_driver_t* self, vo_frame_t* img,
       if( frame->chunk[0] ){
-	free( frame->chunk[0] );
-	frame->chunk[0] = NULL;	
-      }	
+  free( frame->chunk[0] );
+  frame->chunk[0] = NULL; 
+      } 
       if( frame->chunk[1] ){
-	free ( frame->chunk[1] );
-	frame->chunk[1] = NULL;
-      }		
+  free ( frame->chunk[1] );
+  frame->chunk[1] = NULL;
+      }   
       if( frame->chunk[2] ){
-	free ( frame->chunk[2] );
-	frame->chunk[2] = NULL;
+  free ( frame->chunk[2] );
+  frame->chunk[2] = NULL;
       }
@@ -261,4 +261,4 @@ static void null_update_frame_format( xine_vo_driver_t* self, vo_frame_t* img,
     frame->data = xine_xmalloc (frame->sc.output_width 
-				* frame->sc.output_height 
-				* this->bytes_per_pixel );
+        * frame->sc.output_height 
+        * this->bytes_per_pixel );
 
@@ -274,5 +274,5 @@ static void null_update_frame_format( xine_vo_driver_t* self, vo_frame_t* img,
       frame->frame.pitches[0] = 8*((width + 3) / 4);
-	    
+      
       frame->frame.base[0] = xine_xmalloc_aligned (16, frame->frame.pitches[0] * height,
-						   (void **)&frame->chunk[0]);
+               (void **)&frame->chunk[0]);
       frame->chunk[1] = NULL;
@@ -292,9 +292,9 @@ static void null_update_frame_format( xine_vo_driver_t* self, vo_frame_t* img,
       frame->yuv2rgb->configure (frame->yuv2rgb,
-				 frame->sc.delivered_width,
-				 16,
-				 2*frame->frame.pitches[0],
-				 2*frame->frame.pitches[1],
-				 frame->sc.output_width,
-				 frame->stripe_height,
-				 frame->bytes_per_line*2);
+         frame->sc.delivered_width,
+         16,
+         2*frame->frame.pitches[0],
+         2*frame->frame.pitches[1],
+         frame->sc.output_width,
+         frame->stripe_height,
+         frame->bytes_per_line*2);
       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,
       frame->yuv2rgb->configure (frame->yuv2rgb,
-				 frame->sc.delivered_width,
-				 16,
-				 frame->frame.pitches[0],
-				 frame->frame.pitches[1],
-				 frame->sc.output_width,
-				 frame->stripe_height,
-				 frame->bytes_per_line);
+         frame->sc.delivered_width,
+         16,
+         frame->frame.pitches[0],
+         frame->frame.pitches[1],
+         frame->sc.output_width,
+         frame->stripe_height,
+         frame->bytes_per_line);
       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 ){
     (*display)(this->caller, frame->data,
-	       frame->sc.output_width, frame->sc.output_height,
-	       frame->bytes_per_line );
+         frame->sc.output_width, frame->sc.output_height,
+         frame->bytes_per_line );
   }
@@ -360,4 +360,4 @@ static void null_display_frame( xine_vo_driver_t* self, vo_frame_t *frame_gen ){
 static void null_overlay_clut_yuv2rgb (null_driver_t  *this, 
-				       vo_overlay_t *overlay,
-				       opie_frame_t *frame) {
+               vo_overlay_t *overlay,
+               opie_frame_t *frame) {
   int i;
@@ -367,4 +367,4 @@ static void null_overlay_clut_yuv2rgb (null_driver_t  *this,
       *((uint32_t *)&clut[i]) =
-	frame->yuv2rgb->yuv2rgb_single_pixel_fun (frame->yuv2rgb,
-						  clut[i].y, clut[i].cb, clut[i].cr);
+  frame->yuv2rgb->yuv2rgb_single_pixel_fun (frame->yuv2rgb,
+              clut[i].y, clut[i].cb, clut[i].cr);
     }
@@ -376,4 +376,4 @@ static void null_overlay_clut_yuv2rgb (null_driver_t  *this,
       *((uint32_t *)&clut[i]) =
-	frame->yuv2rgb->yuv2rgb_single_pixel_fun(frame->yuv2rgb,
-						 clut[i].y, clut[i].cb, clut[i].cr);
+  frame->yuv2rgb->yuv2rgb_single_pixel_fun(frame->yuv2rgb,
+             clut[i].y, clut[i].cb, clut[i].cr);
     }
@@ -399,4 +399,4 @@ static void null_overlay_blend ( xine_vo_driver_t *this_gen, vo_frame_t *frame_g
       blend_rgb16( (uint8_t *)frame->data, overlay,
-		   frame->sc.output_width, frame->sc.output_height,
-		   frame->sc.delivered_width, frame->sc.delivered_height);
+       frame->sc.output_width, frame->sc.output_height,
+       frame->sc.delivered_width, frame->sc.delivered_height);
       break;
@@ -404,4 +404,4 @@ static void null_overlay_blend ( xine_vo_driver_t *this_gen, vo_frame_t *frame_g
       blend_rgb24( (uint8_t *)frame->data, overlay,
-		   frame->sc.output_width, frame->sc.output_height,
-		   frame->sc.delivered_width, frame->sc.delivered_height);
+       frame->sc.output_width, frame->sc.output_height,
+       frame->sc.delivered_width, frame->sc.delivered_height);
       break;
@@ -409,4 +409,4 @@ static void null_overlay_blend ( xine_vo_driver_t *this_gen, vo_frame_t *frame_g
       blend_rgb32( (uint8_t *)frame->data, overlay,
-		   frame->sc.output_width, frame->sc.output_height,
-		   frame->sc.delivered_width, frame->sc.delivered_height);
+       frame->sc.output_width, frame->sc.output_height,
+       frame->sc.delivered_width, frame->sc.delivered_height);
       break;
@@ -421,3 +421,3 @@ static void null_overlay_blend ( xine_vo_driver_t *this_gen, vo_frame_t *frame_g
 static int null_get_property( xine_vo_driver_t* self,
-			      int property ){
+            int property ){
   return 0;
@@ -425,4 +425,4 @@ static int null_get_property( xine_vo_driver_t* self,
 static int null_set_property( xine_vo_driver_t* self,
-			      int property,
-			      int value ){
+            int property,
+            int value ){
   return value;
@@ -430,4 +430,4 @@ static int null_set_property( xine_vo_driver_t* self,
 static void null_get_property_min_max( xine_vo_driver_t* self,
-				       int property, int *min,
-				       int *max ){
+               int property, int *min,
+               int *max ){
   *max = 0;
@@ -436,4 +436,4 @@ static void null_get_property_min_max( xine_vo_driver_t* self,
 static int null_gui_data_exchange( xine_vo_driver_t* self,
-				   int data_type,
-				   void *data ){
+           int data_type,
+           void *data ){
   return 0;
@@ -448,6 +448,6 @@ static int null_redraw_needed( xine_vo_driver_t* self ){
 }
-				       
+               
 
 xine_vo_driver_t* init_video_out_plugin( config_values_t* conf,
-					 void* video ){
+           void* video ){
   null_driver_t *vo;
@@ -487,3 +487,3 @@ xine_vo_driver_t* init_video_out_plugin( config_values_t* conf,
   vo->yuv2rgb_factory = yuv2rgb_factory_init (MODE_16_RGB, vo->yuv2rgb_swap, 
-					      vo->yuv2rgb_cmap);
+                vo->yuv2rgb_cmap);
 
@@ -560,10 +560,10 @@ void null_set_mode( xine_vo_driver_t* self, int depth,  int rgb  ) {
       this->yuv2rgb_mode = MODE_32_RGB;
-    else	
+    else  
       this->yuv2rgb_mode = MODE_32_BGR;
-  case 24:	
+  case 24:  
     if( this->bpp == 32 ) {
-      if( rgb == 0 ) {	
-	this->yuv2rgb_mode = MODE_32_RGB;
-      } else {	
-	this->yuv2rgb_mode = MODE_32_BGR;
+      if( rgb == 0 ) {  
+  this->yuv2rgb_mode = MODE_32_RGB;
+      } else {  
+  this->yuv2rgb_mode = MODE_32_BGR;
       }
@@ -571,5 +571,5 @@ void null_set_mode( xine_vo_driver_t* self, int depth,  int rgb  ) {
       if( rgb == 0 )
-	this->yuv2rgb_mode = MODE_24_RGB;
+  this->yuv2rgb_mode = MODE_24_RGB;
       else
-	this->yuv2rgb_mode = MODE_24_BGR;
+  this->yuv2rgb_mode = MODE_24_BGR;
     };
@@ -600,3 +600,3 @@ void null_set_mode( xine_vo_driver_t* self, int depth,  int rgb  ) {
   // this->yuv2rgb_factory = yuv2rgb_factory_init (this->yuv2rgb_mode, this->yuv2rgb_swap, 
-  //						this->yuv2rgb_cmap);
+  //            this->yuv2rgb_cmap);
 };
@@ -604,3 +604,3 @@ void null_set_mode( xine_vo_driver_t* self, int depth,  int rgb  ) {
 void null_display_handler( xine_vo_driver_t* self, display_xine_frame_t t, 
-			   void* user_data ) {
+         void* user_data ) {
   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 ) {
           lnk.setIcon("opieplayer2/musicfile");
-//           if(s.right(4) != '.' || s.right(5) != '.')
-//             lnk.setFile( s+"/"); //if url with no extension
-//           else
-            lnk.setFile( s ); //sets file name
+          lnk.setFile( s ); //sets file name