Diffstat (limited to 'core/multimedia/opieplayer/mediaplayer.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/multimedia/opieplayer/mediaplayer.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/core/multimedia/opieplayer/mediaplayer.cpp b/core/multimedia/opieplayer/mediaplayer.cpp index c971a3c..7ef3e6a 100644 --- a/core/multimedia/opieplayer/mediaplayer.cpp +++ b/core/multimedia/opieplayer/mediaplayer.cpp | |||
@@ -88,25 +88,26 @@ void MediaPlayer::setPlaying( bool play ) { | |||
88 | } | 88 | } |
89 | 89 | ||
90 | const DocLnk *playListCurrent = playList->current(); | 90 | const DocLnk *playListCurrent = playList->current(); |
91 | if ( playListCurrent != NULL ) { | 91 | if ( playListCurrent != NULL ) { |
92 | loopControl->stop( TRUE ); | 92 | loopControl->stop( TRUE ); |
93 | currentFile = playListCurrent; | 93 | currentFile = playListCurrent; |
94 | } | 94 | } |
95 | if ( currentFile == NULL ) { | 95 | if ( currentFile == NULL ) { |
96 | QMessageBox::critical( 0, tr( "No file"), tr( "Error: There is no file selected" ) ); | 96 | QMessageBox::critical( 0, tr( "No file"), tr( "Error: There is no file selected" ) ); |
97 | mediaPlayerState->setPlaying( FALSE ); | 97 | mediaPlayerState->setPlaying( FALSE ); |
98 | return; | 98 | return; |
99 | } | 99 | } |
100 | if ( !QFile::exists( currentFile->file() ) ) { | 100 | |
101 | if ( ((currentFile->file()).left(4) != "http") && !QFile::exists( currentFile->file() ) ) { | ||
101 | QMessageBox::critical( 0, tr( "File not found"), tr( "The following file was not found: <i>" ) + currentFile->file() + "</i>" ); | 102 | QMessageBox::critical( 0, tr( "File not found"), tr( "The following file was not found: <i>" ) + currentFile->file() + "</i>" ); |
102 | mediaPlayerState->setPlaying( FALSE ); | 103 | mediaPlayerState->setPlaying( FALSE ); |
103 | return; | 104 | return; |
104 | } | 105 | } |
105 | 106 | ||
106 | if ( !mediaPlayerState->newDecoder( currentFile->file() ) ) { | 107 | if ( !mediaPlayerState->newDecoder( currentFile->file() ) ) { |
107 | QMessageBox::critical( 0, tr( "No decoder found"), tr( "Sorry, no appropriate decoders found for this file: <i>" ) + currentFile->file() + "</i>" ); | 108 | QMessageBox::critical( 0, tr( "No decoder found"), tr( "Sorry, no appropriate decoders found for this file: <i>" ) + currentFile->file() + "</i>" ); |
108 | mediaPlayerState->setPlaying( FALSE ); | 109 | mediaPlayerState->setPlaying( FALSE ); |
109 | return; | 110 | return; |
110 | } | 111 | } |
111 | 112 | ||
112 | if ( !loopControl->init( currentFile->file() ) ) { | 113 | if ( !loopControl->init( currentFile->file() ) ) { |
@@ -125,32 +126,32 @@ void MediaPlayer::setPlaying( bool play ) { | |||
125 | loopControl->play(); | 126 | loopControl->play(); |
126 | 127 | ||
127 | mediaPlayerState->setView( loopControl->hasVideo() ? 'v' : 'a' ); | 128 | mediaPlayerState->setView( loopControl->hasVideo() ? 'v' : 'a' ); |
128 | } | 129 | } |
129 | 130 | ||
130 | 131 | ||
131 | void MediaPlayer::prev() { | 132 | void MediaPlayer::prev() { |
132 | if ( playList->prev() ) | 133 | if ( playList->prev() ) |
133 | play(); | 134 | play(); |
134 | else if ( mediaPlayerState->looping() ) { | 135 | else if ( mediaPlayerState->looping() ) { |
135 | if ( playList->last() ) | 136 | if ( playList->last() ) |
136 | play(); | 137 | play(); |
137 | } else | 138 | } else |
138 | mediaPlayerState->setList(); | 139 | mediaPlayerState->setList(); |
139 | } | 140 | } |
140 | 141 | ||
141 | 142 | ||
142 | void MediaPlayer::next() { | 143 | void MediaPlayer::next() { |
143 | if ( playList->next() ) | 144 | if ( playList->next() ) |
144 | play(); | 145 | play(); |
145 | else if ( mediaPlayerState->looping() ) { | 146 | else if ( mediaPlayerState->looping() ) { |
146 | if ( playList->first() ) | 147 | if ( playList->first() ) |
147 | play(); | 148 | play(); |
148 | } else | 149 | } else |
149 | mediaPlayerState->setList(); | 150 | mediaPlayerState->setList(); |
150 | } | 151 | } |
151 | 152 | ||
152 | 153 | ||
153 | void MediaPlayer::startDecreasingVolume() { | 154 | void MediaPlayer::startDecreasingVolume() { |
154 | volumeDirection = -1; | 155 | volumeDirection = -1; |
155 | startTimer( 100 ); | 156 | startTimer( 100 ); |
156 | AudioDevice::decreaseVolume(); | 157 | AudioDevice::decreaseVolume(); |
@@ -161,18 +162,18 @@ void MediaPlayer::startIncreasingVolume() { | |||
161 | volumeDirection = +1; | 162 | volumeDirection = +1; |
162 | startTimer( 100 ); | 163 | startTimer( 100 ); |
163 | AudioDevice::increaseVolume(); | 164 | AudioDevice::increaseVolume(); |
164 | } | 165 | } |
165 | 166 | ||
166 | 167 | ||
167 | void MediaPlayer::stopChangingVolume() { | 168 | void MediaPlayer::stopChangingVolume() { |
168 | killTimers(); | 169 | killTimers(); |
169 | } | 170 | } |
170 | 171 | ||
171 | 172 | ||
172 | void MediaPlayer::timerEvent( QTimerEvent * ) { | 173 | void MediaPlayer::timerEvent( QTimerEvent * ) { |
173 | if ( volumeDirection == +1 ) | 174 | if ( volumeDirection == +1 ) |
174 | AudioDevice::increaseVolume(); | 175 | AudioDevice::increaseVolume(); |
175 | else if ( volumeDirection == -1 ) | 176 | else if ( volumeDirection == -1 ) |
176 | AudioDevice::decreaseVolume(); | 177 | AudioDevice::decreaseVolume(); |
177 | } | 178 | } |
178 | 179 | ||