summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/playlistwidget.cpp7
-rw-r--r--noncore/multimedia/opieplayer2/playlistwidgetgui.cpp1
-rw-r--r--noncore/multimedia/opieplayer2/playlistwidgetgui.h1
3 files changed, 1 insertions, 8 deletions
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp
index 55b66ab..6355bec 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp
@@ -164,19 +164,16 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
164 164
165 cfg.setGroup("PlayList"); 165 cfg.setGroup("PlayList");
166 QString currentPlaylist = cfg.readEntry( "CurrentPlaylist", "default"); 166 QString currentPlaylist = cfg.readEntry( "CurrentPlaylist", "default");
167 loadList(DocLnk( currentPlaylist ) ); 167 loadList(DocLnk( currentPlaylist ) );
168} 168}
169 169
170 170
171PlayListWidget::~PlayListWidget() { 171PlayListWidget::~PlayListWidget() {
172 if ( d->current ) {
173 delete d->current;
174 }
175 delete d; 172 delete d;
176} 173}
177 174
178 175
179void PlayListWidget::initializeStates() { 176void PlayListWidget::initializeStates() {
180 d->tbPlay->setOn( mediaPlayerState->isPlaying() ); 177 d->tbPlay->setOn( mediaPlayerState->isPlaying() );
181 d->tbLoop->setOn( mediaPlayerState->isLooping() ); 178 d->tbLoop->setOn( mediaPlayerState->isLooping() );
182 d->tbShuffle->setOn( mediaPlayerState->isShuffled() ); 179 d->tbShuffle->setOn( mediaPlayerState->isShuffled() );
@@ -423,20 +420,18 @@ void PlayListWidget::useSelectedDocument() {
423 d->setDocumentUsed = FALSE; 420 d->setDocumentUsed = FALSE;
424} 421}
425 422
426 423
427const DocLnk *PlayListWidget::current() const { // this is fugly 424const DocLnk *PlayListWidget::current() const { // this is fugly
428 assert( currentTab() == CurrentPlayList ); 425 assert( currentTab() == CurrentPlayList );
429 426
430// qDebug("playlist"); 427// qDebug("playlist");
431 if ( mediaPlayerState->isUsingPlaylist() ) { 428 if ( mediaPlayerState->isUsingPlaylist() )
432 return d->selectedFiles->current(); 429 return d->selectedFiles->current();
433 } else if ( d->setDocumentUsed && d->current )
434 return d->current;
435 430
436 assert( false ); 431 assert( false );
437} 432}
438 433
439 434
440bool PlayListWidget::prev() { 435bool PlayListWidget::prev() {
441 if ( mediaPlayerState->isUsingPlaylist() ) { 436 if ( mediaPlayerState->isUsingPlaylist() ) {
442 if ( mediaPlayerState->isShuffled() ) { 437 if ( mediaPlayerState->isShuffled() ) {
diff --git a/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp b/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp
index a217c94..db7c979 100644
--- a/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp
@@ -61,17 +61,16 @@
61 61
62extern MediaPlayerState *mediaPlayerState; 62extern MediaPlayerState *mediaPlayerState;
63 63
64PlayListWidgetGui::PlayListWidgetGui( QWidget* parent, const char* name, WFlags fl ) 64PlayListWidgetGui::PlayListWidgetGui( QWidget* parent, const char* name, WFlags fl )
65 : QMainWindow( parent, name, fl ) { 65 : QMainWindow( parent, name, fl ) {
66 66
67 d = new PlayListWidgetPrivate; 67 d = new PlayListWidgetPrivate;
68 d->setDocumentUsed = FALSE; 68 d->setDocumentUsed = FALSE;
69 d->current = NULL;
70 69
71 setBackgroundMode( PaletteButton ); 70 setBackgroundMode( PaletteButton );
72 setToolBarsMovable( FALSE ); 71 setToolBarsMovable( FALSE );
73 72
74 // Create Toolbar 73 // Create Toolbar
75 QPEToolBar *toolbar = new QPEToolBar( this ); 74 QPEToolBar *toolbar = new QPEToolBar( this );
76 toolbar->setHorizontalStretchable( TRUE ); 75 toolbar->setHorizontalStretchable( TRUE );
77 76
diff --git a/noncore/multimedia/opieplayer2/playlistwidgetgui.h b/noncore/multimedia/opieplayer2/playlistwidgetgui.h
index 6c35771..4eefb93 100644
--- a/noncore/multimedia/opieplayer2/playlistwidgetgui.h
+++ b/noncore/multimedia/opieplayer2/playlistwidgetgui.h
@@ -59,17 +59,16 @@ class 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 PlayListSelection *selectedFiles; 65 PlayListSelection *selectedFiles;
66 bool setDocumentUsed; 66 bool setDocumentUsed;
67 DocLnk *current;
68}; 67};
69 68
70 69
71class ToolButton : public QToolButton { 70class ToolButton : public QToolButton {
72public: 71public:
73 ToolButton( QWidget *parent, const char *name, const QString& icon, QObject *handler, const QString& slot, bool t = FALSE ) 72 ToolButton( QWidget *parent, const char *name, const QString& icon, QObject *handler, const QString& slot, bool t = FALSE )
74 : QToolButton( parent, name ) { 73 : QToolButton( parent, name ) {
75 setTextLabel( name ); 74 setTextLabel( name );