Diffstat (limited to 'noncore/multimedia/opieplayer2/playlistwidget.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/playlistwidget.cpp | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp index b08204e..7ba342b 100644 --- a/noncore/multimedia/opieplayer2/playlistwidget.cpp +++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp | |||
@@ -64,8 +64,8 @@ extern MediaPlayerState *mediaPlayerState; | |||
64 | QString audioMimes ="audio/mpeg;audio/x-wav;audio/x-ogg"; | 64 | QString audioMimes ="audio/mpeg;audio/x-wav;audio/x-ogg"; |
65 | // no m3u's here please | 65 | // no m3u's here please |
66 | 66 | ||
67 | PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) | 67 | PlayListWidget::PlayListWidget( MediaPlayerState &mediaPlayerState, QWidget* parent, const char* name ) |
68 | : PlayListWidgetGui( parent, name, fl ) { | 68 | : PlayListWidgetGui( mediaPlayerState, parent, name ) { |
69 | 69 | ||
70 | d->tbAddToList = new ToolButton( bar, tr( "Add to Playlist" ), | 70 | d->tbAddToList = new ToolButton( bar, tr( "Add to Playlist" ), |
71 | "opieplayer2/add_to_playlist", | 71 | "opieplayer2/add_to_playlist", |
@@ -76,9 +76,9 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) | |||
76 | d->tbPlay = new ToolButton( bar, tr( "Play" ), "opieplayer2/play", | 76 | d->tbPlay = new ToolButton( bar, tr( "Play" ), "opieplayer2/play", |
77 | this , SLOT( btnPlay( bool) ), TRUE ); | 77 | this , SLOT( btnPlay( bool) ), TRUE ); |
78 | d->tbShuffle = new ToolButton( bar, tr( "Randomize" ),"opieplayer2/shuffle", | 78 | d->tbShuffle = new ToolButton( bar, tr( "Randomize" ),"opieplayer2/shuffle", |
79 | mediaPlayerState, SLOT( setShuffled( bool ) ), TRUE ); | 79 | &mediaPlayerState, SLOT( setShuffled( bool ) ), TRUE ); |
80 | d->tbLoop = new ToolButton( bar, tr( "Loop" ), "opieplayer2/loop", | 80 | d->tbLoop = new ToolButton( bar, tr( "Loop" ), "opieplayer2/loop", |
81 | mediaPlayerState, SLOT( setLooping( bool ) ), TRUE ); | 81 | &mediaPlayerState, SLOT( setLooping( bool ) ), TRUE ); |
82 | 82 | ||
83 | (void)new MenuItem( pmPlayList, tr( "Clear List" ), this, SLOT( clearList() ) ); | 83 | (void)new MenuItem( pmPlayList, tr( "Clear List" ), this, SLOT( clearList() ) ); |
84 | (void)new MenuItem( pmPlayList, tr( "Add all audio files" ), | 84 | (void)new MenuItem( pmPlayList, tr( "Add all audio files" ), |
@@ -102,11 +102,11 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) | |||
102 | this,SLOT( scanForVideo() ) ); | 102 | this,SLOT( scanForVideo() ) ); |
103 | 103 | ||
104 | pmView->insertItem( Resource::loadPixmap("fullscreen") , tr( "Full Screen"), | 104 | pmView->insertItem( Resource::loadPixmap("fullscreen") , tr( "Full Screen"), |
105 | mediaPlayerState, SLOT( toggleFullscreen() ) ); | 105 | &mediaPlayerState, SLOT( toggleFullscreen() ) ); |
106 | 106 | ||
107 | Config cfg( "OpiePlayer" ); | 107 | Config cfg( "OpiePlayer" ); |
108 | bool b= cfg.readBoolEntry("FullScreen", 0); | 108 | bool b= cfg.readBoolEntry("FullScreen", 0); |
109 | mediaPlayerState->setFullscreen( b ); | 109 | mediaPlayerState.setFullscreen( b ); |
110 | pmView->setItemChecked( -16, b ); | 110 | pmView->setItemChecked( -16, b ); |
111 | 111 | ||
112 | (void)new ToolButton( vbox1, tr( "Move Up" ), "opieplayer2/up", | 112 | (void)new ToolButton( vbox1, tr( "Move Up" ), "opieplayer2/up", |
@@ -141,16 +141,16 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) | |||
141 | this, SLOT( loadList( const DocLnk & ) ) ); | 141 | this, SLOT( loadList( const DocLnk & ) ) ); |
142 | connect( tabWidget, SIGNAL ( currentChanged(QWidget*) ), | 142 | connect( tabWidget, SIGNAL ( currentChanged(QWidget*) ), |
143 | this, SLOT( tabChanged( QWidget* ) ) ); | 143 | this, SLOT( tabChanged( QWidget* ) ) ); |
144 | connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ), | 144 | connect( &mediaPlayerState, SIGNAL( playingToggled( bool ) ), |
145 | d->tbPlay, SLOT( setOn( bool ) ) ); | 145 | d->tbPlay, SLOT( setOn( bool ) ) ); |
146 | connect( mediaPlayerState, SIGNAL( loopingToggled( bool ) ), | 146 | connect( &mediaPlayerState, SIGNAL( loopingToggled( bool ) ), |
147 | d->tbLoop, SLOT( setOn( bool ) ) ); | 147 | d->tbLoop, SLOT( setOn( bool ) ) ); |
148 | connect( mediaPlayerState, SIGNAL( shuffledToggled( bool ) ), | 148 | connect( &mediaPlayerState, SIGNAL( shuffledToggled( bool ) ), |
149 | d->tbShuffle, SLOT( setOn( bool ) ) ); | 149 | d->tbShuffle, SLOT( setOn( bool ) ) ); |
150 | connect( d->selectedFiles, SIGNAL( doubleClicked( QListViewItem *) ), | 150 | connect( d->selectedFiles, SIGNAL( doubleClicked( QListViewItem *) ), |
151 | this, SLOT( playIt( QListViewItem *) ) ); | 151 | this, SLOT( playIt( QListViewItem *) ) ); |
152 | connect ( gammaSlider, SIGNAL( valueChanged( int ) ), | 152 | connect ( gammaSlider, SIGNAL( valueChanged( int ) ), |
153 | mediaPlayerState, SLOT( setVideoGamma( int ) ) ); | 153 | &mediaPlayerState, SLOT( setVideoGamma( int ) ) ); |
154 | 154 | ||
155 | // see which skins are installed | 155 | // see which skins are installed |
156 | videoScan=false; | 156 | videoScan=false; |
@@ -172,9 +172,9 @@ PlayListWidget::~PlayListWidget() { | |||
172 | 172 | ||
173 | 173 | ||
174 | void PlayListWidget::initializeStates() { | 174 | void PlayListWidget::initializeStates() { |
175 | d->tbPlay->setOn( mediaPlayerState->isPlaying() ); | 175 | d->tbPlay->setOn( mediaPlayerState.isPlaying() ); |
176 | d->tbLoop->setOn( mediaPlayerState->isLooping() ); | 176 | d->tbLoop->setOn( mediaPlayerState.isLooping() ); |
177 | d->tbShuffle->setOn( mediaPlayerState->isShuffled() ); | 177 | d->tbShuffle->setOn( mediaPlayerState.isShuffled() ); |
178 | d->playListFrame->show(); | 178 | d->playListFrame->show(); |
179 | } | 179 | } |
180 | 180 | ||
@@ -404,8 +404,8 @@ void PlayListWidget::setDocument( const QString& fileref ) { | |||
404 | writeCurrentM3u(); | 404 | writeCurrentM3u(); |
405 | 405 | ||
406 | d->setDocumentUsed = TRUE; | 406 | d->setDocumentUsed = TRUE; |
407 | mediaPlayerState->setPlaying( FALSE ); | 407 | mediaPlayerState.setPlaying( FALSE ); |
408 | mediaPlayerState->setPlaying( TRUE ); | 408 | mediaPlayerState.setPlaying( TRUE ); |
409 | } | 409 | } |
410 | } | 410 | } |
411 | 411 | ||
@@ -429,7 +429,7 @@ const DocLnk *PlayListWidget::current() const { // this is fugly | |||
429 | 429 | ||
430 | 430 | ||
431 | bool PlayListWidget::prev() { | 431 | bool PlayListWidget::prev() { |
432 | if ( mediaPlayerState->isShuffled() ) { | 432 | if ( mediaPlayerState.isShuffled() ) { |
433 | const DocLnk *cur = current(); | 433 | const DocLnk *cur = current(); |
434 | int j = 1 + (int)(97.0 * rand() / (RAND_MAX + 1.0)); | 434 | int j = 1 + (int)(97.0 * rand() / (RAND_MAX + 1.0)); |
435 | for ( int i = 0; i < j; i++ ) { | 435 | for ( int i = 0; i < j; i++ ) { |
@@ -443,7 +443,7 @@ bool PlayListWidget::prev() { | |||
443 | return TRUE; | 443 | return TRUE; |
444 | } else { | 444 | } else { |
445 | if ( !d->selectedFiles->prev() ) { | 445 | if ( !d->selectedFiles->prev() ) { |
446 | if ( mediaPlayerState->isLooping() ) { | 446 | if ( mediaPlayerState.isLooping() ) { |
447 | return d->selectedFiles->last(); | 447 | return d->selectedFiles->last(); |
448 | } else { | 448 | } else { |
449 | return FALSE; | 449 | return FALSE; |
@@ -456,11 +456,11 @@ bool PlayListWidget::prev() { | |||
456 | 456 | ||
457 | bool PlayListWidget::next() { | 457 | bool PlayListWidget::next() { |
458 | //qDebug("<<<<<<<<<<<<next()"); | 458 | //qDebug("<<<<<<<<<<<<next()"); |
459 | if ( mediaPlayerState->isShuffled() ) { | 459 | if ( mediaPlayerState.isShuffled() ) { |
460 | return prev(); | 460 | return prev(); |
461 | } else { | 461 | } else { |
462 | if ( !d->selectedFiles->next() ) { | 462 | if ( !d->selectedFiles->next() ) { |
463 | if ( mediaPlayerState->isLooping() ) { | 463 | if ( mediaPlayerState.isLooping() ) { |
464 | return d->selectedFiles->first(); | 464 | return d->selectedFiles->first(); |
465 | } else { | 465 | } else { |
466 | return FALSE; | 466 | return FALSE; |
@@ -530,8 +530,8 @@ void PlayListWidget::removeSelected() { | |||
530 | 530 | ||
531 | void PlayListWidget::playIt( QListViewItem *it) { | 531 | void PlayListWidget::playIt( QListViewItem *it) { |
532 | if(!it) return; | 532 | if(!it) return; |
533 | mediaPlayerState->setPlaying(FALSE); | 533 | mediaPlayerState.setPlaying(FALSE); |
534 | mediaPlayerState->setPlaying(TRUE); | 534 | mediaPlayerState.setPlaying(TRUE); |
535 | d->selectedFiles->unSelect(); | 535 | d->selectedFiles->unSelect(); |
536 | } | 536 | } |
537 | 537 | ||
@@ -614,7 +614,7 @@ void PlayListWidget::tabChanged(QWidget *) { | |||
614 | 614 | ||
615 | void PlayListWidget::btnPlay(bool b) { | 615 | void PlayListWidget::btnPlay(bool b) { |
616 | // mediaPlayerState->setPlaying(false); | 616 | // mediaPlayerState->setPlaying(false); |
617 | mediaPlayerState->setPlaying(b); | 617 | mediaPlayerState.setPlaying(b); |
618 | insanityBool=FALSE; | 618 | insanityBool=FALSE; |
619 | } | 619 | } |
620 | 620 | ||
@@ -1049,8 +1049,8 @@ void PlayListWidget::pmViewActivated(int index) { | |||
1049 | switch(index) { | 1049 | switch(index) { |
1050 | case -16: | 1050 | case -16: |
1051 | { | 1051 | { |
1052 | mediaPlayerState->toggleFullscreen(); | 1052 | mediaPlayerState.toggleFullscreen(); |
1053 | bool b=mediaPlayerState->isFullscreen(); | 1053 | bool b=mediaPlayerState.isFullscreen(); |
1054 | pmView->setItemChecked( index, b); | 1054 | pmView->setItemChecked( index, b); |
1055 | Config cfg( "OpiePlayer" ); | 1055 | Config cfg( "OpiePlayer" ); |
1056 | cfg.writeEntry( "FullScreen", b ); | 1056 | cfg.writeEntry( "FullScreen", b ); |