1 files changed, 27 insertions, 17 deletions
diff --git a/gst/mxf/mxfaes-bwf.h b/gst/mxf/mxfaes-bwf.h
index e158a8b4..7783a2d0 100644
--- a/gst/mxf/mxfaes-bwf.h
+++ b/gst/mxf/mxfaes-bwf.h
@@ -27,14 +27,20 @@
 #include <gst/gst.h>
 
 #include "mxfparse.h"
+#include "mxfmetadata.h"
 
 /* SMPTE 382M Annex 1 */
-#define MXF_METADATA_WAVE_AUDIO_ESSENCE_DESCRIPTOR 0x0148
-/* SMPTE 382M Annex 2 */
-#define MXF_METADATA_AES3_AUDIO_ESSENCE_DESCRIPTOR 0x0147
-
-/* SMPTE 382M Annex 1 */
-typedef struct {
+#define MXF_TYPE_METADATA_WAVE_AUDIO_ESSENCE_DESCRIPTOR \
+  (mxf_metadata_wave_audio_essence_descriptor_get_type())
+#define MXF_METADATA_WAVE_AUDIO_ESSENCE_DESCRIPTOR(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj),MXF_TYPE_METADATA_WAVE_AUDIO_ESSENCE_DESCRIPTOR, MXFMetadataWaveAudioEssenceDescriptor))
+#define MXF_IS_METADATA_WAVE_AUDIO_ESSENCE_DESCRIPTOR(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj),MXF_TYPE_METADATA_WAVE_AUDIO_ESSENCE_DESCRIPTOR))
+typedef struct _MXFMetadataWaveAudioEssenceDescriptor MXFMetadataWaveAudioEssenceDescriptor;
+typedef MXFMetadataBaseClass MXFMetadataWaveAudioEssenceDescriptorClass;
+GType mxf_metadata_wave_audio_essence_descriptor_get_type (void);
+
+struct _MXFMetadataWaveAudioEssenceDescriptor {
   MXFMetadataGenericSoundEssenceDescriptor parent;
 
   guint16 block_align;
@@ -55,10 +61,20 @@ typedef struct {
 
   guint8 *peak_envelope_data;
   guint16 peak_envelope_data_length;
-} MXFMetadataWaveAudioEssenceDescriptor;
+};
 
 /* SMPTE 382M Annex 2 */
-typedef struct {
+#define MXF_TYPE_METADATA_AES3_AUDIO_ESSENCE_DESCRIPTOR \
+  (mxf_metadata_aes3_audio_essence_descriptor_get_type())
+#define MXF_METADATA_AES3_AUDIO_ESSENCE_DESCRIPTOR(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj),MXF_TYPE_METADATA_AES3_AUDIO_ESSENCE_DESCRIPTOR, MXFMetadataAES3AudioEssenceDescriptor))
+#define MXF_IS_METADATA_AES3_AUDIO_ESSENCE_DESCRIPTOR(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj),MXF_TYPE_METADATA_AES3_AUDIO_ESSENCE_DESCRIPTOR))
+typedef struct _MXFMetadataAES3AudioEssenceDescriptor MXFMetadataAES3AudioEssenceDescriptor;
+typedef MXFMetadataBaseClass MXFMetadataAES3AudioEssenceDescriptorClass;
+GType mxf_metadata_aes3_audio_essence_descriptor_get_type (void);
+
+struct _MXFMetadataAES3AudioEssenceDescriptor {
   MXFMetadataWaveAudioEssenceDescriptor parent;
 
   guint8 emphasis;
@@ -79,19 +95,13 @@ typedef struct {
 
   guint32 linked_timecode_track_id;
   guint8 stream_number;
-} MXFMetadataAES3AudioEssenceDescriptor;
-
-gboolean mxf_metadata_wave_audio_essence_descriptor_handle_tag (MXFMetadataGenericDescriptor *descriptor,
-    const MXFPrimerPack *primer, guint16 tag, const guint8 *tag_data, guint16 tag_size);
-void mxf_metadata_wave_audio_essence_descriptor_reset (MXFMetadataWaveAudioEssenceDescriptor *descriptor);
-
-gboolean mxf_metadata_aes3_audio_essence_descriptor_handle_tag (MXFMetadataGenericDescriptor *descriptor,
-    const MXFPrimerPack *primer, guint16 tag, const guint8 *tag_data, guint16 tag_size);
-void mxf_metadata_aes3_audio_essence_descriptor_reset (MXFMetadataAES3AudioEssenceDescriptor *descriptor);
+};
 
 gboolean mxf_is_aes_bwf_essence_track (const MXFMetadataTrack *track);
 
 GstCaps *
 mxf_aes_bwf_create_caps (MXFMetadataGenericPackage *package, MXFMetadataTrack *track, GstTagList **tags, MXFEssenceElementHandler *handler, gpointer *mapping_data);
 
+void mxf_aes_bwf_init (void);
+
 #endif /* __MXF_AES_BWF_H__ */