Commit 9cde42af authored by philn@webkit.org's avatar philn@webkit.org
Browse files

2010-05-17 Philippe Normand <pnormand@igalia.com>

        Reviewed by Eric Seidel.

        [GStreamer] enable gst support if USE_GSTREAMER macro is defined
        https://bugs.webkit.org/show_bug.cgi?id=39205

        Include gstreamer private player in the build when the
        USE_GSTREAMER macro is enabled.

        * platform/graphics/MediaPlayer.cpp:
        (WebCore::installedMediaEngines):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@59825 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 970195cc
2010-05-17 Philippe Normand <pnormand@igalia.com>
Reviewed by Eric Seidel.
[GStreamer] enable gst support if USE_GSTREAMER macro is defined
https://bugs.webkit.org/show_bug.cgi?id=39205
Include gstreamer private player in the build when the
USE_GSTREAMER macro is enabled.
* platform/graphics/MediaPlayer.cpp:
(WebCore::installedMediaEngines):
2010-05-19 Vangelis Kokkevis <vangelis@chromium.org>
 
Reviewed by Darin Fisher.
......@@ -41,6 +41,10 @@
#include <QtGlobal>
#endif
#if USE(GSTREAMER)
#include "MediaPlayerPrivateGStreamer.h"
#endif
#if PLATFORM(MAC)
#include "MediaPlayerPrivateQTKit.h"
#elif OS(WINCE) && !PLATFORM(QT)
......@@ -48,8 +52,6 @@
#elif PLATFORM(WIN)
#include "MediaPlayerPrivateQuickTimeVisualContext.h"
#include "MediaPlayerPrivateQuicktimeWin.h"
#elif PLATFORM(GTK)
#include "MediaPlayerPrivateGStreamer.h"
#elif PLATFORM(QT)
// QtMultimedia support is disabled currently.
#if 1 || (QT_VERSION < 0x040700)
......@@ -165,10 +167,11 @@ static Vector<MediaPlayerFactory*>& installedMediaEngines()
enginesQueried = true;
#if USE(GSTREAMER)
MediaPlayerPrivateGStreamer::registerMediaEngine(addMediaEngine);
#else
#endif
#if PLATFORM(WIN)
MediaPlayerPrivateQuickTimeVisualContext::registerMediaEngine(addMediaEngine);
#endif
#elif !PLATFORM(GTK)
// FIXME: currently all the MediaEngines are named
// MediaPlayerPrivate. This code will need an update when bug
// 36663 is adressed.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment