From 9477db236329a17891105c68bda99073196a3f69 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Fri, 26 Jun 2015 00:11:23 +0200 Subject: config/Templates: add constructor with defaulted "repeat" parameter --- src/config/ConfigTemplates.cxx | 98 +++++++++++++++++++++--------------------- src/config/ConfigTemplates.hxx | 4 ++ 2 files changed, 53 insertions(+), 49 deletions(-) diff --git a/src/config/ConfigTemplates.cxx b/src/config/ConfigTemplates.cxx index 6fbf025fc..7d28d9ffc 100644 --- a/src/config/ConfigTemplates.cxx +++ b/src/config/ConfigTemplates.cxx @@ -24,55 +24,55 @@ #include const ConfigTemplate config_param_templates[] = { - { "music_directory", false }, - { "playlist_directory", false }, - { "follow_inside_symlinks", false }, - { "follow_outside_symlinks", false }, - { "db_file", false }, - { "sticker_file", false }, - { "log_file", false }, - { "pid_file", false }, - { "state_file", false }, - { "state_file_interval", false }, - { "restore_paused", false }, - { "user", false }, - { "group", false }, + { "music_directory" }, + { "playlist_directory" }, + { "follow_inside_symlinks" }, + { "follow_outside_symlinks" }, + { "db_file" }, + { "sticker_file" }, + { "log_file" }, + { "pid_file" }, + { "state_file" }, + { "state_file_interval" }, + { "restore_paused" }, + { "user" }, + { "group" }, { "bind_to_address", true }, - { "port", false }, - { "log_level", false }, - { "zeroconf_name", false }, - { "zeroconf_enabled", false }, + { "port" }, + { "log_level" }, + { "zeroconf_name" }, + { "zeroconf_enabled" }, { "password", true }, - { "default_permissions", false }, - { "audio_output_format", false }, - { "mixer_type", false }, - { "replaygain", false }, - { "replaygain_preamp", false }, - { "replaygain_missing_preamp", false }, - { "replaygain_limit", false }, - { "volume_normalization", false }, - { "samplerate_converter", false }, - { "audio_buffer_size", false }, - { "buffer_before_play", false }, - { "http_proxy_host", false }, - { "http_proxy_port", false }, - { "http_proxy_user", false }, - { "http_proxy_password", false }, - { "connection_timeout", false }, - { "max_connections", false }, - { "max_playlist_length", false }, - { "max_command_list_size", false }, - { "max_output_buffer_size", false }, - { "filesystem_charset", false }, - { "id3v1_encoding", false }, - { "metadata_to_use", false }, - { "save_absolute_paths_in_playlists", false }, - { "gapless_mp3_playback", false }, - { "auto_update", false }, - { "auto_update_depth", false }, - { "despotify_user", false }, - { "despotify_password", false }, - { "despotify_high_bitrate", false }, + { "default_permissions" }, + { "audio_output_format" }, + { "mixer_type" }, + { "replaygain" }, + { "replaygain_preamp" }, + { "replaygain_missing_preamp" }, + { "replaygain_limit" }, + { "volume_normalization" }, + { "samplerate_converter" }, + { "audio_buffer_size" }, + { "buffer_before_play" }, + { "http_proxy_host" }, + { "http_proxy_port" }, + { "http_proxy_user" }, + { "http_proxy_password" }, + { "connection_timeout" }, + { "max_connections" }, + { "max_playlist_length" }, + { "max_command_list_size" }, + { "max_output_buffer_size" }, + { "filesystem_charset" }, + { "id3v1_encoding" }, + { "metadata_to_use" }, + { "save_absolute_paths_in_playlists" }, + { "gapless_mp3_playback" }, + { "auto_update" }, + { "auto_update_depth" }, + { "despotify_user" }, + { "despotify_password" }, + { "despotify_high_bitrate" }, }; static constexpr unsigned n_config_param_templates = @@ -86,9 +86,9 @@ const ConfigTemplate config_block_templates[] = { { "decoder", true }, { "input", true }, { "playlist_plugin", true }, - { "resampler", false }, + { "resampler" }, { "filter", true }, - { "database", false }, + { "database" }, { "neighbors", true }, }; diff --git a/src/config/ConfigTemplates.hxx b/src/config/ConfigTemplates.hxx index 1aa6c6e8d..7b01ad40f 100644 --- a/src/config/ConfigTemplates.hxx +++ b/src/config/ConfigTemplates.hxx @@ -23,6 +23,10 @@ struct ConfigTemplate { const char *const name; const bool repeatable; + + constexpr ConfigTemplate(const char *_name, + bool _repeatable=false) + :name(_name), repeatable(_repeatable) {} }; extern const ConfigTemplate config_param_templates[]; -- cgit v1.2.3