diff options
author | wm4 <wm4@mplayer2.org> | 2012-07-28 23:47:42 +0200 |
---|---|---|
committer | wm4 <wm4@mplayer2.org> | 2012-07-28 23:47:42 +0200 |
commit | 08caadb9c0b3c9070f2e5cb7f883f43d6cd5590e (patch) | |
tree | e6a6c3a2042231651ec2f622e312657da900280b /mplayer.c | |
parent | ca0979a5db442ae212c92a34dcbd97101eb5e51c (diff) | |
download | mpv-08caadb9c0b3c9070f2e5cb7f883f43d6cd5590e.tar.bz2 mpv-08caadb9c0b3c9070f2e5cb7f883f43d6cd5590e.tar.xz |
bstr: rename bstr() function to bstr0(), and typedef bstr to struct bstr
Replace all uses of bstr() with bstr0().
Also remove the ridiculous C++ workaround.
Diffstat (limited to 'mplayer.c')
-rw-r--r-- | mplayer.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1015,7 +1015,7 @@ static int libmpdemux_was_interrupted(struct MPContext *mpctx, int stop_play) static int playtree_add_playlist(struct MPContext *mpctx, play_tree_t *entry) { - play_tree_add_bpf(entry, bstr(mpctx->filename)); + play_tree_add_bpf(entry, bstr0(mpctx->filename)); { if (!entry) { @@ -4212,7 +4212,7 @@ play_next_file: // The entry is added to the main playtree after the switch(). break; case MP_CMD_LOADLIST: - entry = parse_playlist_file(mpctx->mconfig, bstr(cmd->args[0].v.s)); + entry = parse_playlist_file(mpctx->mconfig, bstr0(cmd->args[0].v.s)); break; case MP_CMD_QUIT: exit_player_with_rc(mpctx, EXIT_QUIT, |