little changes to the gamma

6 files changed, 17 insertions, 15 deletions

diff --git a/noncore/multimedia/opieplayer2/lib.cpp b/noncore/multimedia/opieplayer2/lib.cpp
index 85030de..c0e5acd 100644
--- a/noncore/multimedia/opieplayer2/lib.cpp
+++ b/noncore/multimedia/opieplayer2/lib.cpp
@@ -70,215 +70,216 @@ Lib::Lib( XineVideoWidget* widget ) {
     m_video = false;
     m_wid = widget;
     printf("Lib");
     QCString str( getenv("HOME") );
     str += "/Settings/opiexine.cf";
     // get the configuration
 
     // not really OO, should be an extra class, later
     if ( !QFile(str).exists() ) {
         QFile f(str);
         f.open(IO_WriteOnly);
         QTextStream ts( &f );
         ts << "misc.memcpy_method:glibc\n";
         f.close();
     }
 
     m_xine =  xine_new( );
 
     xine_config_load( m_xine, str.data() );
 
 
     // allocate oss for sound
     // and fb for framebuffer
     m_audioOutput = xine_open_audio_driver( m_xine,  "oss", NULL );
     m_videoOutput = ::init_video_out_plugin( m_config, NULL );
 
 
 //xine_open_video_driver( m_xine,  NULL,  XINE_VISUAL_TYPE_FB,  NULL);
 
 
     null_display_handler( m_videoOutput, xine_display_frame, this );
     xine_init( m_xine,  m_audioOutput,  m_videoOutput );
 
     if (m_wid != 0 ) {
         printf( "!0\n" );
         resize ( m_wid-> size ( ) );
         ::null_set_mode( m_videoOutput, qt_screen->depth(), qt_screen->pixelType() );
 
         m_wid->repaint();
     }
 
     xine_register_event_listener( m_xine, xine_event_handler, this );
 }
 
 Lib::~Lib() {
 //    free( m_config );
     xine_remove_event_listener( m_xine, xine_event_handler );
     xine_exit( m_xine );
     /* FIXME either free or delete but valgrind bitches against both */
     //free( m_videoOutput );
     //delete m_audioOutput;
 }
 
 void Lib::resize ( const QSize &s ) {
     if ( s. width ( ) && s. height ( ) ) {
         ::null_set_gui_width( m_videoOutput,  s. width() );
         ::null_set_gui_height( m_videoOutput,  s. height() );
     }
 }
 
 QCString Lib::version() {
     //   QCString str( xine_get_str_version() );
     // return str;
     return "test";
 }
 
 int Lib::majorVersion() {
      xine_get_version ( &m_major_version, &m_minor_version, &m_sub_version );
      return m_major_version;
 }
 
 int Lib::minorVersion() {
     xine_get_version ( &m_major_version, &m_minor_version, &m_sub_version );
      return m_minor_version;
 }
 
 int Lib::subVersion() {
     xine_get_version ( &m_major_version, &m_minor_version, &m_sub_version );
      return m_sub_version;
 }
 
 int Lib::play( const QString& fileName, int startPos, int start_time ) {
     QString str = fileName.stripWhiteSpace();
     if ( !xine_open( m_xine, QFile::encodeName(str.utf8() ).data() ) ) {
         return 0;
     }
     return xine_play( m_xine, startPos, start_time);
 }
 
 void Lib::stop() {
     qDebug("<<<<<<<< STOP IN LIB TRIGGERED >>>>>>>");
     xine_stop( m_xine );
 }
 
 void Lib::pause() {
     xine_set_param( m_xine, XINE_PARAM_SPEED,  XINE_SPEED_PAUSE );
 }
 
 int Lib::speed() {
     return  xine_get_param ( m_xine, XINE_PARAM_SPEED );
 }
 
 void Lib::setSpeed( int speed ) {
     xine_set_param ( m_xine, XINE_PARAM_SPEED, speed );
 }
 
 int Lib::status() {
     return xine_get_status( m_xine );
 }
 
 int Lib::currentPosition() {
     xine_get_pos_length( m_xine, &m_pos, &m_time, &m_length );
     return m_pos;
 }
 
 int Lib::currentTime() {
      xine_get_pos_length( m_xine, &m_pos, &m_time, &m_length );
     return m_time/1000;
 }
 
 int Lib::length() {
       xine_get_pos_length( m_xine, &m_pos, &m_time, &m_length );
       return m_length/1000;
 }
 
 bool Lib::isSeekable() {
     return xine_get_stream_info( m_xine, XINE_STREAM_INFO_SEEKABLE );
 }
 
 void Lib::seekTo( int time ) {
 //     xine_trick_mode ( m_xine, XINE_TRICK_MODE_SEEK_TO_TIME, time ); NOT IMPLEMENTED YET IN XINE :_(
     xine_play( m_xine, 0, time );
 }
 
 
 Frame Lib::currentFrame() {
     Frame frame;
     return frame;
 };
 
 QString Lib::metaInfo( int number) {
     return xine_get_meta_info( m_xine, number );
 }
 
 int Lib::error() {
     return xine_get_error( m_xine );
 };
 
 void Lib::handleXineEvent( xine_event_t* t ) {
     if ( t->type == XINE_EVENT_PLAYBACK_FINISHED ) {
         emit stopped();
     }
 }
 
 
 void Lib::setShowVideo( bool video ) {
     m_video = video;
     ::null_set_show_video( m_videoOutput, video );
 }
 
 bool Lib::isShowingVideo() {
     return ::null_is_showing_video( m_videoOutput );
 }
 
 bool Lib::hasVideo() {
     //looks like it is not implemented yet
     //return xine_get_stream_info( m_xine, XINE_STREAM_INFO_VIDEO_CHANNELS );
     // ugly hack until xine is ready, look for the width of the video
     int test =  xine_get_stream_info( m_xine, 2 );
     if( test > 0 ) {
         // qDebug( QString(" has video:  %1").arg( test ) );
         return true;
     } else {
         //qDebug ( "does not have video ");
         return false;
     }
 }
 
 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)  );
+    int gammaValue = ( 100 + 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 ) {
     if ( !m_video ) {
         qWarning("not showing video now");
         return;
     }
     m_wid-> setVideoFrame ( frame, width, height, bytes );
 }
diff --git a/noncore/multimedia/opieplayer2/mediaplayer.cpp b/noncore/multimedia/opieplayer2/mediaplayer.cpp
index 5069a49..606f8e9 100644
--- a/noncore/multimedia/opieplayer2/mediaplayer.cpp
+++ b/noncore/multimedia/opieplayer2/mediaplayer.cpp
@@ -1,230 +1,230 @@
 #include <qpe/qpeapplication.h>
 #include <qpe/qlibrary.h>
 #include <qpe/resource.h>
 #include <qpe/config.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qfileinfo.h>
 
 #include <qmainwindow.h>
 #include <qmessagebox.h>
 #include <qwidgetstack.h>
 #include <qfile.h>
 
 #include "mediaplayer.h"
 #include "playlistwidget.h"
 #include "audiowidget.h"
 #include "videowidget.h"
 #include "volumecontrol.h"
 
 #include "mediaplayerstate.h"
 
 // for setBacklight()
 #include <linux/fb.h>
 #include <sys/file.h>
 #include <sys/ioctl.h>
 
 
 extern AudioWidget *audioUI;
 extern VideoWidget *videoUI;
 extern PlayListWidget *playList;
 extern MediaPlayerState *mediaPlayerState;
 
 
 #define FBIOBLANK             0x4611
 
 MediaPlayer::MediaPlayer( QObject *parent, const char *name )
     : QObject( parent, name ), volumeDirection( 0 ), currentFile( NULL ) {
 
-    playList->setCaption(tr("OpiePlayer: Initializating"));
+    playList->setCaption( tr( "OpiePlayer: Initializating" ) );
 
     qApp->processEvents();
     //    QPEApplication::grabKeyboard(); // EVIL
     connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) );
 
     connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ), this, SLOT( setPlaying( bool ) ) );
 
     connect( mediaPlayerState, SIGNAL( pausedToggled( bool ) ),  this, SLOT( pauseCheck( bool ) ) );
 
     connect( mediaPlayerState, SIGNAL( next() ), this, SLOT( next() ) );
     connect( mediaPlayerState, SIGNAL( prev() ), this, SLOT( prev() ) );
     connect( mediaPlayerState, SIGNAL( blankToggled( bool ) ), this, SLOT ( blank( bool ) ) );
 
     connect( audioUI,  SIGNAL( moreClicked() ), this, SLOT( startIncreasingVolume() ) );
     connect( audioUI,  SIGNAL( lessClicked() ),  this, SLOT( startDecreasingVolume() ) );
     connect( audioUI,  SIGNAL( moreReleased() ), this, SLOT( stopChangingVolume() ) );
     connect( audioUI,  SIGNAL( lessReleased() ), this, SLOT( stopChangingVolume() ) );
 
     connect( videoUI,  SIGNAL( moreClicked() ), this, SLOT( startIncreasingVolume() ) );
     connect( videoUI,  SIGNAL( lessClicked() ),  this, SLOT( startDecreasingVolume() ) );
     connect( videoUI,  SIGNAL( moreReleased() ), this, SLOT( stopChangingVolume() ) );
     connect( videoUI,  SIGNAL( lessReleased() ), this, SLOT( stopChangingVolume() ) );
 
     volControl = new VolumeControl;
     xineControl = new XineControl();
     playList->setCaption(tr("OpiePlayer"));
 }
 
 MediaPlayer::~MediaPlayer() {
     delete xineControl;
     delete volControl;
 }
 
 void MediaPlayer::pauseCheck( bool b ) {
      if ( b && !mediaPlayerState->playing() ) {
          mediaPlayerState->setPaused( FALSE );
      }
 }
 
 void MediaPlayer::play() {
     mediaPlayerState->setPlaying( FALSE );
     mediaPlayerState->setPlaying( TRUE );
 }
 
 void MediaPlayer::setPlaying( bool play ) {
     if ( !play ) {
         return;
     }
 
     if ( mediaPlayerState->paused() ) {
         mediaPlayerState->setPaused( FALSE );
         return;
     }
 
     QString tickerText, time, fileName;
     if( playList->whichList() == 0 ) { //check for filelist
         const DocLnk *playListCurrent = playList->current();
         if ( playListCurrent != NULL ) {
             currentFile = playListCurrent;
         }
         xineControl->play( currentFile->file() );
         fileName = currentFile->name();
         long seconds =  mediaPlayerState->length();//
         time.sprintf("%li:%02i", seconds/60, (int)seconds%60 );
         //qDebug(time);
 
     } else {
         //if playing in file list.. play in a different way
         // random and looping settings enabled causes problems here,
         // since there is no selected file in the playlist, but a selected file in the file list,
         // so we remember and shutoff
         l = mediaPlayerState->looping();
         if(l) {
             mediaPlayerState->setLooping( false );
         }
         r = mediaPlayerState->shuffled();
         mediaPlayerState->setShuffled( false );
 
         fileName = playList->currentFileListPathName();
         xineControl->play( fileName );
         long seconds =  mediaPlayerState->length();
         time.sprintf("%li:%02i", seconds/60, (int)seconds%60 );
         //qDebug(time);
         if( fileName.left(4) != "http" ) {
             fileName = QFileInfo( fileName ).baseName();
         }
 
     }
 
     if( fileName.left(4) == "http" ) {
        if ( xineControl->getMetaInfo().isEmpty() ) {
            tickerText = tr( " File: " ) + fileName;
        } else {
            tickerText = xineControl->getMetaInfo();
        }
     } else {
         if ( xineControl->getMetaInfo().isEmpty() ) {
             tickerText = tr( " File: " ) + fileName + tr( ", Length: " ) + time + "  ";
         } else {
             tickerText = xineControl->getMetaInfo() + " Length: " + time + "  ";
         }
     }
     audioUI->setTickerText( tickerText );
 }
 
 
 void MediaPlayer::prev() {
     if( playList->whichList() == 0 ) { //if using the playlist
         if ( playList->prev() ) {
             play();
         } else if ( mediaPlayerState->looping() ) {
             if ( playList->last() ) {
                 play();
             }
         } else {
             mediaPlayerState->setList();
         }
     }
 }
 
 
 void MediaPlayer::next() {
 
     if(playList->whichList() == 0) { //if using the playlist
         if ( playList->next() ) {
             play();
         } else if ( mediaPlayerState->looping() ) {
             if ( playList->first() ) {
                 play();
             }
         } else {
             mediaPlayerState->setList();
         }
     } else { //if playing from file list, let's just stop
         qDebug("<<<<<<<<<<<<<<<<<stop for filelists");
         mediaPlayerState->setPlaying(false);
         mediaPlayerState->setView('l');
         if(l) mediaPlayerState->setLooping(l);
         if(r) mediaPlayerState->setShuffled(r);
     }
     qApp->processEvents();
 }
 
 
 void MediaPlayer::startDecreasingVolume() {
     volumeDirection = -1;
     startTimer( 100 );
     volControl->decVol(2);
 }
 
 
 void MediaPlayer::startIncreasingVolume() {
     volumeDirection = +1;
     startTimer( 100 );
     volControl->incVol(2);
 }
 
 
 bool drawnOnScreenDisplay = FALSE;
 unsigned int onScreenDisplayVolume = 0;
 const int yoff = 110;
 
 void MediaPlayer::stopChangingVolume() {
     killTimers();
     // Get rid of the on-screen display stuff
     drawnOnScreenDisplay = FALSE;
     onScreenDisplayVolume = 0;
     int w=0;
     int h=0;
     if( !xineControl->hasVideo() ) {
         w = audioUI->width();
         h = audioUI->height();
         audioUI->repaint( ( w - 200 ) / 2, h - yoff, 200 + 9, 70, FALSE );
     } else {
         w = videoUI->width();
         h = videoUI->height();
         videoUI->repaint( ( w - 200 ) / 2, h - yoff, 200 + 9, 70, FALSE );
     }
 }
 
 
 void MediaPlayer::timerEvent( QTimerEvent * ) {
     if ( volumeDirection == +1 ) {
         volControl->incVol( 2 );
     } else if ( volumeDirection == -1 ) {
         volControl->decVol( 2 );
     }
 
 
       // TODO FIXME
       // huh??
     unsigned int v= 0;
diff --git a/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp b/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp
index 1042a0c..49356d3 100644
--- a/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp
@@ -1,227 +1,227 @@
 /*
                             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 <qpe/qpemenubar.h>
 #include <qpe/qpetoolbar.h>
 #include <qpe/fileselector.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/storage.h>
 #include <qpe/mimetype.h>
 #include <qpe/config.h>
 #include <qpe/global.h>
 #include <qpe/resource.h>
 
 #include <qpopupmenu.h>
 #include <qaction.h>
 #include <qcursor.h>
 #include <qdir.h>
 #include <qlayout.h>
 
 #include "playlistselection.h"
 #include "playlistwidget.h"
 #include "mediaplayerstate.h"
 #include "inputDialog.h"
 
 //only needed for the random play
 #include <stdlib.h>
 
 #include "audiowidget.h"
 #include "videowidget.h"
 #include "mediaplayerstate.h"
 
 extern MediaPlayerState *mediaPlayerState;
 
 PlayListWidgetGui::PlayListWidgetGui( QWidget* parent, const char* name, WFlags fl )
     : QMainWindow( parent, name, fl ) {
 
     d = new PlayListWidgetPrivate;
     d->setDocumentUsed = FALSE;
     d->current = NULL;
 
     setBackgroundMode( PaletteButton );
     setToolBarsMovable( FALSE );
 
     // Create Toolbar
     QPEToolBar *toolbar = new QPEToolBar( this );
     toolbar->setHorizontalStretchable( TRUE );
 
     // Create Menubar
     QPEMenuBar *menu = new QPEMenuBar( toolbar );
     menu->setMargin( 0 );
 
     bar = new QPEToolBar( this );
     bar->setLabel( tr( "Play Operations" ) );
 
     tbDeletePlaylist = new QPushButton( Resource::loadIconSet( "trash" ), "", bar, "close" );
     tbDeletePlaylist->setFlat( TRUE );
     tbDeletePlaylist->setFixedSize( 20, 20 );
 
     tbDeletePlaylist->hide();
 
     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 (Video)" ),  gammaMenu );
 
     gammaSlider = new QSlider( QSlider::Vertical,  gammaMenu );
-    gammaSlider->setRange( -100, 100 );
+    gammaSlider->setRange( -40, 40 );
     gammaSlider->setTickmarks( QSlider::Left );
     gammaSlider->setTickInterval( 20 );
-    gammaSlider->setFocusPolicy( QWidget::NoFocus );
+    //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");
 
     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 );
 
     vbox1 = new QVBox( hbox2 );
     QPEApplication::setStylusOperation( d->selectedFiles->viewport(), QPEApplication::RightOnHold );
     QVBox *stretch1 = new QVBox( vbox1 ); // add stretch
 
     Playout->addMultiCellWidget( vbox3, 0, 0, 0, 1 );
 
     QWidget *aTab;
     aTab = new QWidget( tabWidget, "aTab" );
 
     QGridLayout *Alayout = new QGridLayout( aTab );
     Alayout->setSpacing( 2 );
     Alayout->setMargin( 2 );
     audioView = new QListView( aTab, "Audioview" );
     audioView->addColumn( tr( "Title" ), 140 );
     audioView->addColumn( tr( "Size" ),  -1 );
     audioView->addColumn( tr( "Media" ), -1 );
     audioView->addColumn( tr( "Path" ), 0 );
     audioView->setColumnAlignment( 1, Qt::AlignRight );
     audioView->setColumnAlignment( 2, Qt::AlignRight );
     audioView->setAllColumnsShowFocus( TRUE );
     audioView->setSorting( 0, TRUE );
     audioView->setMultiSelection( TRUE );
     audioView->setSelectionMode( QListView::Extended );
     Alayout->addMultiCellWidget( audioView, 0, 0, 0, 1 );
     tabWidget->insertTab( aTab, tr( "Audio" ) );
 
     QPEApplication::setStylusOperation( audioView->viewport(), QPEApplication::RightOnHold );
 
     QWidget *vTab;
     vTab = new QWidget( tabWidget, "vTab" );
 
     QGridLayout *Vlayout = new QGridLayout( vTab );
     Vlayout->setSpacing( 2 );
     Vlayout->setMargin( 2 );
     videoView = new QListView( vTab, "Videoview" );
     videoView->addColumn( tr( "Title" ), 140);
     videoView->addColumn( tr( "Size" ), -1 );
     videoView->addColumn(tr( "Media" ), -1 );
     videoView->addColumn(tr( "Path" ), 0 );
     videoView->setColumnAlignment( 1, Qt::AlignRight );
     videoView->setColumnAlignment( 2, Qt::AlignRight );
     videoView->setAllColumnsShowFocus( TRUE );
     videoView->setSorting( 0, TRUE );
     videoView->setMultiSelection( TRUE );
     videoView->setSelectionMode( QListView::Extended );
     Vlayout->addMultiCellWidget( videoView, 0, 0, 0, 1 );
 
     QPEApplication::setStylusOperation( videoView->viewport(), QPEApplication::RightOnHold );
 
     tabWidget->insertTab( vTab, tr( "Video" ) );
 
     //playlists list
     QWidget *LTab;
     LTab = new QWidget( tabWidget, "LTab" );
     QGridLayout *Llayout = new QGridLayout( LTab );
     Llayout->setSpacing( 2 );
     Llayout->setMargin( 2 );
 
     playLists = new FileSelector( "playlist/plain;audio/x-mpegurl", LTab, "fileselector" , FALSE, FALSE );
     Llayout->addMultiCellWidget( playLists, 0, 0, 0, 1 );
 
     tabWidget->insertTab( LTab, tr( "Lists" ) );
 
     setCentralWidget( vbox5 );
 }
 
 
 
 PlayListWidgetGui::~PlayListWidgetGui()  {
 }
 
 void PlayListWidgetGui::setView( char view )  {
     if ( view == 'l' )
         showMaximized();
     else
         hide();
 }
 
 
 void PlayListWidgetGui::setActiveWindow()  {
     //  qDebug("SETTING active window");
     // When we get raised we need to ensure that it switches views
     char origView = mediaPlayerState->view();
     mediaPlayerState->setView( 'l' ); // invalidate
     mediaPlayerState->setView( origView ); // now switch back
 }
 
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp
index f5f5c37..7b8ad7a 100644
--- a/noncore/multimedia/opieplayer2/videowidget.cpp
+++ b/noncore/multimedia/opieplayer2/videowidget.cpp
@@ -1,511 +1,511 @@
 /*
                             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
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library 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/qpeapplication.h>
 #include <qpe/resource.h>
 #include <qpe/mediaplayerplugininterface.h>
 #include <qpe/config.h>
 
 
 #include <qwidget.h>
 #include <qpainter.h>
 #include <qpixmap.h>
 #include <qslider.h>
 #include <qdrawutil.h>
 #include "videowidget.h"
 #include "mediaplayerstate.h"
 #include "playlistwidget.h"
 
 
 #ifdef Q_WS_QWS
 # define USE_DIRECT_PAINTER
 # include <qdirectpainter_qws.h>
 # include <qgfxraster_qws.h>
 #endif
 
 
 extern MediaPlayerState *mediaPlayerState;
 extern PlayListWidget *playList;
 
 
 static const int xo = 2; // movable x offset
 static const int yo = 0; // movable y offset
 
 
 struct MediaButton {
     bool isToggle, isHeld, isDown;
 };
 
 MediaButton videoButtons[] = {
     { FALSE, FALSE, FALSE }, // stop
     { TRUE, FALSE, FALSE }, // play
     { FALSE, FALSE, FALSE }, // previous
     { FALSE, FALSE, FALSE }, // next
     { FALSE, FALSE, FALSE }, // volUp
     { FALSE, FALSE, FALSE }, // volDown
     { TRUE, FALSE, FALSE }  // fullscreen
 };
 
 const char *skinV_mask_file_names[7] = {
 "stop","play","back","fwd","up","down","full"
 };
 
 static const int numVButtons = (sizeof(videoButtons)/sizeof(MediaButton));
 
 
 VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) :
 QWidget( parent, name, f ), scaledWidth( 0 ), scaledHeight( 0 ) {
 
 
     setCaption( tr("OpiePlayer - Video") );
 
     videoFrame = new XineVideoWidget ( this, "Video frame" );
 
     connect ( videoFrame, SIGNAL( videoResized ( const QSize & )), this, SIGNAL( videoResized ( const QSize & )));
     connect ( videoFrame,  SIGNAL( clicked () ),  this,  SLOT ( backToNormal() ) );
 
     Config cfg("OpiePlayer");
     cfg.setGroup("Options");
     skin = cfg.readEntry("Skin","default");
 
     QString skinPath = "opieplayer2/skins/" + skin;
     pixBg = new QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) );
     imgUp = new QImage( Resource::loadImage( QString("%1/skinV_up").arg(skinPath) ) );
     imgDn = new QImage( Resource::loadImage( QString("%1/skinV_down").arg(skinPath) ) );
 
     imgButtonMask = new QImage( imgUp->width(), imgUp->height(), 8, 255 );
     imgButtonMask->fill( 0 );
 
     for ( int i = 0; i < 7; i++ ) {
         QString filename = QString( QPEApplication::qpeDir() + "/pics/" + skinPath + "/skinV_mask_" + skinV_mask_file_names[i] + ".png" );
         masks[i] = new QBitmap( filename );
 
         if ( !masks[i]->isNull() ) {
             QImage imgMask = masks[i]->convertToImage();
             uchar **dest = imgButtonMask->jumpTable();
             for ( int y = 0; y < imgUp->height(); y++ ) {
                 uchar *line = dest[y];
                 for ( int x = 0; x < imgUp->width(); x++ ) {
                     if ( !qRed( imgMask.pixel( x, y ) ) )
                         line[x] = i + 1;
                 }
             }
         }
     }
 
     for ( int i = 0; i < 7; i++ ) {
         buttonPixUp[i] = NULL;
         buttonPixDown[i] = NULL;
     }
 
     setBackgroundPixmap( *pixBg );
 
     slider = new QSlider( Qt::Horizontal, this );
     slider->setMinValue( 0 );
     slider->setMaxValue( 1 );
     slider->setBackgroundPixmap( Resource::loadPixmap( backgroundPix ) );
-    slider->setFocusPolicy( QWidget::NoFocus );
+    //slider->setFocusPolicy( QWidget::NoFocus );
 
     resizeEvent( NULL );
 
     connect( slider, SIGNAL( sliderPressed() ), this, SLOT( sliderPressed() ) );
     connect( slider, SIGNAL( sliderReleased() ), this, SLOT( sliderReleased() ) );
     connect( mediaPlayerState, SIGNAL( lengthChanged(long) ),  this, SLOT( setLength(long) ) );
     connect( mediaPlayerState, SIGNAL( viewChanged(char) ),    this, SLOT( setView(char) ) );
     connect( mediaPlayerState, SIGNAL( playingToggled(bool) ), this, SLOT( setPlaying(bool) ) );
 
     setLength( mediaPlayerState->length() );
     setPosition( mediaPlayerState->position() );
     setFullscreen( mediaPlayerState->fullscreen() );
     setPlaying( mediaPlayerState->playing() );
 }
 
 
 VideoWidget::~VideoWidget() {
 
     for ( int i = 0; i < 7; i++ ) {
         delete buttonPixUp[i];
         delete buttonPixDown[i];
     }
 
     delete pixBg;
     delete imgUp;
     delete imgDn;
     delete imgButtonMask;
     for ( int i = 0; i < 7; i++ ) {
         delete masks[i];
     }
 
 }
 
 QPixmap *combineVImageWithBackground( QImage img, QPixmap bg, QPoint offset ) {
     QPixmap pix( img.width(), img.height() );
     QPainter p( &pix );
     p.drawTiledPixmap( pix.rect(), bg, offset );
     p.drawImage( 0, 0, img );
     return new QPixmap( pix );
 }
 
 QPixmap *maskVPixToMask( QPixmap pix, QBitmap mask ) {
     QPixmap *pixmap = new QPixmap( pix );
     pixmap->setMask( mask );
     return pixmap;
 }
 
 void VideoWidget::resizeEvent( QResizeEvent * ) {
     int h = height();
     int w = width();
     //int Vh = 160;
     //int Vw = 220;
 
     slider->setFixedWidth( w - 20 );
     slider->setGeometry( QRect( 15, h - 22, w - 90, 20 ) );
     slider->setBackgroundOrigin( QWidget::ParentOrigin );
     slider->setFocusPolicy( QWidget::NoFocus );
     slider->setBackgroundPixmap( *pixBg );
 
     xoff = 0;// ( imgUp->width() ) / 2;
     if(w>h)
         yoff = 0;
     else
         yoff = 185;//(( Vh  - imgUp->height() ) / 2) - 10;
     QPoint p( xoff, yoff );
 
     QPixmap *pixUp = combineVImageWithBackground( *imgUp, *pixBg, p );
     QPixmap *pixDn = combineVImageWithBackground( *imgDn, *pixBg, p );
 
     for ( int i = 0; i < 7; i++ ) {
         if ( !masks[i]->isNull() ) {
             delete buttonPixUp[i];
             delete buttonPixDown[i];
             buttonPixUp[i] = maskVPixToMask( *pixUp, *masks[i] );
             buttonPixDown[i] = maskVPixToMask( *pixDn, *masks[i] );
         }
     }
 
     delete pixUp;
     delete pixDn;
 }
 
 static bool videoSliderBeingMoved = FALSE;
 
 void VideoWidget::sliderPressed() {
     videoSliderBeingMoved = TRUE;
 }
 
 void VideoWidget::sliderReleased() {
     videoSliderBeingMoved = FALSE;
     if ( slider->width() == 0 ) {
         return;
     }
     long val = long((double)slider->value() * mediaPlayerState->length() / slider->width());
     mediaPlayerState->setPosition( val );
 }
 
 void VideoWidget::setPosition( long i ) {
     updateSlider( i, mediaPlayerState->length() );
 }
 
 
 void VideoWidget::setLength( long max ) {
     updateSlider( mediaPlayerState->position(), max );
 }
 
 void VideoWidget::setView( char view ) {
 
     if ( view == 'v' ) {
         makeVisible();
     } else {
         // Effectively blank the view next time we show it so it looks nicer
         scaledWidth = 0;
         scaledHeight = 0;
         hide();
     }
 }
 
 void VideoWidget::updateSlider( long i, long max ) {
     // Will flicker too much if we don't do this
     if ( max == 0 ) {
         return;
     }
     int width = slider->width();
     int val = int((double)i * width / max);
     if ( !mediaPlayerState->fullscreen() && !videoSliderBeingMoved ) {
         if ( slider->value() != val ) {
             slider->setValue( val );
         }
         if ( slider->maxValue() != width ) {
             slider->setMaxValue( width );
         }
     }
 }
 
 void VideoWidget::setToggleButton( int i, bool down ) {
     if ( down != videoButtons[i].isDown ) {
         toggleButton( i );
     }
 }
 
 void VideoWidget::toggleButton( int i ) {
     videoButtons[i].isDown = !videoButtons[i].isDown;
     QPainter p(this);
     paintButton ( &p, i );
 }
 
 void VideoWidget::paintButton( QPainter *p, int i ) {
 
     if ( videoButtons[i].isDown ) {
         p->drawPixmap( xoff, yoff, *buttonPixDown[i] );
     } else {
         p->drawPixmap( xoff, yoff, *buttonPixUp[i] );
     }
 }
 
 void VideoWidget::mouseMoveEvent( QMouseEvent *event ) {
     for ( int i = 0; i < numVButtons; i++ ) {
         if ( event->state() == QMouseEvent::LeftButton ) {
             // The test to see if the mouse click is inside the button or not
             int x = event->pos().x() - xoff;
             int y = event->pos().y() - yoff;
 
             bool isOnButton = ( x > 0 && y > 0 && x < imgButtonMask->width()
                                 && y < imgButtonMask->height()
                                 && imgButtonMask->pixelIndex( x, y ) == i + 1 );
 
             if ( isOnButton && !videoButtons[i].isHeld ) {
                 videoButtons[i].isHeld = TRUE;
                 toggleButton(i);
 
                 switch (i) {
                 case VideoVolUp:
                     emit moreClicked();
                     return;
                 case VideoVolDown:
                     emit lessClicked();
                     return;
                 }
             } else if ( !isOnButton && videoButtons[i].isHeld ) {
                         videoButtons[i].isHeld = FALSE;
                         toggleButton(i);
             }
         } else {
 
             if ( videoButtons[i].isHeld ) {
                 videoButtons[i].isHeld = FALSE;
                 if ( !videoButtons[i].isToggle ) {
                     setToggleButton( i, FALSE );
                 }
 
                 switch(i) {
 
                 case VideoPlay: {
                     if( mediaPlayerState->isPaused ) {
                         setToggleButton( i, FALSE );
                         mediaPlayerState->setPaused( FALSE );
                         return;
                     } else if( !mediaPlayerState->isPaused ) {
                         setToggleButton( i, TRUE );
                         mediaPlayerState->setPaused( TRUE );
                         return;
                     } else {
                         return;
                     }
                 }
 
                 case VideoStop:       mediaPlayerState->setPlaying( FALSE ); return;
                 case VideoNext:       if(playList->whichList() ==0) mediaPlayerState->setNext(); return;
                 case VideoPrevious:   if(playList->whichList() ==0) mediaPlayerState->setPrev(); return;
                 case VideoVolUp:      emit moreReleased(); return;
                 case VideoVolDown:    emit lessReleased(); return;
                 case VideoFullscreen: mediaPlayerState->setFullscreen( TRUE ); makeVisible(); return;
                 }
             }
         }
     }
 }
 
 void VideoWidget::mousePressEvent( QMouseEvent *event ) {
     mouseMoveEvent( event );
 }
 
 void VideoWidget::mouseReleaseEvent( QMouseEvent *event ) {
     if ( mediaPlayerState->fullscreen() ) {
         mediaPlayerState->setFullscreen( FALSE );
         makeVisible();
     }
     mouseMoveEvent( event );
 }
 
 void VideoWidget::showEvent( QShowEvent* ) {
     QMouseEvent event( QEvent::MouseMove, QPoint( 0, 0 ), 0, 0 );
     mouseMoveEvent( &event );
 }
 
 
  void VideoWidget::backToNormal() {
      mediaPlayerState->setFullscreen( FALSE );
      makeVisible();
  }
 
 void VideoWidget::makeVisible() {
     if ( mediaPlayerState->fullscreen() ) {
         setBackgroundMode( QWidget::NoBackground );
         showFullScreen();
         resize( qApp->desktop()->size() );
         slider->hide();
         videoFrame-> setGeometry ( 0, 0, width ( ), height ( ));
 //        qApp->processEvents();
     } else {
         showNormal();
         showMaximized();
         setBackgroundPixmap( *pixBg );
         if ( mediaPlayerState->streaming() ) {
             slider->hide();
             disconnect( mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) );
             disconnect( mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) );
         } else {
             slider->show();
             connect( mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) );
             connect( mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) );
         }
         QWidget *d = QApplication::desktop();
         int w=d->width();
         int h=d->height();
 
         if(w>h) {
             int newW=(w/2)-(246/2); //this will only work with 320x240
             videoFrame->setGeometry( QRect( newW, 4, 240, 170  ) );
         } else
             videoFrame->setGeometry( QRect( 0, 30, 240, 170  ) );
 
 //        qApp->processEvents();
     }
 }
 
 
 void VideoWidget::paintEvent( QPaintEvent * pe) {
     QPainter p( this );
 
     if ( mediaPlayerState->fullscreen() ) {
         // Clear the background
         p.setBrush( QBrush( Qt::black ) );
     } else {
         if ( !pe->erased() ) {
             // Combine with background and double buffer
             QPixmap pix( pe->rect().size() );
             QPainter p( &pix );
             p.translate( -pe->rect().topLeft().x(), -pe->rect().topLeft().y() );
             p.drawTiledPixmap( pe->rect(), *pixBg, pe->rect().topLeft() );
             for ( int i = 0; i < numVButtons; i++ ) {
                 paintButton( &p, i );
             }
             QPainter p2( this );
             p2.drawPixmap( pe->rect().topLeft(), pix );
         } else {
             QPainter p( this );
             for ( int i = 0; i < numVButtons; i++ )
                 paintButton( &p, i );
         }
-        slider->repaint( TRUE );
-      }
+        //slider->repaint( TRUE );
+        }
 }
 
 
 void VideoWidget::closeEvent( QCloseEvent* ) {
     mediaPlayerState->setList();
 }
 
 
 
 void VideoWidget::keyReleaseEvent( QKeyEvent *e) {
     switch ( e->key() ) {
 ////////////////////////////// Zaurus keys
       case Key_Home:
           break;
       case Key_F9: //activity
           break;
       case Key_F10: //contacts
 //           hide();
           break;
       case Key_F11: //menu
           break;
       case Key_F12: //home
           break;
       case Key_F13: //mail
           break;
       case Key_Space: {
           if(mediaPlayerState->playing()) {
               mediaPlayerState->setPlaying(FALSE);
           } else {
               mediaPlayerState->setPlaying(TRUE);
           }
       }
           break;
       case Key_Down:
 //            toggleButton(6);
             emit lessClicked();
             emit lessReleased();
 //            toggleButton(6);
           break;
       case Key_Up:
 //             toggleButton(5);
              emit moreClicked();
              emit moreReleased();
 //             toggleButton(5);
            break;
       case Key_Right:
           mediaPlayerState->setNext();
           break;
       case Key_Left:
           mediaPlayerState->setPrev();
           break;
       case Key_Escape:
           break;
 
     };
 }
 
 XineVideoWidget* VideoWidget::vidWidget() {
     return videoFrame;
 }
 
 
 void VideoWidget::setFullscreen ( bool b ) {
   setToggleButton( VideoFullscreen, b );
 }
 
 
 void VideoWidget::setPlaying( bool b) {
       setToggleButton( VideoPlay, b );
 }
 
diff --git a/noncore/multimedia/opieplayer2/xinecontrol.cpp b/noncore/multimedia/opieplayer2/xinecontrol.cpp
index 81693e1..31ac9dc 100644
--- a/noncore/multimedia/opieplayer2/xinecontrol.cpp
+++ b/noncore/multimedia/opieplayer2/xinecontrol.cpp
@@ -1,242 +1,242 @@
 /*
                             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 <qtimer.h>
 #include <qmessagebox.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/qpeapplication.h>
 #include "xinecontrol.h"
 #include "mediaplayerstate.h"
 #include "videowidget.h"
 
 extern MediaPlayerState *mediaPlayerState;
 extern VideoWidget *videoUI;
 XineControl::XineControl( QObject *parent, const char *name )
     : QObject( parent, name ) {
 
-    libXine = new XINE::Lib(videoUI->vidWidget() );
+    libXine = new XINE::Lib( videoUI->vidWidget() );
 
-    connect ( videoUI, SIGNAL( videoResized ( const QSize & )), this, SLOT( videoResized ( const QSize & ) ) );
+    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  + ">>>>");
 
     if ( !libXine->play( fileName ) ) {
         QMessageBox::warning( 0l , tr( "Failure" ), getErrorCode() );
         return;
     }
     mediaPlayerState->setPlaying( true );
 
     char whichGui;
     // qDebug( QString( "libXine->hasVideo() return : %1 ").arg( libXine->hasVideo() ) );
     if ( !libXine->hasVideo() ) {
         whichGui = 'a';
         qDebug("HAS AUDIO");
         libXine->setShowVideo( false );
         hasAudioChannel = TRUE;
     } else {
         whichGui = 'v';
         qDebug("HAS VIDEO");
         libXine->setShowVideo( true );
         hasVideoChannel = TRUE;
     }
     // determine if slider is shown
     mediaPlayerState->setIsStreaming( !libXine->isSeekable() );
     // which gui (video / audio)
     mediaPlayerState->setView( whichGui );
 
 #if defined(Q_WS_QWS) && !defined(QT_NO_COP)
     if ( !disabledSuspendScreenSaver ) {
         disabledSuspendScreenSaver = TRUE;
         // Stop the screen from blanking and power saving state
         QCopEnvelope( "QPE/System", "setScreenSaverMode(int)" )
             << ( 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();
 
 #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
     }
 }
 
 /**
  * Pause playback
  * @isSet
  */
 void XineControl::pause( bool isSet) {
     if ( isSet ) {
         libXine->pause();
     } else {
         libXine->play( m_fileName, 0, m_currentTime );
     }
 }
 
 
 /**
  * get current time in playback
  */
 long XineControl::currentTime() {
     // todo: jede sekunde überprüfen
     m_currentTime = libXine->currentTime();
     return m_currentTime;
     QTimer::singleShot( 1000, this, SLOT( currentTime() ) );
 }
 
 /**
  * Set the length of the media file
  */
 void  XineControl::length() {
     m_length = libXine->length();
     mediaPlayerState->setLength( m_length );
 }
 
 
 /**
  * Reports the position the xine backend is at right now
  * @return long the postion in seconds
  */
 long XineControl::position() {
     m_position = ( currentTime() );
     mediaPlayerState->updatePosition( m_position );
     long emitPos = (long)m_position;
     emit positionChanged( emitPos );
     if( mediaPlayerState->isPlaying ) {
     // needs to be stopped the media is stopped
         QTimer::singleShot( 1000, this, SLOT( position() ) );
     }
     // qDebug("POSITION : %d", m_position);
     return m_position;
 }
 
 /**
  * Set videoplayback to fullscreen
  * @param isSet
  */
 void XineControl::setFullscreen( bool isSet ) {
     libXine->showVideoFullScreen( isSet );
 }
 
 
 QString XineControl::getMetaInfo() {
 
     QString returnString;
 
     if ( !libXine->metaInfo( 0 ).isEmpty() ) {
         returnString += tr( " Title: " + libXine->metaInfo( 0 ) );
     }
 
     if ( !libXine->metaInfo( 1 ).isEmpty() ) {
         returnString += tr( " Comment: " + libXine->metaInfo( 1 ) );
     }
 
     if ( !libXine->metaInfo( 2 ).isEmpty() ) {
         returnString += tr( " Artist: " + libXine->metaInfo( 2 ) );
     }
 
     if ( !libXine->metaInfo( 3 ).isEmpty() ) {
         returnString += tr( " Genre: " + libXine->metaInfo( 3 ) );
     }
 
     if ( !libXine->metaInfo( 4 ).isEmpty() ) {
         returnString += tr( " Album: " + libXine->metaInfo( 4 ) );
     }
 
     if ( !libXine->metaInfo( 5 ).isEmpty() ) {
         returnString += tr( " Year: " + libXine->metaInfo( 5 ) );
     }
     return returnString;
 }
 
 QString XineControl::getErrorCode() {
     int errorCode = libXine->error();
 
     if ( errorCode == 1 ) {
         return tr( "No input plugin found for this media type" );
     } else {
         return tr( "Some other error" );
     }
 }
 
 /**
  * Seek to a position in the track
  * @param second the second to jump to
  */
 void XineControl::seekTo( long second ) {
     libXine->seekTo( (int)second );
diff --git a/noncore/multimedia/opieplayer2/yuv2rgb.h b/noncore/multimedia/opieplayer2/yuv2rgb.h
index 5b9c3f6..e453243 100644
--- a/noncore/multimedia/opieplayer2/yuv2rgb.h
+++ b/noncore/multimedia/opieplayer2/yuv2rgb.h
@@ -1,151 +1,152 @@
 
 #ifndef HAVE_YUV2RGB_H
 #define HAVE_YUV2RGB_h
 
 #include <inttypes.h>
 
 typedef struct yuv2rgb_s yuv2rgb_t;
 
 typedef struct yuv2rgb_factory_s yuv2rgb_factory_t;
 
 /*
  * function types for functions which can be replaced
  * by hardware-accelerated versions
  */
 
 /* internal function use to scale yuv data */
 typedef void (*scale_line_func_t) (uint8_t *source, uint8_t *dest, int width, int step);
 
 typedef void (*yuv2rgb_fun_t) (yuv2rgb_t *this, uint8_t * image, uint8_t * py, uint8_t * pu, uint8_t * pv) ;
 
 typedef void (*yuy22rgb_fun_t) (yuv2rgb_t *this, uint8_t * image, uint8_t * p);
 
 typedef uint32_t (*yuv2rgb_single_pixel_fun_t) (yuv2rgb_t *this, uint8_t y, uint8_t u, uint8_t v);
 
 
 /*
  * modes supported - feel free to implement yours
  */
 
 #define MODE_8_RGB    1
 #define MODE_8_BGR    2
 #define MODE_15_RGB   3
 #define MODE_15_BGR   4
 #define MODE_16_RGB   5
 #define MODE_16_BGR   6
 #define MODE_24_RGB   7
 #define MODE_24_BGR   8
 #define MODE_32_RGB   9
 #define MODE_32_BGR  10
         #defineMODE_8_GRAY  11
 #define MODE_PALETTE 12
 
 struct yuv2rgb_s {
 
   /*
    * configure converter for scaling factors
    */
   int (*configure) (yuv2rgb_t *this,
                     int source_width, int source_height,
                     int y_stride, int uv_stride,
                     int dest_width, int dest_height,
                     int rgb_stride);
 
   /*
    * this is the function to call for the yuv2rgb and scaling process
    */
   yuv2rgb_fun_t     yuv2rgb_fun;
 
   /*
    * this is the function to call for the yuy2->rgb and scaling process
    */
   yuy22rgb_fun_t    yuy22rgb_fun;
 
   /*
    * this is the function to call for the yuv2rgb for a single pixel
    * (used for converting clut colors)
    */
 
   yuv2rgb_single_pixel_fun_t yuv2rgb_single_pixel_fun;
 
   /* private stuff below */
 
   int               source_width, source_height;
   int               y_stride, uv_stride;
   int               dest_width, dest_height;
   int               rgb_stride;
   int               step_dx, step_dy;
   int               do_scale;
 
   uint8_t          *y_buffer;
   uint8_t          *u_buffer;
   uint8_t          *v_buffer;
           void           *y_chunk;
           void           *u_chunk;
           void           *v_chunk;
 
   void            **table_rV;
   void            **table_gU;
   int              *table_gV;
   void            **table_bU;
 
   uint8_t          *cmap;
   scale_line_func_t scale_line;
-  
+
 } ;
 
 /*
  * convenience class to easily create a lot of converters
  */
 
 struct yuv2rgb_factory_s {
 
   yuv2rgb_t* (*create_converter) (yuv2rgb_factory_t *this);
 
-  /* 
-   * adjust gamma (-100 to 100 looks fine) 
+  /*
+   * adjust gamma (-100 to 100 looks fine)
    * for all converters produced by this factory
    */
   void (*set_gamma) (yuv2rgb_factory_t *this, int gamma);
 
-  /* 
-   * get gamma value 
+  /*
+   * get gamma value
    */
   int (*get_gamma) (yuv2rgb_factory_t *this);
-                   
+
   /* private data */
 
   int      mode;
   int      swapped;
   uint8_t *cmap;
 
   int      gamma;
   int      entry_size;
 
   uint32_t matrix_coefficients;
 
   void    *table_rV[256];
   void    *table_gU[256];
   int      table_gV[256];
   void    *table_bU[256];
 
   /* preselected functions for mode/swap/hardware */
   yuv2rgb_fun_t               yuv2rgb_fun;
   yuy22rgb_fun_t              yuy22rgb_fun;
   yuv2rgb_single_pixel_fun_t  yuv2rgb_single_pixel_fun;
 
 };
 
 yuv2rgb_factory_t *yuv2rgb_factory_init (int mode, int swapped, uint8_t *colormap);
 
-                   
+
 /*
  * internal stuff below this line
  */
 
 void mmx_yuv2rgb_set_gamma(int gamma);
 void yuv2rgb_init_mmxext (yuv2rgb_factory_t *this);
 void yuv2rgb_init_mmx (yuv2rgb_factory_t *this);
 void yuv2rgb_init_mlib (yuv2rgb_factory_t *this);
+void yuv2rgb_init_arm (yuv2rgb_factory_t *this);
 
 #endif