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

13 files changed, 178 insertions, 22 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
@@ -57,12 +57,13 @@ extern "C" {
     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) {
@@ -200,12 +201,18 @@ void Lib::showVideoFullScreen( bool 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 );
 }
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
@@ -109,12 +109,19 @@ namespace XINE {
         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*/;
 
         /**
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,6 +1,41 @@
+/*
+                            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>
@@ -18,25 +53,23 @@ MediaPlayerState::MediaPlayerState( QObject *parent, const char *name )
     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;
@@ -48,12 +81,13 @@ 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.writeEntry( "VideoGamma",  videoGamma );
 }
 
 
 // public stuff
 
 
@@ -206,12 +240,20 @@ void MediaPlayerState::updatePosition( long 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);
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
@@ -16,24 +16,26 @@
     .%`+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>
 
@@ -76,12 +78,13 @@ public slots:
     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();
@@ -108,12 +111,13 @@ signals:
     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;
@@ -122,13 +126,13 @@ private:
     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,6 +1,38 @@
+/*
+                            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>
@@ -28,13 +60,13 @@ struct null_driver_s {
     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;
@@ -602,22 +634,30 @@ int null_is_fullscreen( vo_driver_t* self ){
 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;
@@ -667,6 +707,7 @@ void null_set_mode( vo_driver_t* self, int depth,  int rgb  ){
 };
 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
@@ -16,17 +16,17 @@
     .%`+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.
 
 */
@@ -115,12 +115,13 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
     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 );
 
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
@@ -16,17 +16,17 @@
     .%`+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.
 
 */
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
@@ -16,17 +16,17 @@
     .%`+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.
 
 */
@@ -96,12 +96,31 @@ PlayListWidgetGui::PlayListWidgetGui( QWidget* parent, const char* name, WFlags
     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" );
 
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
@@ -16,17 +16,17 @@
     .%`+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.
 
 */
@@ -41,13 +41,14 @@
 
 #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;
@@ -101,12 +102,15 @@ public:
 
 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;
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
@@ -16,17 +16,17 @@
     .%`+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.
 
 */
@@ -48,12 +48,13 @@ XineControl::XineControl( QObject *parent, const char *name )
     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() {
@@ -69,13 +70,13 @@ XineControl::~XineControl() {
 
 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 );
@@ -111,12 +112,16 @@ void XineControl::play( const QString& fileName ) {
 }
 
 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 );
 
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
@@ -16,17 +16,17 @@
     .%`+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.
 
 */
@@ -47,32 +47,59 @@ public:
     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_position;
     int m_length;
     QString m_fileName;
     bool disabledSuspendScreenSaver : 1;
     bool hasVideoChannel : 1;
     bool hasAudioChannel : 1;
+
 signals:
     void positionChanged( long );
 
 };
 
 
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
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
@@ -3060,13 +3060,12 @@ yuv2rgb_t *yuv2rgb_create_converter (yuv2rgb_factory_t *factory) {
   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);