From c8f20f93121f6595315e26f5dcd095977056ef55 Mon Sep 17 00:00:00 2001 From: "Carsten Haitzler (Rasterman)" Date: Tue, 21 Jan 2014 22:27:10 +0900 Subject: [PATCH] update url handling to detect yourupe-dl output url streams --- src/bin/media.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/src/bin/media.c b/src/bin/media.c index c22d363e..1ea3e3a9 100644 --- a/src/bin/media.c +++ b/src/bin/media.c @@ -680,8 +680,9 @@ _type_mov_init(Evas_Object *obj) NULL, "gstreamer", "xine", - "vlc" - }; + "vlc", + "gstreamer1" + }; char *mod = NULL; Media *sd = evas_object_smart_data_get(obj); @@ -1315,12 +1316,26 @@ media_src_type_get(const char *src) query = strchr(src, '?'); if (query) { - if (strchr(query + 1, '=') && strchr(query + 1, '&')) + if (strchr(query + 1, '=') && !strchr(query + 1, '&')) { - const char *p = strstr(src, ".youtube.com/"); + const char *p = strstr(src, "www.youtube.com/watch"); + if (p && (p < query)) type = TYPE_MOV; } + else if (strchr(query + 1, '=') && strchr(query + 1, '&')) + { + const char *p = strstr(src, ".youtube.com/"); + + if (p && (p < query)) + type = TYPE_MOV; + else + { + p = strstr(src, ".googlevideo.com/"); + if (p && (p < query)) + type = TYPE_MOV; + } + } } } return type;