summaryrefslogtreecommitdiff
authorzecke <zecke>2004-03-14 18:05:28 (UTC)
committer zecke <zecke>2004-03-14 18:05:28 (UTC)
commit9e54b8bd8343af7c301da17d82596d6027e53309 (patch) (unidiff)
tree693613ff9f1a0f3415e0623e636d47ac4798da2d
parent98bbe5561e8e1a862e19a3d0a0d49ed90ef15b54 (diff)
downloadopie-9e54b8bd8343af7c301da17d82596d6027e53309.zip
opie-9e54b8bd8343af7c301da17d82596d6027e53309.tar.gz
opie-9e54b8bd8343af7c301da17d82596d6027e53309.tar.bz2
OpiePlayer -> ODP
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/multimedia/opieplayer/audiowidget.cpp1
-rw-r--r--core/multimedia/opieplayer/audiowidget.h4
-rw-r--r--core/multimedia/opieplayer/config.in2
-rw-r--r--core/multimedia/opieplayer/inputDialog.cpp3
-rw-r--r--core/multimedia/opieplayer/libflash/libflashpluginimpl.cpp2
-rw-r--r--core/multimedia/opieplayer/libmad/libmadpluginimpl.cpp2
-rw-r--r--core/multimedia/opieplayer/libmpeg3/libmpeg3pluginimpl.cpp2
-rw-r--r--core/multimedia/opieplayer/modplug/modpluginimpl.cpp2
-rw-r--r--core/multimedia/opieplayer/opieplayer.pro2
-rw-r--r--core/multimedia/opieplayer/videowidget.cpp6
-rw-r--r--core/multimedia/opieplayer/vorbis/libtremorpluginimpl.cpp2
-rw-r--r--core/multimedia/opieplayer/wavplugin/wavpluginimpl.cpp2
12 files changed, 23 insertions, 7 deletions
diff --git a/core/multimedia/opieplayer/audiowidget.cpp b/core/multimedia/opieplayer/audiowidget.cpp
index 8bcc567..7da2d54 100644
--- a/core/multimedia/opieplayer/audiowidget.cpp
+++ b/core/multimedia/opieplayer/audiowidget.cpp
@@ -34,6 +34,7 @@ extern MediaPlayerState *mediaPlayerState;
34static const int xo = -2; // movable x offset 34static const int xo = -2; // movable x offset
35static const int yo = 22; // movable y offset 35static const int yo = 22; // movable y offset
36 36
37using namespace Opie::Ui;
37struct MediaButton { 38struct MediaButton {
38 bool isToggle, isHeld, isDown; 39 bool isToggle, isHeld, isDown;
39}; 40};
diff --git a/core/multimedia/opieplayer/audiowidget.h b/core/multimedia/opieplayer/audiowidget.h
index 96bc55c..0a7cb26 100644
--- a/core/multimedia/opieplayer/audiowidget.h
+++ b/core/multimedia/opieplayer/audiowidget.h
@@ -31,7 +31,7 @@
31#include <qlineedit.h> 31#include <qlineedit.h>
32#include <qframe.h> 32#include <qframe.h>
33 33
34#include <opie/oticker.h> 34#include <opie2/oticker.h>
35 35
36class QPixmap; 36class QPixmap;
37 37
@@ -106,7 +106,7 @@ private:
106 QPixmap *buttonPixDown[11]; 106 QPixmap *buttonPixDown[11];
107 107
108 QPixmap *pixmaps[4]; 108 QPixmap *pixmaps[4];
109 OTicker songInfo; 109 Opie::Ui::OTicker songInfo;
110 QSlider slider; 110 QSlider slider;
111 QLineEdit time; 111 QLineEdit time;
112 int xoff, yoff; 112 int xoff, yoff;
diff --git a/core/multimedia/opieplayer/config.in b/core/multimedia/opieplayer/config.in
index dc1b79a..d25b11f 100644
--- a/core/multimedia/opieplayer/config.in
+++ b/core/multimedia/opieplayer/config.in
@@ -1,7 +1,7 @@
1 config OPIEPLAYER 1 config OPIEPLAYER
2 boolean "opie-mediaplayer (mediaplayer that plays mp3, mpeg, and wav)" 2 boolean "opie-mediaplayer (mediaplayer that plays mp3, mpeg, and wav)"
3 default "y" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIEUI2
5 5
6 source core/multimedia/opieplayer/libflash/config.in 6 source core/multimedia/opieplayer/libflash/config.in
7 source core/multimedia/opieplayer/libmad/config.in 7 source core/multimedia/opieplayer/libmad/config.in
diff --git a/core/multimedia/opieplayer/inputDialog.cpp b/core/multimedia/opieplayer/inputDialog.cpp
index 38b8f53..44a1cdd 100644
--- a/core/multimedia/opieplayer/inputDialog.cpp
+++ b/core/multimedia/opieplayer/inputDialog.cpp
@@ -2,11 +2,12 @@
2 2
3#include <qpe/resource.h> 3#include <qpe/resource.h>
4 4
5#include <opie/ofiledialog.h> 5#include <opie2/ofiledialog.h>
6 6
7#include <qlineedit.h> 7#include <qlineedit.h>
8#include <qpushbutton.h> 8#include <qpushbutton.h>
9 9
10using namespace Opie::Ui;
10InputDialog::InputDialog( QWidget* parent, const char* name, bool modal, WFlags fl ) 11InputDialog::InputDialog( QWidget* parent, const char* name, bool modal, WFlags fl )
11 : QDialog( parent, name, modal, fl ) { 12 : QDialog( parent, name, modal, fl ) {
12 if ( !name ) { 13 if ( !name ) {
diff --git a/core/multimedia/opieplayer/libflash/libflashpluginimpl.cpp b/core/multimedia/opieplayer/libflash/libflashpluginimpl.cpp
index af2c07e..b2a1b5d 100644
--- a/core/multimedia/opieplayer/libflash/libflashpluginimpl.cpp
+++ b/core/multimedia/opieplayer/libflash/libflashpluginimpl.cpp
@@ -56,6 +56,8 @@ QRESULT LibFlashPluginImpl::queryInterface( const QUuid &uuid, QUnknownInterface
56 *iface = 0; 56 *iface = 0;
57 if ( ( uuid == IID_QUnknown ) || ( uuid == IID_MediaPlayerPlugin ) ) 57 if ( ( uuid == IID_QUnknown ) || ( uuid == IID_MediaPlayerPlugin ) )
58 *iface = this, (*iface)->addRef(); 58 *iface = this, (*iface)->addRef();
59 else
60 return QS_FALSE;
59 return QS_OK; 61 return QS_OK;
60} 62}
61 63
diff --git a/core/multimedia/opieplayer/libmad/libmadpluginimpl.cpp b/core/multimedia/opieplayer/libmad/libmadpluginimpl.cpp
index 67779e8..b3e01e5 100644
--- a/core/multimedia/opieplayer/libmad/libmadpluginimpl.cpp
+++ b/core/multimedia/opieplayer/libmad/libmadpluginimpl.cpp
@@ -56,6 +56,8 @@ QRESULT LibMadPluginImpl::queryInterface( const QUuid &uuid, QUnknownInterface *
56 *iface = 0; 56 *iface = 0;
57 if ( ( uuid == IID_QUnknown ) || ( uuid == IID_MediaPlayerPlugin ) ) 57 if ( ( uuid == IID_QUnknown ) || ( uuid == IID_MediaPlayerPlugin ) )
58 *iface = this, (*iface)->addRef(); 58 *iface = this, (*iface)->addRef();
59 else
60 return QS_FALSE;
59 return QS_OK; 61 return QS_OK;
60} 62}
61 63
diff --git a/core/multimedia/opieplayer/libmpeg3/libmpeg3pluginimpl.cpp b/core/multimedia/opieplayer/libmpeg3/libmpeg3pluginimpl.cpp
index bf3f372..f6d34b8 100644
--- a/core/multimedia/opieplayer/libmpeg3/libmpeg3pluginimpl.cpp
+++ b/core/multimedia/opieplayer/libmpeg3/libmpeg3pluginimpl.cpp
@@ -56,6 +56,8 @@ QRESULT LibMpeg3PluginImpl::queryInterface( const QUuid &uuid, QUnknownInterface
56 *iface = 0; 56 *iface = 0;
57 if ( ( uuid == IID_QUnknown ) || ( uuid == IID_MediaPlayerPlugin ) ) 57 if ( ( uuid == IID_QUnknown ) || ( uuid == IID_MediaPlayerPlugin ) )
58 *iface = this, (*iface)->addRef(); 58 *iface = this, (*iface)->addRef();
59 else
60 return QS_FALSE;
59 return QS_OK; 61 return QS_OK;
60} 62}
61 63
diff --git a/core/multimedia/opieplayer/modplug/modpluginimpl.cpp b/core/multimedia/opieplayer/modplug/modpluginimpl.cpp
index 6e64e76..6205779 100644
--- a/core/multimedia/opieplayer/modplug/modpluginimpl.cpp
+++ b/core/multimedia/opieplayer/modplug/modpluginimpl.cpp
@@ -37,6 +37,8 @@ QRESULT ModPluginImpl::queryInterface( const QUuid &uuid, QUnknownInterface **if
37 *iface = 0; 37 *iface = 0;
38 if ( ( uuid == IID_QUnknown ) || ( uuid == IID_MediaPlayerPlugin ) ) 38 if ( ( uuid == IID_QUnknown ) || ( uuid == IID_MediaPlayerPlugin ) )
39 *iface = this, (*iface)->addRef(); 39 *iface = this, (*iface)->addRef();
40 else
41 return QS_FALSE;
40 return QS_OK; 42 return QS_OK;
41} 43}
42 44
diff --git a/core/multimedia/opieplayer/opieplayer.pro b/core/multimedia/opieplayer/opieplayer.pro
index 03d8a89..d7b0fb8 100644
--- a/core/multimedia/opieplayer/opieplayer.pro
+++ b/core/multimedia/opieplayer/opieplayer.pro
@@ -13,7 +13,7 @@ SOURCES = main.cpp \
13TARGET = opieplayer 13TARGET = opieplayer
14INCLUDEPATH += $(OPIEDIR)/include 14INCLUDEPATH += $(OPIEDIR)/include
15DEPENDPATH += $(OPIEDIR)/include 15DEPENDPATH += $(OPIEDIR)/include
16LIBS += -lqpe -lpthread -lopie 16LIBS += -lqpe -lpthread -lopieui2
17 17
18INCLUDEPATH += $(OPIEDIR)/include 18INCLUDEPATH += $(OPIEDIR)/include
19DEPENDPATH += $(OPIEDIR)/include 19DEPENDPATH += $(OPIEDIR)/include
diff --git a/core/multimedia/opieplayer/videowidget.cpp b/core/multimedia/opieplayer/videowidget.cpp
index d002c42..164458b 100644
--- a/core/multimedia/opieplayer/videowidget.cpp
+++ b/core/multimedia/opieplayer/videowidget.cpp
@@ -565,10 +565,12 @@ bool VideoWidget::playVideo() {
565 } 565 }
566 else 566 else
567 { 567 {
568 ulong* lout = ((ulong *)out)++ + (w - 1)*spl; 568 ulong* _out = (ulong *)out;
569 ulong* lout = _out++ + (w - 1)*spl;
569 for (int y=0; y<w; y++) 570 for (int y=0; y<w; y++)
570 { 571 {
571 *lout=*((ulong*)in)++; 572 ulong *_in = (ulong*)in;
573 *lout=*_in++;
572 lout-=spl; 574 lout-=spl;
573 } 575 }
574 } 576 }
diff --git a/core/multimedia/opieplayer/vorbis/libtremorpluginimpl.cpp b/core/multimedia/opieplayer/vorbis/libtremorpluginimpl.cpp
index 440747a..0c7b1ea 100644
--- a/core/multimedia/opieplayer/vorbis/libtremorpluginimpl.cpp
+++ b/core/multimedia/opieplayer/vorbis/libtremorpluginimpl.cpp
@@ -57,6 +57,8 @@ QRESULT LibTremorPluginImpl::queryInterface( const QUuid &uuid, QUnknownInterfac
57 *iface = 0; 57 *iface = 0;
58 if ( ( uuid == IID_QUnknown ) || ( uuid == IID_MediaPlayerPlugin ) ) 58 if ( ( uuid == IID_QUnknown ) || ( uuid == IID_MediaPlayerPlugin ) )
59 *iface = this, (*iface)->addRef(); 59 *iface = this, (*iface)->addRef();
60 else
61 return QS_FALSE;
60 return QS_OK; 62 return QS_OK;
61} 63}
62 64
diff --git a/core/multimedia/opieplayer/wavplugin/wavpluginimpl.cpp b/core/multimedia/opieplayer/wavplugin/wavpluginimpl.cpp
index c232d7b..4280880 100644
--- a/core/multimedia/opieplayer/wavplugin/wavpluginimpl.cpp
+++ b/core/multimedia/opieplayer/wavplugin/wavpluginimpl.cpp
@@ -55,6 +55,8 @@ QRESULT WavPluginImpl::queryInterface( const QUuid &uuid, QUnknownInterface **if
55 *iface = 0; 55 *iface = 0;
56 if ( ( uuid == IID_QUnknown ) || ( uuid == IID_MediaPlayerPlugin ) ) 56 if ( ( uuid == IID_QUnknown ) || ( uuid == IID_MediaPlayerPlugin ) )
57 *iface = this, (*iface)->addRef(); 57 *iface = this, (*iface)->addRef();
58 else
59 return QS_FALSE;
58 return QS_OK; 60 return QS_OK;
59} 61}
60 62