From 781fa3888f1cccc455e0218790fefd8e3a2c5e9a Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Thu, 26 May 2016 00:08:15 +0200 Subject: go rid of some sydra left-overs --- LICENSE | 2 +- doc/Makefile | 2 +- src/Makefile | 2 +- src/configure | 2 +- src/daemon.h | 2 +- src/datatypes.h | 2 +- src/gstdvbbackend.c | 4 +++- src/log.c | 2 +- src/log.h | 2 +- src/log_targets.h | 2 +- src/options.c | 8 ++++---- src/options.h | 2 +- src/streamer.c | 2 +- src/streamer.h | 2 +- 14 files changed, 19 insertions(+), 17 deletions(-) diff --git a/LICENSE b/LICENSE index 9f62c98..43e247b 100644 --- a/LICENSE +++ b/LICENSE @@ -26,7 +26,7 @@ * grant permission for non-GPL-compatible GStreamer plugins to be used * and distributed together with GStreamer and gstdvbbackend. * This permission goes above and beyond the permissions granted by the - * GPL license sydra is covered by. + * GPL license gstdvbbackend is covered by. */ GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007 diff --git a/doc/Makefile b/doc/Makefile index 327ad18..a398fcb 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -26,7 +26,7 @@ ## grant permission for non-GPL-compatible GStreamer plugins to be used ## and distributed together with GStreamer and gstdvbbackend. ## This permission goes above and beyond the permissions granted by the -## GPL license sydra is covered by. +## GPL license gstdvbbackend is covered by. ## VERSION=$(shell cat ../version) diff --git a/src/Makefile b/src/Makefile index 7a8e060..1a2ab0a 100644 --- a/src/Makefile +++ b/src/Makefile @@ -26,7 +26,7 @@ ## grant permission for non-GPL-compatible GStreamer plugins to be used ## and distributed together with GStreamer and gstdvbbackend. ## This permission goes above and beyond the permissions granted by the -## GPL license sydra is covered by. +## GPL license gstdvbbackend is covered by. ## ifneq ($(MAKECMDGOALS),distclean) diff --git a/src/configure b/src/configure index c9fc65a..0e80896 100755 --- a/src/configure +++ b/src/configure @@ -27,7 +27,7 @@ # grant permission for non-GPL-compatible GStreamer plugins to be used # and distributed together with GStreamer and gstdvbbackend. # This permission goes above and beyond the permissions granted by the -# GPL license sydra is covered by. +# GPL license gstdvbbackend is covered by. # set -e diff --git a/src/daemon.h b/src/daemon.h index 81f715f..7e2527f 100644 --- a/src/daemon.h +++ b/src/daemon.h @@ -26,7 +26,7 @@ * grant permission for non-GPL-compatible GStreamer plugins to be used * and distributed together with GStreamer and gstdvbbackend. * This permission goes above and beyond the permissions granted by the - * GPL license sydra is covered by. + * GPL license gstdvbbackend is covered by. */ #ifndef GSTDVBBACKEND_daemon_h_INCLUDED diff --git a/src/datatypes.h b/src/datatypes.h index 4a83c42..820272e 100644 --- a/src/datatypes.h +++ b/src/datatypes.h @@ -26,7 +26,7 @@ * grant permission for non-GPL-compatible GStreamer plugins to be used * and distributed together with GStreamer and gstdvbbackend. * This permission goes above and beyond the permissions granted by the - * GPL license sydra is covered by. + * GPL license gstdvbbackend is covered by. */ #ifndef GSTDVBBACKEND_datatypes_h_INCLUDED diff --git a/src/gstdvbbackend.c b/src/gstdvbbackend.c index 0732f57..713d219 100644 --- a/src/gstdvbbackend.c +++ b/src/gstdvbbackend.c @@ -26,7 +26,7 @@ * grant permission for non-GPL-compatible GStreamer plugins to be used * and distributed together with GStreamer and gstdvbbackend. * This permission goes above and beyond the permissions granted by the - * GPL license sydra is covered by. + * GPL license gstdvbbackend is covered by. */ #define _GNU_SOURCE @@ -279,6 +279,8 @@ int main(int argc, char* argv[]) if(opt.debug_) options_print(&opt); + g_set_prgname (opt.progname_); + priv_info_t priv; if(opt.username_) if(priv_init(&priv, opt.username_, opt.groupname_)) { diff --git a/src/log.c b/src/log.c index 5eeaec7..ae889cc 100644 --- a/src/log.c +++ b/src/log.c @@ -26,7 +26,7 @@ * grant permission for non-GPL-compatible GStreamer plugins to be used * and distributed together with GStreamer and gstdvbbackend. * This permission goes above and beyond the permissions granted by the - * GPL license sydra is covered by. + * GPL license gstdvbbackend is covered by. */ #include "datatypes.h" diff --git a/src/log.h b/src/log.h index 2f9d369..3c807bc 100644 --- a/src/log.h +++ b/src/log.h @@ -26,7 +26,7 @@ * grant permission for non-GPL-compatible GStreamer plugins to be used * and distributed together with GStreamer and gstdvbbackend. * This permission goes above and beyond the permissions granted by the - * GPL license sydra is covered by. + * GPL license gstdvbbackend is covered by. */ #ifndef GSTDVBBACKEND_log_h_INCLUDED diff --git a/src/log_targets.h b/src/log_targets.h index fece03b..3ffe3cf 100644 --- a/src/log_targets.h +++ b/src/log_targets.h @@ -26,7 +26,7 @@ * grant permission for non-GPL-compatible GStreamer plugins to be used * and distributed together with GStreamer and gstdvbbackend. * This permission goes above and beyond the permissions granted by the - * GPL license sydra is covered by. + * GPL license gstdvbbackend is covered by. */ #ifndef GSTDVBBACKEND_log_targets_h_INCLUDED diff --git a/src/options.c b/src/options.c index 57a38bf..30623f9 100644 --- a/src/options.c +++ b/src/options.c @@ -26,7 +26,7 @@ * grant permission for non-GPL-compatible GStreamer plugins to be used * and distributed together with GStreamer and gstdvbbackend. * This permission goes above and beyond the permissions granted by the - * GPL license sydra is covered by. + * GPL license gstdvbbackend is covered by. */ #include "datatypes.h" @@ -46,7 +46,7 @@ static void options_defaults(options_t* opt) if(!opt) return; - opt->progname_ = g_strdup("sydra-rtp"); + opt->progname_ = g_strdup("gstdvbbackend"); opt->daemonize_ = TRUE; opt->username_ = NULL; opt->groupname_ = NULL; @@ -68,7 +68,7 @@ static GQuark options_error_quark() { static GQuark quark = 0; if (!quark) - quark = g_quark_from_static_string("sydra_options_error"); + quark = g_quark_from_static_string("gstdvbbackend_options_error"); return quark; } @@ -184,7 +184,7 @@ static int options_parse_post(options_t* opt) if(!opt->log_targets_ || !g_strv_length(opt->log_targets_)) { opt->log_targets_ = g_new(gchar*, 2); if(!opt->log_targets_) return -127; - opt->log_targets_[0] = g_strdup("syslog:3,sydra-launch,daemon"); + opt->log_targets_[0] = g_strdup("syslog:3,gstdvbbackend,daemon"); if(!(opt->log_targets_[0])) return -127; opt->log_targets_[1] = NULL; } diff --git a/src/options.h b/src/options.h index 9337927..90c986e 100644 --- a/src/options.h +++ b/src/options.h @@ -26,7 +26,7 @@ * grant permission for non-GPL-compatible GStreamer plugins to be used * and distributed together with GStreamer and gstdvbbackend. * This permission goes above and beyond the permissions granted by the - * GPL license sydra is covered by. + * GPL license gstdvbbackend is covered by. */ #ifndef GSTDVBBACKEND_options_h_INCLUDED diff --git a/src/streamer.c b/src/streamer.c index b9b20c0..78d8533 100644 --- a/src/streamer.c +++ b/src/streamer.c @@ -26,7 +26,7 @@ * grant permission for non-GPL-compatible GStreamer plugins to be used * and distributed together with GStreamer and gstdvbbackend. * This permission goes above and beyond the permissions granted by the - * GPL license sydra is covered by. + * GPL license gstdvbbackend is covered by. */ #include diff --git a/src/streamer.h b/src/streamer.h index 13a4109..bc464c5 100644 --- a/src/streamer.h +++ b/src/streamer.h @@ -26,7 +26,7 @@ * grant permission for non-GPL-compatible GStreamer plugins to be used * and distributed together with GStreamer and gstdvbbackend. * This permission goes above and beyond the permissions granted by the - * GPL license sydra is covered by. + * GPL license gstdvbbackend is covered by. */ #ifndef GSTDVBBACKEND_streamer_h_INCLUDED -- cgit v1.2.3