author | kergoth <kergoth> | 2003-08-09 18:00:34 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2003-08-09 18:00:34 (UTC) |
commit | 7670c56f5952f7772e8fbab65e9233274e2a0564 (patch) (unidiff) | |
tree | 10932f8976c76755b8edf2ab9397a6e53d95a13c /core/multimedia/opieplayer/main.cpp | |
parent | 1ab4ca95e4d2cf24d32b38c9031cb6076351e730 (diff) | |
download | opie-7670c56f5952f7772e8fbab65e9233274e2a0564.zip opie-7670c56f5952f7772e8fbab65e9233274e2a0564.tar.gz opie-7670c56f5952f7772e8fbab65e9233274e2a0564.tar.bz2 |
Merge from BRANCH_1_0
Diffstat (limited to 'core/multimedia/opieplayer/main.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/multimedia/opieplayer/main.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/core/multimedia/opieplayer/main.cpp b/core/multimedia/opieplayer/main.cpp index 18cd7a6..32dc1d5 100644 --- a/core/multimedia/opieplayer/main.cpp +++ b/core/multimedia/opieplayer/main.cpp | |||
@@ -8,25 +8,24 @@ | |||
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 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #include <qpe/qpeapplication.h> | ||
21 | #include "mediaplayerstate.h" | 20 | #include "mediaplayerstate.h" |
22 | #include "playlistwidget.h" | 21 | #include "playlistwidget.h" |
23 | #include "audiowidget.h" | 22 | #include "audiowidget.h" |
24 | #include "videowidget.h" | 23 | #include "videowidget.h" |
25 | #include "loopcontrol.h" | 24 | #include "loopcontrol.h" |
26 | #include "mediaplayer.h" | 25 | #include "mediaplayer.h" |
27 | 26 | ||
28 | MediaPlayerState *mediaPlayerState; | 27 | MediaPlayerState *mediaPlayerState; |
29 | PlayListWidget *playList; | 28 | PlayListWidget *playList; |
30 | AudioWidget *audioUI; | 29 | AudioWidget *audioUI; |
31 | VideoWidget *videoUI; | 30 | VideoWidget *videoUI; |
32 | LoopControl *loopControl; | 31 | LoopControl *loopControl; |