summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/audiowidget.cpp7
-rw-r--r--noncore/multimedia/opieplayer2/audiowidget.h1
2 files changed, 4 insertions, 4 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp
index 8f34736..adef247 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.cpp
+++ b/noncore/multimedia/opieplayer2/audiowidget.cpp
@@ -67,17 +67,19 @@ void changeTextColor( QWidget * w) {
67 p.setBrush( QColorGroup::Base, QColor( 167, 212, 167 ) ); 67 p.setBrush( QColorGroup::Base, QColor( 167, 212, 167 ) );
68 w->setPalette( p ); 68 w->setPalette( p );
69} 69}
70 70
71} 71}
72 72
73AudioWidget::AudioWidget( PlayListWidget &playList, MediaPlayerState &mediaPlayerState, QWidget* parent, const char* name) : 73AudioWidget::AudioWidget( PlayListWidget &playList, MediaPlayerState &mediaPlayerState, QWidget* parent, const char* name) :
74 74
75 MediaWidget( playList, mediaPlayerState, parent, name ), songInfo( this ), slider( Qt::Horizontal, this ), time( this ) { 75 MediaWidget( playList, mediaPlayerState, parent, name ), songInfo( this ), slider( Qt::Horizontal, this ), time( this ),
76 audioSliderBeingMoved( false )
77{
76 78
77 Button defaultButton; 79 Button defaultButton;
78 defaultButton.isToggle = defaultButton.isHeld = defaultButton.isDown = false; 80 defaultButton.isToggle = defaultButton.isHeld = defaultButton.isDown = false;
79 Button toggleButton; 81 Button toggleButton;
80 toggleButton.isToggle = true; 82 toggleButton.isToggle = true;
81 toggleButton.isHeld = toggleButton.isDown = false; 83 toggleButton.isHeld = toggleButton.isDown = false;
82 84
83 buttons.reserve( 10 ); 85 buttons.reserve( 10 );
@@ -227,19 +229,16 @@ void AudioWidget::resizeEvent( QResizeEvent * ) {
227 delete buttonPixUp[i]; 229 delete buttonPixUp[i];
228 delete buttonPixDown[i]; 230 delete buttonPixDown[i];
229 buttonPixUp[i] = maskPixToMask( pixUp, *masks[i] ); 231 buttonPixUp[i] = maskPixToMask( pixUp, *masks[i] );
230 buttonPixDown[i] = maskPixToMask( pixDn, *masks[i] ); 232 buttonPixDown[i] = maskPixToMask( pixDn, *masks[i] );
231 } 233 }
232 } 234 }
233} 235}
234 236
235static bool audioSliderBeingMoved = FALSE;
236
237
238void AudioWidget::sliderPressed() { 237void AudioWidget::sliderPressed() {
239 audioSliderBeingMoved = TRUE; 238 audioSliderBeingMoved = TRUE;
240} 239}
241 240
242 241
243void AudioWidget::sliderReleased() { 242void AudioWidget::sliderReleased() {
244 audioSliderBeingMoved = FALSE; 243 audioSliderBeingMoved = FALSE;
245 if ( slider.width() == 0 ) 244 if ( slider.width() == 0 )
diff --git a/noncore/multimedia/opieplayer2/audiowidget.h b/noncore/multimedia/opieplayer2/audiowidget.h
index 4598d51..8426490 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.h
+++ b/noncore/multimedia/opieplayer2/audiowidget.h
@@ -102,13 +102,14 @@ private:
102 QPixmap *buttonPixUp[10]; 102 QPixmap *buttonPixUp[10];
103 QPixmap *buttonPixDown[10]; 103 QPixmap *buttonPixDown[10];
104 104
105 QPixmap *pixmaps[4]; 105 QPixmap *pixmaps[4];
106 OTicker songInfo; 106 OTicker songInfo;
107 QSlider slider; 107 QSlider slider;
108 QLineEdit time; 108 QLineEdit time;
109 bool isStreaming : 1; 109 bool isStreaming : 1;
110 bool audioSliderBeingMoved : 1;
110}; 111};
111 112
112 113
113#endif // AUDIO_WIDGET_H 114#endif // AUDIO_WIDGET_H
114 115