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

Merge pull request #506 from chme/queue

Browse Source 
Add missing transaction end in error case
This commit is contained in:
ejurgensen 2018-03-08 22:38:59 +01:00 committed by GitHub
commit 8012be596e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/db.c
View File

@ -4624,30 +4624,6 @@ db_queue_get_pos(uint32_t item_id, char shuffle)
#undef Q_TMPL_SHUFFLE #undef Q_TMPL_SHUFFLE
} }
int
db_queue_get_pos_byfileid(uint32_t file_id, char shuffle)
{
#define Q_TMPL "SELECT pos FROM queue WHERE file_id = %d LIMIT 1;"
#define Q_TMPL_SHUFFLE "SELECT shuffle_pos FROM queue WHERE file_id = %d LIMIT 1;"
char *query;
int pos;
if (shuffle)
query = sqlite3_mprintf(Q_TMPL_SHUFFLE, file_id);
else
query = sqlite3_mprintf(Q_TMPL, file_id);
pos = db_get_one_int(query);
sqlite3_free(query);
return pos;
#undef Q_TMPL
#undef Q_TMPL_SHUFFLE
}
static int static int
queue_fetch_byitemid(uint32_t item_id, struct db_queue_item *queue_item, int with_metadata) queue_fetch_byitemid(uint32_t item_id, struct db_queue_item *queue_item, int with_metadata)
{ {

3
src/db.h
View File

@ -815,9 +815,6 @@ db_queue_get_count();
int int
db_queue_get_pos(uint32_t item_id, char shuffle); db_queue_get_pos(uint32_t item_id, char shuffle);
int
db_queue_get_pos_byfileid(uint32_t file_id, char shuffle);
/* Inotify */ /* Inotify */
int int
db_watch_clear(void); db_watch_clear(void);

5
src/httpd_dacp.c
View File

@ -1703,7 +1703,10 @@ dacp_reply_playqueuecontents(struct httpd_request *hreq)
{ {
ret = playqueuecontents_add_queue_item(songlist, &queue_item, count, status.plid); ret = playqueuecontents_add_queue_item(songlist, &queue_item, count, status.plid);
if (ret < 0) if (ret < 0)
goto error; {
db_queue_enum_end(&qp);
goto error;
}
count++; count++;
} }