summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/playlistwidget.cpp7
-rw-r--r--noncore/multimedia/opieplayer2/playlistwidgetgui.h1
2 files changed, 3 insertions, 5 deletions
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp
index b04fe8d..55b66ab 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp
@@ -421,29 +421,28 @@ void PlayListWidget::setDocument( const QString& fileref ) {
421 421
422void PlayListWidget::useSelectedDocument() { 422void PlayListWidget::useSelectedDocument() {
423 d->setDocumentUsed = FALSE; 423 d->setDocumentUsed = FALSE;
424} 424}
425 425
426 426
427const DocLnk *PlayListWidget::current() const { // this is fugly 427const DocLnk *PlayListWidget::current() const { // this is fugly
428 assert( currentTab() == CurrentPlayList ); 428 assert( currentTab() == CurrentPlayList );
429 429
430// qDebug("playlist"); 430// qDebug("playlist");
431 if ( mediaPlayerState->isUsingPlaylist() ) { 431 if ( mediaPlayerState->isUsingPlaylist() ) {
432 return d->selectedFiles->current(); 432 return d->selectedFiles->current();
433 } else if ( d->setDocumentUsed && d->current ) { 433 } else if ( d->setDocumentUsed && d->current )
434 return d->current; 434 return d->current;
435 } else { 435
436 return &(d->files->selectedDocument()); 436 assert( false );
437 }
438} 437}
439 438
440 439
441bool PlayListWidget::prev() { 440bool PlayListWidget::prev() {
442 if ( mediaPlayerState->isUsingPlaylist() ) { 441 if ( mediaPlayerState->isUsingPlaylist() ) {
443 if ( mediaPlayerState->isShuffled() ) { 442 if ( mediaPlayerState->isShuffled() ) {
444 const DocLnk *cur = current(); 443 const DocLnk *cur = current();
445 int j = 1 + (int)(97.0 * rand() / (RAND_MAX + 1.0)); 444 int j = 1 + (int)(97.0 * rand() / (RAND_MAX + 1.0));
446 for ( int i = 0; i < j; i++ ) { 445 for ( int i = 0; i < j; i++ ) {
447 if ( !d->selectedFiles->next() ) 446 if ( !d->selectedFiles->next() )
448 d->selectedFiles->first(); 447 d->selectedFiles->first();
449 } 448 }
diff --git a/noncore/multimedia/opieplayer2/playlistwidgetgui.h b/noncore/multimedia/opieplayer2/playlistwidgetgui.h
index 61fd40d..6c35771 100644
--- a/noncore/multimedia/opieplayer2/playlistwidgetgui.h
+++ b/noncore/multimedia/opieplayer2/playlistwidgetgui.h
@@ -53,25 +53,24 @@ class PlayListSelection;
53class Config; 53class Config;
54class QPEToolBar; 54class QPEToolBar;
55class QListViewItem; 55class QListViewItem;
56class QListView; 56class QListView;
57class QPoint; 57class QPoint;
58class QAction; 58class QAction;
59class QLabel; 59class QLabel;
60 60
61class PlayListWidgetPrivate { 61class PlayListWidgetPrivate {
62public: 62public:
63 QToolButton *tbPlay, *tbFull, *tbLoop, *tbShuffle, *tbAddToList, *tbRemoveFromList, *tbMoveUp, *tbMoveDown, *tbRemove; 63 QToolButton *tbPlay, *tbFull, *tbLoop, *tbShuffle, *tbAddToList, *tbRemoveFromList, *tbMoveUp, *tbMoveDown, *tbRemove;
64 QFrame *playListFrame; 64 QFrame *playListFrame;
65 FileSelector *files;
66 PlayListSelection *selectedFiles; 65 PlayListSelection *selectedFiles;
67 bool setDocumentUsed; 66 bool setDocumentUsed;
68 DocLnk *current; 67 DocLnk *current;
69}; 68};
70 69
71 70
72class ToolButton : public QToolButton { 71class ToolButton : public QToolButton {
73public: 72public:
74 ToolButton( QWidget *parent, const char *name, const QString& icon, QObject *handler, const QString& slot, bool t = FALSE ) 73 ToolButton( QWidget *parent, const char *name, const QString& icon, QObject *handler, const QString& slot, bool t = FALSE )
75 : QToolButton( parent, name ) { 74 : QToolButton( parent, name ) {
76 setTextLabel( name ); 75 setTextLabel( name );
77 setPixmap( Resource::loadPixmap( icon ) ); 76 setPixmap( Resource::loadPixmap( icon ) );