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

Remove provisions for multi-library support

Browse Source 
It is now clear that multi-library support will not happen, so remove whatever
provisions were in the code for that.

It comes with a small change to the configuration file, too.

With this, DB schema version went to 9.
This commit is contained in:
Julien BLACHE
2010-03-19 19:06:47 +01:00
parent d6285eef40
commit 19b6780a3c
12 changed files with 63 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/db.c
View File

@@ -230,7 +230,6 @@ static struct col_type_map wi_cols_map[] =
{ wi_offsetof(wd), DB_TYPE_INT },
{ wi_offsetof(cookie), DB_TYPE_INT },
{ wi_offsetof(path), DB_TYPE_STRING },
{ wi_offsetof(libidx), DB_TYPE_INT },
};
static __thread sqlite3 *hdl;
@@ -2842,12 +2841,12 @@ db_watch_clear(void)
int
db_watch_add(struct watch_info *wi)
{
#define Q_TMPL "INSERT INTO inotify (wd, cookie, path, libidx) VALUES (%d, 0, '%q', %d);"
#define Q_TMPL "INSERT INTO inotify (wd, cookie, path) VALUES (%d, 0, '%q');"
char *query;
char *errmsg;
int ret;
query = sqlite3_mprintf(Q_TMPL, wi->wd, wi->path, wi->libidx);
query = sqlite3_mprintf(Q_TMPL, wi->wd, wi->path);
if (!query)
{
DPRINTF(E_LOG, L_DB, "Out of memory for query string\n");
@@ -3479,8 +3478,7 @@ db_perthread_deinit(void)
"CREATE TABLE IF NOT EXISTS inotify (" \
" wd INTEGER PRIMARY KEY NOT NULL," \
" cookie INTEGER NOT NULL," \
" path VARCHAR(4096) NOT NULL," \
" libidx INTEGER NOT NULL" \
" path VARCHAR(4096) NOT NULL" \
");"
#define I_PATH \
@@ -3532,9 +3530,9 @@ db_perthread_deinit(void)
*/
#define SCHEMA_VERSION 8
#define SCHEMA_VERSION 9
#define Q_SCVER \
"INSERT INTO admin (key, value) VALUES ('schema_version', '8');"
"INSERT INTO admin (key, value) VALUES ('schema_version', '9');"
struct db_init_query {
char *query;