summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2002-04-20 23:36:33 (UTC)
committer llornkcor <llornkcor>2002-04-20 23:36:33 (UTC)
commit0e028a1857c7648bc329cbbf5cb35435be909ea6 (patch) (unidiff)
treeff44b5649f0e08369fe57f540c5c32ce075a6937
parentd616ece749006d720305632700228a41bcdd5c53 (diff)
downloadopie-0e028a1857c7648bc329cbbf5cb35435be909ea6.zip
opie-0e028a1857c7648bc329cbbf5cb35435be909ea6.tar.gz
opie-0e028a1857c7648bc329cbbf5cb35435be909ea6.tar.bz2
blah
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/multimedia/opieplayer/mediaplayer.cpp13
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
@@ -94,13 +94,14 @@ void MediaPlayer::setPlaying( bool play ) {
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() ) ) {
@@ -131,20 +132,20 @@ void MediaPlayer::setPlaying( bool play ) {
131void MediaPlayer::prev() { 132void 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
142void MediaPlayer::next() { 143void 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}
@@ -167,12 +168,12 @@ void MediaPlayer::startIncreasingVolume() {
167void MediaPlayer::stopChangingVolume() { 168void MediaPlayer::stopChangingVolume() {
168 killTimers(); 169 killTimers();
169} 170}
170 171
171 172
172void MediaPlayer::timerEvent( QTimerEvent * ) { 173void 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