From 05c01867b6ea49ee3a6ddac374ab4f2019a1b3fa Mon Sep 17 00:00:00 2001 From: Tom Hacohen Date: Fri, 6 May 2016 13:24:16 +0100 Subject: [PATCH] Ecore audio: Correctly namespace now that Eolian supports it better. Eolian had a restriction due to the C++ generator that classes and namespaces would be named differently. Now that the C++ generator is fixed, eolian dropped the restriction and we can finally fix the wrong namespaces in ecore audio. --- src/lib/ecore_audio/ecore_audio.eo | 10 +++++----- src/lib/ecore_audio/ecore_audio_in.eo | 6 +++--- src/lib/ecore_audio/ecore_audio_in_sndfile.eo | 16 ++++++++-------- src/lib/ecore_audio/ecore_audio_in_tone.eo | 8 ++++---- src/lib/ecore_audio/ecore_audio_out.eo | 10 +++++----- .../ecore_audio/ecore_audio_out_core_audio.eo | 8 ++++---- src/lib/ecore_audio/ecore_audio_out_pulse.eo | 8 ++++---- src/lib/ecore_audio/ecore_audio_out_sndfile.eo | 12 ++++++------ 8 files changed, 39 insertions(+), 39 deletions(-) diff --git a/src/lib/ecore_audio/ecore_audio.eo b/src/lib/ecore_audio/ecore_audio.eo index db3379da6b..0c8fdfa7f3 100644 --- a/src/lib/ecore_audio/ecore_audio.eo +++ b/src/lib/ecore_audio/ecore_audio.eo @@ -1,7 +1,7 @@ -type @extern Ecore_Audio_Vio: __undefined_type; /* FIXME: Had function pointer members. */ +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 { +enum Ecore.Audio.Format { auto, [[Automatically detect the format (for inputs)]] raw, [[RAW samples (float)]] wav, [[WAV format]] @@ -11,7 +11,7 @@ enum Ecore_Audio_Format { last [[Sentinel value, do not use]] } -class Ecore_Audio (Eo.Base) +class Ecore.Audio (Eo.Base) { [[Convenience audio class.]] @@ -100,7 +100,7 @@ class Ecore_Audio (Eo.Base) ]] } values { - format: Ecore_Audio_Format; [[the format of the object]] + format: Ecore.Audio.Format; [[the format of the object]] } } vio_set { @@ -109,7 +109,7 @@ class Ecore_Audio (Eo.Base) @since 1.8 ]] params { - vio: Ecore_Audio_Vio *; [[the \@ref Ecore_Audio_Vio struct with + vio: Ecore.Audio.Vio *; [[the @Ecore.Audio.Vio struct with the function callbacks ]] data: void *; [[user data to pass to the VIO functions]] diff --git a/src/lib/ecore_audio/ecore_audio_in.eo b/src/lib/ecore_audio/ecore_audio_in.eo index 7b0327a9a2..fd4da49041 100644 --- a/src/lib/ecore_audio/ecore_audio_in.eo +++ b/src/lib/ecore_audio/ecore_audio_in.eo @@ -1,4 +1,4 @@ -class Ecore_Audio_In (Ecore_Audio) +class Ecore.Audio.In (Ecore.Audio) { [[Ecore Audio input object.]] legacy_prefix: null; @@ -98,7 +98,7 @@ class Ecore_Audio_In (Ecore_Audio) ]] } values { - output: Ecore_Audio *; [[The output]] /* FIXME-cyclic Should be Ecore_Audio_Out */ + output: Ecore.Audio *; [[The output]] /* FIXME-cyclic Should be Ecore.Audio.Out */ } } @property remaining { @@ -152,7 +152,7 @@ class Ecore_Audio_In (Ecore_Audio) implements { Eo.Base.constructor; Eo.Base.destructor; - Ecore_Audio.vio_set; + Ecore.Audio.vio_set; @virtual .preloaded.get; @virtual .preloaded.set; @virtual .seek; diff --git a/src/lib/ecore_audio/ecore_audio_in_sndfile.eo b/src/lib/ecore_audio/ecore_audio_in_sndfile.eo index 4396ec99a5..6b88780624 100644 --- a/src/lib/ecore_audio/ecore_audio_in_sndfile.eo +++ b/src/lib/ecore_audio/ecore_audio_in_sndfile.eo @@ -1,15 +1,15 @@ -class Ecore_Audio_In_Sndfile (Ecore_Audio_In) +class Ecore.Audio.In.Sndfile (Ecore.Audio.In) { [[Ecore Audio sndfile input.]] eo_prefix: ecore_audio_obj_in_sndfile; implements { Eo.Base.destructor; - Ecore_Audio.source.set; - Ecore_Audio.source.get; - Ecore_Audio.format.set; - Ecore_Audio.format.get; - Ecore_Audio.vio_set; - Ecore_Audio_In.seek; - Ecore_Audio_In.read_internal; + Ecore.Audio.source.set; + Ecore.Audio.source.get; + Ecore.Audio.format.set; + Ecore.Audio.format.get; + Ecore.Audio.vio_set; + Ecore.Audio.In.seek; + Ecore.Audio.In.read_internal; } } diff --git a/src/lib/ecore_audio/ecore_audio_in_tone.eo b/src/lib/ecore_audio/ecore_audio_in_tone.eo index afa9c3e841..ec2da4abf3 100644 --- a/src/lib/ecore_audio/ecore_audio_in_tone.eo +++ b/src/lib/ecore_audio/ecore_audio_in_tone.eo @@ -1,4 +1,4 @@ -class Ecore_Audio_In_Tone (Ecore_Audio_In) +class Ecore.Audio.In.Tone (Ecore.Audio.In) { [[Ecore Audio tone input.]] eo_prefix: ecore_audio_obj_in_tone; @@ -6,8 +6,8 @@ class Ecore_Audio_In_Tone (Ecore_Audio_In) Eo.Base.constructor; Eo.Base.key_data_set; Eo.Base.key_data_get; - Ecore_Audio_In.length.set; - Ecore_Audio_In.seek; - Ecore_Audio_In.read_internal; + Ecore.Audio.In.length.set; + Ecore.Audio.In.seek; + Ecore.Audio.In.read_internal; } } diff --git a/src/lib/ecore_audio/ecore_audio_out.eo b/src/lib/ecore_audio/ecore_audio_out.eo index 12b4a2aa68..f62df38795 100644 --- a/src/lib/ecore_audio/ecore_audio_out.eo +++ b/src/lib/ecore_audio/ecore_audio_out.eo @@ -1,4 +1,4 @@ -class Ecore_Audio_Out (Ecore_Audio) +class Ecore.Audio.Out (Ecore.Audio) { [[Ecore Audio output object.]] @@ -13,7 +13,7 @@ class Ecore_Audio_Out (Ecore_Audio) ]] return: bool; [[true if the input was attached, false otherwise]] params { - @in input: Ecore_Audio_In *; [[The input to attach to the output]] + @in input: Ecore.Audio.In *; [[The input to attach to the output]] } } input_detach { @@ -23,7 +23,7 @@ class Ecore_Audio_Out (Ecore_Audio) ]] return: bool; [[true if the input was detached, false otherwise]] params { - @in input: Ecore_Audio_In *; [[The input to detach to the output]] + @in input: Ecore.Audio.In *; [[The input to detach to the output]] } } inputs_get { @@ -31,12 +31,12 @@ class Ecore_Audio_Out (Ecore_Audio) @since 1.8 ]] - return: list *; [[A list of the inputs that are attached to the output]] + return: list *; [[A list of the inputs that are attached to the output]] } } implements { Eo.Base.constructor; Eo.Base.destructor; - Ecore_Audio.vio_set; + Ecore.Audio.vio_set; } } diff --git a/src/lib/ecore_audio/ecore_audio_out_core_audio.eo b/src/lib/ecore_audio/ecore_audio_out_core_audio.eo index cd8b99b6b6..fb0c730951 100644 --- a/src/lib/ecore_audio/ecore_audio_out_core_audio.eo +++ b/src/lib/ecore_audio/ecore_audio_out_core_audio.eo @@ -1,10 +1,10 @@ -class Ecore_Audio_Out_Core_Audio (Ecore_Audio_Out) +class Ecore.Audio.Out.Core_Audio (Ecore.Audio.Out) { [[Ecore audio output for Mac OSX Core Aduio.]] eo_prefix: ecore_audio_obj_out_core_audio; implements { - Ecore_Audio.volume.set; - Ecore_Audio_Out.input_attach; - Ecore_Audio_Out.input_detach; + Ecore.Audio.volume.set; + Ecore.Audio.Out.input_attach; + Ecore.Audio.Out.input_detach; } } diff --git a/src/lib/ecore_audio/ecore_audio_out_pulse.eo b/src/lib/ecore_audio/ecore_audio_out_pulse.eo index dd49d5e9d2..58ee140567 100644 --- a/src/lib/ecore_audio/ecore_audio_out_pulse.eo +++ b/src/lib/ecore_audio/ecore_audio_out_pulse.eo @@ -1,13 +1,13 @@ -class Ecore_Audio_Out_Pulse (Ecore_Audio_Out) +class Ecore.Audio.Out.Pulse (Ecore.Audio.Out) { [[Ecore audio ouput for PulseAudio.]] eo_prefix: ecore_audio_obj_out_pulse; implements { Eo.Base.constructor; Eo.Base.destructor; - Ecore_Audio.volume.set; - Ecore_Audio_Out.input_attach; - Ecore_Audio_Out.input_detach; + Ecore.Audio.volume.set; + Ecore.Audio.Out.input_attach; + Ecore.Audio.Out.input_detach; } events { context,ready; [[Called when the output is ready for playback.]] diff --git a/src/lib/ecore_audio/ecore_audio_out_sndfile.eo b/src/lib/ecore_audio/ecore_audio_out_sndfile.eo index 0c18971675..d807f654da 100644 --- a/src/lib/ecore_audio/ecore_audio_out_sndfile.eo +++ b/src/lib/ecore_audio/ecore_audio_out_sndfile.eo @@ -1,14 +1,14 @@ -class Ecore_Audio_Out_Sndfile (Ecore_Audio_Out) +class Ecore.Audio.Out.Sndfile (Ecore.Audio.Out) { [[Ecore audio output to the sndfile library.]] eo_prefix: ecore_audio_obj_out_sndfile; implements { Eo.Base.constructor; Eo.Base.destructor; - Ecore_Audio.source.get; - Ecore_Audio.source.set; - Ecore_Audio.format.get; - Ecore_Audio.format.set; - Ecore_Audio_Out.input_attach; + Ecore.Audio.source.get; + Ecore.Audio.source.set; + Ecore.Audio.format.get; + Ecore.Audio.format.set; + Ecore.Audio.Out.input_attach; } }