author | kergoth <kergoth> | 2003-08-09 16:24:58 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2003-08-09 16:24:58 (UTC) |
commit | e16d333ec2e8509fc665921ca106c25325bae9e0 (patch) (unidiff) | |
tree | 9e9068190a15bc9b2a52ab33b40881128f732c0e /noncore/multimedia/opieplayer2/mediaplayer.cpp | |
parent | 1c58d1407f9584fedcdae390a04e2b37e5853361 (diff) | |
download | opie-e16d333ec2e8509fc665921ca106c25325bae9e0.zip opie-e16d333ec2e8509fc665921ca106c25325bae9e0.tar.gz opie-e16d333ec2e8509fc665921ca106c25325bae9e0.tar.bz2 |
Merge from BRANCH_1_0
Diffstat (limited to 'noncore/multimedia/opieplayer2/mediaplayer.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/mediaplayer.cpp | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/noncore/multimedia/opieplayer2/mediaplayer.cpp b/noncore/multimedia/opieplayer2/mediaplayer.cpp index d4396d2..9f51006 100644 --- a/noncore/multimedia/opieplayer2/mediaplayer.cpp +++ b/noncore/multimedia/opieplayer2/mediaplayer.cpp | |||
@@ -1,15 +1,8 @@ | |||
1 | #include <qpe/qpeapplication.h> | 1 | #include <qpe/qpeapplication.h> |
2 | #include <qpe/qlibrary.h> | ||
3 | #include <qpe/resource.h> | ||
4 | #include <qpe/config.h> | 2 | #include <qpe/config.h> |
5 | #include <qpe/qcopenvelope_qws.h> | 3 | #include <qpe/qcopenvelope_qws.h> |
6 | #include <qfileinfo.h> | 4 | #include <qfileinfo.h> |
7 | 5 | ||
8 | #include <qmainwindow.h> | ||
9 | #include <qmessagebox.h> | ||
10 | #include <qwidgetstack.h> | ||
11 | #include <qfile.h> | ||
12 | |||
13 | #include "mediaplayer.h" | 6 | #include "mediaplayer.h" |
14 | #include "playlistwidget.h" | 7 | #include "playlistwidget.h" |
15 | #include "audiowidget.h" | 8 | #include "audiowidget.h" |
@@ -19,14 +12,12 @@ | |||
19 | 12 | ||
20 | #include "mediaplayerstate.h" | 13 | #include "mediaplayerstate.h" |
21 | 14 | ||
22 | // for setBacklight() | 15 | // for setBacklight() |
23 | #include <linux/fb.h> | 16 | #include <linux/fb.h> |
24 | #include <sys/file.h> | 17 | #include <sys/file.h> |
25 | #include <sys/ioctl.h> | 18 | #include <sys/ioctl.h> |
26 | 19 | ||
27 | 20 | ||
28 | |||
29 | |||
30 | #define FBIOBLANK 0x4611 | 21 | #define FBIOBLANK 0x4611 |
31 | 22 | ||
32 | MediaPlayer::MediaPlayer( PlayListWidget &_playList, MediaPlayerState &_mediaPlayerState, QObject *parent, const char *name ) | 23 | MediaPlayer::MediaPlayer( PlayListWidget &_playList, MediaPlayerState &_mediaPlayerState, QObject *parent, const char *name ) |