"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "containers.c" between
minidlna-1.2.0.tar.gz and minidlna-1.2.1.tar.gz

About: ReadyMedia (formerly known as MiniDLNA) is a simple media server software, with the aim of being fully compliant with DLNA/UPnP-AV clients.

containers.c  (minidlna-1.2.0):containers.c  (minidlna-1.2.1)
skipping to change at line 35 skipping to change at line 35
#define NINETY_DAYS "7776000" #define NINETY_DAYS "7776000"
const char *music_id = MUSIC_ID; const char *music_id = MUSIC_ID;
const char *music_all_id = MUSIC_ALL_ID; const char *music_all_id = MUSIC_ALL_ID;
const char *music_genre_id = MUSIC_GENRE_ID; const char *music_genre_id = MUSIC_GENRE_ID;
const char *music_artist_id = MUSIC_ARTIST_ID; const char *music_artist_id = MUSIC_ARTIST_ID;
const char *music_album_id = MUSIC_ALBUM_ID; const char *music_album_id = MUSIC_ALBUM_ID;
const char *music_plist_id = MUSIC_PLIST_ID; const char *music_plist_id = MUSIC_PLIST_ID;
const char *music_dir_id = MUSIC_DIR_ID; const char *music_dir_id = MUSIC_DIR_ID;
const char *video_id = VIDEO_ID;
const char *video_all_id = VIDEO_ALL_ID; const char *video_all_id = VIDEO_ALL_ID;
const char *video_dir_id = VIDEO_DIR_ID; const char *video_dir_id = VIDEO_DIR_ID;
const char *image_id = IMAGE_ID;
const char *image_all_id = IMAGE_ALL_ID; const char *image_all_id = IMAGE_ALL_ID;
const char *image_date_id = IMAGE_DATE_ID; const char *image_date_id = IMAGE_DATE_ID;
const char *image_camera_id = IMAGE_CAMERA_ID; const char *image_camera_id = IMAGE_CAMERA_ID;
const char *image_dir_id = IMAGE_DIR_ID; const char *image_dir_id = IMAGE_DIR_ID;
struct magic_container_s magic_containers[] = struct magic_container_s magic_containers[] =
{ {
/* Alternate root container */ /* Alternate root container */
{ NULL, { NULL,
"0", "0",
skipping to change at line 114 skipping to change at line 116
{ NULL, "7", &music_album_id, NULL, NULL, NULL, NULL, NULL, NULL, -1, FLA G_MS_PFS }, { NULL, "7", &music_album_id, NULL, NULL, NULL, NULL, NULL, NULL, -1, FLA G_MS_PFS },
{ NULL, "8", &video_all_id, NULL, NULL, NULL, NULL, NULL, NULL, -1, FLAG_ MS_PFS }, { NULL, "8", &video_all_id, NULL, NULL, NULL, NULL, NULL, NULL, -1, FLAG_ MS_PFS },
{ NULL, "B", &image_all_id, NULL, NULL, NULL, NULL, NULL, NULL, -1, FLAG_ MS_PFS }, { NULL, "B", &image_all_id, NULL, NULL, NULL, NULL, NULL, NULL, -1, FLAG_ MS_PFS },
{ NULL, "C", &image_date_id, NULL, NULL, NULL, NULL, NULL, NULL, -1, FLAG _MS_PFS }, { NULL, "C", &image_date_id, NULL, NULL, NULL, NULL, NULL, NULL, -1, FLAG _MS_PFS },
{ NULL, "F", &music_plist_id, NULL, NULL, NULL, NULL, NULL, NULL, -1, FLA G_MS_PFS }, { NULL, "F", &music_plist_id, NULL, NULL, NULL, NULL, NULL, NULL, -1, FLA G_MS_PFS },
{ NULL, "14", &music_dir_id, NULL, NULL, NULL, NULL, NULL, NULL, -1, FLAG _MS_PFS }, { NULL, "14", &music_dir_id, NULL, NULL, NULL, NULL, NULL, NULL, -1, FLAG _MS_PFS },
{ NULL, "15", &video_dir_id, NULL, NULL, NULL, NULL, NULL, NULL, -1, FLAG _MS_PFS }, { NULL, "15", &video_dir_id, NULL, NULL, NULL, NULL, NULL, NULL, -1, FLAG _MS_PFS },
{ NULL, "16", &image_dir_id, NULL, NULL, NULL, NULL, NULL, NULL, -1, FLAG _MS_PFS }, { NULL, "16", &image_dir_id, NULL, NULL, NULL, NULL, NULL, NULL, -1, FLAG _MS_PFS },
{ NULL, "D2", &image_camera_id, NULL, NULL, NULL, NULL, NULL, NULL, -1, F LAG_MS_PFS }, { NULL, "D2", &image_camera_id, NULL, NULL, NULL, NULL, NULL, NULL, -1, F LAG_MS_PFS },
/* Samsung DCM10 containers for Series E(?) */
{ NULL, "I", &image_id, NULL, NULL, NULL, NULL, NULL, NULL, -1, FLAG_SAMS
UNG_DCM10 },
{ NULL, "A", &music_id, NULL, NULL, NULL, NULL, NULL, NULL, -1, FLAG_SAMS
UNG_DCM10 },
{ NULL, "V", &video_id, NULL, NULL, NULL, NULL, NULL, NULL, -1, FLAG_SAMS
UNG_DCM10 },
/* Jump straight to Music on audio-only devices */ /* Jump straight to Music on audio-only devices */
{ NULL, "0", &music_id, NULL, "0", NULL, NULL, NULL, NULL, -1, FLAG_AUDIO _ONLY }, { NULL, "0", &music_id, NULL, "0", NULL, NULL, NULL, NULL, -1, FLAG_AUDIO _ONLY },
{ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0 } { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0 }
}; };
struct magic_container_s * struct magic_container_s *
in_magic_container(const char *id, int flags, const char **real_id) in_magic_container(const char *id, int flags, const char **real_id)
{ {
size_t len; size_t len;
skipping to change at line 136 skipping to change at line 143
for (i = 0; magic_containers[i].objectid_match; i++) for (i = 0; magic_containers[i].objectid_match; i++)
{ {
if (magic_containers[i].required_flags && !(flags & magic_contain ers[i].required_flags)) if (magic_containers[i].required_flags && !(flags & magic_contain ers[i].required_flags))
continue; continue;
if (magic_containers[i].objectid && !(*magic_containers[i].object id)) if (magic_containers[i].objectid && !(*magic_containers[i].object id))
continue; continue;
DPRINTF(E_MAXDEBUG, L_HTTP, "Checking magic container %d [%s]\n", i, magic_containers[i].objectid_match); DPRINTF(E_MAXDEBUG, L_HTTP, "Checking magic container %d [%s]\n", i, magic_containers[i].objectid_match);
len = strlen(magic_containers[i].objectid_match); len = strlen(magic_containers[i].objectid_match);
if (strncmp(id, magic_containers[i].objectid_match, len) == 0) if (strncmp(id, magic_containers[i].objectid_match, len) == 0)
{ {
if (*(id+len) == '$') if (*(id+len) == '$')
*real_id = id+len+1; *real_id = id+len+1;
else if (*(id+len) == '\0') else if (*(id+len) == '\0')
*real_id = id; *real_id = id;
else else
continue; continue;
DPRINTF(E_DEBUG, L_HTTP, "Found magic container %d [%s]\n ", i, magic_containers[i].objectid_match); DPRINTF(E_DEBUG, L_HTTP, "Found magic container %d [%s]\n ", i, magic_containers[i].objectid_match);
return &magic_containers[i]; return &magic_containers[i];
} }
} }
return NULL; return NULL;
} }
 End of changes. 5 change blocks. 
2 lines changed or deleted 12 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)