X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gst%2Fgst.c;h=ddd68a1e81910525b4fe1cd199034bc40cd5c5f2;hb=533548529b564b43bdd5743ef072e2da75822947;hp=bcaae43ef790a82390510603a785a4c9fbeafdf2;hpb=f6a4af20b2b2b044e5c0b939f97861fc7cca94dd;p=platform%2Fupstream%2Fgstreamer.git diff --git a/gst/gst.c b/gst/gst.c index bcaae43..ddd68a1 100644 --- a/gst/gst.c +++ b/gst/gst.c @@ -16,8 +16,8 @@ * * You should have received a copy of the GNU Library General Public * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, + * Boston, MA 02110-1301, USA. */ /** @@ -71,9 +71,6 @@ * N_("Output tags (also known as metadata)"), NULL}, * {NULL} * }; - * // must initialise the threading system before using any other GLib funtion - * if (!g_thread_supported ()) - * g_thread_init (NULL); * ctx = g_option_context_new ("[ADDITIONAL ARGUMENTS]"); * g_option_context_add_main_entries (ctx, options, GETTEXT_PACKAGE); * g_option_context_add_group (ctx, gst_init_get_option_group ()); @@ -118,6 +115,7 @@ #include /* for LC_ALL */ #include "gst.h" +#include "gsttrace.h" #define GST_CAT_DEFAULT GST_CAT_GST_INIT @@ -138,7 +136,7 @@ extern gboolean _priv_gst_disable_registry_update; #endif #ifndef GST_DISABLE_GST_DEBUG -extern const gchar *priv_gst_dump_dot_dir; +const gchar *priv_gst_dump_dot_dir; #endif /* defaults */ @@ -178,6 +176,7 @@ enum ARG_DEBUG, ARG_DEBUG_DISABLE, ARG_DEBUG_NO_COLOR, + ARG_DEBUG_COLOR_MODE, ARG_DEBUG_HELP, #endif ARG_PLUGIN_SPEW, @@ -194,82 +193,6 @@ enum * val ::= [0-5] */ -#ifndef NUL -#define NUL '\0' -#endif - -#ifndef GST_DISABLE_GST_DEBUG -static gboolean -parse_debug_category (gchar * str, const gchar ** category) -{ - if (!str) - return FALSE; - - /* works in place */ - g_strstrip (str); - - if (str[0] != NUL) { - *category = str; - return TRUE; - } - - return FALSE; -} - -static gboolean -parse_debug_level (gchar * str, GstDebugLevel * level) -{ - if (!str) - return FALSE; - - /* works in place */ - g_strstrip (str); - - if (str[0] != NUL && str[1] == NUL - && str[0] >= '0' && str[0] < '0' + GST_LEVEL_COUNT) { - *level = (GstDebugLevel) (str[0] - '0'); - return TRUE; - } - - return FALSE; -} - -static void -parse_debug_list (const gchar * list) -{ - gchar **split; - gchar **walk; - - g_assert (list); - - split = g_strsplit (list, ",", 0); - - for (walk = split; *walk; walk++) { - if (strchr (*walk, ':')) { - gchar **values = g_strsplit (*walk, ":", 2); - - if (values[0] && values[1]) { - GstDebugLevel level; - const gchar *category; - - if (parse_debug_category (values[0], &category) - && parse_debug_level (values[1], &level)) - gst_debug_set_threshold_for_name (category, level); - } - - g_strfreev (values); - } else { - GstDebugLevel level; - - if (parse_debug_level (*walk, &level)) - gst_debug_set_default_threshold (level); - } - } - - g_strfreev (split); -} -#endif - #ifdef G_OS_WIN32 BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved); BOOL WINAPI @@ -317,7 +240,7 @@ gst_init_get_option_group (void) NULL}, {"gst-debug-level", 0, 0, G_OPTION_ARG_CALLBACK, (gpointer) parse_goption_arg, - N_("Default debug level from 1 (only error) to 5 (anything) or " + N_("Default debug level from 1 (only error) to 9 (anything) or " "0 for no output"), N_("LEVEL")}, {"gst-debug", 0, 0, G_OPTION_ARG_CALLBACK, (gpointer) parse_goption_arg, @@ -328,6 +251,11 @@ gst_init_get_option_group (void) {"gst-debug-no-color", 0, G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK, (gpointer) parse_goption_arg, N_("Disable colored debugging output"), NULL}, + {"gst-debug-color-mode", 0, 0, G_OPTION_ARG_CALLBACK, + (gpointer) parse_goption_arg, + N_("Changes coloring mode of the debug log. " + "Possible modes: off, on, disable, auto, unix"), + NULL}, {"gst-debug-disable", 0, G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK, (gpointer) parse_goption_arg, N_("Disable debugging"), NULL}, #endif @@ -360,32 +288,6 @@ gst_init_get_option_group (void) {NULL} }; -/* Since GLib 2.31.0 threading is always enabled and g_thread_init() - * is not needed any longer and deprecated */ -#if !GLIB_CHECK_VERSION (2, 31, 0) - /* Since GLib 2.23.2 calling g_thread_init() 'late' is allowed and is - * automatically done as part of g_type_init() */ - if (glib_check_version (2, 23, 3)) { - /* The GLib threading system must be initialised before calling any other - * GLib function according to the documentation; if the application hasn't - * called gst_init() yet or initialised the threading system otherwise, we - * better issue a warning here (since chances are high that the application - * has already called other GLib functions such as g_option_context_new() */ - if (!g_thread_get_initialized ()) { - g_warning ("The GStreamer function gst_init_get_option_group() was\n" - "\tcalled, but the GLib threading system has not been initialised\n" - "\tyet, something that must happen before any other GLib function\n" - "\tis called. The application needs to be fixed so that it calls\n" - "\t if (!g_thread_get_initialized ()) g_thread_init(NULL);\n" - "\tas very first thing in its main() function. Please file a bug\n" - "\tagainst this application."); - g_thread_init (NULL); - } - } else { - /* GLib >= 2.23.2 */ - } -#endif - group = g_option_group_new ("gst", _("GStreamer Options"), _("Show GStreamer Options"), NULL, NULL); g_option_group_set_parse_hooks (group, (GOptionParseFunc) init_pre, @@ -413,10 +315,6 @@ gst_init_get_option_group (void) * for some reason. If you want your program to fail fatally, * use gst_init() instead. * - * This function should be called before calling any other GLib functions. If - * this is not an option, your program must initialise the GLib thread system - * using g_thread_init() before any other GLib functions are called. - * * Returns: %TRUE if GStreamer could be initialized. */ gboolean @@ -428,11 +326,6 @@ gst_init_check (int *argc, char **argv[], GError ** err) #endif gboolean res; -#if !GLIB_CHECK_VERSION (2, 31, 0) - if (!g_thread_get_initialized ()) - g_thread_init (NULL); -#endif - if (gst_initialized) { GST_DEBUG ("already initialized gst"); return TRUE; @@ -440,6 +333,7 @@ gst_init_check (int *argc, char **argv[], GError ** err) #ifndef GST_DISABLE_OPTION_PARSING ctx = g_option_context_new ("- GStreamer initialization"); g_option_context_set_ignore_unknown_options (ctx, TRUE); + g_option_context_set_help_enabled (ctx, FALSE); group = gst_init_get_option_group (); g_option_context_add_group (ctx, group); res = g_option_context_parse (ctx, argc, argv, err); @@ -476,10 +370,6 @@ gst_init_check (int *argc, char **argv[], GError ** err) * Running GStreamer Applications * for how to disable automatic registry updates. * - * This function should be called before calling any other GLib functions. If - * this is not an option, your program must initialise the GLib thread system - * using g_thread_init() before any other GLib functions are called. - * * * This function will terminate your program if it was unable to initialize * GStreamer for some reason. If you want your program to fall back, @@ -487,7 +377,7 @@ gst_init_check (int *argc, char **argv[], GError ** err) * * * WARNING: This function does not work in the same way as corresponding - * functions in other glib-style libraries, such as gtk_init(). In + * functions in other glib-style libraries, such as gtk_init\(\). In * particular, unknown command line options cause this function to * abort program execution. */ @@ -513,8 +403,6 @@ gst_init (int *argc, char **argv[]) * or gst_init_check(). * * Returns: TRUE if initialization has been done, FALSE otherwise. - * - * Since: 0.10.31 */ gboolean gst_is_initialized (void) @@ -573,47 +461,46 @@ static gboolean init_pre (GOptionContext * context, GOptionGroup * group, gpointer data, GError ** error) { + gchar *libdir; if (gst_initialized) { GST_DEBUG ("already initialized"); return TRUE; } - +#if !GLIB_CHECK_VERSION(2, 35, 0) g_type_init (); - -#if !GLIB_CHECK_VERSION (2, 31, 0) - /* we need threading to be enabled right here */ - g_assert (g_thread_get_initialized ()); #endif #ifndef GST_DISABLE_GST_DEBUG _priv_gst_debug_init (); + priv_gst_dump_dot_dir = g_getenv ("GST_DEBUG_DUMP_DOT_DIR"); #endif #ifdef ENABLE_NLS - setlocale (LC_ALL, ""); bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); #endif /* ENABLE_NLS */ -#ifndef GST_DISABLE_GST_DEBUG + /* This is the earliest we can make stuff show up in the logs. + * So give some useful info about GStreamer here */ +#ifdef G_OS_WIN32 { - const gchar *debug_list; + gchar *basedir = + g_win32_get_package_installation_directory_of_module + (_priv_gst_dll_handle); - if (g_getenv ("GST_DEBUG_NO_COLOR") != NULL) - gst_debug_set_colored (FALSE); - - debug_list = g_getenv ("GST_DEBUG"); - if (debug_list) { - parse_debug_list (debug_list); - } + libdir = g_build_filename (basedir, +#ifdef _DEBUG + "debug" +#endif + "lib", NULL); + g_free (basedir); } - - priv_gst_dump_dot_dir = g_getenv ("GST_DEBUG_DUMP_DOT_DIR"); +#else + libdir = g_strdup (LIBDIR); #endif - /* This is the earliest we can make stuff show up in the logs. - * So give some useful info about GStreamer here */ GST_INFO ("Initializing GStreamer Core Library version %s", VERSION); - GST_INFO ("Using library installed in %s", LIBDIR); + GST_INFO ("Using library installed in %s", libdir); + g_free (libdir); /* Print some basic system details if possible (OS/architecture) */ #ifdef HAVE_SYS_UTSNAME_H @@ -628,6 +515,11 @@ init_pre (GOptionContext * context, GOptionGroup * group, gpointer data, } #endif +#ifndef G_ATOMIC_LOCK_FREE + GST_CAT_WARNING (GST_CAT_PERFORMANCE, "GLib atomic operations are NOT " + "implemented using real hardware atomic operations!"); +#endif + return TRUE; } @@ -662,10 +554,6 @@ init_post (GOptionContext * context, GOptionGroup * group, gpointer data, { GLogLevelFlags llf; -#ifndef GST_DISABLE_TRACE - GstTrace *gst_trace; -#endif /* GST_DISABLE_TRACE */ - if (gst_initialized) { GST_DEBUG ("already initialized"); return TRUE; @@ -674,12 +562,18 @@ init_post (GOptionContext * context, GOptionGroup * group, gpointer data, llf = G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_ERROR | G_LOG_FLAG_FATAL; g_log_set_handler (g_log_domain_gstreamer, llf, debug_log_handler, NULL); +#ifndef GST_DISABLE_TRACE + _priv_gst_alloc_trace_initialize (); +#endif + + _priv_gst_mini_object_initialize (); _priv_gst_quarks_initialize (); _priv_gst_memory_initialize (); _priv_gst_format_initialize (); _priv_gst_query_initialize (); _priv_gst_structure_initialize (); _priv_gst_caps_initialize (); + _priv_gst_caps_features_initialize (); _priv_gst_meta_initialize (); g_type_class_ref (gst_object_get_type ()); @@ -691,8 +585,8 @@ init_post (GOptionContext * context, GOptionGroup * group, gpointer data, g_type_class_ref (gst_bus_get_type ()); g_type_class_ref (gst_task_get_type ()); g_type_class_ref (gst_clock_get_type ()); + g_type_class_ref (gst_debug_color_mode_get_type ()); - g_type_class_ref (gst_index_factory_get_type ()); gst_uri_handler_get_type (); g_type_class_ref (gst_object_flags_get_type ()); @@ -721,12 +615,6 @@ init_post (GOptionContext * context, GOptionGroup * group, gpointer data, g_type_class_ref (gst_seek_flags_get_type ()); g_type_class_ref (gst_qos_type_get_type ()); g_type_class_ref (gst_format_get_type ()); - g_type_class_ref (gst_index_certainty_get_type ()); - g_type_class_ref (gst_index_entry_type_get_type ()); - g_type_class_ref (gst_index_lookup_method_get_type ()); - g_type_class_ref (gst_assoc_flags_get_type ()); - g_type_class_ref (gst_index_resolver_method_get_type ()); - g_type_class_ref (gst_index_flags_get_type ()); g_type_class_ref (gst_debug_level_get_type ()); g_type_class_ref (gst_debug_color_flags_get_type ()); g_type_class_ref (gst_iterator_result_get_type ()); @@ -746,15 +634,17 @@ init_post (GOptionContext * context, GOptionGroup * group, gpointer data, g_type_class_ref (gst_plugin_flags_get_type ()); g_type_class_ref (gst_plugin_dependency_flags_get_type ()); g_type_class_ref (gst_rank_get_type ()); + g_type_class_ref (gst_query_type_flags_get_type ()); g_type_class_ref (gst_query_type_get_type ()); g_type_class_ref (gst_buffering_mode_get_type ()); g_type_class_ref (gst_stream_status_type_get_type ()); g_type_class_ref (gst_structure_change_type_get_type ()); g_type_class_ref (gst_tag_merge_mode_get_type ()); g_type_class_ref (gst_tag_flag_get_type ()); + g_type_class_ref (gst_tag_scope_get_type ()); g_type_class_ref (gst_task_pool_get_type ()); g_type_class_ref (gst_task_state_get_type ()); - g_type_class_ref (gst_alloc_trace_flags_get_type ()); + g_type_class_ref (gst_toc_entry_type_get_type ()); g_type_class_ref (gst_type_find_probability_get_type ()); g_type_class_ref (gst_uri_error_get_type ()); g_type_class_ref (gst_uri_type_get_type ()); @@ -762,7 +652,7 @@ init_post (GOptionContext * context, GOptionGroup * group, gpointer data, g_type_class_ref (gst_parse_flags_get_type ()); g_type_class_ref (gst_search_mode_get_type ()); g_type_class_ref (gst_progress_type_get_type ()); - g_type_class_ref (gst_buffer_pool_flags_get_type ()); + g_type_class_ref (gst_buffer_pool_acquire_flags_get_type ()); g_type_class_ref (gst_memory_flags_get_type ()); g_type_class_ref (gst_map_flags_get_type ()); g_type_class_ref (gst_caps_intersect_mode_get_type ()); @@ -770,6 +660,15 @@ init_post (GOptionContext * context, GOptionGroup * group, gpointer data, g_type_class_ref (gst_pad_probe_return_get_type ()); g_type_class_ref (gst_segment_flags_get_type ()); g_type_class_ref (gst_scheduling_flags_get_type ()); + g_type_class_ref (gst_meta_flags_get_type ()); + g_type_class_ref (gst_toc_entry_type_get_type ()); + g_type_class_ref (gst_toc_scope_get_type ()); + g_type_class_ref (gst_toc_loop_type_get_type ()); + g_type_class_ref (gst_control_binding_get_type ()); + g_type_class_ref (gst_control_source_get_type ()); + g_type_class_ref (gst_lock_flags_get_type ()); + g_type_class_ref (gst_allocator_flags_get_type ()); + g_type_class_ref (gst_stream_flags_get_type ()); _priv_gst_event_initialize (); _priv_gst_buffer_initialize (); @@ -777,14 +676,14 @@ init_post (GOptionContext * context, GOptionGroup * group, gpointer data, _priv_gst_buffer_list_initialize (); _priv_gst_sample_initialize (); _priv_gst_value_initialize (); + _priv_gst_context_initialize (); + g_type_class_ref (gst_param_spec_fraction_get_type ()); _priv_gst_tag_initialize (); gst_parse_context_get_type (); _priv_gst_plugin_initialize (); - gst_g_error_get_type (); - /* register core plugins */ gst_plugin_register_static (GST_VERSION_MAJOR, GST_VERSION_MINOR, "staticelements", "core elements linked into the GStreamer library", @@ -805,14 +704,6 @@ init_post (GOptionContext * context, GOptionGroup * group, gpointer data, if (!gst_update_registry ()) return FALSE; -#ifndef GST_DISABLE_TRACE - _gst_trace_on = 0; - if (_gst_trace_on) { - gst_trace = gst_trace_new ("gst.trace", 1024); - gst_trace_set_default (gst_trace); - } -#endif /* GST_DISABLE_TRACE */ - GST_INFO ("GLib runtime version: %d.%d.%d", glib_major_version, glib_minor_version, glib_micro_version); GST_INFO ("GLib headers version: %d.%d.%d", GLIB_MAJOR_VERSION, @@ -845,7 +736,7 @@ gst_debug_help (void) if (!init_post (NULL, NULL, NULL, NULL)) exit (1); - list2 = gst_registry_plugin_filter (gst_registry_get_default (), + list2 = gst_registry_plugin_filter (gst_registry_get (), select_all, FALSE, NULL); /* FIXME this is gross. why don't debug have categories PluginFeatures? */ @@ -864,9 +755,27 @@ gst_debug_help (void) g_print ("---------------------+--------+--------------------------------\n"); while (walk) { + gboolean on_unix; GstDebugCategory *cat = (GstDebugCategory *) walk->data; + GstDebugColorMode coloring = gst_debug_get_color_mode (); +#ifdef G_OS_UNIX + on_unix = TRUE; +#else + on_unix = FALSE; +#endif + + if (GST_DEBUG_COLOR_MODE_UNIX == coloring + || (on_unix && GST_DEBUG_COLOR_MODE_ON == coloring)) { + gchar *color = gst_debug_construct_term_color (cat->color); - if (gst_debug_is_colored ()) { + g_print ("%s%-20s\033[00m %1d %s %s%s\033[00m\n", + color, + gst_debug_category_get_name (cat), + gst_debug_category_get_threshold (cat), + gst_debug_level_get_name (gst_debug_category_get_threshold (cat)), + color, gst_debug_category_get_description (cat)); + g_free (color); + } else if (GST_DEBUG_COLOR_MODE_ON == coloring && !on_unix) { #ifdef G_OS_WIN32 gint color = gst_debug_construct_win_color (cat->color); const gint clear = FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE; @@ -880,16 +789,6 @@ gst_debug_help (void) g_print ("%s", gst_debug_category_get_description (cat)); SetConsoleTextAttribute (GetStdHandle (STD_OUTPUT_HANDLE), clear); g_print ("\n"); -#else /* G_OS_WIN32 */ - gchar *color = gst_debug_construct_term_color (cat->color); - - g_print ("%s%-20s\033[00m %1d %s %s%s\033[00m\n", - color, - gst_debug_category_get_name (cat), - gst_debug_category_get_threshold (cat), - gst_debug_level_get_name (gst_debug_category_get_threshold (cat)), - color, gst_debug_category_get_description (cat)); - g_free (color); #endif /* G_OS_WIN32 */ } else { g_print ("%-20s %1d %s %s\n", gst_debug_category_get_name (cat), @@ -925,17 +824,20 @@ parse_one_option (gint opt, const gchar * arg, GError ** err) GstDebugLevel tmp = GST_LEVEL_NONE; tmp = (GstDebugLevel) strtol (arg, NULL, 0); - if (tmp >= 0 && tmp < GST_LEVEL_COUNT) { + if (((guint) tmp) < GST_LEVEL_COUNT) { gst_debug_set_default_threshold (tmp); } break; } case ARG_DEBUG: - parse_debug_list (arg); + gst_debug_set_threshold_from_string (arg, FALSE); break; case ARG_DEBUG_NO_COLOR: gst_debug_set_colored (FALSE); break; + case ARG_DEBUG_COLOR_MODE: + gst_debug_set_color_mode_from_string (arg); + break; case ARG_DEBUG_DISABLE: gst_debug_set_active (FALSE); break; @@ -991,6 +893,7 @@ parse_goption_arg (const gchar * opt, "--gst-debug", ARG_DEBUG}, { "--gst-debug-disable", ARG_DEBUG_DISABLE}, { "--gst-debug-no-color", ARG_DEBUG_NO_COLOR}, { + "--gst-debug-color-mode", ARG_DEBUG_COLOR_MODE}, { "--gst-debug-help", ARG_DEBUG_HELP}, #endif { @@ -1030,6 +933,7 @@ parse_goption_arg (const gchar * opt, void gst_deinit (void) { + GstBinClass *bin_class; GstClock *clock; GST_INFO ("deinitializing GStreamer"); @@ -1039,6 +943,14 @@ gst_deinit (void) return; } + g_thread_pool_set_max_unused_threads (0); + bin_class = GST_BIN_CLASS (g_type_class_peek (gst_bin_get_type ())); + if (bin_class->pool != NULL) { + g_thread_pool_free (bin_class->pool, FALSE, TRUE); + bin_class->pool = NULL; + } + gst_task_cleanup_all (); + g_slist_foreach (_priv_gst_preload_plugins, (GFunc) g_free, NULL); g_slist_free (_priv_gst_preload_plugins); _priv_gst_preload_plugins = NULL; @@ -1055,6 +967,10 @@ gst_deinit (void) _priv_gst_registry_cleanup (); +#ifndef GST_DISABLE_TRACE + _priv_gst_alloc_trace_deinit (); +#endif + g_type_class_unref (g_type_class_peek (gst_object_get_type ())); g_type_class_unref (g_type_class_peek (gst_pad_get_type ())); g_type_class_unref (g_type_class_peek (gst_element_factory_get_type ())); @@ -1063,7 +979,6 @@ gst_deinit (void) g_type_class_unref (g_type_class_peek (gst_bin_get_type ())); g_type_class_unref (g_type_class_peek (gst_bus_get_type ())); g_type_class_unref (g_type_class_peek (gst_task_get_type ())); - g_type_class_unref (g_type_class_peek (gst_index_factory_get_type ())); g_type_class_unref (g_type_class_peek (gst_object_flags_get_type ())); g_type_class_unref (g_type_class_peek (gst_bin_flags_get_type ())); g_type_class_unref (g_type_class_peek (gst_buffer_flags_get_type ())); @@ -1097,18 +1012,12 @@ gst_deinit (void) g_type_class_unref (g_type_class_peek (gst_seek_flags_get_type ())); g_type_class_unref (g_type_class_peek (gst_qos_type_get_type ())); g_type_class_unref (g_type_class_peek (gst_format_get_type ())); - g_type_class_unref (g_type_class_peek (gst_index_certainty_get_type ())); - g_type_class_unref (g_type_class_peek (gst_index_entry_type_get_type ())); - g_type_class_unref (g_type_class_peek (gst_index_lookup_method_get_type ())); - g_type_class_unref (g_type_class_peek (gst_assoc_flags_get_type ())); - g_type_class_unref (g_type_class_peek (gst_index_resolver_method_get_type - ())); - g_type_class_unref (g_type_class_peek (gst_index_flags_get_type ())); g_type_class_unref (g_type_class_peek (gst_debug_level_get_type ())); g_type_class_unref (g_type_class_peek (gst_debug_color_flags_get_type ())); g_type_class_unref (g_type_class_peek (gst_iterator_result_get_type ())); g_type_class_unref (g_type_class_peek (gst_iterator_item_get_type ())); g_type_class_unref (g_type_class_peek (gst_message_type_get_type ())); + g_type_class_unref (g_type_class_peek (gst_meta_flags_get_type ())); g_type_class_unref (g_type_class_peek (gst_mini_object_flags_get_type ())); g_type_class_unref (g_type_class_peek (gst_pad_link_return_get_type ())); g_type_class_unref (g_type_class_peek (gst_pad_link_check_get_type ())); @@ -1122,12 +1031,15 @@ gst_deinit (void) g_type_class_unref (g_type_class_peek (gst_plugin_error_get_type ())); g_type_class_unref (g_type_class_peek (gst_plugin_flags_get_type ())); g_type_class_unref (g_type_class_peek (gst_rank_get_type ())); + g_type_class_unref (g_type_class_peek (gst_query_type_flags_get_type ())); g_type_class_unref (g_type_class_peek (gst_query_type_get_type ())); g_type_class_unref (g_type_class_peek (gst_buffering_mode_get_type ())); g_type_class_unref (g_type_class_peek (gst_tag_merge_mode_get_type ())); g_type_class_unref (g_type_class_peek (gst_tag_flag_get_type ())); + g_type_class_unref (g_type_class_peek (gst_tag_scope_get_type ())); g_type_class_unref (g_type_class_peek (gst_task_state_get_type ())); - g_type_class_unref (g_type_class_peek (gst_alloc_trace_flags_get_type ())); + g_type_class_unref (g_type_class_peek (gst_toc_entry_type_get_type ())); + g_type_class_unref (g_type_class_peek (gst_toc_scope_get_type ())); g_type_class_unref (g_type_class_peek (gst_type_find_probability_get_type ())); g_type_class_unref (g_type_class_peek (gst_uri_type_get_type ())); @@ -1135,7 +1047,8 @@ gst_deinit (void) g_type_class_unref (g_type_class_peek (gst_parse_error_get_type ())); g_type_class_unref (g_type_class_peek (gst_param_spec_fraction_get_type ())); g_type_class_unref (g_type_class_peek (gst_progress_type_get_type ())); - g_type_class_unref (g_type_class_peek (gst_buffer_pool_flags_get_type ())); + g_type_class_unref (g_type_class_peek (gst_buffer_pool_acquire_flags_get_type + ())); g_type_class_unref (g_type_class_peek (gst_memory_flags_get_type ())); g_type_class_unref (g_type_class_peek (gst_map_flags_get_type ())); g_type_class_unref (g_type_class_peek (gst_caps_intersect_mode_get_type ())); @@ -1144,6 +1057,15 @@ gst_deinit (void) g_type_class_unref (g_type_class_peek (gst_segment_flags_get_type ())); g_type_class_unref (g_type_class_peek (gst_scheduling_flags_get_type ())); + g_type_class_unref (g_type_class_peek (gst_control_binding_get_type ())); + g_type_class_unref (g_type_class_peek (gst_control_source_get_type ())); + g_type_class_unref (g_type_class_peek (gst_toc_entry_type_get_type ())); + g_type_class_unref (g_type_class_peek (gst_toc_loop_type_get_type ())); + g_type_class_unref (g_type_class_peek (gst_lock_flags_get_type ())); + g_type_class_unref (g_type_class_peek (gst_allocator_flags_get_type ())); + g_type_class_unref (g_type_class_peek (gst_stream_flags_get_type ())); + g_type_class_unref (g_type_class_peek (gst_debug_color_mode_get_type ())); + gst_deinitialized = TRUE; GST_INFO ("deinitialized GStreamer"); } @@ -1208,8 +1130,6 @@ gst_version_string (void) * wants to install its own handler without GStreamer interfering. * * Returns: %TRUE if GStreamer is allowed to install a custom SIGSEGV handler. - * - * Since: 0.10.10 */ gboolean gst_segtrap_is_enabled (void) @@ -1224,8 +1144,6 @@ gst_segtrap_is_enabled (void) * * Applications might want to disable/enable the SIGSEGV handling of * the GStreamer core. See gst_segtrap_is_enabled() for more information. - * - * Since: 0.10.10 */ void gst_segtrap_set_enabled (gboolean enabled)