first parts of gamma correction, fullscreen on arm need some more work

13 files changed, 244 insertions, 88 deletions

diff --git a/noncore/multimedia/opieplayer2/lib.cpp b/noncore/multimedia/opieplayer2/lib.cpp
index b2143a0..748ae1f 100644
--- a/noncore/multimedia/opieplayer2/lib.cpp
+++ b/noncore/multimedia/opieplayer2/lib.cpp
@@ -51,24 +51,25 @@ typedef void (*display_xine_frame_t) (void *user_data, uint8_t* frame,
 
 extern "C" {
     vo_driver_t* init_video_out_plugin( config_values_t* conf, void* video);
     int null_is_showing_video( vo_driver_t* self );
     void null_set_show_video( vo_driver_t* self, int show );
     int null_is_fullscreen( vo_driver_t* self );
     void null_set_fullscreen( vo_driver_t* self, int screen );
     int null_is_scaling( vo_driver_t* self );
     void null_set_scaling( vo_driver_t* self, int scale );
     void null_set_gui_width( vo_driver_t* self, int width );
     void null_set_gui_height( vo_driver_t* self, int height );
     void null_set_mode( vo_driver_t* self, int depth,  int rgb  );
+    void null_set_videoGamma(  vo_driver_t* self , int value );
     void null_display_handler(vo_driver_t* self, display_xine_frame_t t, void* user_data);
 }
 
 using namespace XINE;
 
 Lib::Lib(XineVideoWidget* widget) {
     m_video = false;
     m_wid = widget;
     printf("Lib");
     QCString str( getenv("HOME") );
     str += "/Settings/opiexine.cf";
     // get the configuration
@@ -83,25 +84,25 @@ Lib::Lib(XineVideoWidget* widget) {
     }
 
     m_config = xine_config_file_init( str.data() );
 
     // allocate oss for sound
     // and fb for framebuffer
     m_audioOutput= xine_load_audio_output_plugin( m_config, "oss") ;
     m_videoOutput = ::init_video_out_plugin( m_config, NULL );
     if (m_wid != 0 ) {
         printf("!0\n" );
         resize ( m_wid-> size ( ));
         ::null_set_mode( m_videoOutput, qt_screen->depth(), qt_screen->pixelType() );
-        m_wid-> setImage ( new QImage ( Resource::loadImage("")));
+        m_wid-> setImage ( new QImage ( Resource::loadImage("") ) );
         m_wid->repaint();
     }
     null_display_handler( m_videoOutput,
                           xine_display_frame,
                           this );
 
     m_xine = xine_init( m_videoOutput,
 			m_audioOutput, m_config );
     // install the event handler
     xine_register_event_listener( m_xine, xine_event_handler, this );
 }
 
@@ -194,24 +195,30 @@ void Lib::setShowVideo( bool video ) {
 bool Lib::isShowingVideo() {
     return ::null_is_showing_video( m_videoOutput );
 }
 void Lib::showVideoFullScreen( bool fullScreen ) {
     ::null_set_fullscreen( m_videoOutput, fullScreen );
 }
 bool Lib::isVideoFullScreen() {
     return ::null_is_fullscreen( m_videoOutput );
 }
 void Lib::setScaling( bool scale ) {
     ::null_set_scaling( m_videoOutput, scale  );
 }
+
+void Lib::setGamma( int value ) {
+    //qDebug( QString( "%1").arg(value)  );
+    ::null_set_videoGamma( m_videoOutput, value );
+}
+
 bool Lib::isScaling() {
     return ::null_is_scaling( m_videoOutput );
 }
 void Lib::xine_event_handler( void* user_data, xine_event_t* t ) {
     ((Lib*)user_data)->handleXineEvent( t );
 }
 void Lib::xine_display_frame( void* user_data, uint8_t *frame,
                               int width,  int height,  int bytes ) {
 
     ((Lib*)user_data)->drawFrame( frame,  width, height, bytes );
 }
 void Lib::drawFrame( uint8_t* frame,  int width,  int height,  int bytes ) {
diff --git a/noncore/multimedia/opieplayer2/lib.h b/noncore/multimedia/opieplayer2/lib.h
index abd8c65..b9d0a8a 100644
--- a/noncore/multimedia/opieplayer2/lib.h
+++ b/noncore/multimedia/opieplayer2/lib.h
@@ -103,24 +103,31 @@ namespace XINE {
          */
         bool isVideoFullScreen()/*const*/ ;
 
         /**
          *
          */
         bool isScaling();
 
         /**
          *
          */
         void setScaling( bool );
+
+        /**
+         * Set the Gamma value for video output
+         * @param int the value between -100 and 100, 0 is original
+         */
+        void setGamma( int );
+
         /**
          * test
          */
         Frame currentFrame()/*const*/;
 
         /**
          * Returns the error code
          */
         int error() /*const*/;
 
     signals:
         void stopped();
diff --git a/noncore/multimedia/opieplayer2/mediaplayerstate.cpp b/noncore/multimedia/opieplayer2/mediaplayerstate.cpp
index d984022..4ec5989 100644
--- a/noncore/multimedia/opieplayer2/mediaplayerstate.cpp
+++ b/noncore/multimedia/opieplayer2/mediaplayerstate.cpp
@@ -1,65 +1,99 @@
+/*
+                            This file is part of the Opie Project
+
+                             Copyright (c)  2002 Max Reiss <harlekin@handhelds.org>
+                             Copyright (c)  2002 L. Potter <ljp@llornkcor.com>
+                             Copyright (c)  2002 Holger Freyther <zecke@handhelds.org>
+              =.
+            .=l.
+           .>+-=
+ _;:,     .>    :=|.         This program is free software; you can
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
+:`=1 )Y*s>-.--   :           the terms of the GNU General Public
+.="- .-=="i,     .._         License as published by the Free Software
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
+     ._= =}       :          or (at your option) any later version.
+    .%`+i>       _;_.
+    .i_,=:_.      -<s.       This program is distributed in the hope that
+     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
+    : ..    .:,     . . .    without even the implied warranty of
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
+  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
+..}^=.=       =       ;      General Public License for more
+++=   -.     .`     .:       details.
+ :     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
+                             If not, write to the Free Software Foundation,
+                             Inc., 59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+
+*/
+
+// this file is based on work by trolltech
+
 #include <qpe/qpeapplication.h>
 #include <qpe/qlibrary.h>
 #include <qpe/config.h>
 #include <qvaluelist.h>
 #include <qobject.h>
 #include <qdir.h>
 #include "mediaplayerstate.h"
 
 
 
 //#define MediaPlayerDebug(x) qDebug x
 #define MediaPlayerDebug(x)
 
 
 MediaPlayerState::MediaPlayerState( QObject *parent, const char *name )
         : QObject( parent, name ) {
     Config cfg( "OpiePlayer" );
     readConfig( cfg );
     isStreaming = false;
 }
 
 
 MediaPlayerState::~MediaPlayerState() {
-//     Config cfg( "OpiePlayer" );
-//     writeConfig( cfg );
-
 }
 
 
 void MediaPlayerState::readConfig( Config& cfg ) {
     cfg.setGroup("Options");
     isFullscreen = cfg.readBoolEntry( "FullScreen" );
     isScaled = cfg.readBoolEntry( "Scaling" );
     isLooping = cfg.readBoolEntry( "Looping" );
     isShuffled = cfg.readBoolEntry( "Shuffle" );
     usePlaylist = cfg.readBoolEntry( "UsePlayList" );
+    videoGamma = cfg.readNumEntry( "VideoGamma" );
     usePlaylist = TRUE;
     isPlaying = FALSE;
     isStreaming = FALSE;
     isPaused = FALSE;
     curPosition = 0;
     curLength = 0;
     curView = 'l';
 }
 
 
 void MediaPlayerState::writeConfig( Config& cfg ) const {
-    cfg.setGroup("Options");
-    cfg.writeEntry("FullScreen", isFullscreen );
-    cfg.writeEntry("Scaling", isScaled );
-    cfg.writeEntry("Looping", isLooping );
-    cfg.writeEntry("Shuffle", isShuffled );
-    cfg.writeEntry("UsePlayList", usePlaylist );
+    cfg.setGroup( "Options" );
+    cfg.writeEntry( "FullScreen", isFullscreen );
+    cfg.writeEntry( "Scaling", isScaled );
+    cfg.writeEntry( "Looping", isLooping );
+    cfg.writeEntry( "Shuffle", isShuffled );
+    cfg.writeEntry( "UsePlayList", usePlaylist );
+    cfg.writeEntry( "VideoGamma",  videoGamma );
 }
 
 
 // public stuff
 
 
 bool MediaPlayerState::streaming() {
     return isStreaming;
 }
 
 bool MediaPlayerState::fullscreen() {
     return isFullscreen;
@@ -200,24 +234,32 @@ void MediaPlayerState::setPosition( long p ) {
     curPosition = p;
     emit positionChanged(p);
 }
 
 void MediaPlayerState::updatePosition( long p ){
     if ( curPosition  == p ) {
         return;
     }
     curPosition = p;
     emit positionUpdated(p);
 }
 
+void MediaPlayerState::setVideoGamma( int v ){
+    if ( videoGamma  == v ) {
+        return;
+    }
+    videoGamma = v;
+    emit videoGammaChanged( v );
+}
+
 void MediaPlayerState::setLength( long l ) {
     if ( curLength  == l ) {
         return;
     }
     curLength = l;
     emit lengthChanged(l);
 }
 
 void MediaPlayerState::setView( char v ) {
     if ( curView  == v ) {
         return;
     }
diff --git a/noncore/multimedia/opieplayer2/mediaplayerstate.h b/noncore/multimedia/opieplayer2/mediaplayerstate.h
index 215a2a8..4fef8e0 100644
--- a/noncore/multimedia/opieplayer2/mediaplayerstate.h
+++ b/noncore/multimedia/opieplayer2/mediaplayerstate.h
@@ -10,36 +10,38 @@
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
-..}^=.=       =       ;      Library General Public License for more
+..}^=.=       =       ;      General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
-  -_. . .   )=.  =           Library General Public License along with
+  -_. . .   )=.  =           General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
+// this file is based on work by trolltech
+
 #ifndef MEDIA_PLAYER_STATE_H
 #define MEDIA_PLAYER_STATE_H
 
 
 #include <qobject.h>
 
 
 class MediaPlayerDecoder;
 class Config;
 
 
 class MediaPlayerState : public QObject {
@@ -70,24 +72,25 @@ public slots:
     void setScaled( bool b );
     void setLooping( bool b );
     void setShuffled( bool b );
     void setPlaylist( bool b );
     void setPaused( bool b );
     void setPlaying( bool b );
     void setStop( bool b );
     void setPosition( long p );
     void updatePosition( long p );
     void setLength( long l );
     void setView( char v );
     void setBlanked( bool b );
+    void setVideoGamma( int v );
 
     void setPrev();
     void setNext();
     void setList();
     void setVideo();
     void setAudio();
 
     void toggleFullscreen();
     void toggleScaled();
     void toggleLooping();
     void toggleShuffled();
     void togglePlaylist();
@@ -102,34 +105,35 @@ signals:
     void scaledToggled( bool );
     void loopingToggled( bool );
     void shuffledToggled( bool );
     void playlistToggled( bool );
     void pausedToggled( bool );
     void playingToggled( bool );
     void stopToggled( bool );
     void positionChanged( long ); // When the slider is moved
     void positionUpdated( long ); // When the media file progresses
     void lengthChanged( long );
     void viewChanged( char );
     void blankToggled( bool );
+    void videoGammaChanged( int );
     void prev();
     void next();
 
 private:
     bool isStreaming;
     bool isFullscreen;
     bool isScaled;
     bool isBlanked;
     bool isLooping;
     bool isShuffled;
     bool usePlaylist;
     long curPosition;
     long curLength;
     char curView;
-
+    int videoGamma;
     void readConfig( Config& cfg );
 
 };
 
 
 #endif // MEDIA_PLAYER_STATE_H
 
diff --git a/noncore/multimedia/opieplayer2/nullvideo.c b/noncore/multimedia/opieplayer2/nullvideo.c
index bd52869..ceda333 100644
--- a/noncore/multimedia/opieplayer2/nullvideo.c
+++ b/noncore/multimedia/opieplayer2/nullvideo.c
@@ -1,12 +1,44 @@
+/*
+                            This file is part of the Opie Project
+
+                             Copyright (c)  2002 Max Reiss <harlekin@handhelds.org>
+                             Copyright (c)  2002 L. Potter <ljp@llornkcor.com>
+                             Copyright (c)  2002 Holger Freyther <zecke@handhelds.org>
+              =.
+            .=l.
+           .>+-=
+ _;:,     .>    :=|.         This program is free software; you can
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
+:`=1 )Y*s>-.--   :           the terms of the GNU General Public
+.="- .-=="i,     .._         License as published by the Free Software
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
+     ._= =}       :          or (at your option) any later version.
+    .%`+i>       _;_.
+    .i_,=:_.      -<s.       This program is distributed in the hope that
+     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
+    : ..    .:,     . . .    without even the implied warranty of
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
+  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
+..}^=.=       =       ;      General Public License for more
+++=   -.     .`     .:       details.
+ :     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
+                             If not, write to the Free Software Foundation,
+                             Inc., 59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+
+*/
 
 /*#include <xine.h>*/
 #include <stdlib.h>
 #include <stdio.h>
 
 #include <math.h>
 
 #include <xine/video_out.h>
 #include <xine/xine_internal.h>
 #include <xine/xineutils.h>
 #include <xine/configfile.h>
 
@@ -22,25 +54,25 @@ typedef void (*display_xine_frame_t) (void *user_data, uint8_t* frame,
 
 typedef struct null_driver_s null_driver_t;
 
 struct null_driver_s {
     vo_driver_t vo_driver;
     uint32_t m_capabilities;
     int m_show_video;
     int m_video_fullscreen;
     int m_is_scaling;
     int depth, bpp, bytes_per_pixel;
     int yuv2rgb_mode;
     int yuv2rgb_swap;
-    int zuv2rgb_gamma;
+    int yuv2rgb_gamma;
     uint8_t *yuv2rgb_cmap;
     yuv2rgb_factory_t *yuv2rgb_factory;
     vo_overlay_t *overlay;
     int user_ratio;
     double output_scale_factor;
     int last_frame_output_width;
     int last_frame_output_height;
     int gui_width;
     int gui_height;
     int gui_changed;
     double display_ratio;
     void* caller;
@@ -596,34 +628,42 @@ void null_set_show_video( vo_driver_t* self, int show ) {
     ((null_driver_t*)self)->m_show_video = show;
 }
 
 int null_is_fullscreen( vo_driver_t* self ){
     return ((null_driver_t*)self)->m_video_fullscreen;
 }
 void null_set_fullscreen( vo_driver_t* self, int screen ){
     ((null_driver_t*)self)->m_video_fullscreen = screen;
 }
 int null_is_scaling( vo_driver_t* self ){
     return ((null_driver_t*)self)->m_is_scaling;
 }
+
+void null_set_videoGamma(  vo_driver_t* self , int value ) {
+     ((null_driver_t*) self) ->yuv2rgb_gamma = value;
+     ((null_driver_t*) self) ->yuv2rgb_factory->set_gamma( ((null_driver_t*) self) ->yuv2rgb_factory, value );
+}
+
 void null_set_scaling( vo_driver_t* self, int scale ){
     ((null_driver_t*)self)->m_is_scaling = scale;
 }
      
 void null_set_gui_width( vo_driver_t* self, int width ){
     ((null_driver_t*)self)->gui_width = width;
 }
 void null_set_gui_height( vo_driver_t* self, int height ){
     ((null_driver_t*)self)->gui_height = height;
 }
+
+
 void null_set_mode( vo_driver_t* self, int depth,  int rgb  ){
     null_driver_t* this = (null_driver_t*)self;
     
     this->bytes_per_pixel = (depth + 7 ) / 8;
     this->bpp = this->bytes_per_pixel * 8;
     this->depth = depth;
     printf("depth %d %d\n", depth, this->bpp);
     printf("pixeltype %d\n", rgb );
     switch ( this->depth ){
 	case 32:
 	    if( rgb == 0 )
 		this->yuv2rgb_mode = MODE_32_RGB;
@@ -661,12 +701,13 @@ void null_set_mode( vo_driver_t* self, int depth,  int rgb  ){
 		this->yuv2rgb_mode = MODE_8_BGR;
 	    break;
     };
     //free(this->yuv2rgb_factory );
     // this->yuv2rgb_factory = yuv2rgb_factory_init (this->yuv2rgb_mode, this->yuv2rgb_swap, 
     //						this->yuv2rgb_cmap);
 };
 void null_display_handler(vo_driver_t* self, display_xine_frame_t t, void* user_data) {
     null_driver_t* this = (null_driver_t*) self;
     this->caller = user_data;
     this->frameDis = t;
 }
+
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp
index 6c4d07f..3bd04bc 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp
@@ -10,29 +10,29 @@
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
-..}^=.=       =       ;      Library General Public License for more
+..}^=.=       =       ;      General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
-  -_. . .   )=.  =           Library General Public License along with
+  -_. . .   )=.  =           General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #include <qpe/qpetoolbar.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/storage.h>
 #include <qpe/mimetype.h>
 #include <qpe/global.h>
@@ -109,40 +109,41 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
     connect( videoView, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int) ),
              this,SLOT( viewPressed( int, QListViewItem *, const QPoint&, int) ) );
     connect( videoView, SIGNAL( returnPressed( QListViewItem *) ),
              this,SLOT( playIt( QListViewItem *) ) );
     connect( videoView, SIGNAL( doubleClicked( QListViewItem *) ), this, SLOT( addToSelection( QListViewItem *) ) );
     connect( playLists, SIGNAL( fileSelected( const DocLnk &) ), this, SLOT( loadList( const DocLnk & ) ) );
     connect( tabWidget, SIGNAL ( currentChanged(QWidget*) ), this, SLOT( tabChanged( QWidget* ) ) );
     connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ), d->tbPlay,  SLOT( setOn( bool ) ) );
     connect( mediaPlayerState, SIGNAL( loopingToggled( bool ) ), d->tbLoop, SLOT( setOn( bool ) ) );
     connect( mediaPlayerState, SIGNAL( shuffledToggled( bool ) ), d->tbShuffle, SLOT( setOn( bool ) ) );
     connect( mediaPlayerState, SIGNAL( playlistToggled( bool ) ), this, SLOT( setPlaylist( bool ) ) );
     connect( d->selectedFiles, SIGNAL( doubleClicked( QListViewItem *) ), this, SLOT( playIt( QListViewItem *) ) );
+    connect ( gammaSlider,  SIGNAL( valueChanged( int ) ),  mediaPlayerState,  SLOT( setVideoGamma( int ) ) );
 
     readConfig( cfg );
     QString currentPlaylist = cfg.readEntry( "CurrentPlaylist", "" );
     loadList(DocLnk( currentPlaylist ) );
     setCaption( tr( "OpiePlayer: " ) + currentPlaylist );
 
     // see which skins are installed
     videoScan=FALSE;
     audioScan=FALSE;
     populateSkinsMenu();
     initializeStates();
 }
 
 
 PlayListWidget::~PlayListWidget() {
-      // WTF?!@?! 
+      // WTF?!@?!
 
     if ( d->current ) {
         delete d->current;
     }
     delete d;
 }
 
 
 void PlayListWidget::initializeStates() {
     d->tbPlay->setOn( mediaPlayerState->playing() );
     d->tbLoop->setOn( mediaPlayerState->looping() );
     d->tbShuffle->setOn( mediaPlayerState->shuffled() );
@@ -724,25 +725,25 @@ void PlayListWidget::populateAudioView() {
             const QString name = (*it)->name();
             const QString path = (*it)->path();
             if(dit.current()->file().find(path) != -1 ) {
                 storage = name;
             }
         }
 
         QListViewItem * newItem;
         if ( QFile( dit.current()->file()).exists() || dit.current()->file().left(4) == "http" ) {
             long size;
             if( dit.current()->file().left(4) == "http" )
                 size=0;
-            else 
+            else
                 size = QFile( dit.current()->file() ).size();
             newItem= /*(void)*/ new QListViewItem( audioView, dit.current()->name(), QString::number(size ), storage);
             newItem->setPixmap( 0, Resource::loadPixmap( "opieplayer2/musicfile" ) );
         }
     }
 }
 
 
 void PlayListWidget::populateVideoView() {
     videoView->clear();
     StorageInfo storageInfo;
     const QList<FileSystem> &fs = storageInfo.fileSystems();
@@ -925,25 +926,25 @@ void PlayListWidget::writem3u() {
     QString filename, list;
     if( fileDlg->result() == 1 ) {
         filename = fileDlg->text();
         qDebug( filename );
         int noOfFiles = 0;
         d->selectedFiles->first();
         do {
             // we dont check for existance because of url's
             //         qDebug(d->selectedFiles->current()->file());
 
             // so maybe we should do some net checking to ,-)
             // no, cause it takes to long...
-            
+
             list += d->selectedFiles->current()->file() + "\n";
             noOfFiles++;
         }
         while ( d->selectedFiles->next() );
         qDebug( list );
         if( filename.left( 1) != "/" ) {
             filename=QPEApplication::documentDir() + "/" + filename;
         }
         if( filename.right( 3 ) != "m3u" ) {
             filename=filename+".m3u";
         }
         QFile f( filename );
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.h b/noncore/multimedia/opieplayer2/playlistwidget.h
index 2742252..dcfdd48 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.h
+++ b/noncore/multimedia/opieplayer2/playlistwidget.h
@@ -10,29 +10,29 @@
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
-..}^=.=       =       ;      Library General Public License for more
+..}^=.=       =       ;      General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
-  -_. . .   )=.  =           Library General Public License along with
+  -_. . .   )=.  =           General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #ifndef PLAY_LIST_WIDGET_H
 #define PLAY_LIST_WIDGET_H
 
 #include <qmainwindow.h>
 #include <qpe/applnk.h>
diff --git a/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp b/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp
index 6ecd016..250833c 100644
--- a/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp
@@ -10,29 +10,29 @@
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
-..}^=.=       =       ;      Library General Public License for more
+..}^=.=       =       ;      General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
-  -_. . .   )=.  =           Library General Public License along with
+  -_. . .   )=.  =           General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #include <qpe/qpemenubar.h>
 #include <qpe/qpetoolbar.h>
 #include <qpe/fileselector.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/storage.h>
@@ -90,33 +90,52 @@ PlayListWidgetGui::PlayListWidgetGui( QWidget* parent, const char* name, WFlags
 
     pmPlayList = new QPopupMenu( this );
     menu->insertItem( tr( "File" ), pmPlayList );
 
     pmView = new QPopupMenu( this );
     menu->insertItem( tr( "View" ), pmView );
     pmView->isCheckable();
 
     skinsMenu = new QPopupMenu( this );
     pmView->insertItem( tr( "Skins" ), skinsMenu );
     skinsMenu->isCheckable();
 
+    gammaMenu = new QPopupMenu( this );
+    pmView->insertItem( tr( "Gamma" ),  gammaMenu );
+    gammaMenu->setMinimumHeight( 50 );
+
+    gammaSlider = new QSlider( QSlider::Vertical,  gammaMenu );
+    gammaSlider->setRange( -100, 100 );
+    gammaSlider->setTickmarks( QSlider::Left );
+    gammaSlider->setTickInterval( 20 );
+    gammaSlider->setFocusPolicy( QWidget::NoFocus );
+    gammaSlider->setValue( 0 );
+    gammaSlider->setMinimumHeight( 50 );
+
+    gammaLCD = new QLCDNumber( 3,  gammaMenu );
+
+    gammaMenu->insertItem( gammaSlider );
+    gammaMenu->insertItem( gammaLCD );
+
+    connect( gammaSlider, SIGNAL( valueChanged( int ) ), gammaLCD, SLOT( display( int ) ) );
+
     vbox5 = new QVBox( this );
     QVBox *vbox4 = new QVBox( vbox5 );
     QHBox *hbox6 = new QHBox( vbox4 );
 
     tabWidget = new QTabWidget( hbox6, "tabWidget" );
 
     QWidget *pTab;
     pTab = new QWidget( tabWidget, "pTab" );
-    tabWidget->insertTab( pTab,"Playlist");
+    tabWidget->insertTab( pTab, "Playlist");
 
     QGridLayout *Playout = new QGridLayout( pTab );
     Playout->setSpacing( 2);
     Playout->setMargin( 2);
 
     // Add the playlist area
     QVBox *vbox3 = new QVBox( pTab );
     d->playListFrame = vbox3;
 
     QHBox *hbox2 = new QHBox( vbox3 );
     d->selectedFiles = new PlayListSelection( hbox2 );
 
diff --git a/noncore/multimedia/opieplayer2/playlistwidgetgui.h b/noncore/multimedia/opieplayer2/playlistwidgetgui.h
index 4c8d737..61fd40d 100644
--- a/noncore/multimedia/opieplayer2/playlistwidgetgui.h
+++ b/noncore/multimedia/opieplayer2/playlistwidgetgui.h
@@ -10,50 +10,51 @@
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
-..}^=.=       =       ;      Library General Public License for more
+..}^=.=       =       ;      General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
-  -_. . .   )=.  =           Library General Public License along with
+  -_. . .   )=.  =           General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #ifndef PLAY_LIST_WIDGET_GUI_H
 #define PLAY_LIST_WIDGET_GUI_H
 
 #include <qmainwindow.h>
 #include <qpe/applnk.h>
 #include <qpe/resource.h>
 #include <qpe/qpemenubar.h>
 
 #include <qtabwidget.h>
 #include <qpe/fileselector.h>
 #include <qpushbutton.h>
 #include <qpopupmenu.h>
 #include <qaction.h>
-
+#include <qslider.h>
+#include <qlcdnumber.h>
 
 class PlayListWidgetPrivate;
 class PlayListSelection;
 
 class Config;
 class QPEToolBar;
 class QListViewItem;
 class QListView;
 class QPoint;
 class QAction;
 class QLabel;
 
@@ -95,24 +96,27 @@ public:
 
 class PlayListWidgetGui : public QMainWindow {
     Q_OBJECT
 public:
     PlayListWidgetGui( QWidget* parent=0, const char* name=0, WFlags fl=0 );
     ~PlayListWidgetGui();
 
 protected:
     QTabWidget * tabWidget;
     QListView *audioView, *videoView, *playlistView;
     QLabel *libString;
     QPopupMenu *pmView ;
+    QPopupMenu *gammaMenu;
+    QSlider *gammaSlider;
+    QLCDNumber *gammaLCD;
     bool fromSetDocument;
     bool insanityBool;
     QString setDocFileRef;
     // retrieve the current playlist entry (media file link)
     QPushButton *tbDeletePlaylist;
     int selected;
     QPopupMenu *pmPlayList;
     FileSelector*  playLists;
     QPopupMenu *skinsMenu;
     PlayListWidgetPrivate *d; // Private implementation data
     QVBox *vbox1;
     QVBox *vbox5;
diff --git a/noncore/multimedia/opieplayer2/xinecontrol.cpp b/noncore/multimedia/opieplayer2/xinecontrol.cpp
index 12d80ba..d18fde5 100644
--- a/noncore/multimedia/opieplayer2/xinecontrol.cpp
+++ b/noncore/multimedia/opieplayer2/xinecontrol.cpp
@@ -10,29 +10,29 @@
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
-..}^=.=       =       ;      Library General Public License for more
+..}^=.=       =       ;      General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
-  -_. . .   )=.  =           Library General Public License along with
+  -_. . .   )=.  =           General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 
 #include <qtimer.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/qpeapplication.h>
 #include "xinecontrol.h"
@@ -42,47 +42,48 @@
 extern MediaPlayerState *mediaPlayerState;
 extern VideoWidget *videoUI;
 XineControl::XineControl( QObject *parent, const char *name )
     : QObject( parent, name ) {
     libXine = new XINE::Lib(videoUI->vidWidget() );
 
     connect ( videoUI, SIGNAL( videoResized ( const QSize & )), this, SLOT( videoResized ( const QSize & )));
     connect( mediaPlayerState, SIGNAL( pausedToggled(bool) ),  this, SLOT( pause(bool) ) );
     connect( this, SIGNAL( positionChanged( long ) ), mediaPlayerState, SLOT( updatePosition( long ) ) );
     connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ), this, SLOT( stop( bool ) ) );
     connect( mediaPlayerState, SIGNAL( fullscreenToggled( bool ) ), this, SLOT( setFullscreen( bool ) ) );
     connect( mediaPlayerState, SIGNAL( positionChanged( long ) ),  this,  SLOT( seekTo( long ) ) );
+    connect( mediaPlayerState,  SIGNAL( videoGammaChanged( int ) ), this,  SLOT( setGamma( int ) ) );
     connect( libXine, SIGNAL( stopped() ),  this, SLOT( nextMedia() ) );
 
     disabledSuspendScreenSaver = FALSE;
 }
 
 XineControl::~XineControl() {
 #if defined(Q_WS_QWS) && !defined(QT_NO_COP)
     if ( disabledSuspendScreenSaver ) {
         disabledSuspendScreenSaver = FALSE;
         // Re-enable the suspend mode
         QCopEnvelope("QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::Enable;
     }
 #endif
     delete libXine;
 }
 
 void XineControl::play( const QString& fileName ) {
     hasVideoChannel=FALSE;
     hasAudioChannel=FALSE;
     m_fileName = fileName;
-    
-    qDebug("<<FILENAME: " + fileName  + ">>>>");
-    
+
+    //qDebug("<<FILENAME: " + fileName  + ">>>>");
+
     libXine->play( fileName );
     mediaPlayerState->setPlaying( true );
     // default to audio view until we know how to handle video
     //   MediaDetect mdetect;
     char whichGui = mdetect.videoOrAudio( fileName );
     if (whichGui == 'f') {
         qDebug("Nicht erkannter Dateityp");
         return;
     }
 
     if (whichGui == 'a') {
         libXine->setShowVideo( false );
@@ -105,24 +106,28 @@ void XineControl::play( const QString& fileName ) {
             << ( whichGui == 'v' ? QPEApplication::Disable : QPEApplication::DisableSuspend );
     }
 #endif
 
     length();
     position();
 }
 
 void XineControl::nextMedia() {
     mediaPlayerState->setNext();
 }
 
+void XineControl::setGamma( int value ) {
+    libXine->setGamma( value );
+}
+
 void XineControl::stop( bool isSet ) {
     if ( !isSet) {
         libXine->stop( );
         mediaPlayerState->setList();
         //        mediaPlayerState->setPlaying( false );
 
 #if defined(Q_WS_QWS) && !defined(QT_NO_COP)
         if ( disabledSuspendScreenSaver ) {
             disabledSuspendScreenSaver = FALSE;
             // Re-enable the suspend mode
             QCopEnvelope("QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::Enable;
         }
diff --git a/noncore/multimedia/opieplayer2/xinecontrol.h b/noncore/multimedia/opieplayer2/xinecontrol.h
index 4263b36..1de610b 100644
--- a/noncore/multimedia/opieplayer2/xinecontrol.h
+++ b/noncore/multimedia/opieplayer2/xinecontrol.h
@@ -10,29 +10,29 @@
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
-..}^=.=       =       ;      Library General Public License for more
+..}^=.=       =       ;      General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
-  -_. . .   )=.  =           Library General Public License along with
+  -_. . .   )=.  =           General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #ifndef XINECONTROL_H
 #define XINECONTROL_H
 
 #include "lib.h"
 #include "mediadetect.h"
@@ -41,39 +41,66 @@
 class XineControl : public QObject  {
     Q_OBJECT
 public:
     XineControl( QObject *parent = 0, const char *name =0 );
     ~XineControl();
 
     bool hasVideo() const { return hasVideoChannel; }
     bool hasAudio() const { return hasAudioChannel; }
 
 public slots:
     void play( const QString& fileName );
     void stop( bool );
+
+    /**
+     * Pause the media stream
+     * @param if pause or not
+     */
     void pause( bool );
+
+    /**
+     * Set videos fullscreen
+     * @param yes or no
+     */
     void setFullscreen( bool );
+
+    /**
+     *
+     */
     long currentTime();
     void seekTo( long );
     // get length of media file and set it
     void length();
     long position();
+
+    /**
+     * Proceed to the next media file in playlist
+     */
     void nextMedia();
+
     void videoResized ( const QSize &s );
 
+    /**
+     * Set the gamma value of the video output
+     *  @param int value between -100 and 100, 0 is original
+     */
+    void setGamma( int );
+
+
 private:
     XINE::Lib *libXine;
     MediaDetect mdetect;
-    long m_currentTime;    
+    long m_currentTime;
     long m_position;
     int m_length;
     QString m_fileName;
     bool disabledSuspendScreenSaver : 1;
     bool hasVideoChannel : 1;
     bool hasAudioChannel : 1;
+
 signals:
     void positionChanged( long );
 
 };
 
 
 #endif
diff --git a/noncore/multimedia/opieplayer2/xinevideowidget.cpp b/noncore/multimedia/opieplayer2/xinevideowidget.cpp
index bc95d86..d06d62a 100644
--- a/noncore/multimedia/opieplayer2/xinevideowidget.cpp
+++ b/noncore/multimedia/opieplayer2/xinevideowidget.cpp
@@ -120,92 +120,92 @@ void XineVideoWidget::paintEvent ( QPaintEvent * )
       QDirectPainter dp ( this );
 
       int rot = dp. transformOrientation ( ) + m_rotation;
 
       uchar *fb = dp. frameBuffer ( );
       uchar *frame = m_buff;  // rot == 0 ? m_buff : m_buff + ( m_thisframe. height ( ) - 1 ) * m_bytes_per_line_frame;
 
       QRect framerect = qt_screen-> mapToDevice ( QRect ( mapToGlobal ( m_thisframe. topLeft ( )), m_thisframe. size ( )), QSize ( qt_screen-> width ( ), qt_screen-> height ( )));
 
       qt_bug_workaround_clip_rects. resize ( dp. numRects ( ));
 
       for ( int i = dp. numRects ( ) - 1; i >= 0; i-- ) {
-        const QRect &clip = dp. rect ( i );
+          const QRect &clip = dp. rect ( i );
 
-        qt_bug_workaround_clip_rects [i] = qt_screen-> mapFromDevice ( clip, QSize ( qt_screen-> width ( ), qt_screen-> height ( )));
+          qt_bug_workaround_clip_rects [i] = qt_screen-> mapFromDevice ( clip, QSize ( qt_screen-> width ( ), qt_screen-> height ( )));
 
-        uchar *dst = fb + ( clip. x ( ) * m_bytes_per_pixel ) + ( clip. y ( ) * m_bytes_per_line_fb );
-        uchar *src = frame;
+          uchar *dst = fb + ( clip. x ( ) * m_bytes_per_pixel ) + ( clip. y ( ) * m_bytes_per_line_fb );
+          uchar *src = frame;
 
-        switch ( rot ) {
+          switch ( rot ) {
           case 0: src += ( (( clip. x ( ) - framerect. x ( )) * m_bytes_per_pixel ) + (( clip. y ( ) - framerect. y ( )) * m_bytes_per_line_frame ) ); break;
           case 1: src += ( (( clip. y ( ) - framerect. y ( )) * m_bytes_per_pixel ) + (( clip. x ( ) - framerect. x ( )) * m_bytes_per_line_frame ) + (( framerect. height ( ) - 1 ) * m_bytes_per_pixel ) ); break;
           case 2: src += ( (( clip. x ( ) - framerect. x ( )) * m_bytes_per_pixel ) + (( clip. y ( ) - framerect. y ( )) * m_bytes_per_line_frame ) + (( framerect. height ( ) - 1 ) * m_bytes_per_line_frame ) ); break;
           case 3: src += ( (( clip. y ( ) - framerect. y ( )) * m_bytes_per_pixel ) + (( clip. x ( ) - framerect. x ( )) * m_bytes_per_line_frame ) ); break;
-	  default: break;
-        }
+          default: break;
+          }
 
-        uint leftfill = 0;
-        uint framefill = 0;
-        uint rightfill = 0;
-        uint clipwidth = clip. width ( ) * m_bytes_per_pixel;
+          uint leftfill = 0;
+          uint framefill = 0;
+          uint rightfill = 0;
+          uint clipwidth = clip. width ( ) * m_bytes_per_pixel;
 
-        if ( clip. left ( ) < framerect. left ( ))
-          leftfill = (( framerect. left ( ) - clip. left ( )) * m_bytes_per_pixel ) <? clipwidth;
-        if ( clip. right ( ) > framerect. right ( ))
-          rightfill = (( clip. right ( ) - framerect. right ( )) * m_bytes_per_pixel ) <? clipwidth;
+          if ( clip. left ( ) < framerect. left ( ))
+              leftfill = (( framerect. left ( ) - clip. left ( )) * m_bytes_per_pixel ) <? clipwidth;
+          if ( clip. right ( ) > framerect. right ( ))
+              rightfill = (( clip. right ( ) - framerect. right ( )) * m_bytes_per_pixel ) <? clipwidth;
 
-        framefill = clipwidth - ( leftfill + rightfill );
+          framefill = clipwidth - ( leftfill + rightfill );
 
-        for ( int y = clip. top ( ); y <= clip. bottom ( ); y++ ) {
-          if (( y < framerect. top ( )) || ( y > framerect. bottom ( ))) {
-            memset ( dst, 0, clipwidth );
-          }
+          for ( int y = clip. top ( ); y <= clip. bottom ( ); y++ ) {
+              if (( y < framerect. top ( )) || ( y > framerect. bottom ( ))) {
+                  memset ( dst, 0, clipwidth );
+              }
           else {
-            if ( leftfill )
-              memset ( dst, 0, leftfill );
-
-            if ( framefill ) {
-              switch ( rot ) {
-                case 0: memcpy ( dst + leftfill, src, framefill );                                  break;
-                case 1: memcpy_step ( dst + leftfill, src, framefill, m_bytes_per_line_frame );     break;
-                case 2: memcpy_rev ( dst + leftfill, src, framefill );                              break;
-                case 3: memcpy_step_rev ( dst + leftfill, src, framefill, m_bytes_per_line_frame ); break;
-		default: break;
+              if ( leftfill )
+                  memset ( dst, 0, leftfill );
+
+              if ( framefill ) {
+                  switch ( rot ) {
+                  case 0: memcpy ( dst + leftfill, src, framefill );                                  break;
+                  case 1: memcpy_step ( dst + leftfill, src, framefill, m_bytes_per_line_frame );     break;
+                  case 2: memcpy_rev ( dst + leftfill, src, framefill );                              break;
+                  case 3: memcpy_step_rev ( dst + leftfill, src, framefill, m_bytes_per_line_frame ); break;
+                  default: break;
+                  }
               }
-            }
             if ( rightfill )
-              memset ( dst + leftfill + framefill, 0, rightfill );
+                memset ( dst + leftfill + framefill, 0, rightfill );
           }
 
-          dst += m_bytes_per_line_fb;
+              dst += m_bytes_per_line_fb;
 
-          switch ( rot ) {
-            case 0: src += m_bytes_per_line_frame; break;
-            case 1: src -= m_bytes_per_pixel;      break;
-            case 2: src -= m_bytes_per_line_frame; break;
+              switch ( rot ) {
+              case 0: src += m_bytes_per_line_frame; break;
+              case 1: src -= m_bytes_per_pixel;      break;
+              case 2: src -= m_bytes_per_line_frame; break;
             case 3: src += m_bytes_per_pixel;      break;
-	    default: break;
+              default: break;
+              }
           }
-        }
       }
     }
     //qWarning ( " ||| painting |||" );
     {
-      // QVFB hack by MArtin Jones
-      QPainter p ( this );
+        // QVFB hack by MArtin Jones
+        QPainter p ( this );
 
-      for ( int i = qt_bug_workaround_clip_rects. size ( ) - 1; i >= 0; i-- ) {
-        p. fillRect ( QRect ( mapFromGlobal ( qt_bug_workaround_clip_rects [i]. topLeft ( )), qt_bug_workaround_clip_rects [i]. size ( )), QBrush ( NoBrush ) );
-      }
+        for ( int i = qt_bug_workaround_clip_rects. size ( ) - 1; i >= 0; i-- ) {
+            p. fillRect ( QRect ( mapFromGlobal ( qt_bug_workaround_clip_rects [i]. topLeft ( )), qt_bug_workaround_clip_rects [i]. size ( )), QBrush ( NoBrush ) );
+        }
     }
   }
   //qWarning( "painting >>>" );
 }
 
 
 void XineVideoWidget::setImage ( QImage* image )
 {
   delete m_image;
   m_image = image;
 }
 
diff --git a/noncore/multimedia/opieplayer2/yuv2rgb.c b/noncore/multimedia/opieplayer2/yuv2rgb.c
index 22bb4cb..e8e86e6 100644
--- a/noncore/multimedia/opieplayer2/yuv2rgb.c
+++ b/noncore/multimedia/opieplayer2/yuv2rgb.c
@@ -3054,34 +3054,33 @@ yuv2rgb_t *yuv2rgb_create_converter (yuv2rgb_factory_t *factory) {
 
   this->yuv2rgb_fun              = factory->yuv2rgb_fun;
   this->yuy22rgb_fun             = factory->yuy22rgb_fun;
   this->yuv2rgb_single_pixel_fun = factory->yuv2rgb_single_pixel_fun;
 
   this->configure                = yuv2rgb_configure;
   return this;
 }
 
 /*
  * factory functions 
  */
-
 void yuv2rgb_set_gamma (yuv2rgb_factory_t *this, int gamma) {
-
-  int i;
-  
-  for (i = 0; i < 256; i++) {
-    (uint8_t *)this->table_rV[i] += this->entry_size*(gamma - this->gamma);
-    (uint8_t *)this->table_gU[i] += this->entry_size*(gamma - this->gamma);
-    (uint8_t *)this->table_bU[i] += this->entry_size*(gamma - this->gamma);
-  }
+    
+    int i;
+    
+    for (i = 0; i < 256; i++) {
+	(uint8_t *)this->table_rV[i] += this->entry_size*(gamma - this->gamma);
+	(uint8_t *)this->table_gU[i] += this->entry_size*(gamma - this->gamma);
+	(uint8_t *)this->table_bU[i] += this->entry_size*(gamma - this->gamma);
+    }
 #ifdef ARCH_X86
   mmx_yuv2rgb_set_gamma(gamma);
 #endif  
   this->gamma = gamma;
 }
 
 int yuv2rgb_get_gamma (yuv2rgb_factory_t *this) {
 
   return this->gamma;
 }
 
 yuv2rgb_factory_t* yuv2rgb_factory_init (int mode, int swapped,