From b3bdb5e6a1515c938fec0661bb56f4b39538195c Mon Sep 17 00:00:00 2001 From: Antti Ajanki Date: Thu, 8 Aug 2013 17:16:00 +0300 Subject: Combine quvi and external downloader pipes into a pipe that reads a menu written by an external shell script (src/menuscripts). Add YLE Areena as an example script (TODO: downloading rtmp streams). --- src/libwebvi/linktemplates.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'src/libwebvi/linktemplates.c') diff --git a/src/libwebvi/linktemplates.c b/src/libwebvi/linktemplates.c index a193df3..e7f76fd 100644 --- a/src/libwebvi/linktemplates.c +++ b/src/libwebvi/linktemplates.c @@ -126,15 +126,12 @@ LinkAction *parse_action(const gchar *actionstr) { if (*actionstr == '\0') { return link_action_create(LINK_ACTION_PARSE, NULL); - } else if (strcmp(actionstr, STREAM_LIBQUVI_SELECTOR) == 0) { - return link_action_create(LINK_ACTION_STREAM_LIBQUVI, NULL); + } else if (strncmp(actionstr, STREAM_SELECTOR, STREAM_SELECTOR_LEN) == 0) { + const gchar *command = actionstr + STREAM_SELECTOR_LEN; + return link_action_create(LINK_ACTION_STREAM, command); } else if (strncmp(actionstr, EXT_CMD_SELECTOR, EXT_CMD_SELECTOR_LEN) == 0) { const gchar *command = actionstr + EXT_CMD_SELECTOR_LEN; return link_action_create(LINK_ACTION_EXTERNAL_COMMAND, command); - } else if (strncmp(actionstr, STREAM_SELECTOR, STREAM_SELECTOR_LEN) == 0) { - g_log(LIBWEBVI_LOG_DOMAIN, G_LOG_LEVEL_WARNING, - "Unknown streamer %s in link template file", actionstr); - return NULL; } else { g_log(LIBWEBVI_LOG_DOMAIN, G_LOG_LEVEL_WARNING, "Invalid action %s in link template file", actionstr); -- cgit v1.2.3