diff options
author | wm4 <wm4@nowhere> | 2015-06-24 14:18:51 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2015-06-24 14:18:51 +0200 |
commit | fcd589b12393614d684c890917f9aac794aa325a (patch) | |
tree | 4f878d0389f1baaffa718305966737ccdf5de38b /demux/cue.c | |
parent | ae2873f72e90c948da1ed32af3e30e0cd6cef409 (diff) | |
download | mpv-fcd589b12393614d684c890917f9aac794aa325a.tar.bz2 mpv-fcd589b12393614d684c890917f9aac794aa325a.tar.xz |
demux: get rid of some bstr things
Change the demuxer_add_attachment() and demuxer_add_chapter() signatures
to take char* instead of bstr, and everything which depends on it.
Diffstat (limited to 'demux/cue.c')
-rw-r--r-- | demux/cue.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/demux/cue.c b/demux/cue.c index 832d78b215..7f2ded28c8 100644 --- a/demux/cue.c +++ b/demux/cue.c @@ -90,17 +90,17 @@ static bool eat_char(struct bstr *data, char ch) } } -static struct bstr read_quoted(struct bstr *data) +static char *read_quoted(void *talloc_ctx, struct bstr *data) { *data = bstr_lstrip(*data); if (!eat_char(data, '"')) - return (struct bstr) {0}; + return NULL; int end = bstrchr(*data, '"'); if (end < 0) - return (struct bstr) {0}; + return NULL; struct bstr res = bstr_splice(*data, 0, end); *data = bstr_cut(*data, end + 1); - return res; + return bstrto0(talloc_ctx, res); } // Read a 2 digit unsigned decimal integer. @@ -163,7 +163,7 @@ struct cue_file *mp_parse_cue(struct bstr data) data = skip_utf8_bom(data); - struct bstr filename = {0}; + char *filename = NULL; // Global metadata, and copied into new tracks. struct cue_track proto_track = {0}; struct cue_track *cur_track = &proto_track; @@ -182,7 +182,7 @@ struct cue_file *mp_parse_cue(struct bstr data) break; } case CUE_TITLE: - cur_track->title = read_quoted(¶m); + cur_track->title = read_quoted(f, ¶m); break; case CUE_INDEX: { int type = read_int_2(¶m); @@ -197,7 +197,7 @@ struct cue_file *mp_parse_cue(struct bstr data) } case CUE_FILE: // NOTE: FILE comes before TRACK, so don't use cur_track->filename - filename = read_quoted(¶m); + filename = read_quoted(f, ¶m); break; } } |