summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/audiowidget.cpp5
-rw-r--r--noncore/multimedia/opieplayer2/lib.cpp16
-rw-r--r--noncore/multimedia/opieplayer2/mediaplayer.cpp14
-rw-r--r--noncore/multimedia/opieplayer2/om3u.cpp4
-rw-r--r--noncore/multimedia/opieplayer2/playlistselection.cpp9
-rw-r--r--noncore/multimedia/opieplayer2/playlistwidget.cpp19
-rw-r--r--noncore/multimedia/opieplayer2/xinecontrol.cpp12
7 files changed, 50 insertions, 29 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp
index 36def67..95a0f45 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.cpp
+++ b/noncore/multimedia/opieplayer2/audiowidget.cpp
@@ -34,9 +34,12 @@
34 34
35#include "audiowidget.h" 35#include "audiowidget.h"
36 36
37/* OPIE */
38#include <opie2/odebug.h>
37#include <qpe/qpeapplication.h> 39#include <qpe/qpeapplication.h>
38 40using namespace Opie::Core;
39using namespace Opie::Ui; 41using namespace Opie::Ui;
42
40namespace 43namespace
41{ 44{
42 45
diff --git a/noncore/multimedia/opieplayer2/lib.cpp b/noncore/multimedia/opieplayer2/lib.cpp
index 5c24dbe..1ab5c96 100644
--- a/noncore/multimedia/opieplayer2/lib.cpp
+++ b/noncore/multimedia/opieplayer2/lib.cpp
@@ -31,20 +31,22 @@
31 31
32*/ 32*/
33 33
34#include "xinevideowidget.h"
35#include "frame.h"
36#include "lib.h"
34 37
35#include <qtextstream.h> 38/* OPIE */
39#include <opie2/odebug.h>
40using namespace Opie::Core;
36 41
42/* QT */
43#include <qtextstream.h>
37#include <qdir.h> 44#include <qdir.h>
38
39#include <qgfx_qws.h> 45#include <qgfx_qws.h>
40 46
47/* STD */
41#include <assert.h> 48#include <assert.h>
42 49
43#include "xinevideowidget.h"
44#include "frame.h"
45#include "lib.h"
46
47
48typedef void (*display_xine_frame_t) (void *user_data, uint8_t* frame, 50typedef void (*display_xine_frame_t) (void *user_data, uint8_t* frame,
49 int width, int height,int bytes ); 51 int width, int height,int bytes );
50 52
diff --git a/noncore/multimedia/opieplayer2/mediaplayer.cpp b/noncore/multimedia/opieplayer2/mediaplayer.cpp
index 7e38fc7..7b4bfd9 100644
--- a/noncore/multimedia/opieplayer2/mediaplayer.cpp
+++ b/noncore/multimedia/opieplayer2/mediaplayer.cpp
@@ -1,19 +1,21 @@
1#include <qpe/qpeapplication.h>
2#include <qpe/config.h>
3#include <qfileinfo.h>
4
5#include "mediaplayer.h" 1#include "mediaplayer.h"
6#include "audiowidget.h" 2#include "audiowidget.h"
7#include "videowidget.h" 3#include "videowidget.h"
8#include "volumecontrol.h" 4#include "volumecontrol.h"
9 5
6/* OPIE */
7#include <opie2/odebug.h>
8#include <qpe/qpeapplication.h>
9#include <qpe/config.h>
10
11/* QT */
12#include <qfileinfo.h>
10 13
11 // for setBacklight() 14/* STD */
12#include <linux/fb.h> 15#include <linux/fb.h>
13#include <sys/file.h> 16#include <sys/file.h>
14#include <sys/ioctl.h> 17#include <sys/ioctl.h>
15 18
16
17#define FBIOBLANK 0x4611 19#define FBIOBLANK 0x4611
18 20
19MediaPlayer::MediaPlayer( PlayListWidget &_playList, MediaPlayerState &_mediaPlayerState, QObject *parent, const char *name ) 21MediaPlayer::MediaPlayer( PlayListWidget &_playList, MediaPlayerState &_mediaPlayerState, QObject *parent, const char *name )
diff --git a/noncore/multimedia/opieplayer2/om3u.cpp b/noncore/multimedia/opieplayer2/om3u.cpp
index 95dbab5..790fa09 100644
--- a/noncore/multimedia/opieplayer2/om3u.cpp
+++ b/noncore/multimedia/opieplayer2/om3u.cpp
@@ -31,7 +31,9 @@
31 31
32#include "om3u.h" 32#include "om3u.h"
33 33
34 34/* OPIE */
35#include <opie2/odebug.h>
36using namespace Opie::Core;
35 37
36//extern PlayListWidget *playList; 38//extern PlayListWidget *playList;
37 39
diff --git a/noncore/multimedia/opieplayer2/playlistselection.cpp b/noncore/multimedia/opieplayer2/playlistselection.cpp
index 3499837..678ebdf 100644
--- a/noncore/multimedia/opieplayer2/playlistselection.cpp
+++ b/noncore/multimedia/opieplayer2/playlistselection.cpp
@@ -17,11 +17,16 @@
17** not clear to you. 17** not clear to you.
18** 18**
19**********************************************************************/ 19**********************************************************************/
20#include "playlistselection.h"
20 21
21#include <qheader.h> 22/* OPIE */
23#include <opie2/odebug.h>
24using namespace Opie::Core;
22 25
23#include "playlistselection.h" 26/* QT */
27#include <qheader.h>
24 28
29/* STD */
25#include <stdlib.h> 30#include <stdlib.h>
26 31
27class PlayListSelectionItem : public QListViewItem { 32class PlayListSelectionItem : public QListViewItem {
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp
index 956d206..6a15134 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp
@@ -31,12 +31,6 @@
31 31
32*/ 32*/
33 33
34#include <qtoolbar.h>
35
36#include <opie2/ofiledialog.h>
37
38#include <qmessagebox.h>
39
40#include "playlistselection.h" 34#include "playlistselection.h"
41#include "playlistwidget.h" 35#include "playlistwidget.h"
42#include "mediaplayer.h" 36#include "mediaplayer.h"
@@ -44,10 +38,19 @@
44#include "om3u.h" 38#include "om3u.h"
45#include "playlistfileview.h" 39#include "playlistfileview.h"
46 40
47//only needed for the random play 41/* OPIE */
42#include <opie2/odebug.h>
43#include <opie2/ofiledialog.h>
44using namespace Opie::Core;
45using namespace Opie::Ui;
46
47/* QT */
48#include <qmessagebox.h>
49#include <qtoolbar.h>
50
51/* STD */
48#include <assert.h> 52#include <assert.h>
49 53
50using namespace Opie::Ui;
51PlayListWidget::PlayListWidget(QWidget* parent, const char* name, WFlags fl ) 54PlayListWidget::PlayListWidget(QWidget* parent, const char* name, WFlags fl )
52 : PlayListWidgetGui( parent, "playList" ) , currentFileListView( 0 ) 55 : PlayListWidgetGui( parent, "playList" ) , currentFileListView( 0 )
53{ 56{
diff --git a/noncore/multimedia/opieplayer2/xinecontrol.cpp b/noncore/multimedia/opieplayer2/xinecontrol.cpp
index 94f99f8..9f944d7 100644
--- a/noncore/multimedia/opieplayer2/xinecontrol.cpp
+++ b/noncore/multimedia/opieplayer2/xinecontrol.cpp
@@ -31,14 +31,18 @@
31 31
32*/ 32*/
33 33
34#include "xinecontrol.h"
35#include "xinevideowidget.h"
34 36
35#include <qtimer.h> 37/* OPIE */
36#include <qmessagebox.h> 38#include <opie2/odebug.h>
37#include <qpe/qcopenvelope_qws.h> 39#include <qpe/qcopenvelope_qws.h>
38#include <qpe/qpeapplication.h> 40#include <qpe/qpeapplication.h>
41using namespace Opie::Core;
39 42
40#include "xinecontrol.h" 43/* QT */
41#include "xinevideowidget.h" 44#include <qtimer.h>
45#include <qmessagebox.h>
42 46
43XineControl::XineControl( XineVideoWidget *xineWidget, 47XineControl::XineControl( XineVideoWidget *xineWidget,
44 MediaPlayerState &_mediaPlayerState, 48 MediaPlayerState &_mediaPlayerState,