oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Util/StringUtil: add StringStartsWith()

Browse Source 
Replaces GLib's g_str_has_prefix().
This commit is contained in:
Max Kellermann
2013-11-28 18:48:35 +01:00
parent a788b7e747
commit af4133e3c9
16 changed files with 68 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/input/CdioParanoiaInputPlugin.cxx
View File

@@ -25,6 +25,7 @@
#include "CdioParanoiaInputPlugin.hxx"
#include "InputStream.hxx"
#include "InputPlugin.hxx"
#include "util/StringUtil.hxx"
#include "util/Error.hxx"
#include "util/Domain.hxx"
#include "system/ByteOrder.hxx"
@@ -117,7 +118,7 @@ struct cdio_uri {
static bool
parse_cdio_uri(struct cdio_uri *dest, const char *src, Error &error)
{
if (!g_str_has_prefix(src, "cdda://"))
if (!StringStartsWith(src, "cdda://"))
return false;
src += 7;

5
src/input/DespotifyInputPlugin.cxx
View File

@@ -23,14 +23,13 @@
#include "InputStream.hxx"
#include "InputPlugin.hxx"
#include "tag/Tag.hxx"
#include "util/StringUtil.hxx"
#include "Log.hxx"
extern "C" {
#include <despotify.h>
}
#include <glib.h>
#include <unistd.h>
#include <string.h>
#include <errno.h>
@@ -130,7 +129,7 @@ input_despotify_open(const char *url,
struct ds_link *ds_link;
struct ds_track *track;
if (!g_str_has_prefix(url, "spt://"))
if (!StringStartsWith(url, "spt://"))
return nullptr;
session = mpd_despotify_get_session();

15
src/input/FfmpegInputPlugin.cxx
View File

@@ -24,6 +24,7 @@
#include "FfmpegInputPlugin.hxx"
#include "InputStream.hxx"
#include "InputPlugin.hxx"
#include "util/StringUtil.hxx"
#include "util/Error.hxx"
#include "util/Domain.hxx"
@@ -32,8 +33,6 @@ extern "C" {
#include <libavformat/avformat.h>
}
#include <glib.h>
struct FfmpegInputStream {
InputStream base;
@@ -90,12 +89,12 @@ input_ffmpeg_open(const char *uri,
Mutex &mutex, Cond &cond,
Error &error)
{
if (!g_str_has_prefix(uri, "gopher://") &&
!g_str_has_prefix(uri, "rtp://") &&
!g_str_has_prefix(uri, "rtsp://") &&
!g_str_has_prefix(uri, "rtmp://") &&
!g_str_has_prefix(uri, "rtmpt://") &&
!g_str_has_prefix(uri, "rtmps://"))
if (!StringStartsWith(uri, "gopher://") &&
!StringStartsWith(uri, "rtp://") &&
!StringStartsWith(uri, "rtsp://") &&
!StringStartsWith(uri, "rtmp://") &&
!StringStartsWith(uri, "rtmpt://") &&
!StringStartsWith(uri, "rtmps://"))
return nullptr;
AVIOContext *h;

10
src/input/MmsInputPlugin.cxx
View File

@@ -21,10 +21,10 @@
#include "MmsInputPlugin.hxx"
#include "InputStream.hxx"
#include "InputPlugin.hxx"
#include "util/StringUtil.hxx"
#include "util/Error.hxx"
#include "util/Domain.hxx"
#include <glib.h>
#include <libmms/mmsx.h>
struct MmsInputStream {
@@ -58,10 +58,10 @@ input_mms_open(const char *url,
Mutex &mutex, Cond &cond,
Error &error)
{
if (!g_str_has_prefix(url, "mms://") &&
!g_str_has_prefix(url, "mmsh://") &&
!g_str_has_prefix(url, "mmst://") &&
!g_str_has_prefix(url, "mmsu://"))
if (!StringStartsWith(url, "mms://") &&
!StringStartsWith(url, "mmsh://") &&
!StringStartsWith(url, "mmst://") &&
!StringStartsWith(url, "mmsu://"))
return nullptr;
const auto mms = mmsx_connect(nullptr, nullptr, url, 128 * 1024);