summaryrefslogtreecommitdiff
authorzecke <zecke>2004-03-14 18:05:28 (UTC)
committer zecke <zecke>2004-03-14 18:05:28 (UTC)
commit9e54b8bd8343af7c301da17d82596d6027e53309 (patch) (side-by-side diff)
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
@@ -31,12 +31,13 @@
extern MediaPlayerState *mediaPlayerState;
static const int xo = -2; // movable x offset
static const int yo = 22; // movable y offset
+using namespace Opie::Ui;
struct MediaButton {
bool isToggle, isHeld, isDown;
};
//Layout information for the audioButtons (and if it is a toggle button or not)
MediaButton audioButtons[] = {
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
@@ -28,13 +28,13 @@
#include <qbitmap.h>
#include <qstring.h>
#include <qslider.h>
#include <qlineedit.h>
#include <qframe.h>
-#include <opie/oticker.h>
+#include <opie2/oticker.h>
class QPixmap;
enum AudioButtons {
AudioPlay=0,
AudioStop,
@@ -103,13 +103,13 @@ private:
QImage *imgButtonMask;
QBitmap *masks[11];
QPixmap *buttonPixUp[11];
QPixmap *buttonPixDown[11];
QPixmap *pixmaps[4];
- OTicker songInfo;
+ Opie::Ui::OTicker songInfo;
QSlider slider;
QLineEdit time;
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,10 +1,10 @@
config OPIEPLAYER
boolean "opie-mediaplayer (mediaplayer that plays mp3, mpeg, and wav)"
default "y"
- depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+ depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIEUI2
source core/multimedia/opieplayer/libflash/config.in
source core/multimedia/opieplayer/libmad/config.in
source core/multimedia/opieplayer/libmpeg3/config.in
source core/multimedia/opieplayer/modplug/config.in
source core/multimedia/opieplayer/wavplugin/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
@@ -1,15 +1,16 @@
#include "inputDialog.h"
#include <qpe/resource.h>
-#include <opie/ofiledialog.h>
+#include <opie2/ofiledialog.h>
#include <qlineedit.h>
#include <qpushbutton.h>
+using namespace Opie::Ui;
InputDialog::InputDialog( QWidget* parent, const char* name, bool modal, WFlags fl )
: QDialog( parent, name, modal, fl ) {
if ( !name ) {
setName( "InputDialog" );
}
resize( 234, 115);
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
@@ -53,12 +53,14 @@ MediaPlayerEncoder *LibFlashPluginImpl::encoder()
QRESULT LibFlashPluginImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
{
*iface = 0;
if ( ( uuid == IID_QUnknown ) || ( uuid == IID_MediaPlayerPlugin ) )
*iface = this, (*iface)->addRef();
+ else
+ return QS_FALSE;
return QS_OK;
}
Q_EXPORT_INTERFACE()
{
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
@@ -53,12 +53,14 @@ MediaPlayerEncoder *LibMadPluginImpl::encoder()
QRESULT LibMadPluginImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
{
*iface = 0;
if ( ( uuid == IID_QUnknown ) || ( uuid == IID_MediaPlayerPlugin ) )
*iface = this, (*iface)->addRef();
+ else
+ return QS_FALSE;
return QS_OK;
}
Q_EXPORT_INTERFACE()
{
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
@@ -53,12 +53,14 @@ MediaPlayerEncoder *LibMpeg3PluginImpl::encoder()
QRESULT LibMpeg3PluginImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
{
*iface = 0;
if ( ( uuid == IID_QUnknown ) || ( uuid == IID_MediaPlayerPlugin ) )
*iface = this, (*iface)->addRef();
+ else
+ return QS_FALSE;
return QS_OK;
}
Q_EXPORT_INTERFACE()
{
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
@@ -34,12 +34,14 @@ ModPluginImpl::~ModPluginImpl()
QRESULT ModPluginImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
{
*iface = 0;
if ( ( uuid == IID_QUnknown ) || ( uuid == IID_MediaPlayerPlugin ) )
*iface = this, (*iface)->addRef();
+ else
+ return QS_FALSE;
return QS_OK;
}
Q_EXPORT_INTERFACE()
{
Q_CREATE_INSTANCE( ModPluginImpl )
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
@@ -10,12 +10,12 @@ SOURCES = main.cpp \
loopcontrol.cpp playlistselection.cpp mediaplayerstate.cpp \
videowidget.cpp audiowidget.cpp playlistwidget.cpp \
mediaplayer.cpp audiodevice.cpp inputDialog.cpp om3u.cpp
TARGET = opieplayer
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include
-LIBS += -lqpe -lpthread -lopie
+LIBS += -lqpe -lpthread -lopieui2
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include
include ( $(OPIEDIR)/include.pro )
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
@@ -562,16 +562,18 @@ bool VideoWidget::playVideo() {
*lout=*in++;
lout-=spl;
}
}
else
{
- ulong* lout = ((ulong *)out)++ + (w - 1)*spl;
+ ulong* _out = (ulong *)out;
+ ulong* lout = _out++ + (w - 1)*spl;
for (int y=0; y<w; y++)
{
- *lout=*((ulong*)in)++;
+ ulong *_in = (ulong*)in;
+ *lout=*_in++;
lout-=spl;
}
}
}
p.drawImage( (240 - rw) / 2, (320 - rh) / 2, rotatedFrame, 0, 0, rw, rh );
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
@@ -54,12 +54,14 @@ MediaPlayerEncoder *LibTremorPluginImpl::encoder()
QRESULT LibTremorPluginImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
{
*iface = 0;
if ( ( uuid == IID_QUnknown ) || ( uuid == IID_MediaPlayerPlugin ) )
*iface = this, (*iface)->addRef();
+ else
+ return QS_FALSE;
return QS_OK;
}
Q_EXPORT_INTERFACE()
{
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
@@ -52,12 +52,14 @@ MediaPlayerEncoder *WavPluginImpl::encoder()
QRESULT WavPluginImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
{
*iface = 0;
if ( ( uuid == IID_QUnknown ) || ( uuid == IID_MediaPlayerPlugin ) )
*iface = this, (*iface)->addRef();
+ else
+ return QS_FALSE;
return QS_OK;
}
Q_EXPORT_INTERFACE()
{