MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-11-26 04:26:14 -05:00
Code Issues Packages Projects Releases Wiki Activity

Switch to the new database code

Browse Source
This commit is contained in:
Julien BLACHE
2009-06-07 18:58:02 +02:00
parent f2c677462b
commit a200703393
16 changed files with 334 additions and 432 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/main.c
View File

@@ -47,11 +47,11 @@
#include <libavformat/avformat.h>
#include "conffile.h"
#include "db.h"
#include "logger.h"
#include "misc.h"
#include "filescanner.h"
#include "httpd.h"
#include "db-generic.h"
#include "mdns_avahi.h"
@@ -334,7 +334,6 @@ main(int argc, char **argv)
char *logdomains;
char *logfile;
char *ffid;
char *perr;
char *pidfile;
sigset_t sigs;
int sigfd;
@@ -500,23 +499,17 @@ main(int argc, char **argv)
goto mdns_fail;
}
/* this will require that the db be readable by the runas user */
ret = db_open(&perr, "sqlite3", "/var/cache/mt-daapd"); /* FIXME */
if (ret != 0)
/* Initialize the database before starting */
DPRINTF(E_INFO, L_MAIN, "Initializing database\n");
ret = db_init();
if (ret < 0)
{
DPRINTF(E_FATAL, L_MAIN, "Error opening db: %s\n", perr);
DPRINTF(E_FATAL, L_MAIN, "Database init failed\n");
ret = EXIT_FAILURE;
goto db_fail;
}
/* Initialize the database before starting */
DPRINTF(E_INFO, L_MAIN, "Initializing database\n");
if (db_init(0))
{
DPRINTF(E_FATAL, L_MAIN, "Error in db_init: %s\n", strerror(errno));
}
/* Spawn file scanner thread */
ret = filescanner_init();
if (ret != 0)
@@ -582,9 +575,6 @@ main(int argc, char **argv)
filescanner_deinit();
filescanner_fail:
DPRINTF(E_LOG, L_MAIN, "Closing database\n");
db_deinit();
db_fail:
if (ret == EXIT_FAILURE)
{