author | simon <simon> | 2002-12-02 20:20:28 (UTC) |
---|---|---|
committer | simon <simon> | 2002-12-02 20:20:28 (UTC) |
commit | abeed050bedee6e2697ea417ed74ab621361da48 (patch) (side-by-side diff) | |
tree | f1abe40769dee855617c55db5fc37625c5518a27 /noncore/multimedia/opieplayer2/playlistwidgetgui.cpp | |
parent | e1ef407b16b652755f9c8eefce0f617ec3996998 (diff) | |
download | opie-abeed050bedee6e2697ea417ed74ab621361da48.zip opie-abeed050bedee6e2697ea417ed74ab621361da48.tar.gz opie-abeed050bedee6e2697ea417ed74ab621361da48.tar.bz2 |
- the playlist no more uses the mediaplayerstate as singleton
Diffstat (limited to 'noncore/multimedia/opieplayer2/playlistwidgetgui.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/playlistwidgetgui.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
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 @@ -56,16 +56,14 @@ #include <stdlib.h> #include "audiowidget.h" #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; setBackgroundMode( PaletteButton ); setToolBarsMovable( FALSE ); @@ -218,11 +216,11 @@ 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 } |