6 files changed, 6 insertions, 4 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
@@ -238,47 +238,48 @@ bool Lib::hasVideo() {
     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
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
@@ -82,52 +82,52 @@ PlayListWidgetGui::PlayListWidgetGui( QWidget* parent, const char* name, WFlags
     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);
 
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
@@ -113,49 +113,49 @@ QWidget( parent, name, f ), scaledWidth( 0 ), scaledHeight( 0 ) {
         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;
@@ -415,49 +415,49 @@ void VideoWidget::makeVisible() {
 
 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;
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
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
@@ -126,26 +126,27 @@ struct yuv2rgb_factory_s {
 
   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