storm/minidlna
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Use containter definitions instead of hard-coding them.

Browse Source
This commit is contained in:
Justin Maggard 2011-02-15 00:37:42 +00:00
parent adeae41293
commit 9327b9fcbd
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
playlist.c
View File

@ -169,7 +169,7 @@ retry:
" (OBJECT_ID, PARENT_ID, CLASS, DETAIL_ID, NAME, REF_ID) " " (OBJECT_ID, PARENT_ID, CLASS, DETAIL_ID, NAME, REF_ID) "
"SELECT" "SELECT"
" '%s$%llX$%d', '%s$%llX', CLASS, DETAIL_ID, NAME, OBJECT_ID from OBJECTS" " '%s$%llX$%d', '%s$%llX', CLASS, DETAIL_ID, NAME, OBJECT_ID from OBJECTS"
" where DETAIL_ID = %lld and OBJECT_ID glob '64$*'", " where DETAIL_ID = %lld and OBJECT_ID glob '" BROWSEDIR_ID "$*'",
MUSIC_PLIST_ID, plID, plist.track, MUSIC_PLIST_ID, plID, plist.track,
MUSIC_PLIST_ID, plID, MUSIC_PLIST_ID, plID,
detailID); detailID);

26
scanner.c
View File

@ -228,7 +228,7 @@ insert_containers(const char * name, const char *path, const char * refID, const
} }
else if( strstr(class, "audioItem") ) else if( strstr(class, "audioItem") )
{ {
asprintf(&sql, "SELECT ALBUM, CREATOR, GENRE, ALBUM_ART from DETAILS where ID = %lu", detailID); asprintf(&sql, "SELECT ALBUM, ARTIST, GENRE, ALBUM_ART from DETAILS where ID = %lu", detailID);
ret = sql_get_table(db, sql, &result, &row, &cols); ret = sql_get_table(db, sql, &result, &row, &cols);
free(sql); free(sql);
if( ret != SQLITE_OK ) if( ret != SQLITE_OK )
@ -543,22 +543,22 @@ CreateDatabase(void)
int ret, i; int ret, i;
const char * containers[] = { "0","-1", "root", const char * containers[] = { "0","-1", "root",
MUSIC_ID, "0", _("Music"), MUSIC_ID, "0", _("Music"),
MUSIC_ALL_ID, "1", _("All Music"), MUSIC_ALL_ID, MUSIC_ID, _("All Music"),
MUSIC_GENRE_ID, "1", _("Genre"), MUSIC_GENRE_ID, MUSIC_ID, _("Genre"),
MUSIC_ARTIST_ID, "1", _("Artist"), MUSIC_ARTIST_ID, MUSIC_ID, _("Artist"),
MUSIC_ALBUM_ID, "1", _("Album"), MUSIC_ALBUM_ID, MUSIC_ID, _("Album"),
MUSIC_DIR_ID, "1", _("Folders"), MUSIC_DIR_ID, MUSIC_ID, _("Folders"),
MUSIC_PLIST_ID, "1", _("Playlists"), MUSIC_PLIST_ID, MUSIC_ID, _("Playlists"),
VIDEO_ID, "0", _("Video"), VIDEO_ID, "0", _("Video"),
VIDEO_ALL_ID, "2", _("All Video"), VIDEO_ALL_ID, VIDEO_ID, _("All Video"),
VIDEO_DIR_ID, "2", _("Folders"), VIDEO_DIR_ID, VIDEO_ID, _("Folders"),
IMAGE_ID, "0", _("Pictures"), IMAGE_ID, "0", _("Pictures"),
IMAGE_ALL_ID, "3", _("All Pictures"), IMAGE_ALL_ID, IMAGE_ID, _("All Pictures"),
IMAGE_DATE_ID, "3", _("Date Taken"), IMAGE_DATE_ID, IMAGE_ID, _("Date Taken"),
IMAGE_CAMERA_ID, "3", _("Camera"), IMAGE_CAMERA_ID, IMAGE_ID, _("Camera"),
IMAGE_DIR_ID, "3", _("Folders"), IMAGE_DIR_ID, IMAGE_ID, _("Folders"),
BROWSEDIR_ID, "0", _("Browse Folders"), BROWSEDIR_ID, "0", _("Browse Folders"),
0 }; 0 };