MyFavMirrors
/
owntone-server
mirror of https://github.com/owntone/owntone-server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[db] Remove HAVE_SPOTIFY_H conditionals, not required 

The db functions don't depend on the Spotify library, so remove conditionals
This commit is contained in:
ejurgensen 2020-06-29 22:17:44 +02:00
parent 3fd812ef2f
commit 1b74966ef1
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/db.c
View File

@ -4319,7 +4319,6 @@ db_pairing_fetch_byguid(struct pairing_info *pi)
#undef Q_TMPL #undef Q_TMPL
} }
#ifdef HAVE_SPOTIFY_H
/* Spotify */ /* Spotify */
void void
db_spotify_purge(void) db_spotify_purge(void)
@ -4399,7 +4398,6 @@ db_spotify_files_delete(void)
DPRINTF(E_DBG, L_DB, "Deleted %d rows\n", sqlite3_changes(hdl)); DPRINTF(E_DBG, L_DB, "Deleted %d rows\n", sqlite3_changes(hdl));
#undef Q_TMPL #undef Q_TMPL
} }
#endif
/* Admin */ /* Admin */
int int
@ -4540,7 +4538,7 @@ db_admin_getint64(int64_t *int64val, const char *key)
int int
db_admin_delete(const char *key) db_admin_delete(const char *key)
{ {
#define Q_TMPL "DELETE FROM admin where key='%q';" #define Q_TMPL "DELETE FROM admin WHERE key='%q';"
char *query; char *query;
query = sqlite3_mprintf(Q_TMPL, key); query = sqlite3_mprintf(Q_TMPL, key);

2
src/db.h
View File

@ -762,7 +762,6 @@ db_pairing_add(struct pairing_info *pi);
int int
db_pairing_fetch_byguid(struct pairing_info *pi); db_pairing_fetch_byguid(struct pairing_info *pi);
#ifdef HAVE_SPOTIFY_H
/* Spotify */ /* Spotify */
void void
db_spotify_purge(void); db_spotify_purge(void);
@ -772,7 +771,6 @@ db_spotify_pl_delete(int id);
void void
db_spotify_files_delete(void); db_spotify_files_delete(void);
#endif
/* Admin */ /* Admin */
int int