author | zecke <zecke> | 2004-03-14 18:05:28 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-03-14 18:05:28 (UTC) |
commit | 9e54b8bd8343af7c301da17d82596d6027e53309 (patch) (unidiff) | |
tree | 693613ff9f1a0f3415e0623e636d47ac4798da2d | |
parent | 98bbe5561e8e1a862e19a3d0a0d49ed90ef15b54 (diff) | |
download | opie-9e54b8bd8343af7c301da17d82596d6027e53309.zip opie-9e54b8bd8343af7c301da17d82596d6027e53309.tar.gz opie-9e54b8bd8343af7c301da17d82596d6027e53309.tar.bz2 |
OpiePlayer -> ODP
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 | |||
@@ -33,8 +33,9 @@ extern MediaPlayerState *mediaPlayerState; | |||
33 | 33 | ||
34 | static const int xo = -2; // movable x offset | 34 | static const int xo = -2; // movable x offset |
35 | static const int yo = 22; // movable y offset | 35 | static const int yo = 22; // movable y offset |
36 | 36 | ||
37 | using namespace Opie::Ui; | ||
37 | struct MediaButton { | 38 | struct MediaButton { |
38 | bool isToggle, isHeld, isDown; | 39 | bool isToggle, isHeld, isDown; |
39 | }; | 40 | }; |
40 | 41 | ||
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 | |||
@@ -30,9 +30,9 @@ | |||
30 | #include <qslider.h> | 30 | #include <qslider.h> |
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 | ||
36 | class QPixmap; | 36 | class QPixmap; |
37 | 37 | ||
38 | enum AudioButtons { | 38 | enum AudioButtons { |
@@ -105,9 +105,9 @@ private: | |||
105 | QPixmap *buttonPixUp[11]; | 105 | QPixmap *buttonPixUp[11]; |
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; |
113 | 113 | ||
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,8 +1,8 @@ | |||
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 |
8 | source core/multimedia/opieplayer/libmpeg3/config.in | 8 | source core/multimedia/opieplayer/libmpeg3/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,13 +1,14 @@ | |||
1 | #include "inputDialog.h" | 1 | #include "inputDialog.h" |
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 | ||
10 | using namespace Opie::Ui; | ||
10 | InputDialog::InputDialog( QWidget* parent, const char* name, bool modal, WFlags fl ) | 11 | InputDialog::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 ) { |
13 | setName( "InputDialog" ); | 14 | setName( "InputDialog" ); |
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 | |||
@@ -55,8 +55,10 @@ QRESULT LibFlashPluginImpl::queryInterface( const QUuid &uuid, QUnknownInterface | |||
55 | { | 55 | { |
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 | ||
62 | 64 | ||
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 | |||
@@ -55,8 +55,10 @@ QRESULT LibMadPluginImpl::queryInterface( const QUuid &uuid, QUnknownInterface * | |||
55 | { | 55 | { |
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 | ||
62 | 64 | ||
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 | |||
@@ -55,8 +55,10 @@ QRESULT LibMpeg3PluginImpl::queryInterface( const QUuid &uuid, QUnknownInterface | |||
55 | { | 55 | { |
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 | ||
62 | 64 | ||
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 | |||
@@ -36,8 +36,10 @@ QRESULT ModPluginImpl::queryInterface( const QUuid &uuid, QUnknownInterface **if | |||
36 | { | 36 | { |
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 | ||
43 | Q_EXPORT_INTERFACE() | 45 | Q_EXPORT_INTERFACE() |
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 | |||
@@ -12,9 +12,9 @@ SOURCES = main.cpp \ | |||
12 | mediaplayer.cpp audiodevice.cpp inputDialog.cpp om3u.cpp | 12 | mediaplayer.cpp audiodevice.cpp inputDialog.cpp om3u.cpp |
13 | TARGET = opieplayer | 13 | TARGET = opieplayer |
14 | INCLUDEPATH += $(OPIEDIR)/include | 14 | INCLUDEPATH += $(OPIEDIR)/include |
15 | DEPENDPATH += $(OPIEDIR)/include | 15 | DEPENDPATH += $(OPIEDIR)/include |
16 | LIBS += -lqpe -lpthread -lopie | 16 | LIBS += -lqpe -lpthread -lopieui2 |
17 | 17 | ||
18 | INCLUDEPATH += $(OPIEDIR)/include | 18 | INCLUDEPATH += $(OPIEDIR)/include |
19 | DEPENDPATH += $(OPIEDIR)/include | 19 | DEPENDPATH += $(OPIEDIR)/include |
20 | 20 | ||
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 | |||
@@ -564,12 +564,14 @@ bool VideoWidget::playVideo() { | |||
564 | } | 564 | } |
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 | } |
575 | } | 577 | } |
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 | |||
@@ -56,8 +56,10 @@ QRESULT LibTremorPluginImpl::queryInterface( const QUuid &uuid, QUnknownInterfac | |||
56 | { | 56 | { |
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 | ||
63 | 65 | ||
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 | |||
@@ -54,8 +54,10 @@ QRESULT WavPluginImpl::queryInterface( const QUuid &uuid, QUnknownInterface **if | |||
54 | { | 54 | { |
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 | ||
61 | 63 | ||