diff options
| author | Max Kellermann <max@duempel.org> | 2013-11-28 18:48:35 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-11-28 18:48:35 +0100 |
| commit | af4133e3c92c78cc19ff14b876be6afcab1db091 (patch) | |
| tree | da38387995bde630b20f81a717862ae21d19bb48 /src/playlist | |
| parent | a788b7e747bc21b9aadee45dd028fa6198af794e (diff) | |
| download | mpd-af4133e3c92c78cc19ff14b876be6afcab1db091.tar.gz mpd-af4133e3c92c78cc19ff14b876be6afcab1db091.tar.xz mpd-af4133e3c92c78cc19ff14b876be6afcab1db091.zip | |
Util/StringUtil: add StringStartsWith()
Replaces GLib's g_str_has_prefix().
Diffstat (limited to 'src/playlist')
| -rw-r--r-- | src/playlist/ExtM3uPlaylistPlugin.cxx | 4 | ||||
| -rw-r--r-- | src/playlist/SoundCloudPlaylistPlugin.cxx | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/playlist/ExtM3uPlaylistPlugin.cxx b/src/playlist/ExtM3uPlaylistPlugin.cxx index 8d260fec7..a9c22a933 100644 --- a/src/playlist/ExtM3uPlaylistPlugin.cxx +++ b/src/playlist/ExtM3uPlaylistPlugin.cxx @@ -26,8 +26,6 @@ #include "util/StringUtil.hxx" #include "TextInputStream.hxx" -#include <glib.h> - #include <string.h> #include <stdlib.h> @@ -119,7 +117,7 @@ ExtM3uPlaylist::NextSong() line_s = line.c_str(); - if (g_str_has_prefix(line_s, "#EXTINF:")) { + if (StringStartsWith(line_s, "#EXTINF:")) { delete tag; tag = extm3u_parse_tag(line_s + 8); continue; diff --git a/src/playlist/SoundCloudPlaylistPlugin.cxx b/src/playlist/SoundCloudPlaylistPlugin.cxx index f6797b14d..0d4b39948 100644 --- a/src/playlist/SoundCloudPlaylistPlugin.cxx +++ b/src/playlist/SoundCloudPlaylistPlugin.cxx @@ -25,6 +25,7 @@ #include "InputStream.hxx" #include "Song.hxx" #include "tag/Tag.hxx" +#include "util/StringUtil.hxx" #include "util/Error.hxx" #include "util/Domain.hxx" #include "Log.hxx" @@ -65,9 +66,9 @@ static char * soundcloud_resolve(const char* uri) { char *u, *ru; - if (g_str_has_prefix(uri, "http://")) { + if (StringStartsWith(uri, "http://")) { u = g_strdup(uri); - } else if (g_str_has_prefix(uri, "soundcloud.com")) { + } else if (StringStartsWith(uri, "soundcloud.com")) { u = g_strconcat("http://", uri, nullptr); } else { /* assume it's just a path on soundcloud.com */ |