1 files changed, 19 insertions, 18 deletions
diff --git a/WebCore/platform/graphics/MediaPlayer.cpp b/WebCore/platform/graphics/MediaPlayer.cpp
index 9fb2d4a..83e84d9 100644
--- a/WebCore/platform/graphics/MediaPlayer.cpp
+++ b/WebCore/platform/graphics/MediaPlayer.cpp
@@ -47,21 +47,29 @@
 
 #if PLATFORM(MAC)
 #include "MediaPlayerPrivateQTKit.h"
+#define PlatformMediaEngineClassName MediaPlayerPrivateQTKit
 #elif OS(WINCE) && !PLATFORM(QT)
 #include "MediaPlayerPrivateWinCE.h"
+#define PlatformMediaEngineClassName MediaPlayerPrivate
 #elif PLATFORM(WIN)
 #include "MediaPlayerPrivateQuickTimeVisualContext.h"
-#include "MediaPlayerPrivateQuicktimeWin.h"
+#define PlatformMediaEngineClassName MediaPlayerPrivateQuickTimeVisualContext
 #elif PLATFORM(QT)
-#if USE(QT_MULTIMEDIA)
+#if USE(QT_MULTIMEDIA) && !USE(GSTREAMER)
 #include "MediaPlayerPrivateQt.h"
-#else
+#define PlatformMediaEngineClassName MediaPlayerPrivateQt
+#elif !USE(GSTREAMER)
 #include "MediaPlayerPrivatePhonon.h"
+#define PlatformMediaEngineClassName MediaPlayerPrivatePhonon
 #endif
 #elif PLATFORM(CHROMIUM)
 #include "MediaPlayerPrivateChromium.h"
+<<<<<<< HEAD
 #elif PLATFORM(ANDROID)
 #include "MediaPlayerPrivateAndroid.h"
+=======
+#define PlatformMediaEngineClassName MediaPlayerPrivate
+>>>>>>> webkit.org at r72274
 #endif
 
 namespace WebCore {
@@ -167,26 +175,14 @@ static Vector<MediaPlayerFactory*>& installedMediaEngines()
 
     if (!enginesQueried) {
         enginesQueried = true;
+
 #if USE(GSTREAMER)
         MediaPlayerPrivateGStreamer::registerMediaEngine(addMediaEngine);
 #endif
 
-#if PLATFORM(WIN)
-        MediaPlayerPrivateQuickTimeVisualContext::registerMediaEngine(addMediaEngine);
-#elif PLATFORM(QT)
-#if USE(QT_MULTIMEDIA)
-        MediaPlayerPrivateQt::registerMediaEngine(addMediaEngine);
-#else
-        MediaPlayerPrivatePhonon::registerMediaEngine(addMediaEngine);
+#if !PLATFORM(GTK) && !PLATFORM(EFL) && !(PLATFORM(QT) && USE(GSTREAMER))
+        PlatformMediaEngineClassName::registerMediaEngine(addMediaEngine);
 #endif
-#elif !PLATFORM(GTK) && !PLATFORM(EFL)
-        // FIXME: currently all the MediaEngines are named
-        // MediaPlayerPrivate. This code will need an update when bug
-        // 36663 is adressed.
-        MediaPlayerPrivate::registerMediaEngine(addMediaEngine);
-#endif
-
-        // register additional engines here
     }
     
     return installedEngines;
@@ -653,6 +649,11 @@ float MediaPlayer::mediaTimeForTimeValue(float timeValue) const
     return m_private->mediaTimeForTimeValue(timeValue);
 }
 
+double MediaPlayer::maximumDurationToCacheMediaTime() const
+{
+    return m_private->maximumDurationToCacheMediaTime();
+}
+
 // Client callbacks.
 void MediaPlayer::networkStateChanged()
 {