diff options
| author | J. Alexander Treuman <jat@spatialrift.net> | 2006-08-28 20:47:50 +0000 |
|---|---|---|
| committer | J. Alexander Treuman <jat@spatialrift.net> | 2006-08-28 20:47:50 +0000 |
| commit | 806acdd4f41e93bf1e3e67e99e11c55cce6188c3 (patch) | |
| tree | 163551ba2ee2a5505524d7d1110abae59d703fa2 /src/conf.h | |
| parent | 6018a1b4f87702bd15dd668fd3247d3c2e6ae027 (diff) | |
| download | mpd-806acdd4f41e93bf1e3e67e99e11c55cce6188c3.tar.gz mpd-806acdd4f41e93bf1e3e67e99e11c55cce6188c3.tar.xz mpd-806acdd4f41e93bf1e3e67e99e11c55cce6188c3.zip | |
Rearrange mpd.conf.5 and conf.[ch] to use the more logical ordering of config parameters that the new (yet to be committed) mpdconf.example will use.
git-svn-id: https://svn.musicpd.org/mpd/trunk@4715 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to 'src/conf.h')
| -rw-r--r-- | src/conf.h | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/src/conf.h b/src/conf.h index bebc62798..166b1d4b6 100644 --- a/src/conf.h +++ b/src/conf.h @@ -21,44 +21,44 @@ #include "../config.h" -#define CONF_PORT "port" -#define CONF_PID_FILE "pid_file" #define CONF_MUSIC_DIR "music_directory" #define CONF_PLAYLIST_DIR "playlist_directory" +#define CONF_DB_FILE "db_file" #define CONF_LOG_FILE "log_file" #define CONF_ERROR_FILE "error_file" -#define CONF_CONN_TIMEOUT "connection_timeout" -#define CONF_MIXER_DEVICE "mixer_device" -#define CONF_MAX_CONN "max_connections" -#define CONF_MAX_PLAYLIST_LENGTH "max_playlist_length" -#define CONF_BUFFER_BEFORE_PLAY "buffer_before_play" -#define CONF_MAX_COMMAND_LIST_SIZE "max_command_list_size" -#define CONF_MAX_OUTPUT_BUFFER_SIZE "max_output_buffer_size" -#define CONF_AUDIO_OUTPUT "audio_output" -#define CONF_SAVE_ABSOLUTE_PATHS "save_absolute_paths_in_playlists" -#define CONF_BIND_TO_ADDRESS "bind_to_address" -#define CONF_MIXER_TYPE "mixer_type" +#define CONF_PID_FILE "pid_file" #define CONF_STATE_FILE "state_file" #define CONF_USER "user" -#define CONF_DB_FILE "db_file" +#define CONF_BIND_TO_ADDRESS "bind_to_address" +#define CONF_PORT "port" #define CONF_LOG_LEVEL "log_level" -#define CONF_MIXER_CONTROL "mixer_control" -#define CONF_FS_CHARSET "filesystem_charset" #define CONF_PASSWORD "password" #define CONF_DEFAULT_PERMS "default_permissions" -#define CONF_AUDIO_BUFFER_SIZE "audio_buffer_size" +#define CONF_AUDIO_OUTPUT "audio_output" #define CONF_AUDIO_OUTPUT_FORMAT "audio_output_format" +#define CONF_MIXER_TYPE "mixer_type" +#define CONF_MIXER_DEVICE "mixer_device" +#define CONF_MIXER_CONTROL "mixer_control" #define CONF_REPLAYGAIN "replaygain" #define CONF_REPLAYGAIN_PREAMP "replaygain_preamp" +#define CONF_VOLUME_NORMALIZATION "volume_normalization" +#define CONF_AUDIO_BUFFER_SIZE "audio_buffer_size" +#define CONF_BUFFER_BEFORE_PLAY "buffer_before_play" +#define CONF_HTTP_BUFFER_SIZE "http_buffer_size" +#define CONF_HTTP_PREBUFFER_SIZE "http_prebuffer_size" #define CONF_HTTP_PROXY_HOST "http_proxy_host" #define CONF_HTTP_PROXY_PORT "http_proxy_port" #define CONF_HTTP_PROXY_USER "http_proxy_user" #define CONF_HTTP_PROXY_PASSWORD "http_proxy_password" -#define CONF_HTTP_BUFFER_SIZE "http_buffer_size" -#define CONF_HTTP_PREBUFFER_SIZE "http_prebuffer_size" -#define CONF_METADATA_TO_USE "metadata_to_use" +#define CONF_CONN_TIMEOUT "connection_timeout" +#define CONF_MAX_CONN "max_connections" +#define CONF_MAX_PLAYLIST_LENGTH "max_playlist_length" +#define CONF_MAX_COMMAND_LIST_SIZE "max_command_list_size" +#define CONF_MAX_OUTPUT_BUFFER_SIZE "max_output_buffer_size" +#define CONF_FS_CHARSET "filesystem_charset" #define CONF_ID3V1_ENCODING "id3v1_encoding" -#define CONF_VOLUME_NORMALIZATION "volume_normalization" +#define CONF_METADATA_TO_USE "metadata_to_use" +#define CONF_SAVE_ABSOLUTE_PATHS "save_absolute_paths_in_playlists" typedef struct _BlockParam { char *name; |