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 @@ -65,6 +65,6 @@ QString audioMimes ="audio/mpeg;audio/x-wav;audio/x-ogg"; // no m3u's here please -PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) - : PlayListWidgetGui( parent, name, fl ) { +PlayListWidget::PlayListWidget( MediaPlayerState &mediaPlayerState, QWidget* parent, const char* name ) + : PlayListWidgetGui( mediaPlayerState, parent, name ) { d->tbAddToList = new ToolButton( bar, tr( "Add to Playlist" ), @@ -77,7 +77,7 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) this , SLOT( btnPlay( bool) ), TRUE ); d->tbShuffle = new ToolButton( bar, tr( "Randomize" ),"opieplayer2/shuffle", - mediaPlayerState, SLOT( setShuffled( bool ) ), TRUE ); + &mediaPlayerState, SLOT( setShuffled( bool ) ), TRUE ); d->tbLoop = new ToolButton( bar, tr( "Loop" ), "opieplayer2/loop", - mediaPlayerState, SLOT( setLooping( bool ) ), TRUE ); + &mediaPlayerState, SLOT( setLooping( bool ) ), TRUE ); (void)new MenuItem( pmPlayList, tr( "Clear List" ), this, SLOT( clearList() ) ); @@ -103,9 +103,9 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) pmView->insertItem( Resource::loadPixmap("fullscreen") , tr( "Full Screen"), - mediaPlayerState, SLOT( toggleFullscreen() ) ); + &mediaPlayerState, SLOT( toggleFullscreen() ) ); Config cfg( "OpiePlayer" ); bool b= cfg.readBoolEntry("FullScreen", 0); - mediaPlayerState->setFullscreen( b ); + mediaPlayerState.setFullscreen( b ); pmView->setItemChecked( -16, b ); @@ -142,14 +142,14 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) connect( tabWidget, SIGNAL ( currentChanged(QWidget*) ), this, SLOT( tabChanged( QWidget* ) ) ); - connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ), + connect( &mediaPlayerState, SIGNAL( playingToggled( bool ) ), d->tbPlay, SLOT( setOn( bool ) ) ); - connect( mediaPlayerState, SIGNAL( loopingToggled( bool ) ), + connect( &mediaPlayerState, SIGNAL( loopingToggled( bool ) ), d->tbLoop, SLOT( setOn( bool ) ) ); - connect( mediaPlayerState, SIGNAL( shuffledToggled( bool ) ), + connect( &mediaPlayerState, SIGNAL( shuffledToggled( bool ) ), d->tbShuffle, SLOT( setOn( bool ) ) ); connect( d->selectedFiles, SIGNAL( doubleClicked( QListViewItem *) ), this, SLOT( playIt( QListViewItem *) ) ); connect ( gammaSlider, SIGNAL( valueChanged( int ) ), - mediaPlayerState, SLOT( setVideoGamma( int ) ) ); + &mediaPlayerState, SLOT( setVideoGamma( int ) ) ); // see which skins are installed @@ -173,7 +173,7 @@ PlayListWidget::~PlayListWidget() { void PlayListWidget::initializeStates() { - d->tbPlay->setOn( mediaPlayerState->isPlaying() ); - d->tbLoop->setOn( mediaPlayerState->isLooping() ); - d->tbShuffle->setOn( mediaPlayerState->isShuffled() ); + d->tbPlay->setOn( mediaPlayerState.isPlaying() ); + d->tbLoop->setOn( mediaPlayerState.isLooping() ); + d->tbShuffle->setOn( mediaPlayerState.isShuffled() ); d->playListFrame->show(); } @@ -405,6 +405,6 @@ void PlayListWidget::setDocument( const QString& fileref ) { d->setDocumentUsed = TRUE; - mediaPlayerState->setPlaying( FALSE ); - mediaPlayerState->setPlaying( TRUE ); + mediaPlayerState.setPlaying( FALSE ); + mediaPlayerState.setPlaying( TRUE ); } } @@ -430,5 +430,5 @@ const DocLnk *PlayListWidget::current() const { // this is fugly bool PlayListWidget::prev() { - if ( mediaPlayerState->isShuffled() ) { + if ( mediaPlayerState.isShuffled() ) { const DocLnk *cur = current(); int j = 1 + (int)(97.0 * rand() / (RAND_MAX + 1.0)); @@ -444,5 +444,5 @@ bool PlayListWidget::prev() { } else { if ( !d->selectedFiles->prev() ) { - if ( mediaPlayerState->isLooping() ) { + if ( mediaPlayerState.isLooping() ) { return d->selectedFiles->last(); } else { @@ -457,9 +457,9 @@ bool PlayListWidget::prev() { bool PlayListWidget::next() { //qDebug("<<<<<<<<<<<<next()"); - if ( mediaPlayerState->isShuffled() ) { + if ( mediaPlayerState.isShuffled() ) { return prev(); } else { if ( !d->selectedFiles->next() ) { - if ( mediaPlayerState->isLooping() ) { + if ( mediaPlayerState.isLooping() ) { return d->selectedFiles->first(); } else { @@ -531,6 +531,6 @@ void PlayListWidget::removeSelected() { void PlayListWidget::playIt( QListViewItem *it) { if(!it) return; - mediaPlayerState->setPlaying(FALSE); - mediaPlayerState->setPlaying(TRUE); + mediaPlayerState.setPlaying(FALSE); + mediaPlayerState.setPlaying(TRUE); d->selectedFiles->unSelect(); } @@ -615,5 +615,5 @@ void PlayListWidget::tabChanged(QWidget *) { void PlayListWidget::btnPlay(bool b) { // mediaPlayerState->setPlaying(false); - mediaPlayerState->setPlaying(b); + mediaPlayerState.setPlaying(b); insanityBool=FALSE; } @@ -1050,6 +1050,6 @@ void PlayListWidget::pmViewActivated(int index) { case -16: { - mediaPlayerState->toggleFullscreen(); - bool b=mediaPlayerState->isFullscreen(); + mediaPlayerState.toggleFullscreen(); + bool b=mediaPlayerState.isFullscreen(); pmView->setItemChecked( index, b); Config cfg( "OpiePlayer" ); |