summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/mediaplayerstate.cpp3
-rw-r--r--noncore/multimedia/opieplayer2/mediaplayerstate.h1
-rw-r--r--noncore/multimedia/opieplayer2/playlistwidget.cpp92
3 files changed, 35 insertions, 61 deletions
diff --git a/noncore/multimedia/opieplayer2/mediaplayerstate.cpp b/noncore/multimedia/opieplayer2/mediaplayerstate.cpp
index 43040c2..586870c 100644
--- a/noncore/multimedia/opieplayer2/mediaplayerstate.cpp
+++ b/noncore/multimedia/opieplayer2/mediaplayerstate.cpp
@@ -66,9 +66,7 @@ void MediaPlayerState::readConfig( Config& cfg ) {
scaled = cfg.readBoolEntry( "Scaling" );
looping = cfg.readBoolEntry( "Looping" );
shuffled = cfg.readBoolEntry( "Shuffle" );
- usePlaylist = cfg.readBoolEntry( "UsePlayList" );
videoGamma = cfg.readNumEntry( "VideoGamma" );
- usePlaylist = TRUE;
playing = FALSE;
streaming = FALSE;
paused = FALSE;
@@ -84,7 +82,6 @@ void MediaPlayerState::writeConfig( Config& cfg ) const {
cfg.writeEntry( "Scaling", scaled );
cfg.writeEntry( "Looping", looping );
cfg.writeEntry( "Shuffle", shuffled );
- cfg.writeEntry( "UsePlayList", usePlaylist );
cfg.writeEntry( "VideoGamma", videoGamma );
}
diff --git a/noncore/multimedia/opieplayer2/mediaplayerstate.h b/noncore/multimedia/opieplayer2/mediaplayerstate.h
index 7a80ad8..fc4e6cb 100644
--- a/noncore/multimedia/opieplayer2/mediaplayerstate.h
+++ b/noncore/multimedia/opieplayer2/mediaplayerstate.h
@@ -56,7 +56,6 @@ public:
bool isScaled() const { return scaled; }
bool isLooping() const { return looping; }
bool isShuffled() const { return shuffled; }
- bool isUsingPlaylist() const { return usePlaylist; }
bool isPaused() const { return paused; }
bool isPlaying() const { return playing; }
bool isStopped() const { return stopped; }
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp
index 5b277cc..f53def6 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp
@@ -205,15 +205,11 @@ void PlayListWidget::writeDefaultPlaylist() {
void PlayListWidget::addToSelection( const DocLnk& lnk ) {
d->setDocumentUsed = FALSE;
- if ( mediaPlayerState->isUsingPlaylist() ) {
- if( QFileInfo( lnk.file() ).exists() ||
- lnk.file().left(4) == "http" ) {
- d->selectedFiles->addToSelection( lnk );
- }
-// writeCurrentM3u();
+ if( QFileInfo( lnk.file() ).exists() ||
+ lnk.file().left(4) == "http" ) {
+ d->selectedFiles->addToSelection( lnk );
}
- else
- mediaPlayerState->setPlaying( TRUE );
+// writeCurrentM3u();
}
@@ -422,78 +418,60 @@ void PlayListWidget::useSelectedDocument() {
const DocLnk *PlayListWidget::current() const { // this is fugly
assert( currentTab() == CurrentPlayList );
-// qDebug("playlist");
- if ( mediaPlayerState->isUsingPlaylist() )
- return d->selectedFiles->current();
-
- assert( false );
+ return d->selectedFiles->current();
}
bool PlayListWidget::prev() {
- if ( mediaPlayerState->isUsingPlaylist() ) {
- if ( mediaPlayerState->isShuffled() ) {
- const DocLnk *cur = current();
- int j = 1 + (int)(97.0 * rand() / (RAND_MAX + 1.0));
- for ( int i = 0; i < j; i++ ) {
- if ( !d->selectedFiles->next() )
- d->selectedFiles->first();
+ if ( mediaPlayerState->isShuffled() ) {
+ const DocLnk *cur = current();
+ int j = 1 + (int)(97.0 * rand() / (RAND_MAX + 1.0));
+ for ( int i = 0; i < j; i++ ) {
+ if ( !d->selectedFiles->next() )
+ d->selectedFiles->first();
+ }
+ if ( cur == current() )
+ if ( !d->selectedFiles->next() ) {
+ d->selectedFiles->first();
}
- if ( cur == current() )
- if ( !d->selectedFiles->next() ) {
- d->selectedFiles->first();
- }
- return TRUE;
- } else {
- if ( !d->selectedFiles->prev() ) {
- if ( mediaPlayerState->isLooping() ) {
- return d->selectedFiles->last();
- } else {
- return FALSE;
- }
+ return TRUE;
+ } else {
+ if ( !d->selectedFiles->prev() ) {
+ if ( mediaPlayerState->isLooping() ) {
+ return d->selectedFiles->last();
+ } else {
+ return FALSE;
}
- return TRUE;
}
- } else {
- return mediaPlayerState->isLooping();
- }
+ return TRUE;
+ }
}
bool PlayListWidget::next() {
//qDebug("<<<<<<<<<<<<next()");
- if ( mediaPlayerState->isUsingPlaylist() ) {
- if ( mediaPlayerState->isShuffled() ) {
- return prev();
- } else {
- if ( !d->selectedFiles->next() ) {
- if ( mediaPlayerState->isLooping() ) {
- return d->selectedFiles->first();
- } else {
- return FALSE;
- }
+ if ( mediaPlayerState->isShuffled() ) {
+ return prev();
+ } else {
+ if ( !d->selectedFiles->next() ) {
+ if ( mediaPlayerState->isLooping() ) {
+ return d->selectedFiles->first();
+ } else {
+ return FALSE;
}
- return TRUE;
}
- } else {
- return mediaPlayerState->isLooping();
+ return TRUE;
}
}
bool PlayListWidget::first() {
- if ( mediaPlayerState->isUsingPlaylist() )
- return d->selectedFiles->first();
- else
- return mediaPlayerState->isLooping();
+ return d->selectedFiles->first();
}
bool PlayListWidget::last() {
- if ( mediaPlayerState->isUsingPlaylist() )
- return d->selectedFiles->last();
- else
- return mediaPlayerState->isLooping();
+ return d->selectedFiles->last();
}