diff options
| author | Wim Taymans <wim.taymans@gmail.com> | 2005-03-10 12:51:45 +0000 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@gmail.com> | 2005-03-10 12:51:45 +0000 |
| commit | 007cff6d75995bda6ab24c9f7be7137686bc163d (patch) | |
| tree | a004a802d8721fd1b0f421505e67993e373b2089 /tools | |
| parent | e82e7b604ac0db2979fa83109102116f0ba47b40 (diff) | |
Doc updates.
Original commit message from CVS:
* docs/design/part-MT-refcounting.txt:
* docs/design/part-clocks.txt:
* docs/design/part-gstelement.txt:
* docs/design/part-gstobject.txt:
* docs/design/part-standards.txt:
* gst/gstbin.c: (gst_bin_add_func), (gst_bin_add),
(gst_bin_remove_func), (gst_bin_remove):
* gst/gstbin.h:
* gst/gstbuffer.c:
* gst/gstcaps.h:
* testsuite/clock/clock1.c: (main):
* testsuite/clock/clock2.c: (gst_clock_debug), (element_wait),
(main):
* testsuite/dlopen/loadgst.c: (do_test):
* testsuite/refcounting/bin.c: (add_remove_test1),
(add_remove_test2), (main):
* testsuite/refcounting/element.c: (main):
* testsuite/refcounting/element_pad.c: (main):
* testsuite/refcounting/pad.c: (main):
* tools/gst-launch.c: (sigint_handler_sighandler):
* tools/gst-typefind.c: (main):
Doc updates.
Added doc about clock.
removed gst_bin_iterate_recurse_up(), marked methods
for removal.
Fix more testsuites.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/gst-launch.c | 8 | ||||
| -rw-r--r-- | tools/gst-typefind.c | 6 |
2 files changed, 9 insertions, 5 deletions
diff --git a/tools/gst-launch.c b/tools/gst-launch.c index af0cb9b2f..bcda0bfb6 100644 --- a/tools/gst-launch.c +++ b/tools/gst-launch.c @@ -221,7 +221,7 @@ fault_handler_sighandler (int signum) fault_spin (); } -#else +#else /* USE_SIGINFO */ static void fault_handler_sigaction (int signum, siginfo_t * si, void *misc) @@ -246,7 +246,7 @@ fault_handler_sigaction (int signum, siginfo_t * si, void *misc) fault_spin (); } -#endif +#endif /* USE_SIGINFO */ static void fault_spin (void) @@ -293,7 +293,7 @@ fault_setup (void) sigaction (SIGSEGV, &action, NULL); sigaction (SIGQUIT, &action, NULL); } -#endif +#endif /* DISABLE_FAULT_HANDLER */ static void print_tag (const GstTagList * list, const gchar * tag, gpointer unused) @@ -343,6 +343,8 @@ error_cb (GObject * object, GstObject * source, GError * error, gchar * debug) static void sigint_handler_sighandler (int signum) { + g_print ("Caught interrupt -- "); + sigint_restore (); caught_intr = TRUE; diff --git a/tools/gst-typefind.c b/tools/gst-typefind.c index 7ea6034e9..bf463431b 100644 --- a/tools/gst-typefind.c +++ b/tools/gst-typefind.c @@ -52,8 +52,10 @@ main (int argc, char *argv[]) g_assert (GST_IS_ELEMENT (source)); typefind = gst_element_factory_make ("typefind", "typefind"); g_assert (GST_IS_ELEMENT (typefind)); - gst_bin_add_many (GST_BIN (pipeline), source, typefind, NULL); - gst_element_link (source, typefind); + gst_bin_add (GST_BIN (pipeline), source); + gst_bin_add (GST_BIN (pipeline), typefind); + gst_pad_link (gst_element_get_pad (source, "src"), + gst_element_get_pad (typefind, "sink")); g_signal_connect (G_OBJECT (typefind), "have-type", G_CALLBACK (have_type_handler), NULL); |