From fdd2f2b6d7e3d6941ff72fdf0c1d532ddf4d95e3 Mon Sep 17 00:00:00 2001 From: Tom Hacohen Date: Tue, 16 Feb 2016 15:16:04 +0000 Subject: [PATCH] Ecore audio: Fix Eolian warnings. This includes either migrating types to eolian, fixing namespace or importing extra types. --- src/lib/ecore_audio/Ecore_Audio.h | 19 ------------------- src/lib/ecore_audio/ecore_audio.eo | 13 +++++++++++++ 2 files changed, 13 insertions(+), 19 deletions(-) diff --git a/src/lib/ecore_audio/Ecore_Audio.h b/src/lib/ecore_audio/Ecore_Audio.h index ec1f85b..50e4b83 100644 --- a/src/lib/ecore_audio/Ecore_Audio.h +++ b/src/lib/ecore_audio/Ecore_Audio.h @@ -54,25 +54,6 @@ enum _Ecore_Audio_Type { */ typedef enum _Ecore_Audio_Type Ecore_Audio_Type; -/** - * @since 1.8 - */ -enum _Ecore_Audio_Format { - ECORE_AUDIO_FORMAT_AUTO, /**< Automatically detect the format (for inputs) */ - ECORE_AUDIO_FORMAT_RAW, /**< RAW samples (float) */ - ECORE_AUDIO_FORMAT_WAV, /**< WAV format */ - ECORE_AUDIO_FORMAT_OGG, /**< OGG */ - ECORE_AUDIO_FORMAT_FLAC, /**< FLAC, the Free Lossless Audio Codec */ - ECORE_AUDIO_FORMAT_MP3, /**< MP3 (not supported) */ - ECORE_AUDIO_FORMAT_LAST /**< Sentinel value, do not use */ -}; - - /* - * @since 1.8 - */ -typedef enum _Ecore_Audio_Format Ecore_Audio_Format; -/**< The format of the audio data */ - /** @since 1.8 */ typedef struct _Ecore_Audio_Module Ecore_Audio_Module; diff --git a/src/lib/ecore_audio/ecore_audio.eo b/src/lib/ecore_audio/ecore_audio.eo index 1491634..38cfe02 100644 --- a/src/lib/ecore_audio/ecore_audio.eo +++ b/src/lib/ecore_audio/ecore_audio.eo @@ -1,3 +1,16 @@ +type @extern Ecore_Audio_Vio: __undefined_type; /* FIXME: Had function pointer members. */ +type @extern eo_key_data_free_func: __undefined_type; /* FIXME: Function pointers not allowed. */ + +enum Ecore_Audio_Format { + auto, [[Automatically detect the format (for inputs)]] + raw, [[RAW samples (float)]] + wav, [[WAV format]] + ogg, [[OGG]] + flac, [[FLAC, the Free Lossless Audio Codec]] + mp3, [[MP3 (not supported)]] + last [[Sentinel value, do not use]] +} + class Ecore_Audio (Eo.Base) { legacy_prefix: null; -- 2.7.4