From 1ec94df29d7ae754ffb0de0f96ffb45df77d40f4 Mon Sep 17 00:00:00 2001 From: Tim-Philipp Müller Date: Wed, 8 Mar 2006 12:16:14 +0000 Subject: gst/qtdemux/qtdemux.c: Extract disc number and count from files that use 'disk' instead of 'disc' as node identifier ... Original commit message from CVS: * gst/qtdemux/qtdemux.c: (qtdemux_parse_udta): Extract disc number and count from files that use 'disk' instead of 'disc' as node identifier for that (fixes #332066). --- common | 2 +- gst/qtdemux/qtdemux.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/common b/common index c09cd18d..d576cc67 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit c09cd18d328f740ac532377fa5605b0f712cc6fd +Subproject commit d576cc6779aa9555121d4c78ab69cc620fae3e2b diff --git a/gst/qtdemux/qtdemux.c b/gst/qtdemux/qtdemux.c index 7d07ab4b..4d8df982 100644 --- a/gst/qtdemux/qtdemux.c +++ b/gst/qtdemux/qtdemux.c @@ -1316,6 +1316,7 @@ gst_qtdemux_add_stream (GstQTDemux * qtdemux, #define FOURCC__alb GST_MAKE_FOURCC(0xa9,'a','l','b') #define FOURCC_gnre GST_MAKE_FOURCC('g','n','r','e') #define FOURCC_disc GST_MAKE_FOURCC('d','i','s','c') +#define FOURCC_disk GST_MAKE_FOURCC('d','i','s','k') #define FOURCC_trkn GST_MAKE_FOURCC('t','r','k','n') #define FOURCC_cpil GST_MAKE_FOURCC('c','p','i','l') #define FOURCC_tmpo GST_MAKE_FOURCC('t','m','p','o') @@ -1421,6 +1422,7 @@ QtNodeType qt_node_types[] = { {FOURCC_gnre, "Genre", QT_CONTAINER,}, {FOURCC_trkn, "Track Number", QT_CONTAINER,}, {FOURCC_disc, "Disc Number", QT_CONTAINER,}, + {FOURCC_disk, "Disc Number", QT_CONTAINER,}, {FOURCC_cpil, "cpil", QT_CONTAINER,}, {FOURCC_tmpo, "Tempo", QT_CONTAINER,}, {FOURCC__too, "too", QT_CONTAINER,}, @@ -2932,6 +2934,12 @@ qtdemux_parse_udta (GstQTDemux * qtdemux, GNode * udta) if (node) { qtdemux_tag_add_num (qtdemux, GST_TAG_ALBUM_VOLUME_NUMBER, GST_TAG_ALBUM_VOLUME_COUNT, node); + } else { + node = qtdemux_tree_get_child_by_type (ilst, FOURCC_disk); + if (node) { + qtdemux_tag_add_num (qtdemux, GST_TAG_ALBUM_VOLUME_NUMBER, + GST_TAG_ALBUM_VOLUME_COUNT, node); + } } node = qtdemux_tree_get_child_by_type (ilst, FOURCC_gnre); -- cgit