From efc5ac17bf0a563cc4200252e8d4718731dc9fde Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Wed, 4 Sep 2013 14:04:35 +0200
Subject: path: add a common mp_is_url() function

Remove the duplicated code.
---
 mpvcore/mplayer.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'mpvcore/mplayer.c')

diff --git a/mpvcore/mplayer.c b/mpvcore/mplayer.c
index 12bf0a3aec..be820dd10e 100644
--- a/mpvcore/mplayer.c
+++ b/mpvcore/mplayer.c
@@ -682,6 +682,8 @@ static void load_per_protocol_config(m_config_t *conf, const char * const file)
     m_profile_t *p;
 
     /* does filename actually uses a protocol ? */
+    if (!mp_is_url(bstr0(file)))
+        return;
     str = strstr(file, "://");
     if (!str)
         return;
@@ -784,11 +786,6 @@ static void load_per_file_config(m_config_t *conf, const char * const file,
     }
 }
 
-static bool might_be_an_url(bstr f)
-{
-    return bstr_find0(f, "://") >= 0;
-}
-
 #define MP_WATCH_LATER_CONF "watch_later"
 
 static char *get_playback_resume_config_filename(const char *fname)
@@ -796,7 +793,7 @@ static char *get_playback_resume_config_filename(const char *fname)
     char *res = NULL;
     void *tmp = talloc_new(NULL);
     const char *realpath = fname;
-    if (!might_be_an_url(bstr0(fname))) {
+    if (!mp_is_url(bstr0(fname))) {
         char *cwd = mp_getcwd(tmp);
         if (!cwd)
             goto exit;
-- 
cgit v1.2.3