summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/main.cpp2
-rw-r--r--noncore/multimedia/opieplayer2/playlistwidget.cpp48
-rw-r--r--noncore/multimedia/opieplayer2/playlistwidget.h3
-rw-r--r--noncore/multimedia/opieplayer2/playlistwidgetgui.cpp12
-rw-r--r--noncore/multimedia/opieplayer2/playlistwidgetgui.h4
5 files changed, 35 insertions, 34 deletions
diff --git a/noncore/multimedia/opieplayer2/main.cpp b/noncore/multimedia/opieplayer2/main.cpp
index 24aba6c..02fdbf3 100644
--- a/noncore/multimedia/opieplayer2/main.cpp
+++ b/noncore/multimedia/opieplayer2/main.cpp
@@ -16,7 +16,7 @@ int main(int argc, char **argv) {
MediaPlayerState st( 0, "mediaPlayerState" );
mediaPlayerState = &st;
- PlayListWidget pl( 0, "playList" );
+ PlayListWidget pl( st, 0, "playList" );
playList = &pl;
pl.showMaximized();
AudioWidget aw( 0, "audioUI" );
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;
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" ),
"opieplayer2/add_to_playlist",
@@ -76,9 +76,9 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
d->tbPlay = new ToolButton( bar, tr( "Play" ), "opieplayer2/play",
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() ) );
(void)new MenuItem( pmPlayList, tr( "Add all audio files" ),
@@ -102,11 +102,11 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
this,SLOT( scanForVideo() ) );
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 );
(void)new ToolButton( vbox1, tr( "Move Up" ), "opieplayer2/up",
@@ -141,16 +141,16 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
this, SLOT( loadList( const DocLnk & ) ) );
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
videoScan=false;
@@ -172,9 +172,9 @@ 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();
}
@@ -404,8 +404,8 @@ void PlayListWidget::setDocument( const QString& fileref ) {
writeCurrentM3u();
d->setDocumentUsed = TRUE;
- mediaPlayerState->setPlaying( FALSE );
- mediaPlayerState->setPlaying( TRUE );
+ mediaPlayerState.setPlaying( FALSE );
+ mediaPlayerState.setPlaying( TRUE );
}
}
@@ -429,7 +429,7 @@ 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));
for ( int i = 0; i < j; i++ ) {
@@ -443,7 +443,7 @@ bool PlayListWidget::prev() {
return TRUE;
} else {
if ( !d->selectedFiles->prev() ) {
- if ( mediaPlayerState->isLooping() ) {
+ if ( mediaPlayerState.isLooping() ) {
return d->selectedFiles->last();
} else {
return FALSE;
@@ -456,11 +456,11 @@ 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 {
return FALSE;
@@ -530,8 +530,8 @@ 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();
}
@@ -614,7 +614,7 @@ void PlayListWidget::tabChanged(QWidget *) {
void PlayListWidget::btnPlay(bool b) {
// mediaPlayerState->setPlaying(false);
- mediaPlayerState->setPlaying(b);
+ mediaPlayerState.setPlaying(b);
insanityBool=FALSE;
}
@@ -1049,8 +1049,8 @@ void PlayListWidget::pmViewActivated(int index) {
switch(index) {
case -16:
{
- mediaPlayerState->toggleFullscreen();
- bool b=mediaPlayerState->isFullscreen();
+ mediaPlayerState.toggleFullscreen();
+ bool b=mediaPlayerState.isFullscreen();
pmView->setItemChecked( index, b);
Config cfg( "OpiePlayer" );
cfg.writeEntry( "FullScreen", b );
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.h b/noncore/multimedia/opieplayer2/playlistwidget.h
index fa2837a..3f52e63 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.h
+++ b/noncore/multimedia/opieplayer2/playlistwidget.h
@@ -69,7 +69,7 @@ public:
QString file;
};
- PlayListWidget( QWidget* parent=0, const char* name=0, WFlags fl=0 );
+ PlayListWidget( MediaPlayerState &mediaPlayerState, QWidget* parent=0, const char* name=0 );
~PlayListWidget();
DocLnkSet files;
DocLnkSet vFiles;
@@ -134,6 +134,7 @@ private slots:
void viewPressed( int, QListViewItem *, const QPoint&, int);
void playlistViewPressed( int, QListViewItem *, const QPoint&, int);
void playSelected();
+
};
#endif // PLAY_LIST_WIDGET_H
diff --git a/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp b/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp
index 8be7a2f..f47ddcc 100644
--- a/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp
@@ -59,10 +59,8 @@
#include "videowidget.h"
#include "mediaplayerstate.h"
-extern MediaPlayerState *mediaPlayerState;
-
-PlayListWidgetGui::PlayListWidgetGui( QWidget* parent, const char* name, WFlags fl )
- : QMainWindow( parent, name, fl ) {
+PlayListWidgetGui::PlayListWidgetGui( MediaPlayerState &_mediaPlayerState, QWidget* parent, const char* name )
+ : QMainWindow( parent, name ), mediaPlayerState( _mediaPlayerState ) {
d = new PlayListWidgetPrivate;
d->setDocumentUsed = FALSE;
@@ -221,8 +219,8 @@ void PlayListWidgetGui::setView( char view ) {
void PlayListWidgetGui::setActiveWindow() {
// qDebug("SETTING active window");
// When we get raised we need to ensure that it switches views
- MediaPlayerState::DisplayType origDisplayType = mediaPlayerState->displayType();
- mediaPlayerState->setDisplayType( MediaPlayerState::MediaSelection ); // invalidate
- mediaPlayerState->setDisplayType( origDisplayType ); // now switch back
+ MediaPlayerState::DisplayType origDisplayType = mediaPlayerState.displayType();
+ mediaPlayerState.setDisplayType( MediaPlayerState::MediaSelection ); // invalidate
+ mediaPlayerState.setDisplayType( origDisplayType ); // now switch back
}
diff --git a/noncore/multimedia/opieplayer2/playlistwidgetgui.h b/noncore/multimedia/opieplayer2/playlistwidgetgui.h
index 4eefb93..9b5252a 100644
--- a/noncore/multimedia/opieplayer2/playlistwidgetgui.h
+++ b/noncore/multimedia/opieplayer2/playlistwidgetgui.h
@@ -49,6 +49,7 @@
class PlayListWidgetPrivate;
class PlayListSelection;
+class MediaPlayerState;
class Config;
class QPEToolBar;
@@ -95,7 +96,7 @@ public:
class PlayListWidgetGui : public QMainWindow {
Q_OBJECT
public:
- PlayListWidgetGui( QWidget* parent=0, const char* name=0, WFlags fl=0 );
+ PlayListWidgetGui( MediaPlayerState &_mediaPlayerState, QWidget* parent=0, const char* name=0 );
~PlayListWidgetGui();
protected:
@@ -122,6 +123,7 @@ protected:
void setActiveWindow(); // need to handle this to show the right view
void setView( char );
+ MediaPlayerState &mediaPlayerState;
};
#endif