diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2014-09-26 02:18:50 +0200 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2014-09-26 02:18:50 +0200 |
| commit | 3a452971c96e4f7a9a3adf5d01b52dfb90f4027a (patch) | |
| tree | 5bfe9bf8f64d9bc6a9ccb81c423f71cfd8ad987e /src | |
| parent | include compiler in version print (diff) | |
no more debugging for GOptions
no textoverlay for preview
Diffstat (limited to 'src')
| -rw-r--r-- | src/options.c | 2 | ||||
| -rw-r--r-- | src/pipelines.c | 10 | ||||
| -rw-r--r-- | src/sydra.c | 3 |
3 files changed, 4 insertions, 11 deletions
diff --git a/src/options.c b/src/options.c index bcc1312..2ed8aed 100644 --- a/src/options.c +++ b/src/options.c @@ -184,7 +184,7 @@ int options_parse(options_t* opt, int argc, char* argv[]) { "appname", 'n', 0, G_OPTION_ARG_STRING, &opt->appname_, "set the application name (will be used by xvimagesink for window title)", "NAME" }, { "videosink", 'V', 0, G_OPTION_ARG_STRING, &opt->preview_videosink_, - "video sink element for local preview (i.e. xvimagesink) - leave empty to disable preview", "BIN DESCRIPTION" }, + "video sink element for local preview (i.e. textoverlay text=\" preview \" ! xvimagesink) - leave empty to disable preview", "BIN DESCRIPTION" }, { NULL } }; GOptionContext *ctx = g_option_context_new("- spreadspace streaming hydra "); diff --git a/src/pipelines.c b/src/pipelines.c index 5f73af3..3d32237 100644 --- a/src/pipelines.c +++ b/src/pipelines.c @@ -148,20 +148,16 @@ static gboolean create_udp_sinks(options_t* opt, GstElement* pipeline, GstElemen static gboolean create_preview_elements(const char* preview_bin_desc, GstElement* pipeline, GstElement* tee) { GstElement *qr = sydra_create_element("queue", NULL); - GstElement *to = sydra_create_element("textoverlay", NULL); GstElement *preview_bin = sydra_create_bin_from_desc("preview sink", preview_bin_desc); - if(!qr || !to || !preview_bin) { + if(!qr || !preview_bin) { return FALSE; } log_printf(DEBUG, "preview path created successfully!"); - g_object_set(G_OBJECT(to), "text", " local ", "halignment", 1 , "valignment", 0, - "shaded-background", TRUE, "font-desc", "Sans 18", NULL); - - gst_bin_add_many (GST_BIN(pipeline), qr, to, preview_bin, NULL); - gst_element_link_many(qr, to, preview_bin, NULL); + gst_bin_add_many (GST_BIN(pipeline), qr, preview_bin, NULL); + gst_element_link(qr, preview_bin); if(!sydra_link_request_static(tee, "src_%u", qr, "sink")) { return FALSE; diff --git a/src/sydra.c b/src/sydra.c index 085eea2..a7a73f4 100644 --- a/src/sydra.c +++ b/src/sydra.c @@ -256,9 +256,6 @@ int main(int argc, char* argv[]) else g_set_prgname (opt.progname_); - options_clear(&opt); - exit(0); - priv_info_t priv; if(opt.username_) if(priv_init(&priv, opt.username_, opt.groupname_)) { |