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

2 files changed, 44 insertions, 44 deletions

diff --git a/src/conf.c b/src/conf.c
index b5bbd8e92..0b3e0df5f 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -135,44 +135,44 @@ void initConf(void)
 	configEntriesList = makeList((ListFreeDataFunc *) freeConfigEntry, 1);
 
 	/* registerConfigParam(name,                   repeatable, block); */
-	registerConfigParam(CONF_PORT,                          0,     0);
-	registerConfigParam(CONF_PID_FILE,                      0,     0);
 	registerConfigParam(CONF_MUSIC_DIR,                     0,     0);
 	registerConfigParam(CONF_PLAYLIST_DIR,                  0,     0);
+	registerConfigParam(CONF_DB_FILE,                       0,     0);
 	registerConfigParam(CONF_LOG_FILE,                      0,     0);
 	registerConfigParam(CONF_ERROR_FILE,                    0,     0);
-	registerConfigParam(CONF_CONN_TIMEOUT,                  0,     0);
-	registerConfigParam(CONF_MIXER_DEVICE,                  0,     0);
-	registerConfigParam(CONF_MAX_CONN,                      0,     0);
-	registerConfigParam(CONF_MAX_PLAYLIST_LENGTH,           0,     0);
-	registerConfigParam(CONF_BUFFER_BEFORE_PLAY,            0,     0);
-	registerConfigParam(CONF_MAX_COMMAND_LIST_SIZE,         0,     0);
-	registerConfigParam(CONF_MAX_OUTPUT_BUFFER_SIZE,        0,     0);
-	registerConfigParam(CONF_AUDIO_OUTPUT,                  1,     1);
-	registerConfigParam(CONF_SAVE_ABSOLUTE_PATHS,           0,     0);
-	registerConfigParam(CONF_BIND_TO_ADDRESS,               1,     0);
-	registerConfigParam(CONF_MIXER_TYPE,                    0,     0);
+	registerConfigParam(CONF_PID_FILE,                      0,     0);
 	registerConfigParam(CONF_STATE_FILE,                    0,     0);
 	registerConfigParam(CONF_USER,                          0,     0);
-	registerConfigParam(CONF_DB_FILE,                       0,     0);
+	registerConfigParam(CONF_BIND_TO_ADDRESS,               1,     0);
+	registerConfigParam(CONF_PORT,                          0,     0);
 	registerConfigParam(CONF_LOG_LEVEL,                     0,     0);
-	registerConfigParam(CONF_MIXER_CONTROL,                 0,     0);
-	registerConfigParam(CONF_FS_CHARSET,                    0,     0);
 	registerConfigParam(CONF_PASSWORD,                      1,     0);
 	registerConfigParam(CONF_DEFAULT_PERMS,                 0,     0);
-	registerConfigParam(CONF_AUDIO_BUFFER_SIZE,             0,     0);
-	registerConfigParam(CONF_REPLAYGAIN,                    0,     0);
+	registerConfigParam(CONF_AUDIO_OUTPUT,                  1,     1);
 	registerConfigParam(CONF_AUDIO_OUTPUT_FORMAT,           0,     0);
+	registerConfigParam(CONF_MIXER_TYPE,                    0,     0);
+	registerConfigParam(CONF_MIXER_DEVICE,                  0,     0);
+	registerConfigParam(CONF_MIXER_CONTROL,                 0,     0);
+	registerConfigParam(CONF_REPLAYGAIN,                    0,     0);
+	registerConfigParam(CONF_REPLAYGAIN_PREAMP,             0,     0);
+	registerConfigParam(CONF_VOLUME_NORMALIZATION,          0,     0);
+	registerConfigParam(CONF_AUDIO_BUFFER_SIZE,             0,     0);
+	registerConfigParam(CONF_BUFFER_BEFORE_PLAY,            0,     0);
+	registerConfigParam(CONF_HTTP_BUFFER_SIZE,              0,     0);
+	registerConfigParam(CONF_HTTP_PREBUFFER_SIZE,           0,     0);
 	registerConfigParam(CONF_HTTP_PROXY_HOST,               0,     0);
 	registerConfigParam(CONF_HTTP_PROXY_PORT,               0,     0);
 	registerConfigParam(CONF_HTTP_PROXY_USER,               0,     0);
 	registerConfigParam(CONF_HTTP_PROXY_PASSWORD,           0,     0);
-	registerConfigParam(CONF_HTTP_BUFFER_SIZE,              0,     0);
-	registerConfigParam(CONF_HTTP_PREBUFFER_SIZE,           0,     0);
-	registerConfigParam(CONF_REPLAYGAIN_PREAMP,             0,     0);
-	registerConfigParam(CONF_METADATA_TO_USE,               0,     0);
+	registerConfigParam(CONF_CONN_TIMEOUT,                  0,     0);
+	registerConfigParam(CONF_MAX_CONN,                      0,     0);
+	registerConfigParam(CONF_MAX_PLAYLIST_LENGTH,           0,     0);
+	registerConfigParam(CONF_MAX_COMMAND_LIST_SIZE,         0,     0);
+	registerConfigParam(CONF_MAX_OUTPUT_BUFFER_SIZE,        0,     0);
+	registerConfigParam(CONF_FS_CHARSET,                    0,     0);
 	registerConfigParam(CONF_ID3V1_ENCODING,                0,     0);
-	registerConfigParam(CONF_VOLUME_NORMALIZATION,          0,     0);
+	registerConfigParam(CONF_METADATA_TO_USE,               0,     0);
+	registerConfigParam(CONF_SAVE_ABSOLUTE_PATHS,           0,     0);
 }
 
 static void addBlockParam(ConfigParam * param, char *name, char *value,
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;