projects
/
platform
/
upstream
/
gstreamer.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tee: Check for the removed pad flag also in the slow pushing path
[platform/upstream/gstreamer.git]
/
gst
/
gstregistry.c
diff --git
a/gst/gstregistry.c
b/gst/gstregistry.c
index
983946f
..
a8b2f51
100644
(file)
--- a/
gst/gstregistry.c
+++ b/
gst/gstregistry.c
@@
-196,7
+196,7
@@
static GstPlugin *gst_registry_lookup_bn_locked (GstRegistry * registry,
const char *basename);
#define gst_registry_parent_class parent_class
const char *basename);
#define gst_registry_parent_class parent_class
-G_DEFINE_TYPE (GstRegistry, gst_registry, GST_TYPE_OBJECT);
+G_DEFINE_TYPE
_WITH_PRIVATE
(GstRegistry, gst_registry, GST_TYPE_OBJECT);
static void
gst_registry_class_init (GstRegistryClass * klass)
static void
gst_registry_class_init (GstRegistryClass * klass)
@@
-205,8
+205,6
@@
gst_registry_class_init (GstRegistryClass * klass)
gobject_class = (GObjectClass *) klass;
gobject_class = (GObjectClass *) klass;
- g_type_class_add_private (klass, sizeof (GstRegistryPrivate));
-
/**
* GstRegistry::plugin-added:
* @registry: the registry that emitted the signal
/**
* GstRegistry::plugin-added:
* @registry: the registry that emitted the signal
@@
-239,9
+237,7
@@
gst_registry_class_init (GstRegistryClass * klass)
static void
gst_registry_init (GstRegistry * registry)
{
static void
gst_registry_init (GstRegistry * registry)
{
- registry->priv =
- G_TYPE_INSTANCE_GET_PRIVATE (registry, GST_TYPE_REGISTRY,
- GstRegistryPrivate);
+ registry->priv = gst_registry_get_instance_private (registry);
registry->priv->feature_hash = g_hash_table_new (g_str_hash, g_str_equal);
registry->priv->basename_hash = g_hash_table_new (g_str_hash, g_str_equal);
}
registry->priv->feature_hash = g_hash_table_new (g_str_hash, g_str_equal);
registry->priv->basename_hash = g_hash_table_new (g_str_hash, g_str_equal);
}
@@
-1375,7
+1371,7
@@
gst_registry_scan_path_internal (GstRegistryScanContext * context,
/**
* gst_registry_scan_path:
* @registry: the registry to add found plugins to
/**
* gst_registry_scan_path:
* @registry: the registry to add found plugins to
- * @path: the path to scan
+ * @path:
(type filename):
the path to scan
*
* Scan the given path for plugins to add to the registry. The syntax of the
* path is specific to the registry.
*
* Scan the given path for plugins to add to the registry. The syntax of the
* path is specific to the registry.
@@
-1647,11
+1643,8
@@
scan_and_update_registry (GstRegistry * default_registry,
g_win32_get_package_installation_directory_of_module
(_priv_gst_dll_handle);
g_win32_get_package_installation_directory_of_module
(_priv_gst_dll_handle);
- dir = g_build_filename (base_dir,
-#ifdef _DEBUG
- "debug"
-#endif
- "lib", "gstreamer-" GST_API_VERSION, NULL);
+ dir = g_build_filename (base_dir, GST_PLUGIN_SUBDIR,
+ "gstreamer-" GST_API_VERSION, NULL);
GST_DEBUG ("scanning DLL dir %s", dir);
changed |= gst_registry_scan_path_internal (&context, dir);
GST_DEBUG ("scanning DLL dir %s", dir);
changed |= gst_registry_scan_path_internal (&context, dir);