Diffstat (limited to 'noncore/multimedia/opieplayer2/audiowidget.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp index 125fd72..303e56e 100644 --- a/noncore/multimedia/opieplayer2/audiowidget.cpp +++ b/noncore/multimedia/opieplayer2/audiowidget.cpp | |||
@@ -116,25 +116,25 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) : | |||
116 | connect( mediaPlayerState, SIGNAL( pausedToggled(bool) ), this, SLOT( setPaused(bool) ) ); | 116 | connect( mediaPlayerState, SIGNAL( pausedToggled(bool) ), this, SLOT( setPaused(bool) ) ); |
117 | connect( mediaPlayerState, SIGNAL( playingToggled(bool) ), this, SLOT( setPlaying(bool) ) ); | 117 | connect( mediaPlayerState, SIGNAL( playingToggled(bool) ), this, SLOT( setPlaying(bool) ) ); |
118 | 118 | ||
119 | // Intialise state | 119 | // Intialise state |
120 | setLength( mediaPlayerState->length() ); | 120 | setLength( mediaPlayerState->length() ); |
121 | setPosition( mediaPlayerState->position() ); | 121 | setPosition( mediaPlayerState->position() ); |
122 | setLooping( mediaPlayerState->fullscreen() ); | 122 | setLooping( mediaPlayerState->fullscreen() ); |
123 | setPaused( mediaPlayerState->paused() ); | 123 | setPaused( mediaPlayerState->paused() ); |
124 | setPlaying( mediaPlayerState->playing() ); | 124 | setPlaying( mediaPlayerState->playing() ); |
125 | } | 125 | } |
126 | 126 | ||
127 | AudioWidget::~AudioWidget() { | 127 | AudioWidget::~AudioWidget() { |
128 | mediaPlayerState->isStreaming = FALSE; | 128 | mediaPlayerState->setIsStreaming( FALSE ); |
129 | for ( int i = 0; i < 3; i++ ) { | 129 | for ( int i = 0; i < 3; i++ ) { |
130 | delete pixmaps[i]; | 130 | delete pixmaps[i]; |
131 | } | 131 | } |
132 | } | 132 | } |
133 | 133 | ||
134 | 134 | ||
135 | static bool audioSliderBeingMoved = FALSE; | 135 | static bool audioSliderBeingMoved = FALSE; |
136 | 136 | ||
137 | 137 | ||
138 | void AudioWidget::sliderPressed() { | 138 | void AudioWidget::sliderPressed() { |
139 | audioSliderBeingMoved = TRUE; | 139 | audioSliderBeingMoved = TRUE; |
140 | } | 140 | } |
@@ -152,25 +152,25 @@ void AudioWidget::sliderReleased() { | |||
152 | void AudioWidget::setPosition( long i ) { | 152 | void AudioWidget::setPosition( long i ) { |
153 | // qDebug("set position %d",i); | 153 | // qDebug("set position %d",i); |
154 | updateSlider( i, mediaPlayerState->length() ); | 154 | updateSlider( i, mediaPlayerState->length() ); |
155 | } | 155 | } |
156 | 156 | ||
157 | 157 | ||
158 | void AudioWidget::setLength( long max ) { | 158 | void AudioWidget::setLength( long max ) { |
159 | updateSlider( mediaPlayerState->position(), max ); | 159 | updateSlider( mediaPlayerState->position(), max ); |
160 | } | 160 | } |
161 | 161 | ||
162 | 162 | ||
163 | void AudioWidget::setView( char view ) { | 163 | void AudioWidget::setView( char view ) { |
164 | if (mediaPlayerState->isStreaming) { | 164 | if (mediaPlayerState->streaming() ) { |
165 | if( !slider->isHidden()) slider->hide(); | 165 | if( !slider->isHidden()) slider->hide(); |
166 | disconnect( mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) ); | 166 | disconnect( mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) ); |
167 | disconnect( mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) ); | 167 | disconnect( mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) ); |
168 | } else { | 168 | } else { |
169 | // this stops the slider from being moved, thus | 169 | // this stops the slider from being moved, thus |
170 | // does not stop stream when it reaches the end | 170 | // does not stop stream when it reaches the end |
171 | slider->show(); | 171 | slider->show(); |
172 | connect( mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) ); | 172 | connect( mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) ); |
173 | connect( mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) ); | 173 | connect( mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) ); |
174 | } | 174 | } |
175 | 175 | ||
176 | if ( view == 'a' ) { | 176 | if ( view == 'a' ) { |