diff options
| author | Frans Englich <frans.englich@nokia.com> | 2009-07-18 04:02:32 (GMT) |
|---|---|---|
| committer | Frans Englich <frans.englich@nokia.com> | 2009-07-18 04:02:32 (GMT) |
| commit | 17c74f4f49f5cb7c62dc4d2300293f2e93b16a90 (patch) | |
| tree | 884d2c9a9ab3038b27301d06410abd92b2f97fde /src/3rdparty/phonon | |
| parent | 975af6c3c81788e39422c55f67ffabfebd31d9be (diff) | |
| download | Qt-17c74f4f49f5cb7c62dc4d2300293f2e93b16a90.zip Qt-17c74f4f49f5cb7c62dc4d2300293f2e93b16a90.tar.gz Qt-17c74f4f49f5cb7c62dc4d2300293f2e93b16a90.tar.bz2 | |
Work.
Diffstat (limited to 'src/3rdparty/phonon')
| -rw-r--r-- | src/3rdparty/phonon/mmf/backend.cpp | 3 | ||||
| -rw-r--r-- | src/3rdparty/phonon/mmf/backend.h | 3 | ||||
| -rw-r--r-- | src/3rdparty/phonon/mmf/mediaobject.h | 6 |
3 files changed, 10 insertions, 2 deletions
diff --git a/src/3rdparty/phonon/mmf/backend.cpp b/src/3rdparty/phonon/mmf/backend.cpp index 86d329b..4324409 100644 --- a/src/3rdparty/phonon/mmf/backend.cpp +++ b/src/3rdparty/phonon/mmf/backend.cpp @@ -28,9 +28,10 @@ using namespace Phonon::MMF; Backend::Backend(QObject *parent) { + qDebug() << Q_FUNC_INFO; setParent(parent); - setProperty("identifier", QLatin1String("mmf")); + setProperty("identifier", QLatin1String("phonon_mmf")); setProperty("backendName", QLatin1String("MMF")); setProperty("backendComment", QLatin1String("Backend using Nokia's S60 Multimedia Framework Architecture (MMF).")); setProperty("backendVersion", QLatin1String("0.1")); diff --git a/src/3rdparty/phonon/mmf/backend.h b/src/3rdparty/phonon/mmf/backend.h index cb03859..4fff204 100644 --- a/src/3rdparty/phonon/mmf/backend.h +++ b/src/3rdparty/phonon/mmf/backend.h @@ -42,6 +42,9 @@ namespace Phonon virtual bool disconnectNodes(QObject *, QObject *); virtual bool endConnectionChange(QSet<QObject *>); virtual QStringList availableMimeTypes() const; + + Q_SIGNALS: + void objectDescriptionChanged(ObjectDescriptionType); }; } } diff --git a/src/3rdparty/phonon/mmf/mediaobject.h b/src/3rdparty/phonon/mmf/mediaobject.h index 3afa3b4..207cb91 100644 --- a/src/3rdparty/phonon/mmf/mediaobject.h +++ b/src/3rdparty/phonon/mmf/mediaobject.h @@ -19,8 +19,11 @@ along with this library. If not, see <http://www.gnu.org/licenses/>. #ifndef PHONON_MMF_MEDIAOBJECT_H #define PHONON_MMF_MEDIAOBJECT_H +/* We use the extra qualification include/ to avoid picking up the include + * Phonon has. */ +#include <include/VideoPlayer.h> + #include <DrmAudioSamplePlayer.h> -#include <VideoPlayer.h> #include <Phonon/MediaSource> #include <Phonon/mediaobjectinterface.h> @@ -44,6 +47,7 @@ namespace Phonon , public MediaObjectInterface , public MDrmAudioPlayerCallback , public MAudioLoadingObserver + , public MVideoLoadingObserver //, public MVideoPlayerUtilityObserver { Q_OBJECT |