author | simon <simon> | 2002-12-02 23:31:57 (UTC) |
---|---|---|
committer | simon <simon> | 2002-12-02 23:31:57 (UTC) |
commit | 22e232bdb4bae5e28013a4d14bfda3c068827557 (patch) (unidiff) | |
tree | bcefd6ed54318bb075cd71455b82236606634cd4 /noncore/multimedia/opieplayer2/main.cpp | |
parent | 24a00c944aace8d7627c1eb0d7cc0ebf40731c57 (diff) | |
download | opie-22e232bdb4bae5e28013a4d14bfda3c068827557.zip opie-22e232bdb4bae5e28013a4d14bfda3c068827557.tar.gz opie-22e232bdb4bae5e28013a4d14bfda3c068827557.tar.bz2 |
- yay, last singleton gone. global playList variable is no more :)
Diffstat (limited to 'noncore/multimedia/opieplayer2/main.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/main.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/noncore/multimedia/opieplayer2/main.cpp b/noncore/multimedia/opieplayer2/main.cpp index 7fc7b94..ffc7cb6 100644 --- a/noncore/multimedia/opieplayer2/main.cpp +++ b/noncore/multimedia/opieplayer2/main.cpp | |||
@@ -4,16 +4,13 @@ | |||
4 | #include "playlistwidget.h" | 4 | #include "playlistwidget.h" |
5 | #include "mediaplayer.h" | 5 | #include "mediaplayer.h" |
6 | 6 | ||
7 | PlayListWidget *playList; | ||
8 | |||
9 | int main(int argc, char **argv) { | 7 | int main(int argc, char **argv) { |
10 | QPEApplication a(argc,argv); | 8 | QPEApplication a(argc,argv); |
11 | 9 | ||
12 | MediaPlayerState st( 0, "mediaPlayerState" ); | 10 | MediaPlayerState st( 0, "mediaPlayerState" ); |
13 | PlayListWidget pl( st, 0, "playList" ); | 11 | PlayListWidget pl( st, 0, "playList" ); |
14 | playList = &pl; | ||
15 | pl.showMaximized(); | 12 | pl.showMaximized(); |
16 | MediaPlayer mp( st, 0, "mediaPlayer" ); | 13 | MediaPlayer mp( pl, st, 0, "mediaPlayer" ); |
17 | QObject::connect( &pl, SIGNAL( skinSelected() ), | 14 | QObject::connect( &pl, SIGNAL( skinSelected() ), |
18 | &mp, SLOT( recreateAudioAndVideoWidgets() ) ); | 15 | &mp, SLOT( recreateAudioAndVideoWidgets() ) ); |
19 | 16 | ||