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

Make RSP honor the correct_order flag

This commit is contained in:
Ron Pedde 2006-08-07 05:06:23 +00:00
parent 5acac92603
commit 6c84e8863e
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/db-sql.c
View File

@ -699,7 +699,7 @@ int db_sql_add_playlist_item(char **pe, int playlistid, int songid) {
return result; return result;
} }
if(playlist_type == 1) { /* can't add to smart playlists, or static */ if(playlist_type == PL_SMART) { /* can't add to smart playlists */
db_get_error(pe,DB_E_INVALIDTYPE); db_get_error(pe,DB_E_INVALIDTYPE);
return DB_E_INVALIDTYPE; return DB_E_INVALIDTYPE;
} }
@ -1020,7 +1020,7 @@ int db_sql_update_playlists(char **pe) {
/* Now, update the playlists */ /* Now, update the playlists */
for(index=0;index < playlists; index++) { for(index=0;index < playlists; index++) {
if(atoi(pinfo[index].type) == 1) { if(atoi(pinfo[index].type) == PL_SMART) {
/* smart */ /* smart */
if(!db_sql_parse_smart(NULL,&where_clause,pinfo[index].clause)) { if(!db_sql_parse_smart(NULL,&where_clause,pinfo[index].clause)) {
DPRINTF(E_LOG,L_DB,"Playlist %d bad syntax",pinfo[index].plid); DPRINTF(E_LOG,L_DB,"Playlist %d bad syntax",pinfo[index].plid);
@ -1144,7 +1144,7 @@ int db_sql_enum_start(char **pe, DBQUERYINFO *pinfo) {
case queryTypePlaylistItems: /* Figure out if it's smart or dull */ case queryTypePlaylistItems: /* Figure out if it's smart or dull */
sprintf(query_select,"select * from songs "); sprintf(query_select,"select * from songs ");
sprintf(query_count,"select count(id) from songs "); sprintf(query_count,"select count(songs.id) from songs ");
break; break;
/* Note that sqlite doesn't support COUNT(DISTINCT x) */ /* Note that sqlite doesn't support COUNT(DISTINCT x) */

1
src/plugin.c
View File

@ -706,6 +706,7 @@ int pi_db_enum_start(char **pe, DB_QUERY *pinfo) {
case QUERY_TYPE_ITEMS: case QUERY_TYPE_ITEMS:
default: default:
pqi->query_type = queryTypePlaylistItems; pqi->query_type = queryTypePlaylistItems;
pqi->correct_order = conf_get_int("scan","correct_order",1);
break; break;
} }