diff options
author | wm4 <wm4@nowhere> | 2012-08-04 02:17:40 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2012-08-04 19:59:55 +0200 |
commit | 714226b20ccd9b4b394201d37b3eeac17057ba88 (patch) | |
tree | 71b84934805c28708ca267dda84ff13642548de7 | |
parent | c7fe5f58e3769d6f577cb42f60ec0d2386c8afc0 (diff) | |
download | mpv-714226b20ccd9b4b394201d37b3eeac17057ba88.tar.bz2 mpv-714226b20ccd9b4b394201d37b3eeac17057ba88.tar.xz |
playlist: rename params_count field to num_params for consistency
Other (newer) parts of mplayer use this convention, so don't introduce
new conventions.
-rw-r--r-- | mplayer.c | 2 | ||||
-rw-r--r-- | playlist.c | 6 | ||||
-rw-r--r-- | playlist.h | 2 |
3 files changed, 5 insertions, 5 deletions
@@ -3607,7 +3607,7 @@ static void play_current_file(struct MPContext *mpctx) assert(mpctx->playlist->current); load_per_file_options(mpctx->mconfig, mpctx->playlist->current->params, - mpctx->playlist->current->params_count); + mpctx->playlist->current->num_params); // We must enable getch2 here to be able to interrupt network connection // or cache filling diff --git a/playlist.c b/playlist.c index 908baa9096..27877cb8b3 100644 --- a/playlist.c +++ b/playlist.c @@ -32,14 +32,14 @@ struct playlist_entry *playlist_entry_new(const char *filename) void playlist_entry_add_param(struct playlist_entry *e, bstr name, bstr value) { struct playlist_param p = {bstrdup(e, name), bstrdup(e, value)}; - MP_TARRAY_APPEND(e, e->params, e->params_count, p); + MP_TARRAY_APPEND(e, e->params, e->num_params, p); } void playlist_entry_add_params(struct playlist_entry *e, struct playlist_param *params, - int params_count) + int num_params) { - for (int n = 0; n < params_count; n++) + for (int n = 0; n < num_params; n++) playlist_entry_add_param(e, params[n].name, params[n].value); } diff --git a/playlist.h b/playlist.h index 8a74896d98..eb2ef9ed99 100644 --- a/playlist.h +++ b/playlist.h @@ -32,7 +32,7 @@ struct playlist_entry { char *filename; struct playlist_param *params; - int params_count; + int num_params; }; struct playlist { |