diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2014-09-04 22:59:16 +0200 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2014-09-04 22:59:16 +0200 |
| commit | b93cf68ccf41e62d3e4dd76b8924aeb5d16ee481 (patch) | |
| tree | 4ebafcf9b478ad06797e0984e793d6c2fbc9427b /src/sydra.c | |
| parent | pipeline works now - however recording is still disabled.. (diff) | |
removed custom sighandler code in favor of glib based signal handling
Diffstat (limited to 'src/sydra.c')
| -rw-r--r-- | src/sydra.c | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/src/sydra.c b/src/sydra.c index 747d605..b45ef3c 100644 --- a/src/sydra.c +++ b/src/sydra.c @@ -35,15 +35,25 @@ #include <sys/select.h> #include <time.h> +#include <glib.h> +#include <glib-unix.h> #include <gst/gst.h> #include "datatypes.h" #include "options.h" #include "string_list.h" #include "log.h" -#include "sig_handler.h" #include "daemon.h" +static gboolean sig_handler_terminate(gpointer user_data) +{ + GMainLoop *loop = (GMainLoop *)user_data; + + log_printf(NOTICE, "signal received, closing application"); + g_main_loop_quit(loop); + return TRUE; +} + static gboolean bus_call(GstBus *bus, GstMessage *msg, gpointer data) { GMainLoop *loop = (GMainLoop *)data; @@ -161,7 +171,7 @@ int main_loop(options_t* opt) int rtcp_port_a = opt->rtp_port_base_ + 300; char* sender_desc; - int slen = asprintf(&sender_desc, "rtpbin name=rtpbin \ + int slen = asprintf(&sender_desc, "rtpbin name=rtpbin \ %s ! tee name=vt \ vt. ! queue silent=true ! %s ! tee name=cvt \ cvt. ! %s ! rtpbin.send_rtp_sink_0 \ @@ -202,9 +212,10 @@ int main_loop(options_t* opt) log_printf(INFO, "Set State: Playing"); gst_element_set_state(pipeline, GST_STATE_PLAYING); - signal_start(loop); + g_unix_signal_add(SIGHUP, sig_handler_terminate, loop); + g_unix_signal_add(SIGINT, sig_handler_terminate, loop); + g_unix_signal_add(SIGTERM, sig_handler_terminate, loop); g_main_loop_run(loop); - signal_stop(); log_printf(NOTICE, "Stopping pipeline"); gst_element_set_state (pipeline, GST_STATE_NULL); @@ -310,7 +321,6 @@ int main(int argc, char* argv[]) fclose(pid_file); } - signal_init(); gst_init(NULL, NULL); const gchar *nano_str; guint major, minor, micro, nano; |