#include <fcntl.h>
#include <unistd.h>
#else
+#define WIN32_LEAN_AND_MEAN
+
#define fsync(fd) _commit(fd)
#include <io.h>
+
+#include <windows.h>
+extern HMODULE _priv_gst_dll_handle;
#endif
#ifdef HAVE_SYS_UTSNAME_H
plugin_loader_create_blacklist_plugin (GstPluginLoader * l,
PendingPluginEntry * entry)
{
- GstPlugin *plugin = g_object_newv (GST_TYPE_PLUGIN, 0, NULL);
+ GstPlugin *plugin = g_object_new (GST_TYPE_PLUGIN, NULL);
plugin->filename = g_strdup (entry->filename);
plugin->file_mtime = entry->file_mtime;
static gboolean
gst_plugin_loader_try_helper (GstPluginLoader * loader, gchar * location)
{
- char *argv[5] = { NULL, };
+ char *argv[6] = { NULL, };
int c = 0;
#if defined (__APPLE__) && defined (USR_BIN_ARCH_SWITCH)
#endif
argv[c++] = location;
argv[c++] = (char *) "-l";
+ argv[c++] = _gst_executable_path;
argv[c++] = NULL;
- if (c > 3) {
+ if (c > 4) {
GST_LOG ("Trying to spawn gst-plugin-scanner helper at %s with arch %s",
location, argv[1]);
} else {
if (!res) {
GST_LOG ("Trying installed plugin scanner");
+
+#ifdef G_OS_WIN32
+ {
+ gchar *basedir;
+
+ basedir =
+ g_win32_get_package_installation_directory_of_module
+ (_priv_gst_dll_handle);
+ helper_bin =
+ g_build_filename (basedir, GST_PLUGIN_SCANNER_SUBDIR,
+ "gstreamer-" GST_API_VERSION, "gst-plugin-scanner.exe", NULL);
+ g_free (basedir);
+ }
+#else
helper_bin = g_strdup (GST_PLUGIN_SCANNER_INSTALLED);
+#endif
res = gst_plugin_loader_try_helper (loader, helper_bin);
g_free (helper_bin);
gboolean
_gst_plugin_loader_client_run (void)
{
+ gboolean res = TRUE;
GstPluginLoader *l;
l = plugin_loader_new (NULL);
dup_fd = dup (0); /* STDIN */
if (dup_fd == -1) {
- GST_ERROR ("Failed to start. Could no dup STDIN, errno %d", errno);
- return FALSE;
+ GST_ERROR ("Failed to start. Could not dup STDIN, errno %d", errno);
+ res = FALSE;
+ goto beach;
}
l->fd_r.fd = dup_fd;
close (0);
dup_fd = dup (1); /* STDOUT */
if (dup_fd == -1) {
- GST_ERROR ("Failed to start. Could no dup STDOUT, errno %d", errno);
- return FALSE;
+ GST_ERROR ("Failed to start. Could not dup STDOUT, errno %d", errno);
+ res = FALSE;
+ goto beach;
}
l->fd_w.fd = dup_fd;
close (1);
/* Loop, listening for incoming packets on the fd and writing responses */
while (!l->rx_done && exchange_packets (l));
+#ifndef G_OS_WIN32
+beach:
+#endif
+
plugin_loader_free (l);
- return TRUE;
+ return res;
}
static void
l->tx_buf_write - l->tx_buf_read);
if (!l->rx_done) {
- if (gst_poll_fd_has_error (l->fdset, &l->fd_r) ||
- gst_poll_fd_has_closed (l->fdset, &l->fd_r)) {
- GST_LOG ("read fd %d closed/errored", l->fd_r.fd);
+ if (gst_poll_fd_has_error (l->fdset, &l->fd_r)) {
+ GST_LOG ("read fd %d errored", l->fd_r.fd);
goto fail_and_cleanup;
}
if (gst_poll_fd_can_read (l->fdset, &l->fd_r)) {
if (!read_one (l))
goto fail_and_cleanup;
+ } else if (gst_poll_fd_has_closed (l->fdset, &l->fd_r)) {
+ GST_LOG ("read fd %d closed", l->fd_r.fd);
+ goto fail_and_cleanup;
}
}
if (l->tx_buf_read < l->tx_buf_write) {
- if (gst_poll_fd_has_error (l->fdset, &l->fd_w) ||
- gst_poll_fd_has_closed (l->fdset, &l->fd_r)) {
- GST_ERROR ("write fd %d closed/errored", l->fd_w.fd);
+ if (gst_poll_fd_has_error (l->fdset, &l->fd_w)) {
+ GST_ERROR ("write fd %d errored", l->fd_w.fd);
goto fail_and_cleanup;
}
if (gst_poll_fd_can_write (l->fdset, &l->fd_w)) {
if (!write_one (l))
goto fail_and_cleanup;
+ } else if (gst_poll_fd_has_closed (l->fdset, &l->fd_w)) {
+ GST_LOG ("write fd %d closed", l->fd_w.fd);
+ goto fail_and_cleanup;
}
}
} while (l->tx_buf_read < l->tx_buf_write);