aboutsummaryrefslogtreecommitdiffstats
path: root/src/Main.cxx
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2013-01-03 00:24:45 +0100
committerMax Kellermann <max@duempel.org>2013-01-03 01:04:18 +0100
commitd3293b889d20433adede6a248582ce778e1c87b8 (patch)
tree005c50fe1c81aae34aea2cd320e1f12e09a3c3aa /src/Main.cxx
parentb4b0b34e5a131f02f723f40cf9566cc43e37cf85 (diff)
downloadmpd-d3293b889d20433adede6a248582ce778e1c87b8.tar.gz
mpd-d3293b889d20433adede6a248582ce778e1c87b8.tar.xz
mpd-d3293b889d20433adede6a248582ce778e1c87b8.zip
database.h: move prototypes to DatabaseGlue.hxx
Diffstat (limited to 'src/Main.cxx')
-rw-r--r--src/Main.cxx7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/Main.cxx b/src/Main.cxx
index 3d457e31e..5e63f5f67 100644
--- a/src/Main.cxx
+++ b/src/Main.cxx
@@ -25,6 +25,7 @@
#include "StateFile.hxx"
#include "PlayerThread.hxx"
#include "Mapper.hxx"
+#include "DatabaseGlue.hxx"
extern "C" {
#include "daemon.h"
@@ -186,13 +187,13 @@ glue_db_init_and_load(void)
param = allocated;
}
- if (!db_init(param, &error))
+ if (!DatabaseGlobalInit(param, &error))
MPD_ERROR("%s", error->message);
if (allocated != NULL)
config_param_free(allocated);
- ret = db_load(&error);
+ ret = DatabaseGlobalOpen(&error);
if (!ret)
MPD_ERROR("%s", error->message);
@@ -520,7 +521,7 @@ int mpd_main(int argc, char *argv[])
playlist_global_finish();
start = clock();
- db_finish();
+ DatabaseGlobalDeinit();
g_debug("db_finish took %f seconds",
((float)(clock()-start))/CLOCKS_PER_SEC);