MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2024-12-29 00:23:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

[mpd] db upgrade v16: remove unused data_kind column from files-query

Browse Source 
and rename variable to "type" to match the pl-query
This commit is contained in:
chme 2015-03-20 13:44:29 +01:00
parent 5b0cb6588b
commit 516d46232b
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/db.c
View File

@ -5674,11 +5674,11 @@ db_upgrade_v16(void)
char *title; char *title;
int id; int id;
char *path; char *path;
int data_kind; int type;
char virtual_path[PATH_MAX]; char virtual_path[PATH_MAX];
int ret; int ret;
query = "SELECT id, album_artist, album, title, path, data_kind FROM files;"; query = "SELECT id, album_artist, album, title, path FROM files;";
DPRINTF(E_DBG, L_DB, "Running query '%s'\n", query); DPRINTF(E_DBG, L_DB, "Running query '%s'\n", query);
@ -5696,7 +5696,6 @@ db_upgrade_v16(void)
album = (char *)sqlite3_column_text(stmt, 2); album = (char *)sqlite3_column_text(stmt, 2);
title = (char *)sqlite3_column_text(stmt, 3); title = (char *)sqlite3_column_text(stmt, 3);
path = (char *)sqlite3_column_text(stmt, 4); path = (char *)sqlite3_column_text(stmt, 4);
data_kind = sqlite3_column_int(stmt, 5);
if (strncmp(path, "http:", strlen("http:")) == 0) if (strncmp(path, "http:", strlen("http:")) == 0)
{ {
@ -5741,9 +5740,9 @@ db_upgrade_v16(void)
id = sqlite3_column_int(stmt, 0); id = sqlite3_column_int(stmt, 0);
title = (char *)sqlite3_column_text(stmt, 1); title = (char *)sqlite3_column_text(stmt, 1);
path = (char *)sqlite3_column_text(stmt, 2); path = (char *)sqlite3_column_text(stmt, 2);
data_kind = sqlite3_column_int(stmt, 3); type = sqlite3_column_int(stmt, 3);
if (data_kind == 0) /* Excludes default playlists */ if (type == 0) /* Excludes default playlists */
{ {
if (strncmp(path, "spotify:", strlen("spotify:")) == 0) if (strncmp(path, "spotify:", strlen("spotify:")) == 0)
{ {