Diffstat (limited to 'noncore/multimedia/opieplayer2/mediaplayer.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/mediaplayer.cpp | 31 |
1 files changed, 9 insertions, 22 deletions
diff --git a/noncore/multimedia/opieplayer2/mediaplayer.cpp b/noncore/multimedia/opieplayer2/mediaplayer.cpp index 6a38adc..74ab2e3 100644 --- a/noncore/multimedia/opieplayer2/mediaplayer.cpp +++ b/noncore/multimedia/opieplayer2/mediaplayer.cpp | |||
@@ -30,13 +30,13 @@ extern PlayListWidget *playList; | |||
30 | extern MediaPlayerState *mediaPlayerState; | 30 | extern MediaPlayerState *mediaPlayerState; |
31 | 31 | ||
32 | 32 | ||
33 | #define FBIOBLANK 0x4611 | 33 | #define FBIOBLANK 0x4611 |
34 | 34 | ||
35 | MediaPlayer::MediaPlayer( QObject *parent, const char *name ) | 35 | MediaPlayer::MediaPlayer( QObject *parent, const char *name ) |
36 | : QObject( parent, name ), volumeDirection( 0 ), currentFile( NULL ) { | 36 | : QObject( parent, name ), volumeDirection( 0 ) { |
37 | 37 | ||
38 | fd=-1;fl=-1; | 38 | fd=-1;fl=-1; |
39 | playList->setCaption( tr( "OpiePlayer: Initializating" ) ); | 39 | playList->setCaption( tr( "OpiePlayer: Initializating" ) ); |
40 | 40 | ||
41 | qApp->processEvents(); | 41 | qApp->processEvents(); |
42 | // QPEApplication::grabKeyboard(); // EVIL | 42 | // QPEApplication::grabKeyboard(); // EVIL |
@@ -92,47 +92,34 @@ void MediaPlayer::setPlaying( bool play ) { | |||
92 | if ( mediaPlayerState->isPaused() ) { | 92 | if ( mediaPlayerState->isPaused() ) { |
93 | mediaPlayerState->setPaused( FALSE ); | 93 | mediaPlayerState->setPaused( FALSE ); |
94 | return; | 94 | return; |
95 | } | 95 | } |
96 | 96 | ||
97 | QString tickerText, time, fileName; | 97 | QString tickerText, time, fileName; |
98 | if( playList->currentTab() == PlayListWidget::CurrentPlayList ) { //check for filelist | 98 | if ( playList->currentTab() != PlayListWidget::CurrentPlayList ) { |
99 | const DocLnk *playListCurrent = playList->current(); | ||
100 | if ( playListCurrent != NULL ) { | ||
101 | currentFile = playListCurrent; | ||
102 | } | ||
103 | xineControl->play( currentFile->file() ); | ||
104 | fileName = currentFile->name(); | ||
105 | long seconds = mediaPlayerState->length();// | ||
106 | time.sprintf("%li:%02i", seconds/60, (int)seconds%60 ); | ||
107 | //qDebug(time); | ||
108 | |||
109 | } else { | ||
110 | //if playing in file list.. play in a different way | 99 | //if playing in file list.. play in a different way |
111 | // random and looping settings enabled causes problems here, | 100 | // random and looping settings enabled causes problems here, |
112 | // since there is no selected file in the playlist, but a selected file in the file list, | 101 | // since there is no selected file in the playlist, but a selected file in the file list, |
113 | // so we remember and shutoff | 102 | // so we remember and shutoff |
114 | l = mediaPlayerState->isLooping(); | 103 | l = mediaPlayerState->isLooping(); |
115 | if(l) { | 104 | if(l) { |
116 | mediaPlayerState->setLooping( false ); | 105 | mediaPlayerState->setLooping( false ); |
117 | } | 106 | } |
118 | r = mediaPlayerState->isShuffled(); | 107 | r = mediaPlayerState->isShuffled(); |
119 | mediaPlayerState->setShuffled( false ); | 108 | mediaPlayerState->setShuffled( false ); |
109 | } | ||
120 | 110 | ||
121 | fileName = playList->currentFileListPathName(); | 111 | PlayListWidget::Entry playListEntry = playList->currentEntry(); |
122 | xineControl->play( fileName ); | 112 | fileName = playListEntry.name; |
123 | long seconds = mediaPlayerState->length(); | 113 | xineControl->play( playListEntry.file ); |
124 | time.sprintf("%li:%02i", seconds/60, (int)seconds%60 ); | ||
125 | //qDebug(time); | ||
126 | if( fileName.left(4) != "http" ) { | ||
127 | fileName = QFileInfo( fileName ).baseName(); | ||
128 | } | ||
129 | 114 | ||
130 | } | 115 | long seconds = mediaPlayerState->length(); |
116 | time.sprintf("%li:%02i", seconds/60, (int)seconds%60 ); | ||
131 | 117 | ||
132 | if( fileName.left(4) == "http" ) { | 118 | if( fileName.left(4) == "http" ) { |
119 | fileName = QFileInfo( fileName ).baseName(); | ||
133 | if ( xineControl->getMetaInfo().isEmpty() ) { | 120 | if ( xineControl->getMetaInfo().isEmpty() ) { |
134 | tickerText = tr( " File: " ) + fileName; | 121 | tickerText = tr( " File: " ) + fileName; |
135 | } else { | 122 | } else { |
136 | tickerText = xineControl->getMetaInfo(); | 123 | tickerText = xineControl->getMetaInfo(); |
137 | } | 124 | } |
138 | } else { | 125 | } else { |