summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2004-04-04 17:38:26 (UTC)
committer mickeyl <mickeyl>2004-04-04 17:38:26 (UTC)
commit4588425855268ce88a80ddbac7e1c3d4b87b03f4 (patch) (side-by-side diff)
treecc2ba17458cd68592093e6c1bb216df3582cb6f5
parentea3708cbc40ebc5f1db70546f0a93e8a23ba967c (diff)
downloadopie-4588425855268ce88a80ddbac7e1c3d4b87b03f4.zip
opie-4588425855268ce88a80ddbac7e1c3d4b87b03f4.tar.gz
opie-4588425855268ce88a80ddbac7e1c3d4b87b03f4.tar.bz2
use odebug classes
Diffstat (more/less context) (ignore 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.cpp16
-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, 51 insertions, 30 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
@@ -33,11 +33,14 @@
#include "audiowidget.h"
+/* OPIE */
+#include <opie2/odebug.h>
#include <qpe/qpeapplication.h>
-
+using namespace Opie::Core;
using namespace Opie::Ui;
+
namespace
{
const int xo = -2; // movable x offset
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
@@ -30,22 +30,24 @@
Boston, MA 02111-1307, USA.
*/
+#include "xinevideowidget.h"
+#include "frame.h"
+#include "lib.h"
-#include <qtextstream.h>
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+/* QT */
+#include <qtextstream.h>
#include <qdir.h>
-
#include <qgfx_qws.h>
+/* STD */
#include <assert.h>
-#include "xinevideowidget.h"
-#include "frame.h"
-#include "lib.h"
-
-
typedef void (*display_xine_frame_t) (void *user_data, uint8_t* frame,
int width, int height,int bytes );
extern "C" {
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,21 +1,23 @@
-#include <qpe/qpeapplication.h>
-#include <qpe/config.h>
-#include <qfileinfo.h>
-
#include "mediaplayer.h"
#include "audiowidget.h"
#include "videowidget.h"
#include "volumecontrol.h"
+/* OPIE */
+#include <opie2/odebug.h>
+#include <qpe/qpeapplication.h>
+#include <qpe/config.h>
+
+/* QT */
+#include <qfileinfo.h>
- // for setBacklight()
+/* STD */
#include <linux/fb.h>
#include <sys/file.h>
#include <sys/ioctl.h>
-
-#define FBIOBLANK 0x4611
+#define FBIOBLANK 0x4611
MediaPlayer::MediaPlayer( PlayListWidget &_playList, MediaPlayerState &_mediaPlayerState, QObject *parent, const char *name )
: QObject( parent, name ), volumeDirection( 0 ), mediaPlayerState( _mediaPlayerState ), playList( _playList ) {
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
@@ -30,9 +30,11 @@
*/
#include "om3u.h"
-
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
//extern PlayListWidget *playList;
Om3u::Om3u( const QString &filePath, int mode)
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
@@ -16,13 +16,18 @@
** Contact info@trolltech.com if any conditions of this licensing are
** not clear to you.
**
**********************************************************************/
+#include "playlistselection.h"
-#include <qheader.h>
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
-#include "playlistselection.h"
+/* QT */
+#include <qheader.h>
+/* STD */
#include <stdlib.h>
class PlayListSelectionItem : public QListViewItem {
public:
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
@@ -30,25 +30,28 @@
Boston, MA 02111-1307, USA.
*/
-#include <qtoolbar.h>
-
-#include <opie2/ofiledialog.h>
-
-#include <qmessagebox.h>
-
#include "playlistselection.h"
#include "playlistwidget.h"
#include "mediaplayer.h"
#include "inputDialog.h"
#include "om3u.h"
#include "playlistfileview.h"
-//only needed for the random play
+/* OPIE */
+#include <opie2/odebug.h>
+#include <opie2/ofiledialog.h>
+using namespace Opie::Core;
+using namespace Opie::Ui;
+
+/* QT */
+#include <qmessagebox.h>
+#include <qtoolbar.h>
+
+/* STD */
#include <assert.h>
-using namespace Opie::Ui;
PlayListWidget::PlayListWidget(QWidget* parent, const char* name, WFlags fl )
: PlayListWidgetGui( parent, "playList" ) , currentFileListView( 0 )
{
mediaPlayerState = new MediaPlayerState(0, "mediaPlayerState" );
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
@@ -30,16 +30,20 @@
Boston, MA 02111-1307, USA.
*/
+#include "xinecontrol.h"
+#include "xinevideowidget.h"
-#include <qtimer.h>
-#include <qmessagebox.h>
+/* OPIE */
+#include <opie2/odebug.h>
#include <qpe/qcopenvelope_qws.h>
#include <qpe/qpeapplication.h>
+using namespace Opie::Core;
-#include "xinecontrol.h"
-#include "xinevideowidget.h"
+/* QT */
+#include <qtimer.h>
+#include <qmessagebox.h>
XineControl::XineControl( XineVideoWidget *xineWidget,
MediaPlayerState &_mediaPlayerState,
QObject *parent, const char *name )