Diffstat (limited to 'noncore/multimedia/opieplayer2/mediaplayer.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/mediaplayer.cpp | 31 |
1 files changed, 22 insertions, 9 deletions
diff --git a/noncore/multimedia/opieplayer2/mediaplayer.cpp b/noncore/multimedia/opieplayer2/mediaplayer.cpp index 553e3c1..8da7f73 100644 --- a/noncore/multimedia/opieplayer2/mediaplayer.cpp +++ b/noncore/multimedia/opieplayer2/mediaplayer.cpp | |||
@@ -91,49 +91,62 @@ void MediaPlayer::setPlaying( bool play ) { | |||
91 | } | 91 | } |
92 | 92 | ||
93 | QString tickerText, time, fileName; | 93 | QString tickerText, time, fileName; |
94 | if( playList->whichList() == 0 ) { //check for filelist | 94 | if( playList->whichList() == 0 ) { //check for filelist |
95 | const DocLnk *playListCurrent = playList->current(); | 95 | const DocLnk *playListCurrent = playList->current(); |
96 | if ( playListCurrent != NULL ) { | 96 | if ( playListCurrent != NULL ) { |
97 | currentFile = playListCurrent; | 97 | currentFile = playListCurrent; |
98 | } | 98 | } |
99 | xineControl->play( currentFile->file() ); | 99 | xineControl->play( currentFile->file() ); |
100 | fileName = currentFile->name(); | 100 | fileName = currentFile->name(); |
101 | long seconds = mediaPlayerState->length();// | 101 | long seconds = mediaPlayerState->length();// |
102 | time.sprintf("%li:%02i", seconds/60, (int)seconds%60 ); | 102 | time.sprintf("%li:%02i", seconds/60, (int)seconds%60 ); |
103 | qDebug(time); | 103 | //qDebug(time); |
104 | 104 | ||
105 | } else { //if playing in file list.. play in a different way | 105 | } else { |
106 | //if playing in file list.. play in a different way | ||
106 | // random and looping settings enabled causes problems here, | 107 | // random and looping settings enabled causes problems here, |
107 | // since there is no selected file in the playlist, but a selected file in the file list, | 108 | // since there is no selected file in the playlist, but a selected file in the file list, |
108 | // so we remember and shutoff | 109 | // so we remember and shutoff |
109 | l = mediaPlayerState->looping(); | 110 | l = mediaPlayerState->looping(); |
110 | if(l) | 111 | if(l) { |
111 | mediaPlayerState->setLooping( false ); | 112 | mediaPlayerState->setLooping( false ); |
113 | } | ||
112 | r = mediaPlayerState->shuffled(); | 114 | r = mediaPlayerState->shuffled(); |
113 | mediaPlayerState->setShuffled(false); | 115 | mediaPlayerState->setShuffled(false); |
114 | 116 | ||
115 | fileName = playList->currentFileListPathName(); | 117 | fileName = playList->currentFileListPathName(); |
116 | xineControl->play( fileName); | 118 | xineControl->play( fileName); |
117 | long seconds = mediaPlayerState->length();// | 119 | long seconds = mediaPlayerState->length(); |
118 | time.sprintf("%li:%02i", seconds/60, (int)seconds%60 ); | 120 | time.sprintf("%li:%02i", seconds/60, (int)seconds%60 ); |
119 | qDebug(time); | 121 | //qDebug(time); |
120 | if( fileName.left(4) != "http" ) | 122 | if( fileName.left(4) != "http" ) { |
121 | fileName = QFileInfo( fileName).baseName(); | 123 | fileName = QFileInfo( fileName).baseName(); |
124 | } | ||
122 | 125 | ||
123 | } | 126 | } |
124 | if( fileName.left(4) == "http" ) | 127 | |
128 | if( fileName.left(4) == "http" ) { | ||
129 | if ( xineControl->getMetaInfo().isEmpty() ) { | ||
125 | tickerText= tr( " File: " ) + fileName; | 130 | tickerText= tr( " File: " ) + fileName; |
126 | else | 131 | } else { |
127 | tickerText = tr( " File: " ) + fileName + tr(", Length: ") + time; | 132 | tickerText = xineControl->getMetaInfo(); |
133 | } | ||
134 | } else { | ||
135 | if ( xineControl->getMetaInfo().isEmpty() ) { | ||
136 | tickerText = tr( " File: " ) + fileName + tr( ", Length: " ) + time + " "; | ||
137 | } else { | ||
138 | tickerText = xineControl->getMetaInfo() + " Length: " + time + " "; | ||
139 | } | ||
140 | } | ||
128 | audioUI->setTickerText( tickerText ); | 141 | audioUI->setTickerText( tickerText ); |
129 | } | 142 | } |
130 | 143 | ||
131 | 144 | ||
132 | void MediaPlayer::prev() { | 145 | void MediaPlayer::prev() { |
133 | if(playList->whichList() == 0) { //if using the playlist | 146 | if(playList->whichList() == 0) { //if using the playlist |
134 | if ( playList->prev() ) { | 147 | if ( playList->prev() ) { |
135 | play(); | 148 | play(); |
136 | } else if ( mediaPlayerState->looping() ) { | 149 | } else if ( mediaPlayerState->looping() ) { |
137 | if ( playList->last() ) { | 150 | if ( playList->last() ) { |
138 | play(); | 151 | play(); |
139 | } | 152 | } |