oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

mapper: pass music and playlist directory to mapper_init()

Browse Source 
Added another glue function in main().
This commit is contained in:
Max Kellermann 2009-07-15 18:58:19 +02:00
parent 7bc8c7518b
commit c134adbcbf
3 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main.c
View File

@ -100,6 +100,22 @@ glue_daemonize_init(const struct options *options)
daemonize_kill(); daemonize_kill();
} }
static void
glue_mapper_init(void)
{
const char *music_dir, *playlist_dir;
music_dir = config_get_path(CONF_MUSIC_DIR);
#if GLIB_CHECK_VERSION(2,14,0)
if (music_dir == NULL)
music_dir = g_get_user_special_dir(G_USER_DIRECTORY_MUSIC);
#endif
playlist_dir = config_get_path(CONF_PLAYLIST_DIR);
mapper_init(music_dir, playlist_dir);
}
/** /**
* Returns the database. If this function returns false, this has not * Returns the database. If this function returns false, this has not
* succeeded, and the caller should create the database after the * succeeded, and the caller should create the database after the
@ -304,7 +320,7 @@ int main(int argc, char *argv[])
event_pipe_register(PIPE_EVENT_IDLE, idle_event_emitted); event_pipe_register(PIPE_EVENT_IDLE, idle_event_emitted);
path_global_init(); path_global_init();
mapper_init(); glue_mapper_init();
initPermissions(); initPermissions();
playlist_global_init(); playlist_global_init();
spl_global_init(); spl_global_init();

22
src/mapper.c
View File

@ -25,7 +25,6 @@
#include "directory.h" #include "directory.h"
#include "song.h" #include "song.h"
#include "path.h" #include "path.h"
#include "conf.h"
#include <glib.h> #include <glib.h>
@ -90,24 +89,13 @@ mapper_set_playlist_dir(const char *path)
playlist_dir); playlist_dir);
} }
void mapper_init(void) void mapper_init(const char *_music_dir, const char *_playlist_dir)
{ {
const char *path; if (_music_dir != NULL)
mapper_set_music_dir(_music_dir);
path = config_get_path(CONF_MUSIC_DIR); if (_playlist_dir != NULL)
if (path != NULL) mapper_set_playlist_dir(_playlist_dir);
mapper_set_music_dir(path);
#if GLIB_CHECK_VERSION(2,14,0)
else {
path = g_get_user_special_dir(G_USER_DIRECTORY_MUSIC);
if (path != NULL)
mapper_set_music_dir(path);
}
#endif
path = config_get_path(CONF_PLAYLIST_DIR);
if (path != NULL)
mapper_set_playlist_dir(path);
} }
void mapper_finish(void) void mapper_finish(void)

2
src/mapper.h
View File

@ -31,7 +31,7 @@
struct directory; struct directory;
struct song; struct song;
void mapper_init(void); void mapper_init(const char *_music_dir, const char *_playlist_dir);
void mapper_finish(void); void mapper_finish(void);