author | llornkcor <llornkcor> | 2002-02-25 01:35:47 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-02-25 01:35:47 (UTC) |
commit | f180c1a5e8fc889ff1fb390d5cc94cdbc5085046 (patch) (unidiff) | |
tree | 5e9ea6f1313f4c33d57fb266523c1cfbe0826756 /core/multimedia/opieplayer/main.cpp | |
parent | c0446b55fc32b7fdea9f58db06e40da703f5e8ff (diff) | |
download | opie-f180c1a5e8fc889ff1fb390d5cc94cdbc5085046.zip opie-f180c1a5e8fc889ff1fb390d5cc94cdbc5085046.tar.gz opie-f180c1a5e8fc889ff1fb390d5cc94cdbc5085046.tar.bz2 |
fucked up- no workie.. back out
Diffstat (limited to 'core/multimedia/opieplayer/main.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/multimedia/opieplayer/main.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/core/multimedia/opieplayer/main.cpp b/core/multimedia/opieplayer/main.cpp index 9f7ef73..720a1ca 100644 --- a/core/multimedia/opieplayer/main.cpp +++ b/core/multimedia/opieplayer/main.cpp | |||
@@ -1,10 +1,10 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of the Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
@@ -22,13 +22,12 @@ | |||
22 | #include "playlistwidget.h" | 22 | #include "playlistwidget.h" |
23 | #include "audiowidget.h" | 23 | #include "audiowidget.h" |
24 | #include "videowidget.h" | 24 | #include "videowidget.h" |
25 | #include "loopcontrol.h" | 25 | #include "loopcontrol.h" |
26 | #include "mediaplayer.h" | 26 | #include "mediaplayer.h" |
27 | 27 | ||
28 | |||
29 | MediaPlayerState *mediaPlayerState; | 28 | MediaPlayerState *mediaPlayerState; |
30 | PlayListWidget *playList; | 29 | PlayListWidget *playList; |
31 | AudioWidget *audioUI; | 30 | AudioWidget *audioUI; |
32 | VideoWidget *videoUI; | 31 | VideoWidget *videoUI; |
33 | LoopControl *loopControl; | 32 | LoopControl *loopControl; |
34 | 33 | ||
@@ -45,13 +44,13 @@ int main(int argc, char **argv) { | |||
45 | VideoWidget vw( 0, "videoUI" ); | 44 | VideoWidget vw( 0, "videoUI" ); |
46 | videoUI = &vw; | 45 | videoUI = &vw; |
47 | LoopControl lc( 0, "loopControl" ); | 46 | LoopControl lc( 0, "loopControl" ); |
48 | loopControl = &lc; | 47 | loopControl = &lc; |
49 | MediaPlayer mp( 0, "mediaPlayer" ); | 48 | MediaPlayer mp( 0, "mediaPlayer" ); |
50 | 49 | ||
51 | pl.setCaption( MediaPlayer::tr("Opie Player") ); | 50 | pl.setCaption( MediaPlayer::tr("Media Player") ); |
52 | a.showMainDocumentWidget(&pl); | 51 | a.showMainDocumentWidget(&pl); |
53 | 52 | ||
54 | return a.exec(); | 53 | return a.exec(); |
55 | } | 54 | } |
56 | 55 | ||
57 | 56 | ||