[gst-cvs] gstreamer: pluginloader: disable external plugin loader on Windows until it is ported properly

[Tim Mueller]

Module: gstreamer
Branch: master
Commit: 9909d3312fc411f95088ca23119811385a80c210
URL:    http://cgit.freedesktop.org/gstreamer/gstreamer/commit/?id=9909d3312fc411f95088ca23119811385a80c210

Author: Andoni Morales Alastruey <ylatuya at gmail.com>
Date:   Fri Jan  8 20:56:18 2010 +0100

pluginloader: disable external plugin loader on Windows until it is ported properly

See #597662.

---

 gst/gstpluginloader.c |    6 +++++-
 gst/gstregistry.c     |    6 ++++++
 2 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/gst/gstpluginloader.c b/gst/gstpluginloader.c
index b4b3d60..b987c89 100644
--- a/gst/gstpluginloader.c
+++ b/gst/gstpluginloader.c
@@ -32,7 +32,11 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>
+#else
+#define fsync(fd) _commit(fd)
+#include <io.h>
 #endif
+
 #include <errno.h>
 
 #include <gst/gstconfig.h>
@@ -428,7 +432,7 @@ gboolean
 _gst_plugin_loader_client_run ()
 {
   GstPluginLoader *l;
-  int dup_fd;
+  int dup_fd = 0;
 
   l = plugin_loader_new (NULL);
   if (l == NULL)
diff --git a/gst/gstregistry.c b/gst/gstregistry.c
index 9e44031..a4048da 100644
--- a/gst/gstregistry.c
+++ b/gst/gstregistry.c
@@ -1003,6 +1003,12 @@ gst_registry_scan_plugin_file (GstRegistryScanContext * context,
   gboolean changed = FALSE;
   GstPlugin *newplugin = NULL;
 
+  #ifdef G_OS_WIN32
+    /* Disable external plugin loader on Windows until it is ported properly. */
+    context->helper_state = REGISTRY_SCAN_HELPER_DISABLED;
+  #endif
+
+
   /* Have a plugin to load - see if the scan-helper needs starting */
   if (context->helper_state == REGISTRY_SCAN_HELPER_NOT_STARTED) {
     GST_DEBUG ("Starting plugin scanner for file %s", filename);