From 6e766588ca61322c59d0a527cb240522d9d8210e Mon Sep 17 00:00:00 2001 From: harlekin Date: Thu, 10 Oct 2002 10:17:20 +0000 Subject: little changes to the gamma --- 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 @@ -259,6 +259,7 @@ void Lib::setScaling( bool scale ) { void Lib::setGamma( int value ) { //qDebug( QString( "%1").arg(value) ); + int gammaValue = ( 100 + value ); ::null_set_videoGamma( m_videoOutput, value ); } 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 @@ -35,7 +35,7 @@ extern MediaPlayerState *mediaPlayerState; 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 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 @@ -103,10 +103,10 @@ PlayListWidgetGui::PlayListWidgetGui( QWidget* parent, const char* name, WFlags 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 ); 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 @@ -134,7 +134,7 @@ QWidget( parent, name, f ), scaledWidth( 0 ), scaledHeight( 0 ) { slider->setMinValue( 0 ); slider->setMaxValue( 1 ); slider->setBackgroundPixmap( Resource::loadPixmap( backgroundPix ) ); - slider->setFocusPolicy( QWidget::NoFocus ); + //slider->setFocusPolicy( QWidget::NoFocus ); resizeEvent( NULL ); @@ -436,8 +436,8 @@ void VideoWidget::paintEvent( QPaintEvent * pe) { for ( int i = 0; i < numVButtons; i++ ) paintButton( &p, i ); } - slider->repaint( TRUE ); - } + //slider->repaint( TRUE ); + } } 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 @@ -45,9 +45,9 @@ 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 ) ) ); 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 @@ -91,7 +91,7 @@ struct yuv2rgb_s { uint8_t *cmap; scale_line_func_t scale_line; - + } ; /* @@ -102,17 +102,17 @@ 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; @@ -138,7 +138,7 @@ struct yuv2rgb_factory_s { yuv2rgb_factory_t *yuv2rgb_factory_init (int mode, int swapped, uint8_t *colormap); - + /* * internal stuff below this line */ @@ -147,5 +147,6 @@ 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 -- cgit v0.9.0.2