author | chicken <chicken> | 2003-11-17 19:28:21 (UTC) |
---|---|---|
committer | chicken <chicken> | 2003-11-17 19:28:21 (UTC) |
commit | 56f2b27abab0cbae7548b43be4509965b37e3a92 (patch) (unidiff) | |
tree | 210dc84c5dbb1a93aaa5ae358a38a3de3510f493 /noncore/multimedia/opieplayer2/main.cpp | |
parent | 8515000ba00ec666ee5e68fdd3c2786186093b93 (diff) | |
download | opie-56f2b27abab0cbae7548b43be4509965b37e3a92.zip opie-56f2b27abab0cbae7548b43be4509965b37e3a92.tar.gz opie-56f2b27abab0cbae7548b43be4509965b37e3a92.tar.bz2 |
merge branch with head
Diffstat (limited to 'noncore/multimedia/opieplayer2/main.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/main.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/noncore/multimedia/opieplayer2/main.cpp b/noncore/multimedia/opieplayer2/main.cpp index f87cee8..b0a22b2 100644 --- a/noncore/multimedia/opieplayer2/main.cpp +++ b/noncore/multimedia/opieplayer2/main.cpp | |||
@@ -1,22 +1,29 @@ | |||
1 | 1 | ||
2 | #include <qpe/qpeapplication.h> | 2 | #include <qpe/qpeapplication.h> |
3 | #include "mediaplayerstate.h" | 3 | #include "mediaplayerstate.h" |
4 | #include "playlistwidget.h" | 4 | #include "playlistwidget.h" |
5 | #include "mediaplayer.h" | 5 | #include "mediaplayer.h" |
6 | 6 | ||
7 | |||
8 | |||
9 | #include <opie/oapplicationfactory.h> | ||
10 | |||
11 | OPIE_EXPORT_APP( OApplicationFactory<PlayListWidget> ) | ||
12 | |||
13 | #if 0 | ||
7 | int main(int argc, char **argv) { | 14 | int main(int argc, char **argv) { |
8 | QPEApplication a(argc,argv); | 15 | QPEApplication a(argc,argv); |
9 | 16 | ||
10 | MediaPlayerState st( 0, "mediaPlayerState" ); | 17 | MediaPlayerState st( 0, "mediaPlayerState" ); |
11 | PlayListWidget pl( st, 0, "playList" ); | 18 | PlayListWidget pl( st, 0, "playList" ); |
12 | pl.showMaximized(); | 19 | pl.showMaximized(); |
13 | MediaPlayer mp( pl, st, 0, "mediaPlayer" ); | 20 | MediaPlayer mp( pl, st, 0, "mediaPlayer" ); |
14 | QObject::connect( &pl, SIGNAL( skinSelected() ), | 21 | QObject::connect( &pl, SIGNAL( skinSelected() ), |
15 | &mp, SLOT( reloadSkins() ) ); | 22 | &mp, SLOT( reloadSkins() ) ); |
16 | 23 | ||
17 | a.showMainDocumentWidget(&pl); | 24 | a.showMainDocumentWidget(&pl); |
18 | 25 | ||
19 | return a.exec(); | 26 | return a.exec(); |
20 | } | 27 | } |
21 | 28 | #endif | |
22 | 29 | ||