diff options
author | Christian Pointner <equinox@spreadspace.org> | 2014-10-02 23:25:28 +0200 |
---|---|---|
committer | Christian Pointner <equinox@spreadspace.org> | 2014-10-02 23:25:28 +0200 |
commit | d048447e6bee06400acd3854f999e4c264172ac0 (patch) | |
tree | 7c6d04cebd98ceb40bea09a77da248ad808128af /src | |
parent | improved explanation of sydra (diff) |
renamed the sydra utility to sydra-rtp
Diffstat (limited to 'src')
-rw-r--r-- | src/Makefile | 4 | ||||
-rwxr-xr-x | src/configure | 4 | ||||
-rw-r--r-- | src/datatypes.h | 2 | ||||
-rw-r--r-- | src/log_targets.h | 4 | ||||
-rw-r--r-- | src/options.c | 4 | ||||
-rw-r--r-- | src/options.h | 2 | ||||
-rw-r--r-- | src/pipelines.c | 4 | ||||
-rw-r--r-- | src/sydra-rtp.c (renamed from src/sydra.c) | 4 |
8 files changed, 14 insertions, 14 deletions
diff --git a/src/Makefile b/src/Makefile index 3fcf405..ac211d8 100644 --- a/src/Makefile +++ b/src/Makefile @@ -37,14 +37,14 @@ ifneq ($(MAKECMDGOALS),distclean) include include.mk endif -EXECUTABLE := sydra +EXECUTABLE := sydra-rtp C_OBJS := log.o \ options.o \ utils.o \ pipelines.o \ udp.o \ - sydra.o + sydra-rtp.o C_SRCS := $(C_OBJS:%.o=%.c) diff --git a/src/configure b/src/configure index acb7a20..515399f 100755 --- a/src/configure +++ b/src/configure @@ -150,7 +150,7 @@ DATE=`date +"%d.%m.%Y %H:%M:%S %Z"` cat > config.h <<EOF /* - * sydra config header + * sydra-rtp config header * * this file was created automatically * do not edit this file directly @@ -160,7 +160,7 @@ cat > config.h <<EOF #ifndef SYDRA_config_h_INCLUDED #define SYDRA_config_h_INCLUDED -#define VERSION_STRING_0 "sydra version $VERSION" +#define VERSION_STRING_0 "sydra-rtp version $VERSION" #define VERSION_STRING_1 "built on $HOSTNAME, $DATE" #define TARGET "$TARGET" diff --git a/src/datatypes.h b/src/datatypes.h index 7ecd997..97fc03b 100644 --- a/src/datatypes.h +++ b/src/datatypes.h @@ -44,7 +44,7 @@ #include <netdb.h> -typedef enum { SENDER, RECEIVER } sydra_mode_t; +typedef enum { SENDER, RECEIVER } sydra_rtp_mode_t; struct addr_port { enum { IPv4, IPv6 } type_; diff --git a/src/log_targets.h b/src/log_targets.h index c27cc1a..71e56b9 100644 --- a/src/log_targets.h +++ b/src/log_targets.h @@ -87,7 +87,7 @@ int log_target_syslog_init(log_target_t* self, const char* conf) char* logname; const char* end = NULL; if(!conf) - logname = strdup("sydra"); + logname = strdup("sydra-rtp"); else { end = strchr(conf, ','); if(end) { @@ -216,7 +216,7 @@ int log_target_file_init(log_target_t* self, const char* conf) char* logfilename; if(!conf) - logfilename = strdup("sydra.log"); + logfilename = strdup("sydra-rtp.log"); else { const char* end = strchr(conf, ','); if(end) { diff --git a/src/options.c b/src/options.c index 89c55fc..483d6d7 100644 --- a/src/options.c +++ b/src/options.c @@ -49,7 +49,7 @@ static void options_defaults(options_t* opt) if(!opt) return; - opt->progname_ = g_strdup("sydra"); + opt->progname_ = g_strdup("sydra-rtp"); opt->daemonize_ = TRUE; opt->username_ = NULL; opt->groupname_ = NULL; @@ -335,7 +335,7 @@ static int options_parse_post(options_t* opt) if(!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,daemon"); + opt->log_targets_[0] = g_strdup("syslog:3,sydra-rtp,daemon"); if(!(opt->log_targets_[0])) return -127; opt->log_targets_[1] = NULL; } diff --git a/src/options.h b/src/options.h index 9ebcb01..afc5ae6 100644 --- a/src/options.h +++ b/src/options.h @@ -49,7 +49,7 @@ struct options_struct { gboolean debug_; gchar* appname_; - sydra_mode_t mode_; + sydra_rtp_mode_t mode_; gchar* source_; gchar* sink_; diff --git a/src/pipelines.c b/src/pipelines.c index 114a2c5..fa33562 100644 --- a/src/pipelines.c +++ b/src/pipelines.c @@ -353,7 +353,7 @@ static gboolean create_recorder_elements(options_t* opt, GstElement* pipeline, s GstElement* create_sender_pipeline(options_t* opt, struct udp_sinks *udp) { - GstElement *pipeline = gst_pipeline_new ("sydra-sender"); + GstElement *pipeline = gst_pipeline_new ("sydra-rtp-sender"); if(!pipeline) { log_printf(ERROR, "Creating pipeline failed!"); return NULL; @@ -434,7 +434,7 @@ static void rtpbin_pad_added(GstElement* rtp, GstPad* pad, gpointer user_data) GstElement* create_receiver_pipeline(options_t* opt, struct udp_sources *udp) { - GstElement *pipeline = gst_pipeline_new ("sydra-receiver"); + GstElement *pipeline = gst_pipeline_new ("sydra-rtp-receiver"); if(!pipeline) { log_printf(ERROR, "Creating pipeline failed!"); return NULL; diff --git a/src/sydra.c b/src/sydra-rtp.c index 70b9e56..c8c15da 100644 --- a/src/sydra.c +++ b/src/sydra-rtp.c @@ -312,13 +312,13 @@ int main(int argc, char* argv[]) nano_str = " (Prerelease)"; else nano_str = ""; - log_printf(NOTICE, "sydra linked against GStreamer %d.%d.%d%s", major, minor, micro, nano_str); + log_printf(NOTICE, "sydra-rtp linked against GStreamer %d.%d.%d%s", major, minor, micro, nano_str); ret = main_loop(&opt); options_clear(&opt); - log_printf(NOTICE, "sydra shutdown"); + log_printf(NOTICE, "sydra-rtp shutdown"); gst_deinit(); log_close(); |