Diffstat (limited to 'noncore/multimedia/opieplayer2') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.cpp | 8 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.h | 1 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/mediawidget.cpp | 12 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/mediawidget.h | 1 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/videowidget.cpp | 6 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/videowidget.h | 1 |
6 files changed, 12 insertions, 17 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp index 277d162..8c7e614 100644 --- a/noncore/multimedia/opieplayer2/audiowidget.cpp +++ b/noncore/multimedia/opieplayer2/audiowidget.cpp | |||
@@ -302,20 +302,12 @@ void AudioWidget::updateSlider( long i, long max ) { | |||
302 | if ( slider.maxValue() != width ) { | 302 | if ( slider.maxValue() != width ) { |
303 | slider.setMaxValue( width ); | 303 | slider.setMaxValue( width ); |
304 | } | 304 | } |
305 | } | 305 | } |
306 | } | 306 | } |
307 | 307 | ||
308 | |||
309 | void AudioWidget::setToggleButton( int i, bool down ) { | ||
310 | qDebug("setToggleButton %d", i); | ||
311 | if ( down != buttons[i].isDown ) { | ||
312 | toggleButton( i ); | ||
313 | } | ||
314 | } | ||
315 | |||
316 | void AudioWidget::skipFor() { | 308 | void AudioWidget::skipFor() { |
317 | skipDirection = +1; | 309 | skipDirection = +1; |
318 | startTimer( 50 ); | 310 | startTimer( 50 ); |
319 | mediaPlayerState.setPosition( mediaPlayerState.position() + 2 ); | 311 | mediaPlayerState.setPosition( mediaPlayerState.position() + 2 ); |
320 | } | 312 | } |
321 | 313 | ||
diff --git a/noncore/multimedia/opieplayer2/audiowidget.h b/noncore/multimedia/opieplayer2/audiowidget.h index 8c433ac..9b276b5 100644 --- a/noncore/multimedia/opieplayer2/audiowidget.h +++ b/noncore/multimedia/opieplayer2/audiowidget.h | |||
@@ -87,13 +87,12 @@ protected: | |||
87 | void keyReleaseEvent( QKeyEvent *e); | 87 | void keyReleaseEvent( QKeyEvent *e); |
88 | private slots: | 88 | private slots: |
89 | void skipFor(); | 89 | void skipFor(); |
90 | void skipBack(); | 90 | void skipBack(); |
91 | void stopSkip(); | 91 | void stopSkip(); |
92 | private: | 92 | private: |
93 | void setToggleButton( int, bool ); | ||
94 | int skipDirection; | 93 | int skipDirection; |
95 | QString skin; | 94 | QString skin; |
96 | QImage imgUp; | 95 | QImage imgUp; |
97 | QImage imgDn; | 96 | QImage imgDn; |
98 | 97 | ||
99 | OTicker songInfo; | 98 | OTicker songInfo; |
diff --git a/noncore/multimedia/opieplayer2/mediawidget.cpp b/noncore/multimedia/opieplayer2/mediawidget.cpp index 271f788..9c5291b 100644 --- a/noncore/multimedia/opieplayer2/mediawidget.cpp +++ b/noncore/multimedia/opieplayer2/mediawidget.cpp | |||
@@ -94,13 +94,13 @@ bool MediaWidget::isOverButton( const QPoint &position, int buttonId ) const | |||
94 | } | 94 | } |
95 | 95 | ||
96 | void MediaWidget::paintAllButtons( QPainter &p ) | 96 | void MediaWidget::paintAllButtons( QPainter &p ) |
97 | { | 97 | { |
98 | for ( ButtonMap::ConstIterator it = buttons.begin(); | 98 | for ( ButtonMap::ConstIterator it = buttons.begin(); |
99 | it != buttons.end(); ++it ) | 99 | it != buttons.end(); ++it ) |
100 | paintButton( *it ); | 100 | paintButton( p, *it ); |
101 | } | 101 | } |
102 | 102 | ||
103 | void MediaWidget::paintButton( const Button &button ) | 103 | void MediaWidget::paintButton( const Button &button ) |
104 | { | 104 | { |
105 | QPainter p( this ); | 105 | QPainter p( this ); |
106 | paintButton( p, button ); | 106 | paintButton( p, button ); |
@@ -111,12 +111,22 @@ void MediaWidget::paintButton( QPainter &p, const Button &button ) | |||
111 | if ( button.isDown ) | 111 | if ( button.isDown ) |
112 | p.drawPixmap( upperLeftOfButtonMask, button.pixDown ); | 112 | p.drawPixmap( upperLeftOfButtonMask, button.pixDown ); |
113 | else | 113 | else |
114 | p.drawPixmap( upperLeftOfButtonMask, button.pixUp ); | 114 | p.drawPixmap( upperLeftOfButtonMask, button.pixUp ); |
115 | } | 115 | } |
116 | 116 | ||
117 | void MediaWidget::setToggleButton( int buttonId, bool down ) | ||
118 | { | ||
119 | qDebug("setToggleButton %d", buttonId ); | ||
120 | |||
121 | Button &button = buttons[ buttonId ]; | ||
122 | |||
123 | if ( down != button.isDown ) | ||
124 | toggleButton( buttonId ); | ||
125 | } | ||
126 | |||
117 | void MediaWidget::toggleButton( int buttonId ) | 127 | void MediaWidget::toggleButton( int buttonId ) |
118 | { | 128 | { |
119 | Button &button = buttons[ buttonId ]; | 129 | Button &button = buttons[ buttonId ]; |
120 | 130 | ||
121 | button.isDown = !button.isDown; | 131 | button.isDown = !button.isDown; |
122 | 132 | ||
diff --git a/noncore/multimedia/opieplayer2/mediawidget.h b/noncore/multimedia/opieplayer2/mediawidget.h index 34910fb..b7860dc 100644 --- a/noncore/multimedia/opieplayer2/mediawidget.h +++ b/noncore/multimedia/opieplayer2/mediawidget.h | |||
@@ -88,12 +88,13 @@ protected: | |||
88 | bool isOverButton( const QPoint &position, int buttonId ) const; | 88 | bool isOverButton( const QPoint &position, int buttonId ) const; |
89 | 89 | ||
90 | void paintAllButtons( QPainter &p ); | 90 | void paintAllButtons( QPainter &p ); |
91 | void paintButton( const Button &button ); | 91 | void paintButton( const Button &button ); |
92 | void paintButton( QPainter &p, const Button &button ); | 92 | void paintButton( QPainter &p, const Button &button ); |
93 | 93 | ||
94 | void setToggleButton( int buttonId, bool down ); | ||
94 | void toggleButton( int buttonId ); | 95 | void toggleButton( int buttonId ); |
95 | 96 | ||
96 | MediaPlayerState &mediaPlayerState; | 97 | MediaPlayerState &mediaPlayerState; |
97 | PlayListWidget &playList; | 98 | PlayListWidget &playList; |
98 | 99 | ||
99 | ButtonMap buttons; | 100 | ButtonMap buttons; |
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp index 8f6a8a9..db4a396 100644 --- a/noncore/multimedia/opieplayer2/videowidget.cpp +++ b/noncore/multimedia/opieplayer2/videowidget.cpp | |||
@@ -239,18 +239,12 @@ void VideoWidget::updateSlider( long i, long max ) { | |||
239 | if ( slider->maxValue() != width ) { | 239 | if ( slider->maxValue() != width ) { |
240 | slider->setMaxValue( width ); | 240 | slider->setMaxValue( width ); |
241 | } | 241 | } |
242 | } | 242 | } |
243 | } | 243 | } |
244 | 244 | ||
245 | void VideoWidget::setToggleButton( int i, bool down ) { | ||
246 | if ( down != buttons[i].isDown ) { | ||
247 | toggleButton( i ); | ||
248 | } | ||
249 | } | ||
250 | |||
251 | void VideoWidget::mouseMoveEvent( QMouseEvent *event ) { | 245 | void VideoWidget::mouseMoveEvent( QMouseEvent *event ) { |
252 | for ( unsigned int i = 0; i < buttons.count(); i++ ) { | 246 | for ( unsigned int i = 0; i < buttons.count(); i++ ) { |
253 | if ( event->state() == QMouseEvent::LeftButton ) { | 247 | if ( event->state() == QMouseEvent::LeftButton ) { |
254 | // The test to see if the mouse click is inside the button or not | 248 | // The test to see if the mouse click is inside the button or not |
255 | bool isOnButton = isOverButton( event->pos() - upperLeftOfButtonMask, i ); | 249 | bool isOnButton = isOverButton( event->pos() - upperLeftOfButtonMask, i ); |
256 | 250 | ||
diff --git a/noncore/multimedia/opieplayer2/videowidget.h b/noncore/multimedia/opieplayer2/videowidget.h index 45279d7..915e9cc 100644 --- a/noncore/multimedia/opieplayer2/videowidget.h +++ b/noncore/multimedia/opieplayer2/videowidget.h | |||
@@ -98,13 +98,12 @@ private: | |||
98 | // Ticker songInfo; | 98 | // Ticker songInfo; |
99 | QImage imgUp; | 99 | QImage imgUp; |
100 | QImage imgDn; | 100 | QImage imgDn; |
101 | QString skin; | 101 | QString skin; |
102 | 102 | ||
103 | 103 | ||
104 | void setToggleButton( int, bool ); | ||
105 | 104 | ||
106 | QString backgroundPix; | 105 | QString backgroundPix; |
107 | QSlider *slider; | 106 | QSlider *slider; |
108 | QImage *currentFrame; | 107 | QImage *currentFrame; |
109 | int scaledWidth; | 108 | int scaledWidth; |
110 | int scaledHeight; | 109 | int scaledHeight; |