Commit e89bd30d authored by Max Kellermann's avatar Max Kellermann

Playlist: pass max_length to playlist_init()

Move the configuration lookup to Main.cxx.
parent 2a9d933a
...@@ -414,7 +414,8 @@ int mpd_main(int argc, char *argv[]) ...@@ -414,7 +414,8 @@ int mpd_main(int argc, char *argv[])
} }
initPermissions(); initPermissions();
playlist_global_init(); playlist_global_init(config_get_positive(CONF_MAX_PLAYLIST_LENGTH,
DEFAULT_PLAYLIST_MAX_LENGTH));
spl_global_init(); spl_global_init();
#ifdef ENABLE_ARCHIVE #ifdef ENABLE_ARCHIVE
archive_plugin_init_all(); archive_plugin_init_all();
......
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
#include "song.h" #include "song.h"
extern "C" { extern "C" {
#include "conf.h"
#include "idle.h" #include "idle.h"
} }
...@@ -54,11 +53,9 @@ playlist_tag_changed(struct playlist *playlist) ...@@ -54,11 +53,9 @@ playlist_tag_changed(struct playlist *playlist)
} }
void void
playlist_init(struct playlist *playlist) playlist_init(struct playlist *playlist, unsigned max_length)
{ {
queue_init(&playlist->queue, queue_init(&playlist->queue, max_length);
config_get_positive(CONF_MAX_PLAYLIST_LENGTH,
DEFAULT_PLAYLIST_MAX_LENGTH));
playlist->queued = -1; playlist->queued = -1;
playlist->current = -1; playlist->current = -1;
......
...@@ -74,13 +74,13 @@ struct playlist { ...@@ -74,13 +74,13 @@ struct playlist {
extern struct playlist g_playlist; extern struct playlist g_playlist;
void void
playlist_global_init(void); playlist_global_init(unsigned max_length);
void void
playlist_global_finish(void); playlist_global_finish(void);
void void
playlist_init(struct playlist *playlist); playlist_init(struct playlist *playlist, unsigned max_length);
void void
playlist_finish(struct playlist *playlist); playlist_finish(struct playlist *playlist);
......
...@@ -45,9 +45,9 @@ playlist_event(void) ...@@ -45,9 +45,9 @@ playlist_event(void)
} }
void void
playlist_global_init(void) playlist_global_init(unsigned max_length)
{ {
playlist_init(&g_playlist); playlist_init(&g_playlist, max_length);
event_pipe_register(PIPE_EVENT_TAG, playlist_tag_event); event_pipe_register(PIPE_EVENT_TAG, playlist_tag_event);
event_pipe_register(PIPE_EVENT_PLAYLIST, playlist_event); event_pipe_register(PIPE_EVENT_PLAYLIST, playlist_event);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment