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

Rename "queue_item.item_id" to "queue_item.id"

Browse Source
This commit is contained in:
chme 2016-12-03 08:03:19 +01:00
parent eb896a1085
commit 6c6f02fdfa
5 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/db.c
View File

@ -4650,7 +4650,7 @@ queue_enum_fetch(struct db_queue_enum *queue_enum, struct db_queue_item *queue_i
return -1;
}
queue_item->item_id = (uint32_t)sqlite3_column_int(queue_enum->stmt, 0);
queue_item->id = (uint32_t)sqlite3_column_int(queue_enum->stmt, 0);
queue_item->file_id = (uint32_t)sqlite3_column_int(queue_enum->stmt, 1);
queue_item->pos = (uint32_t)sqlite3_column_int(queue_enum->stmt, 2);
queue_item->shuffle_pos = (uint32_t)sqlite3_column_int(queue_enum->stmt, 3);
@ -4801,7 +4801,7 @@ db_queue_fetch_byitemid(uint32_t item_id)
DPRINTF(E_LOG, L_DB, "Error fetching queue item by item id\n");
return NULL;
}
else if (queue_item->item_id == 0)
else if (queue_item->id == 0)
{
// No item found
free_queue_item(queue_item, 0);
@ -4851,7 +4851,7 @@ db_queue_fetch_byfileid(uint32_t file_id)
DPRINTF(E_LOG, L_DB, "Error fetching queue item by file id\n");
return NULL;
}
else if (queue_item->item_id == 0)
else if (queue_item->id == 0)
{
// No item found
free_queue_item(queue_item, 0);
@ -4910,7 +4910,7 @@ db_queue_fetch_bypos(uint32_t pos, char shuffle)
DPRINTF(E_LOG, L_DB, "Error fetching queue item by pos id\n");
return NULL;
}
else if (queue_item->item_id == 0)
else if (queue_item->id == 0)
{
// No item found
free_queue_item(queue_item, 0);
@ -4940,7 +4940,7 @@ queue_fetch_byposrelativetoitem(struct db_queue_enum *queue_enum, int pos, uint3
ret = queue_fetch_bypos(queue_enum, pos_absolute, shuffle, queue_item, keep_item);
DPRINTF(E_DBG, L_DB, "Fetch by pos: fetched item (id=%d, pos=%d, file-id=%d)\n", queue_item->item_id, queue_item->pos, queue_item->file_id);
DPRINTF(E_DBG, L_DB, "Fetch by pos: fetched item (id=%d, pos=%d, file-id=%d)\n", queue_item->id, queue_item->pos, queue_item->file_id);
return ret;
}
@ -4975,14 +4975,14 @@ db_queue_fetch_byposrelativetoitem(int pos, uint32_t item_id, char shuffle)
DPRINTF(E_LOG, L_DB, "Error fetching queue item by pos relative to item id\n");
return NULL;
}
else if (queue_item->item_id == 0)
else if (queue_item->id == 0)
{
// No item found
free_queue_item(queue_item, 0);
return NULL;
}
DPRINTF(E_DBG, L_DB, "Fetch by pos: fetched item (id=%d, pos=%d, file-id=%d)\n", queue_item->item_id, queue_item->pos, queue_item->file_id);
DPRINTF(E_DBG, L_DB, "Fetch by pos: fetched item (id=%d, pos=%d, file-id=%d)\n", queue_item->id, queue_item->pos, queue_item->file_id);
return queue_item;
}
@ -5045,15 +5045,15 @@ db_queue_cleanup()
}
pos = 0;
while ((ret = queue_enum_fetch(&queue_enum, &queue_item, 0)) == 0 && (queue_item.item_id > 0))
while ((ret = queue_enum_fetch(&queue_enum, &queue_item, 0)) == 0 && (queue_item.id > 0))
{
if (queue_item.pos != pos)
{
query = sqlite3_mprintf(Q_TMPL_UPDATE, pos, queue_item.item_id);
query = sqlite3_mprintf(Q_TMPL_UPDATE, pos, queue_item.id);
ret = db_query_run(query, 1, 0);
if (ret < 0)
{
DPRINTF(E_LOG, L_DB, "Failed to update item with item-id: %d\n", queue_item.item_id);
DPRINTF(E_LOG, L_DB, "Failed to update item with item-id: %d\n", queue_item.id);
break;
}
}
@ -5081,15 +5081,15 @@ db_queue_cleanup()
}
pos = 0;
while ((ret = queue_enum_fetch(&queue_enum, &queue_item, 0)) == 0 && (queue_item.item_id > 0))
while ((ret = queue_enum_fetch(&queue_enum, &queue_item, 0)) == 0 && (queue_item.id > 0))
{
if (queue_item.shuffle_pos != pos)
{
query = sqlite3_mprintf(Q_TMPL_UPDATE_SHUFFLE, pos, queue_item.item_id);
query = sqlite3_mprintf(Q_TMPL_UPDATE_SHUFFLE, pos, queue_item.id);
ret = db_query_run(query, 1, 0);
if (ret < 0)
{
DPRINTF(E_LOG, L_DB, "Failed to update item with item-id: %d\n", queue_item.item_id);
DPRINTF(E_LOG, L_DB, "Failed to update item with item-id: %d\n", queue_item.id);
break;
}
}
@ -5142,7 +5142,7 @@ queue_delete_item(struct db_queue_item *queue_item)
int ret;
// Remove item with the given item_id
query = sqlite3_mprintf("DELETE FROM queue where id = %d;", queue_item->item_id);
query = sqlite3_mprintf("DELETE FROM queue where id = %d;", queue_item->id);
ret = db_query_run(query, 1, 0);
if (ret < 0)
{
@ -5188,7 +5188,7 @@ db_queue_delete_byitemid(uint32_t item_id)
return -1;
}
if (queue_item.item_id == 0)
if (queue_item.id == 0)
{
queue_enum_end(&queue_enum);
db_transaction_end();
@ -5234,12 +5234,12 @@ db_queue_delete_bypos(uint32_t pos, int count)
return -1;
}
while ((ret = queue_enum_fetch(&queue_enum, &queue_item, 0)) == 0 && (queue_item.item_id > 0))
while ((ret = queue_enum_fetch(&queue_enum, &queue_item, 0)) == 0 && (queue_item.id > 0))
{
ret = queue_delete_item(&queue_item);
if (ret < 0)
{
DPRINTF(E_LOG, L_DB, "Failed to delete item with item-id: %d\n", queue_item.item_id);
DPRINTF(E_LOG, L_DB, "Failed to delete item with item-id: %d\n", queue_item.id);
break;
}
}
@ -5277,7 +5277,7 @@ db_queue_delete_byposrelativetoitem(uint32_t pos, uint32_t item_id, char shuffle
db_transaction_rollback();
return -1;
}
else if (queue_item.item_id == 0)
else if (queue_item.id == 0)
{
// No item found
queue_enum_end(&queue_enum);
@ -5387,7 +5387,7 @@ db_queue_move_bypos(int pos_from, int pos_to)
return -1;
}
if (queue_item.item_id == 0)
if (queue_item.id == 0)
{
queue_enum_end(&queue_enum);
db_transaction_end();
@ -5415,7 +5415,7 @@ db_queue_move_bypos(int pos_from, int pos_to)
}
// Update item with the given item_id
query = sqlite3_mprintf("UPDATE queue SET pos = %d where id = %d;", pos_to, queue_item.item_id);
query = sqlite3_mprintf("UPDATE queue SET pos = %d where id = %d;", pos_to, queue_item.id);
ret = db_query_run(query, 1, 0);
if (ret < 0)
{
@ -5465,9 +5465,9 @@ db_queue_move_byposrelativetoitem(uint32_t from_pos, uint32_t to_offset, uint32_
return -1;
}
DPRINTF(E_DBG, L_DB, "Move by pos: base item (id=%d, pos=%d, file-id=%d)\n", queue_item.item_id, queue_item.pos, queue_item.file_id);
DPRINTF(E_DBG, L_DB, "Move by pos: base item (id=%d, pos=%d, file-id=%d)\n", queue_item.id, queue_item.pos, queue_item.file_id);
if (queue_item.item_id == 0)
if (queue_item.id == 0)
{
queue_enum_end(&queue_enum);
db_transaction_end();
@ -5507,9 +5507,9 @@ db_queue_move_byposrelativetoitem(uint32_t from_pos, uint32_t to_offset, uint32_
return -1;
}
DPRINTF(E_DBG, L_DB, "Move by pos: move item (id=%d, pos=%d, file-id=%d)\n", queue_item.item_id, queue_item.pos, queue_item.file_id);
DPRINTF(E_DBG, L_DB, "Move by pos: move item (id=%d, pos=%d, file-id=%d)\n", queue_item.id, queue_item.pos, queue_item.file_id);
if (queue_item.item_id == 0)
if (queue_item.id == 0)
{
queue_enum_end(&queue_enum);
db_transaction_end();
@ -5546,9 +5546,9 @@ db_queue_move_byposrelativetoitem(uint32_t from_pos, uint32_t to_offset, uint32_
// Update item with the given item_id
if (shuffle)
query = sqlite3_mprintf("UPDATE queue SET shuffle_pos = %d where id = %d;", pos_move_to, queue_item.item_id);
query = sqlite3_mprintf("UPDATE queue SET shuffle_pos = %d where id = %d;", pos_move_to, queue_item.id);
else
query = sqlite3_mprintf("UPDATE queue SET pos = %d where id = %d;", pos_move_to, queue_item.item_id);
query = sqlite3_mprintf("UPDATE queue SET pos = %d where id = %d;", pos_move_to, queue_item.id);
ret = db_query_run(query, 1, 0);
if (ret < 0)
@ -5640,13 +5640,13 @@ db_queue_reshuffle(uint32_t item_id)
}
i = 0;
while ((ret = queue_enum_fetch(&queue_enum, &queue_item, 0)) == 0 && (queue_item.item_id > 0) && (i < len))
while ((ret = queue_enum_fetch(&queue_enum, &queue_item, 0)) == 0 && (queue_item.id > 0) && (i < len))
{
query = sqlite3_mprintf("UPDATE queue SET shuffle_pos = %d where id = %d;", shuffle_pos[i], queue_item.item_id);
query = sqlite3_mprintf("UPDATE queue SET shuffle_pos = %d where id = %d;", shuffle_pos[i], queue_item.id);
ret = db_query_run(query, 1, 0);
if (ret < 0)
{
DPRINTF(E_LOG, L_DB, "Failed to delete item with item-id: %d\n", queue_item.item_id);
DPRINTF(E_LOG, L_DB, "Failed to delete item with item-id: %d\n", queue_item.id);
break;
}

4
src/db.h
View File

@ -376,9 +376,9 @@ struct directory_enum {
struct db_queue_item
{
/* Item-Id is a unique id for this queue item. If the same item appears multiple
/* A unique id for this queue item. If the same item appears multiple
times in the queue each corresponding queue item has its own id. */
uint32_t item_id;
uint32_t id;
/* Id of the file/item in the files database */
uint32_t file_id;

4
src/httpd_dacp.c
View File

@ -1635,9 +1635,9 @@ dacp_reply_playqueuecontents(struct evhttp_request *req, struct evbuffer *evbuf,
ret = db_queue_enum_start(&queue_enum);
count = 0; //FIXME [queue] Check count value
while ((ret = db_queue_enum_fetch(&queue_enum, &queue_item)) == 0 && queue_item.item_id > 0)
while ((ret = db_queue_enum_fetch(&queue_enum, &queue_item)) == 0 && queue_item.id > 0)
{
if (status.item_id == 0 || status.item_id == queue_item.item_id)
if (status.item_id == 0 || status.item_id == queue_item.id)
count = 1;
else if (count > 0)
{

14
src/mpd.c
View File

@ -436,7 +436,7 @@ mpd_add_db_queue_item(struct evbuffer *evbuf, struct db_queue_item *queue_item)
queue_item->genre,
queue_item->disc,
queue_item->pos,
queue_item->item_id);
queue_item->id);
return ret;
}
@ -766,7 +766,7 @@ mpd_command_status(struct evbuffer *evbuf, int argc, char **argv, char **errmsg)
evbuffer_add_printf(evbuf,
"nextsong: %d\n"
"nextsongid: %d\n",
next_item->item_id,
next_item->id,
next_item->pos);
free_queue_item(next_item, 0);
@ -1828,7 +1828,7 @@ mpd_command_playlistid(struct evbuffer *evbuf, int argc, char **argv, char **err
return ACK_ERROR_ARG;
}
while ((ret = db_queue_enum_fetch(&queue_enum, &queue_item)) == 0 && queue_item.item_id > 0)
while ((ret = db_queue_enum_fetch(&queue_enum, &queue_item)) == 0 && queue_item.id > 0)
{
ret = mpd_add_db_queue_item(evbuf, &queue_item);
if (ret < 0)
@ -1897,7 +1897,7 @@ mpd_command_playlistinfo(struct evbuffer *evbuf, int argc, char **argv, char **e
return ACK_ERROR_ARG;
}
while ((ret = db_queue_enum_fetch(&queue_enum, &queue_item)) == 0 && queue_item.item_id > 0)
while ((ret = db_queue_enum_fetch(&queue_enum, &queue_item)) == 0 && queue_item.id > 0)
{
ret = mpd_add_db_queue_item(evbuf, &queue_item);
if (ret < 0)
@ -1945,7 +1945,7 @@ mpd_command_plchanges(struct evbuffer *evbuf, int argc, char **argv, char **errm
return ACK_ERROR_ARG;
}
while ((ret = db_queue_enum_fetch(&queue_enum, &queue_item)) == 0 && queue_item.item_id > 0)
while ((ret = db_queue_enum_fetch(&queue_enum, &queue_item)) == 0 && queue_item.id > 0)
{
ret = mpd_add_db_queue_item(evbuf, &queue_item);
if (ret < 0)
@ -1991,13 +1991,13 @@ mpd_command_plchangesposid(struct evbuffer *evbuf, int argc, char **argv, char *
return ACK_ERROR_ARG;
}
while ((ret = db_queue_enum_fetch(&queue_enum, &queue_item)) == 0 && queue_item.item_id > 0)
while ((ret = db_queue_enum_fetch(&queue_enum, &queue_item)) == 0 && queue_item.id > 0)
{
evbuffer_add_printf(evbuf,
"cpos: %d\n"
"Id: %d\n",
queue_item.pos,
queue_item.item_id);
queue_item.id);
}
db_queue_enum_end(&queue_enum);

4
src/player.c
View File

@ -927,7 +927,7 @@ source_new(struct db_queue_item *queue_item)
}
ps->id = queue_item->file_id;
ps->item_id = queue_item->item_id;
ps->item_id = queue_item->id;
ps->data_kind = queue_item->data_kind;
ps->media_kind = queue_item->media_kind;
ps->len_ms = queue_item->song_length;
@ -2311,7 +2311,7 @@ playback_start_item(void *arg, int *retval)
else
{
// Start playback for given queue item
DPRINTF(E_DBG, L_PLAYER, "Start playback of '%s' (id=%d, item-id=%d)\n", queue_item->path, queue_item->file_id, queue_item->item_id);
DPRINTF(E_DBG, L_PLAYER, "Start playback of '%s' (id=%d, item-id=%d)\n", queue_item->path, queue_item->file_id, queue_item->id);
source_stop();
ps = source_new(queue_item);