mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-17 11:45:25 +00:00
Code Issues 1 Projects Releases Wiki Activity

Don't use GLib 2.16 API unconditionally

Browse source
This commit is contained in:
Sebastian Dröge 2009-01-31 11:29:20 +01:00
parent 93a2b5c9ea
commit 6a09f5f4fe
2 changed files with 75 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
gst/mxf/mxfdemux.c
View file

@ -524,7 +524,11 @@ static GstFlowReturn
gst_mxf_demux_resolve_references (GstMXFDemux * demux) gst_mxf_demux_resolve_references (GstMXFDemux * demux)
{ {
GstFlowReturn ret = GST_FLOW_OK; GstFlowReturn ret = GST_FLOW_OK;
#if GLIB_CHECK_VERSION (2, 16, 0)
GHashTableIter iter; GHashTableIter iter;
#else
GList *l, *values;
#endif
MXFMetadataBase *m = NULL; MXFMetadataBase *m = NULL;
GST_DEBUG_OBJECT (demux, "Resolve metadata references"); GST_DEBUG_OBJECT (demux, "Resolve metadata references");
@ -534,15 +538,29 @@ gst_mxf_demux_resolve_references (GstMXFDemux * demux)
GST_ERROR_OBJECT (demux, "No metadata yet"); GST_ERROR_OBJECT (demux, "No metadata yet");
return GST_FLOW_ERROR; return GST_FLOW_ERROR;
} }
#if GLIB_CHECK_VERSION (2, 16, 0)
g_hash_table_iter_init (&iter, demux->metadata); g_hash_table_iter_init (&iter, demux->metadata);
while (g_hash_table_iter_next (&iter, NULL, (gpointer) & m)) { while (g_hash_table_iter_next (&iter, NULL, (gpointer) & m)) {
m->resolved = MXF_METADATA_BASE_RESOLVE_STATE_NONE; m->resolved = MXF_METADATA_BASE_RESOLVE_STATE_NONE;
} }
#else
values = g_hash_table_get_values (demux->metadata);
for (l = values; l; l = l->next) {
m = l->data;
m->resolved = MXF_METADATA_BASE_RESOLVE_STATE_NONE;
}
#endif
#if GLIB_CHECK_VERSION (2, 16, 0)
g_hash_table_iter_init (&iter, demux->metadata); g_hash_table_iter_init (&iter, demux->metadata);
while (g_hash_table_iter_next (&iter, NULL, (gpointer) & m)) { while (g_hash_table_iter_next (&iter, NULL, (gpointer) & m)) {
gboolean resolved; gboolean resolved;
#else
for (l = values; l; l = l->next) {
gboolean resolved;
m = l->data;
#endif
resolved = mxf_metadata_base_resolve (m, demux->metadata); resolved = mxf_metadata_base_resolve (m, demux->metadata);
@ -556,9 +574,17 @@ gst_mxf_demux_resolve_references (GstMXFDemux * demux)
demux->metadata_resolved = TRUE; demux->metadata_resolved = TRUE;
#if !GLIB_CHECK_VERSION (2, 16, 0)
g_list_free (values);
#endif
return ret; return ret;
error: error:
#if !GLIB_CHECK_VERSION (2, 16, 0)
g_list_free (values);
#endif
demux->metadata_resolved = FALSE; demux->metadata_resolved = FALSE;
return ret; return ret;
@ -632,11 +658,11 @@ gst_mxf_demux_choose_package (GstMXFDemux * demux)
for (i = 0; i < demux->preface->content_storage->n_packages; i++) { for (i = 0; i < demux->preface->content_storage->n_packages; i++) {
if (demux->preface->content_storage->packages[i] && if (demux->preface->content_storage->packages[i] &&
MXF_IS_METADATA_MATERIAL_PACKAGE (demux->preface->content_storage-> MXF_IS_METADATA_MATERIAL_PACKAGE (demux->preface->
packages[i])) { content_storage->packages[i])) {
ret = ret =
MXF_METADATA_GENERIC_PACKAGE (demux->preface->content_storage-> MXF_METADATA_GENERIC_PACKAGE (demux->preface->
packages[i]); content_storage->packages[i]);
break; break;
} }
} }
@ -1280,8 +1306,8 @@ gst_mxf_demux_pad_next_component (GstMXFDemux * demux, GstMXFDemuxPad * pad)
pad->current_component_index); pad->current_component_index);
pad->current_component = pad->current_component =
MXF_METADATA_SOURCE_CLIP (sequence->structural_components[pad-> MXF_METADATA_SOURCE_CLIP (sequence->
current_component_index]); structural_components[pad->current_component_index]);
if (pad->current_component == NULL) { if (pad->current_component == NULL) {
GST_ERROR_OBJECT (demux, "No such structural component"); GST_ERROR_OBJECT (demux, "No such structural component");
return GST_FLOW_ERROR; return GST_FLOW_ERROR;
@ -1289,8 +1315,8 @@ gst_mxf_demux_pad_next_component (GstMXFDemux * demux, GstMXFDemuxPad * pad)
if (!pad->current_component->source_package if (!pad->current_component->source_package
|| !pad->current_component->source_package->top_level || !pad->current_component->source_package->top_level
|| !MXF_METADATA_GENERIC_PACKAGE (pad->current_component-> || !MXF_METADATA_GENERIC_PACKAGE (pad->
source_package)->tracks) { current_component->source_package)->tracks) {
GST_ERROR_OBJECT (demux, "Invalid component"); GST_ERROR_OBJECT (demux, "Invalid component");
return GST_FLOW_ERROR; return GST_FLOW_ERROR;
} }

50
gst/mxf/mxfmetadata.c
View file

@ -875,11 +875,22 @@ mxf_metadata_essence_container_data_resolve (MXFMetadataBase * m,
MXFMetadataEssenceContainerData *self = MXFMetadataEssenceContainerData *self =
MXF_METADATA_ESSENCE_CONTAINER_DATA (m); MXF_METADATA_ESSENCE_CONTAINER_DATA (m);
MXFMetadataBase *current = NULL; MXFMetadataBase *current = NULL;
#if GLIB_CHECK_VERSION (2, 16, 0)
GHashTableIter iter; GHashTableIter iter;
g_hash_table_iter_init (&iter, metadata); g_hash_table_iter_init (&iter, metadata);
#else
GList *l, *values;
values = g_hash_table_get_values (metadata);
#endif
#if GLIB_CHECK_VERSION (2, 16, 0)
while (g_hash_table_iter_next (&iter, NULL, (gpointer) & current)) { while (g_hash_table_iter_next (&iter, NULL, (gpointer) & current)) {
#else
for (l = values; l; l = l->next) {
current = l->data;
#endif
if (MXF_IS_METADATA_SOURCE_PACKAGE (current)) { if (MXF_IS_METADATA_SOURCE_PACKAGE (current)) {
MXFMetadataSourcePackage *package = MXF_METADATA_SOURCE_PACKAGE (current); MXFMetadataSourcePackage *package = MXF_METADATA_SOURCE_PACKAGE (current);
@ -893,6 +904,10 @@ mxf_metadata_essence_container_data_resolve (MXFMetadataBase * m,
} }
} }
#if !GLIB_CHECK_VERSION (2, 16, 0)
g_list_free (values);
#endif
if (!self->linked_package) { if (!self->linked_package) {
GST_ERROR ("Couldn't resolve a package"); GST_ERROR ("Couldn't resolve a package");
return FALSE; return FALSE;
@ -1919,11 +1934,22 @@ mxf_metadata_source_clip_resolve (MXFMetadataBase * m, GHashTable * metadata)
{ {
MXFMetadataSourceClip *self = MXF_METADATA_SOURCE_CLIP (m); MXFMetadataSourceClip *self = MXF_METADATA_SOURCE_CLIP (m);
MXFMetadataBase *current = NULL; MXFMetadataBase *current = NULL;
#if GLIB_CHECK_VERSION (2, 16, 0)
GHashTableIter iter; GHashTableIter iter;
g_hash_table_iter_init (&iter, metadata); g_hash_table_iter_init (&iter, metadata);
#else
GList *l, *values;
values = g_hash_table_get_values (metadata);
#endif
#if GLIB_CHECK_VERSION (2, 16, 0)
while (g_hash_table_iter_next (&iter, NULL, (gpointer) & current)) { while (g_hash_table_iter_next (&iter, NULL, (gpointer) & current)) {
#else
for (l = values; l; l = l->next) {
current = l->data;
#endif
if (MXF_IS_METADATA_SOURCE_PACKAGE (current)) { if (MXF_IS_METADATA_SOURCE_PACKAGE (current)) {
MXFMetadataGenericPackage *p = MXF_METADATA_GENERIC_PACKAGE (current); MXFMetadataGenericPackage *p = MXF_METADATA_GENERIC_PACKAGE (current);
@ -1934,6 +1960,10 @@ mxf_metadata_source_clip_resolve (MXFMetadataBase * m, GHashTable * metadata)
} }
} }
#if !GLIB_CHECK_VERSION (2, 16, 0)
g_list_free (values);
#endif
return return
MXF_METADATA_BASE_CLASS (mxf_metadata_source_clip_parent_class)->resolve MXF_METADATA_BASE_CLASS (mxf_metadata_source_clip_parent_class)->resolve
(m, metadata); (m, metadata);
@ -2564,8 +2594,8 @@ mxf_metadata_generic_picture_essence_descriptor_handle_tag (MXFMetadataBase *
default: default:
ret = ret =
MXF_METADATA_BASE_CLASS MXF_METADATA_BASE_CLASS
(mxf_metadata_generic_picture_essence_descriptor_parent_class)->handle_tag (mxf_metadata_generic_picture_essence_descriptor_parent_class)->
(metadata, primer, tag, tag_data, tag_size); handle_tag (metadata, primer, tag, tag_data, tag_size);
break; break;
} }
@ -2718,8 +2748,8 @@ mxf_metadata_generic_sound_essence_descriptor_handle_tag (MXFMetadataBase *
default: default:
ret = ret =
MXF_METADATA_BASE_CLASS MXF_METADATA_BASE_CLASS
(mxf_metadata_generic_sound_essence_descriptor_parent_class)->handle_tag (mxf_metadata_generic_sound_essence_descriptor_parent_class)->
(metadata, primer, tag, tag_data, tag_size); handle_tag (metadata, primer, tag, tag_data, tag_size);
break; break;
} }
@ -2853,8 +2883,8 @@ mxf_metadata_cdci_picture_essence_descriptor_handle_tag (MXFMetadataBase *
default: default:
ret = ret =
MXF_METADATA_BASE_CLASS MXF_METADATA_BASE_CLASS
(mxf_metadata_cdci_picture_essence_descriptor_parent_class)->handle_tag (mxf_metadata_cdci_picture_essence_descriptor_parent_class)->
(metadata, primer, tag, tag_data, tag_size); handle_tag (metadata, primer, tag, tag_data, tag_size);
break; break;
} }
@ -2979,8 +3009,8 @@ mxf_metadata_rgba_picture_essence_descriptor_handle_tag (MXFMetadataBase *
default: default:
ret = ret =
MXF_METADATA_BASE_CLASS MXF_METADATA_BASE_CLASS
(mxf_metadata_rgba_picture_essence_descriptor_parent_class)->handle_tag (mxf_metadata_rgba_picture_essence_descriptor_parent_class)->
(metadata, primer, tag, tag_data, tag_size); handle_tag (metadata, primer, tag, tag_data, tag_size);
break; break;
} }
@ -3043,8 +3073,8 @@ mxf_metadata_generic_data_essence_descriptor_handle_tag (MXFMetadataBase *
default: default:
ret = ret =
MXF_METADATA_BASE_CLASS MXF_METADATA_BASE_CLASS
(mxf_metadata_generic_data_essence_descriptor_parent_class)->handle_tag (mxf_metadata_generic_data_essence_descriptor_parent_class)->
(metadata, primer, tag, tag_data, tag_size); handle_tag (metadata, primer, tag, tag_data, tag_size);
break; break;
} }