author | simon <simon> | 2002-12-02 20:20:28 (UTC) |
---|---|---|
committer | simon <simon> | 2002-12-02 20:20:28 (UTC) |
commit | abeed050bedee6e2697ea417ed74ab621361da48 (patch) (unidiff) | |
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 | |||
@@ -59,10 +59,8 @@ | |||
59 | #include "videowidget.h" | 59 | #include "videowidget.h" |
60 | #include "mediaplayerstate.h" | 60 | #include "mediaplayerstate.h" |
61 | 61 | ||
62 | extern MediaPlayerState *mediaPlayerState; | 62 | PlayListWidgetGui::PlayListWidgetGui( MediaPlayerState &_mediaPlayerState, QWidget* parent, const char* name ) |
63 | 63 | : QMainWindow( parent, name ), mediaPlayerState( _mediaPlayerState ) { | |
64 | PlayListWidgetGui::PlayListWidgetGui( QWidget* parent, const char* name, WFlags fl ) | ||
65 | : QMainWindow( parent, name, fl ) { | ||
66 | 64 | ||
67 | d = new PlayListWidgetPrivate; | 65 | d = new PlayListWidgetPrivate; |
68 | d->setDocumentUsed = FALSE; | 66 | d->setDocumentUsed = FALSE; |
@@ -221,8 +219,8 @@ void PlayListWidgetGui::setView( char view ) { | |||
221 | void PlayListWidgetGui::setActiveWindow() { | 219 | void PlayListWidgetGui::setActiveWindow() { |
222 | // qDebug("SETTING active window"); | 220 | // qDebug("SETTING active window"); |
223 | // When we get raised we need to ensure that it switches views | 221 | // When we get raised we need to ensure that it switches views |
224 | MediaPlayerState::DisplayType origDisplayType = mediaPlayerState->displayType(); | 222 | MediaPlayerState::DisplayType origDisplayType = mediaPlayerState.displayType(); |
225 | mediaPlayerState->setDisplayType( MediaPlayerState::MediaSelection ); // invalidate | 223 | mediaPlayerState.setDisplayType( MediaPlayerState::MediaSelection ); // invalidate |
226 | mediaPlayerState->setDisplayType( origDisplayType ); // now switch back | 224 | mediaPlayerState.setDisplayType( origDisplayType ); // now switch back |
227 | } | 225 | } |
228 | 226 | ||