Diffstat (limited to 'noncore/multimedia/opieplayer2') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/lib.cpp | 1 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/mediaplayer.cpp | 2 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/playlistwidgetgui.cpp | 4 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/videowidget.cpp | 6 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/xinecontrol.cpp | 4 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/yuv2rgb.h | 15 |
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 | |||
@@ -258,8 +258,9 @@ void Lib::setScaling( bool scale ) { | |||
258 | } | 258 | } |
259 | 259 | ||
260 | void Lib::setGamma( int value ) { | 260 | void Lib::setGamma( int value ) { |
261 | //qDebug( QString( "%1").arg(value) ); | 261 | //qDebug( QString( "%1").arg(value) ); |
262 | int gammaValue = ( 100 + value ); | ||
262 | ::null_set_videoGamma( m_videoOutput, value ); | 263 | ::null_set_videoGamma( m_videoOutput, value ); |
263 | } | 264 | } |
264 | 265 | ||
265 | bool Lib::isScaling() { | 266 | bool Lib::isScaling() { |
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 | |||
@@ -34,9 +34,9 @@ extern MediaPlayerState *mediaPlayerState; | |||
34 | 34 | ||
35 | MediaPlayer::MediaPlayer( QObject *parent, const char *name ) | 35 | MediaPlayer::MediaPlayer( QObject *parent, const char *name ) |
36 | : QObject( parent, name ), volumeDirection( 0 ), currentFile( NULL ) { | 36 | : QObject( parent, name ), volumeDirection( 0 ), currentFile( NULL ) { |
37 | 37 | ||
38 | playList->setCaption(tr("OpiePlayer: Initializating")); | 38 | playList->setCaption( tr( "OpiePlayer: Initializating" ) ); |
39 | 39 | ||
40 | qApp->processEvents(); | 40 | qApp->processEvents(); |
41 | // QPEApplication::grabKeyboard(); // EVIL | 41 | // QPEApplication::grabKeyboard(); // EVIL |
42 | connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) ); | 42 | connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) ); |
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 | |||
@@ -102,12 +102,12 @@ PlayListWidgetGui::PlayListWidgetGui( QWidget* parent, const char* name, WFlags | |||
102 | gammaMenu = new QPopupMenu( this ); | 102 | gammaMenu = new QPopupMenu( this ); |
103 | pmView->insertItem( tr( "Gamma (Video)" ), gammaMenu ); | 103 | pmView->insertItem( tr( "Gamma (Video)" ), gammaMenu ); |
104 | 104 | ||
105 | gammaSlider = new QSlider( QSlider::Vertical, gammaMenu ); | 105 | gammaSlider = new QSlider( QSlider::Vertical, gammaMenu ); |
106 | gammaSlider->setRange( -100, 100 ); | 106 | gammaSlider->setRange( -40, 40 ); |
107 | gammaSlider->setTickmarks( QSlider::Left ); | 107 | gammaSlider->setTickmarks( QSlider::Left ); |
108 | gammaSlider->setTickInterval( 20 ); | 108 | gammaSlider->setTickInterval( 20 ); |
109 | gammaSlider->setFocusPolicy( QWidget::NoFocus ); | 109 | //gammaSlider->setFocusPolicy( QWidget::NoFocus ); |
110 | gammaSlider->setValue( 0 ); | 110 | gammaSlider->setValue( 0 ); |
111 | gammaSlider->setMinimumHeight( 50 ); | 111 | gammaSlider->setMinimumHeight( 50 ); |
112 | 112 | ||
113 | gammaLCD = new QLCDNumber( 3, gammaMenu ); | 113 | gammaLCD = new QLCDNumber( 3, gammaMenu ); |
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 | |||
@@ -133,9 +133,9 @@ QWidget( parent, name, f ), scaledWidth( 0 ), scaledHeight( 0 ) { | |||
133 | slider = new QSlider( Qt::Horizontal, this ); | 133 | slider = new QSlider( Qt::Horizontal, this ); |
134 | slider->setMinValue( 0 ); | 134 | slider->setMinValue( 0 ); |
135 | slider->setMaxValue( 1 ); | 135 | slider->setMaxValue( 1 ); |
136 | slider->setBackgroundPixmap( Resource::loadPixmap( backgroundPix ) ); | 136 | slider->setBackgroundPixmap( Resource::loadPixmap( backgroundPix ) ); |
137 | slider->setFocusPolicy( QWidget::NoFocus ); | 137 | //slider->setFocusPolicy( QWidget::NoFocus ); |
138 | 138 | ||
139 | resizeEvent( NULL ); | 139 | resizeEvent( NULL ); |
140 | 140 | ||
141 | connect( slider, SIGNAL( sliderPressed() ), this, SLOT( sliderPressed() ) ); | 141 | connect( slider, SIGNAL( sliderPressed() ), this, SLOT( sliderPressed() ) ); |
@@ -435,10 +435,10 @@ void VideoWidget::paintEvent( QPaintEvent * pe) { | |||
435 | QPainter p( this ); | 435 | QPainter p( this ); |
436 | for ( int i = 0; i < numVButtons; i++ ) | 436 | for ( int i = 0; i < numVButtons; i++ ) |
437 | paintButton( &p, i ); | 437 | paintButton( &p, i ); |
438 | } | 438 | } |
439 | slider->repaint( TRUE ); | 439 | //slider->repaint( TRUE ); |
440 | } | 440 | } |
441 | } | 441 | } |
442 | 442 | ||
443 | 443 | ||
444 | void VideoWidget::closeEvent( QCloseEvent* ) { | 444 | void VideoWidget::closeEvent( QCloseEvent* ) { |
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 | |||
@@ -44,11 +44,11 @@ extern MediaPlayerState *mediaPlayerState; | |||
44 | extern VideoWidget *videoUI; | 44 | extern VideoWidget *videoUI; |
45 | XineControl::XineControl( QObject *parent, const char *name ) | 45 | XineControl::XineControl( QObject *parent, const char *name ) |
46 | : QObject( parent, name ) { | 46 | : QObject( parent, name ) { |
47 | 47 | ||
48 | libXine = new XINE::Lib(videoUI->vidWidget() ); | 48 | libXine = new XINE::Lib( videoUI->vidWidget() ); |
49 | 49 | ||
50 | connect ( videoUI, SIGNAL( videoResized ( const QSize & )), this, SLOT( videoResized ( const QSize & ) ) ); | 50 | connect ( videoUI, SIGNAL( videoResized( const QSize & )), this, SLOT( videoResized ( const QSize & ) ) ); |
51 | connect( mediaPlayerState, SIGNAL( pausedToggled( bool ) ), this, SLOT( pause( bool ) ) ); | 51 | connect( mediaPlayerState, SIGNAL( pausedToggled( bool ) ), this, SLOT( pause( bool ) ) ); |
52 | connect( this, SIGNAL( positionChanged( long ) ), mediaPlayerState, SLOT( updatePosition( long ) ) ); | 52 | connect( this, SIGNAL( positionChanged( long ) ), mediaPlayerState, SLOT( updatePosition( long ) ) ); |
53 | connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ), this, SLOT( stop( bool ) ) ); | 53 | connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ), this, SLOT( stop( bool ) ) ); |
54 | connect( mediaPlayerState, SIGNAL( fullscreenToggled( bool ) ), this, SLOT( setFullscreen( bool ) ) ); | 54 | connect( mediaPlayerState, SIGNAL( fullscreenToggled( bool ) ), this, SLOT( setFullscreen( 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 | |||
@@ -90,9 +90,9 @@ struct yuv2rgb_s { | |||
90 | void **table_bU; | 90 | void **table_bU; |
91 | 91 | ||
92 | uint8_t *cmap; | 92 | uint8_t *cmap; |
93 | scale_line_func_t scale_line; | 93 | scale_line_func_t scale_line; |
94 | 94 | ||
95 | } ; | 95 | } ; |
96 | 96 | ||
97 | /* | 97 | /* |
98 | * convenience class to easily create a lot of converters | 98 | * convenience class to easily create a lot of converters |
@@ -101,19 +101,19 @@ struct yuv2rgb_s { | |||
101 | struct yuv2rgb_factory_s { | 101 | struct yuv2rgb_factory_s { |
102 | 102 | ||
103 | yuv2rgb_t* (*create_converter) (yuv2rgb_factory_t *this); | 103 | yuv2rgb_t* (*create_converter) (yuv2rgb_factory_t *this); |
104 | 104 | ||
105 | /* | 105 | /* |
106 | * adjust gamma (-100 to 100 looks fine) | 106 | * adjust gamma (-100 to 100 looks fine) |
107 | * for all converters produced by this factory | 107 | * for all converters produced by this factory |
108 | */ | 108 | */ |
109 | void (*set_gamma) (yuv2rgb_factory_t *this, int gamma); | 109 | void (*set_gamma) (yuv2rgb_factory_t *this, int gamma); |
110 | 110 | ||
111 | /* | 111 | /* |
112 | * get gamma value | 112 | * get gamma value |
113 | */ | 113 | */ |
114 | int (*get_gamma) (yuv2rgb_factory_t *this); | 114 | int (*get_gamma) (yuv2rgb_factory_t *this); |
115 | 115 | ||
116 | /* private data */ | 116 | /* private data */ |
117 | 117 | ||
118 | int mode; | 118 | int mode; |
119 | int swapped; | 119 | int swapped; |
@@ -137,15 +137,16 @@ struct yuv2rgb_factory_s { | |||
137 | }; | 137 | }; |
138 | 138 | ||
139 | yuv2rgb_factory_t *yuv2rgb_factory_init (int mode, int swapped, uint8_t *colormap); | 139 | yuv2rgb_factory_t *yuv2rgb_factory_init (int mode, int swapped, uint8_t *colormap); |
140 | 140 | ||
141 | 141 | ||
142 | /* | 142 | /* |
143 | * internal stuff below this line | 143 | * internal stuff below this line |
144 | */ | 144 | */ |
145 | 145 | ||
146 | void mmx_yuv2rgb_set_gamma(int gamma); | 146 | void mmx_yuv2rgb_set_gamma(int gamma); |
147 | void yuv2rgb_init_mmxext (yuv2rgb_factory_t *this); | 147 | void yuv2rgb_init_mmxext (yuv2rgb_factory_t *this); |
148 | void yuv2rgb_init_mmx (yuv2rgb_factory_t *this); | 148 | void yuv2rgb_init_mmx (yuv2rgb_factory_t *this); |
149 | void yuv2rgb_init_mlib (yuv2rgb_factory_t *this); | 149 | void yuv2rgb_init_mlib (yuv2rgb_factory_t *this); |
150 | void yuv2rgb_init_arm (yuv2rgb_factory_t *this); | ||
150 | 151 | ||
151 | #endif | 152 | #endif |