diff options
| author | Gareth Stockwell <gareth.stockwell@sosco.com> | 2009-08-20 17:24:55 +0100 |
|---|---|---|
| committer | Gareth Stockwell <gareth.stockwell@sosco.com> | 2009-08-20 17:24:55 +0100 |
| commit | 2150242ddbe66c5d4c440599f1282580be013e61 (patch) | |
| tree | d0eefc4aa67a121987f8b74822e558603d3cedc1 /src/3rdparty/phonon/mmf/mediaobject.cpp | |
| parent | ee990e2ed366a16605afb6a13edd9c59b1bcc33d (diff) | |
Started fleshing out the VideoPlayer implementation
Now loads, prepares and plays a clip, but the video is not visible because it's not yet wired up to a VideoWidget.
Video 'playback' can be tested using the demos/mediaplayer application, but the menus are not displayed properly, so a video clip filename must be hardcoded in main.cpp and passed to the MediaPlayer constructor.
Diffstat (limited to 'src/3rdparty/phonon/mmf/mediaobject.cpp')
| -rw-r--r-- | src/3rdparty/phonon/mmf/mediaobject.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/phonon/mmf/mediaobject.cpp b/src/3rdparty/phonon/mmf/mediaobject.cpp index 0336109c5b..8ac9441cae 100644 --- a/src/3rdparty/phonon/mmf/mediaobject.cpp +++ b/src/3rdparty/phonon/mmf/mediaobject.cpp @@ -30,7 +30,7 @@ using namespace Phonon::MMF; // Constructor / destructor //----------------------------------------------------------------------------- -MMF::MediaObject::MediaObject(QObject *parent) : QObject::QObject(parent) +MMF::MediaObject::MediaObject(QObject *parent) : QObject(parent) , m_recognizerOpened(false) { m_player.reset(new DummyPlayer()); @@ -224,7 +224,7 @@ void MMF::MediaObject::setSource(const MediaSource &source) void MMF::MediaObject::createPlayer(const MediaSource &source) { - TRACE_CONTEXT(AudioPlayer::createPlayer, EAudioApi); + TRACE_CONTEXT(MediaObject::createPlayer, EAudioApi); TRACE_ENTRY("state %d source.type %d", state(), source.type()); TRACE_ENTRY("source.type %d", source.type()); |