Eolian: Clean out Ecore Audio Eo headers

7 files changed, 3 insertions, 538 deletions

diff --git a/src/lib/ecore_audio/ecore_audio_obj.h b/src/lib/ecore_audio/ecore_audio_obj.h
index 153a638292..ad5062b8e3 100644
--- a/src/lib/ecore_audio/ecore_audio_obj.h
+++ b/src/lib/ecore_audio/ecore_audio_obj.h
@@ -34,150 +34,6 @@ extern "C"
  * @{
  */
 #include "ecore_audio.eo.h"
-#if 0
-#define ECORE_AUDIO_OBJ_CLASS ecore_audio_obj_class_get() /**< Ecore_Audio object class */
-
-/**
- * @brief Get the Eo class ID 
- *
- * @return The Eo class ID
- */
-const Eo_Class *ecore_audio_obj_class_get() EINA_CONST;
-
-extern EAPI Eo_Op ECORE_AUDIO_OBJ_BASE_ID;
-
-enum Ecore_Audio_Obj_Sub_Ids
-{
-   ECORE_AUDIO_OBJ_SUB_ID_NAME_SET,
-   ECORE_AUDIO_OBJ_SUB_ID_NAME_GET,
-   ECORE_AUDIO_OBJ_SUB_ID_PAUSED_SET,
-   ECORE_AUDIO_OBJ_SUB_ID_PAUSED_GET,
-   ECORE_AUDIO_OBJ_SUB_ID_VOLUME_SET,
-   ECORE_AUDIO_OBJ_SUB_ID_VOLUME_GET,
-   ECORE_AUDIO_OBJ_SUB_ID_SOURCE_SET,
-   ECORE_AUDIO_OBJ_SUB_ID_SOURCE_GET,
-   ECORE_AUDIO_OBJ_SUB_ID_FORMAT_SET,
-   ECORE_AUDIO_OBJ_SUB_ID_FORMAT_GET,
-   ECORE_AUDIO_OBJ_SUB_ID_VIO_SET,
-   ECORE_AUDIO_OBJ_SUB_ID_LAST
-};
-
-#define ECORE_AUDIO_OBJ_ID(sub_id) (ECORE_AUDIO_OBJ_BASE_ID + EO_TYPECHECK(enum Ecore_Audio_Obj_Sub_Ids, sub_id))
-
-/**
- * @brief Set the name of the object
- *
- * @since 1.8
- *
- * @param[in] name
- */
-#define ecore_audio_obj_name_set(name) ECORE_AUDIO_OBJ_ID(ECORE_AUDIO_OBJ_SUB_ID_NAME_SET), EO_TYPECHECK(const char *, name)
-
-/**
- * @brief Get the name of the object
- *
- * @since 1.8
- *
- * @param[out] ret
- */
-#define ecore_audio_obj_name_get(ret) ECORE_AUDIO_OBJ_ID(ECORE_AUDIO_OBJ_SUB_ID_NAME_GET), EO_TYPECHECK(const char **, ret)
-
-/**
- * @brief Set the paused state of the object
- *
- * @since 1.8
- *
- * @param[in]   paused EINA_TRUE to pause the object, EINA_FALSE to resume
- */
-#define ecore_audio_obj_paused_set(paused) ECORE_AUDIO_OBJ_ID(ECORE_AUDIO_OBJ_SUB_ID_PAUSED_SET), EO_TYPECHECK(Eina_Bool, paused)
-
-/**
- * @brief Get the paused state of the object
- *
- * @since 1.8
- *
- * @param[out]   ret EINA_TRUE if object is paused, EINA_FALSE if not
- */
-#define ecore_audio_obj_paused_get(ret) ECORE_AUDIO_OBJ_ID(ECORE_AUDIO_OBJ_SUB_ID_PAUSED_GET), EO_TYPECHECK(Eina_Bool *, ret)
-
-/**
- * @brief Set the volume of the object
- *
- * @since 1.8
- *
- * @param[in] volume The volume, 1.0 is the default, can be > 1.0
- */
-#define ecore_audio_obj_volume_set(volume) ECORE_AUDIO_OBJ_ID(ECORE_AUDIO_OBJ_SUB_ID_VOLUME_SET), EO_TYPECHECK(double, volume)
-
-/**
- * @brief Get the volume of the object
- *
- * @since 1.8
- *
- * @param[out] ret The volume
- */
-#define ecore_audio_obj_volume_get(ret) ECORE_AUDIO_OBJ_ID(ECORE_AUDIO_OBJ_SUB_ID_VOLUME_GET), EO_TYPECHECK(double *, ret)
-
-/**
- * @brief Set the source of an object
- *
- * @since 1.8
- *
- * What sources are supported depends on the actual object. For example,
- * the libsndfile class accepts WAV, OGG, FLAC files as source.
- *
- * @param[in] source The source to set to (i.e. file, URL, device)
- * @param[out] ret EINA_TRUE if the source was set correctly (i.e. the file was opened), EINA_FALSE otherwise
- */
-#define ecore_audio_obj_source_set(source, ret) ECORE_AUDIO_OBJ_ID(ECORE_AUDIO_OBJ_SUB_ID_SOURCE_SET), EO_TYPECHECK(const char *, source), EO_TYPECHECK(Eina_Bool *, ret)
-
-/**
- * @brief Get the source of an object
- *
- * @since 1.8
- *
- * @param[out] ret The currently set source
- */
-#define ecore_audio_obj_source_get(ret) ECORE_AUDIO_OBJ_ID(ECORE_AUDIO_OBJ_SUB_ID_SOURCE_GET), EO_TYPECHECK(const char **, ret)
-
-/**
- * @brief Set the format of an object
- *
- * @since 1.8
- *
- * What formats are supported depends on the actual object. Default is
- * ECORE_AUDIO_FORMAT_AUTO
- *
- * @param[in] format The format to set, of type Ecore_Audio_Format
- * @param[out] ret EINA_TRUE if the format was supported, EINA_FALSE otherwise
- */
-#define ecore_audio_obj_format_set(format, ret) ECORE_AUDIO_OBJ_ID(ECORE_AUDIO_OBJ_SUB_ID_FORMAT_SET), EO_TYPECHECK(Ecore_Audio_Format, format), EO_TYPECHECK(Eina_Bool *, ret)
-
-/**
- * @brief Get the format of an object
- *
- * @since 1.8
- *
- * After setting the source if the format was ECORE_AUDIO_FORMAT_AUTO this
- * function will now return the actual format.
- *
- * @param[out] ret The format of the object
- */
-#define ecore_audio_obj_format_get(ret) ECORE_AUDIO_OBJ_ID(ECORE_AUDIO_OBJ_SUB_ID_FORMAT_GET), EO_TYPECHECK(Ecore_Audio_Format *, ret)
-
-/**
- * @brief Set the virtual IO functions
- *
- * @since 1.8
- *
- * @param[in] vio The @ref Ecore_Audio_Vio struct with the function callbacks
- * @param[in] data User data to pass to the VIO functions
- * @param[in] free_func This function takes care to clean up @ref data when
- * the VIO is destroyed. NULL means do nothing.
- */
-#define ecore_audio_obj_vio_set(vio, data, free_func) ECORE_AUDIO_OBJ_ID(ECORE_AUDIO_OBJ_SUB_ID_VIO_SET), EO_TYPECHECK(Ecore_Audio_Vio *, vio), EO_TYPECHECK(void *, data), EO_TYPECHECK(eo_key_data_free_func, free_func)
-
-#endif
 /**
  * @}
  */
diff --git a/src/lib/ecore_audio/ecore_audio_obj_in.h b/src/lib/ecore_audio/ecore_audio_obj_in.h
index 8caa518489..9840de887b 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_in.h
+++ b/src/lib/ecore_audio/ecore_audio_obj_in.h
@@ -34,240 +34,6 @@ extern "C"
  * @{
  */
 #include "ecore_audio_in.eo.h"
-#if 0
-
-#define ECORE_AUDIO_OBJ_IN_CLASS ecore_audio_obj_in_class_get() /**< Ecore_Audio input object class */
-
-/**
- * @brief Get the Eo class ID
- *
- * @return The Eo class ID
- */
-const Eo_Class *ecore_audio_obj_in_class_get() EINA_CONST;
-
-extern EAPI Eo_Op ECORE_AUDIO_OBJ_IN_BASE_ID;
-
-enum Ecore_Audio_Obj_In_Sub_Ids
-{
-   ECORE_AUDIO_OBJ_IN_SUB_ID_SPEED_SET,
-   ECORE_AUDIO_OBJ_IN_SUB_ID_SPEED_GET,
-   ECORE_AUDIO_OBJ_IN_SUB_ID_SAMPLERATE_SET,
-   ECORE_AUDIO_OBJ_IN_SUB_ID_SAMPLERATE_GET,
-   ECORE_AUDIO_OBJ_IN_SUB_ID_CHANNELS_SET,
-   ECORE_AUDIO_OBJ_IN_SUB_ID_CHANNELS_GET,
-   ECORE_AUDIO_OBJ_IN_SUB_ID_PRELOADED_SET,
-   ECORE_AUDIO_OBJ_IN_SUB_ID_PRELOADED_GET,
-   ECORE_AUDIO_OBJ_IN_SUB_ID_LOOPED_SET,
-   ECORE_AUDIO_OBJ_IN_SUB_ID_LOOPED_GET,
-   ECORE_AUDIO_OBJ_IN_SUB_ID_LENGTH_SET,
-   ECORE_AUDIO_OBJ_IN_SUB_ID_LENGTH_GET,
-   ECORE_AUDIO_OBJ_IN_SUB_ID_READ,
-   ECORE_AUDIO_OBJ_IN_SUB_ID_READ_INTERNAL,
-   ECORE_AUDIO_OBJ_IN_SUB_ID_SEEK,
-   ECORE_AUDIO_OBJ_IN_SUB_ID_OUTPUT_GET,
-   ECORE_AUDIO_OBJ_IN_SUB_ID_REMAINING_GET,
-   ECORE_AUDIO_OBJ_IN_SUB_ID_LAST
-};
-
-#define ECORE_AUDIO_OBJ_IN_ID(sub_id) (ECORE_AUDIO_OBJ_IN_BASE_ID + EO_TYPECHECK(enum Ecore_Audio_Obj_In_Sub_Ids, sub_id))
-
-/**
- * @brief Set the playback speed of the input
- *
- * @since 1.8
- *
- * @param[in] speed The speed, 1.0 is the default
- */
-#define ecore_audio_obj_in_speed_set(speed) ECORE_AUDIO_OBJ_IN_ID(ECORE_AUDIO_OBJ_IN_SUB_ID_SPEED_SET), EO_TYPECHECK(double, speed)
-
-/**
- * @brief Get the playback speed of the input
- *
- * @since 1.8
- *
- * This will trigger the ECORE_AUDIO_EV_IN_SAMPLERATE_CHANGED event.
- *
- * @param[out] speed The speed
- */
-#define ecore_audio_obj_in_speed_get(speed) ECORE_AUDIO_OBJ_IN_ID(ECORE_AUDIO_OBJ_IN_SUB_ID_SPEED_GET), EO_TYPECHECK(double *, speed)
-
-/**
- * @brief Set the sample-rate of the input
- *
- * @since 1.8
- *
- * This will trigger the ECORE_AUDIO_EV_IN_SAMPLERATE_CHANGED event.
- *
- * @param[in] samplerate The samplerate in Hz
- */
-#define ecore_audio_obj_in_samplerate_set(samplerate) ECORE_AUDIO_OBJ_IN_ID(ECORE_AUDIO_OBJ_IN_SUB_ID_SAMPLERATE_SET), EO_TYPECHECK(int, samplerate)
-
-/**
- * @brief Get the sample-rate of the input
- *
- * @since 1.8
- *
- * @param[out] samplerate The samplerate in Hz
- */
-#define ecore_audio_obj_in_samplerate_get(samplerate) ECORE_AUDIO_OBJ_IN_ID(ECORE_AUDIO_OBJ_IN_SUB_ID_SAMPLERATE_GET), EO_TYPECHECK(int *, samplerate)
-
-/**
- * @brief Set the amount of channels the input has
- *
- * @since 1.8
- *
- * @param[in] channels The number of channels
- */
-#define ecore_audio_obj_in_channels_set(channels) ECORE_AUDIO_OBJ_IN_ID(ECORE_AUDIO_OBJ_IN_SUB_ID_CHANNELS_SET), EO_TYPECHECK(int, channels)
-
-/**
- * @brief Get the amount of channels the input has
- *
- * @since 1.8
- *
- * @param[out] channels The number of channels
- */
-#define ecore_audio_obj_in_channels_get(channels) ECORE_AUDIO_OBJ_IN_ID(ECORE_AUDIO_OBJ_IN_SUB_ID_CHANNELS_GET), EO_TYPECHECK(int *, channels)
-
-/**
- * @brief Set the preloaded state of the input
- *
- * @since 1.8
- *
- * @param[in] preloaded EINA_TRUE if the input should be cached, EINA_FALSE otherwise
- */
-#define ecore_audio_obj_in_preloaded_set(preloaded) ECORE_AUDIO_OBJ_IN_ID(ECORE_AUDIO_OBJ_IN_SUB_ID_PRELOADED_SET), EO_TYPECHECK(Eina_Bool, preloaded)
-
-/**
- * @brief Get the preloaded state of the input
- *
- * @since 1.8
- *
- * @param[out] preloaded EINA_TRUE if the input is cached, EINA_FALSE otherwise
- */
-#define ecore_audio_obj_in_preloaded_get(preloaded) ECORE_AUDIO_OBJ_IN_ID(ECORE_AUDIO_OBJ_IN_SUB_ID_PRELOADED_GET), EO_TYPECHECK(Eina_Bool *, preloaded)
-
-/**
- * @brief Set the looped state of the input
- *
- * @since 1.8
- *
- * If the input is looped and reaches the end it will start from the
- * beginning again. At the same time the event @ref ECORE_AUDIO_EV_IN_LOOPED
- * will be emitted
- *
- * @param[in] looped EINA_TRUE if the input should be looped, EINA_FALSE otherwise
- */
-#define ecore_audio_obj_in_looped_set(looped) ECORE_AUDIO_OBJ_IN_ID(ECORE_AUDIO_OBJ_IN_SUB_ID_LOOPED_SET), EO_TYPECHECK(Eina_Bool, looped)
-
-/**
- * @brief Get the looped state of the input
- *
- * @since 1.8
- *
- * @see ecore_audio_obj_in_looped_set
- *
- * @param[out] ret EINA_TRUE if the input is looped, EINA_FALSE otherwise
- */
-#define ecore_audio_obj_in_looped_get(ret) ECORE_AUDIO_OBJ_IN_ID(ECORE_AUDIO_OBJ_IN_SUB_ID_LOOPED_GET), EO_TYPECHECK(Eina_Bool *, ret)
-
-/**
- * @brief Set the length of the input
- *
- * @since 1.8
- *
- * This function is only implemented by some classes
- * (i.e. ECORE_AUDIO_OBJ_IN_TONE_CLASS)
- *
- * @param[in] length The length of the input in seconds
- */
-#define ecore_audio_obj_in_length_set(length) ECORE_AUDIO_OBJ_IN_ID(ECORE_AUDIO_OBJ_IN_SUB_ID_LENGTH_SET), EO_TYPECHECK(double, length)
-
-/**
- * @brief Get the length of the input
- *
- * @since 1.8
- *
- * @param[out] ret The length of the input in seconds
- */
-#define ecore_audio_obj_in_length_get(ret) ECORE_AUDIO_OBJ_IN_ID(ECORE_AUDIO_OBJ_IN_SUB_ID_LENGTH_GET), EO_TYPECHECK(double *, ret)
-
-/**
- * @brief Read from the input
- *
- * @since 1.8
- *
- * @param[out] buf The buffer to read into
- * @param[in] len The amount of samples to read
- * @param[out] ret The amount of samples written to buf
- */
-#define ecore_audio_obj_in_read(buf, len, ret) ECORE_AUDIO_OBJ_IN_ID(ECORE_AUDIO_OBJ_IN_SUB_ID_READ), EO_TYPECHECK(void *, buf), EO_TYPECHECK(size_t, len), EO_TYPECHECK(ssize_t *, ret)
-
-/**
- * @brief Seek within the input
- *
- * @since 1.8
- *
- * @param[in] offs The offset in seconds
- * @param[in] mode The seek mode. Is absolute with SEEK_SET, relative to the
- * current position with SEEK_CUR and relative to the end with SEEK_END.
- * @param[out] ret The current absolute position in seconds within the input
- */
-#define ecore_audio_obj_in_seek(offs, mode, ret) ECORE_AUDIO_OBJ_IN_ID(ECORE_AUDIO_OBJ_IN_SUB_ID_SEEK), EO_TYPECHECK(double, offs), EO_TYPECHECK(int, mode), EO_TYPECHECK(double *, ret)
-
-/**
- * @brief Get the output that this input is attached to
- *
- * @since 1.8
- *
- * @param[out] ret The output
- */
-#define ecore_audio_obj_in_output_get(ret) ECORE_AUDIO_OBJ_IN_ID(ECORE_AUDIO_OBJ_IN_SUB_ID_OUTPUT_GET), EO_TYPECHECK(Eo **, ret)
-
-/**
- * @brief Get the remaining time of the input
- *
- * @param[out] ret The amount of time in seconds left to play
- */
-#define ecore_audio_obj_in_remaining_get(ret) ECORE_AUDIO_OBJ_IN_ID(ECORE_AUDIO_OBJ_IN_SUB_ID_REMAINING_GET), EO_TYPECHECK(double *, ret)
-
-extern const Eo_Event_Description _ECORE_AUDIO_EV_IN_LOOPED;
-
-/**
- * @brief The input looped
- *
- * @since 1.8
- *
- * Emitted when @ref ecore_audio_obj_in_looped_set is set to EINA_TRUE and
- * the input restarted playing after reaching the end.
- */
-#define ECORE_AUDIO_EV_IN_LOOPED (&(_ECORE_AUDIO_EV_IN_LOOPED))
-
-extern const Eo_Event_Description _ECORE_AUDIO_EV_IN_STOPPED;
-
-/**
- * @brief The input stopped playing
- *
- * @since 1.8
- *
- * Emitted when the input stopped playing after reaching the end.
- */
-#define ECORE_AUDIO_EV_IN_STOPPED (&(_ECORE_AUDIO_EV_IN_STOPPED))
-
-extern const Eo_Event_Description _ECORE_AUDIO_EV_IN_SAMPLERATE_CHANGED;
-
-/**
- * @brief The sample rate changed
- *
- * @since 1.8
- *
- * Emitted when the samplerate changed - this can happen if you call
- * @ref ecore_audio_obj_in_samplerate_set or
- * @ref ecore_audio_obj_in_speed_set.
- */
-#define ECORE_AUDIO_EV_IN_SAMPLERATE_CHANGED (&(_ECORE_AUDIO_EV_IN_SAMPLERATE_CHANGED))
-
-#endif
 /**
  * @}
  */
diff --git a/src/lib/ecore_audio/ecore_audio_obj_in_sndfile.h b/src/lib/ecore_audio/ecore_audio_obj_in_sndfile.h
index f759d5c9b7..fb37b7ccc6 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_in_sndfile.h
+++ b/src/lib/ecore_audio/ecore_audio_obj_in_sndfile.h
@@ -34,27 +34,6 @@ extern "C"
  * @{
  */
 #include "ecore_audio_in_sndfile.eo.h"
-
-#if 0
-#define ECORE_AUDIO_OBJ_IN_SNDFILE_CLASS ecore_audio_obj_in_sndfile_class_get() /**< Ecore_Audio sndfile input */
-
-/**
- * @brief Get the Eo class ID 
- *
- * @return The Eo class ID
- */
-const Eo_Class *ecore_audio_obj_in_sndfile_class_get() EINA_CONST;
-
-extern EAPI Eo_Op ECORE_AUDIO_OBJ_IN_SNDFILE_BASE_ID;
-
-enum Ecore_Audio_Obj_In_Sndfile_Sub_Ids
-{
-   ECORE_AUDIO_OBJ_IN_SNDFILE_SUB_ID_LAST
-};
-
-#define ECORE_AUDIO_OBJ_IN_SNDFILE_ID(sub_id) (ECORE_AUDIO_OBJ_IN_SNDFILE_BASE_ID + EO_TYPECHECK(enum Ecore_Audio_Obj_In_Sndfile_Sub_Ids, sub_id)
-
-#endif
 /**
  * @}
  */
@@ -63,4 +42,4 @@ enum Ecore_Audio_Obj_In_Sndfile_Sub_Ids
 }
 #endif
 
-#endif
+#endif
\ No newline at end of file
diff --git a/src/lib/ecore_audio/ecore_audio_obj_in_tone.h b/src/lib/ecore_audio/ecore_audio_obj_in_tone.h
index 738f49a55a..bf6bee04e8 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_in_tone.h
+++ b/src/lib/ecore_audio/ecore_audio_obj_in_tone.h
@@ -42,26 +42,8 @@ extern "C"
 #define ECORE_AUDIO_ATTR_TONE_FREQ "ecore_audio_freq"
 
 #include "ecore_audio_in_tone.eo.h"
-#if 0
-#define ECORE_AUDIO_OBJ_IN_TONE_CLASS ecore_audio_obj_in_tone_class_get() /**< Ecore_Audio tone input */
 
 /**
- * @brief Get the Eo class ID 
- *
- * @return The Eo class ID
- */
-const Eo_Class *ecore_audio_obj_in_tone_class_get() EINA_CONST;
-
-extern EAPI Eo_Op ECORE_AUDIO_OBJ_IN_TONE_BASE_ID;
-
-enum Ecore_Audio_Obj_In_Tone_Sub_Ids
-{
-   ECORE_AUDIO_OBJ_IN_TONE_SUB_ID_LAST
-};
-
-#define ECORE_AUDIO_OBJ_IN_TONE_ID(sub_id) (ECORE_AUDIO_OBJ_IN_TONE_BASE_ID + EO_TYPECHECK(enum Ecore_Audio_Obj_In_Tone_Sub_Ids, sub_id)
-#endif
-/**
  * @}
  */
 
diff --git a/src/lib/ecore_audio/ecore_audio_obj_out.h b/src/lib/ecore_audio/ecore_audio_obj_out.h
index bd5bd64df3..e8d0819028 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_out.h
+++ b/src/lib/ecore_audio/ecore_audio_obj_out.h
@@ -34,60 +34,6 @@ extern "C"
  * @{
  */
 #include "ecore_audio_out.eo.h"
-
-#if 0
-#define ECORE_AUDIO_OBJ_OUT_CLASS ecore_audio_obj_out_class_get() /**< Ecore_Audio output object class */
-
-/**
- * @brief Get the Eo class ID
- *
- * @return The Eo class ID
- */
-const Eo_Class *ecore_audio_obj_out_class_get() EINA_CONST;
-
-extern EAPI Eo_Op ECORE_AUDIO_OBJ_OUT_BASE_ID;
-
-enum Ecore_Audio_Obj_Out_Sub_Ids
-{
-   ECORE_AUDIO_OBJ_OUT_SUB_ID_INPUT_ATTACH,
-   ECORE_AUDIO_OBJ_OUT_SUB_ID_INPUT_DETACH,
-   ECORE_AUDIO_OBJ_OUT_SUB_ID_INPUTS_GET,
-   ECORE_AUDIO_OBJ_OUT_SUB_ID_LAST
-};
-
-#define ECORE_AUDIO_OBJ_OUT_ID(sub_id) (ECORE_AUDIO_OBJ_OUT_BASE_ID + EO_TYPECHECK(enum Ecore_Audio_Obj_Out_Sub_Ids, sub_id))
-
-/**
- * @brief Attach an input to an output
- *
- * @since 1.8
- *
- * @param[in] input The input to attach to the output
- * @param[out] ret EINA_TRUE if the input was attached, EINA_FALSE otherwise
- */
-#define ecore_audio_obj_out_input_attach(input, ret) ECORE_AUDIO_OBJ_OUT_ID(ECORE_AUDIO_OBJ_OUT_SUB_ID_INPUT_ATTACH), EO_TYPECHECK(Eo *, input), EO_TYPECHECK(Eina_Bool *, ret)
-
-/**
- * @brief Detach an input from an output
- *
- * @since 1.8
- *
- * @param[in] input The input to detach to the output
- * @param[out] ret EINA_TRUE if the input was detached, EINA_FALSE otherwise
- */
-#define ecore_audio_obj_out_input_detach(input, ret) ECORE_AUDIO_OBJ_OUT_ID(ECORE_AUDIO_OBJ_OUT_SUB_ID_INPUT_DETACH), EO_TYPECHECK(Eo *, input), EO_TYPECHECK(Eina_Bool *, ret)
-
-/**
- * @brief Detach an input from an output
- *
- * @since 1.8
- *
- * @param[out] inputs An @ref Eina_List of the inputs that are attached to
- * the output
- */
-#define ecore_audio_obj_out_inputs_get(inputs) ECORE_AUDIO_OBJ_OUT_ID(ECORE_AUDIO_OBJ_OUT_SUB_ID_INPUTS_GET), EO_TYPECHECK(Eina_List **, inputs)
-
-#endif
 /**
  * @}
  */
@@ -96,5 +42,4 @@ enum Ecore_Audio_Obj_Out_Sub_Ids
 }
 #endif
 
-#endif
-
+#endif
\ No newline at end of file
diff --git a/src/lib/ecore_audio/ecore_audio_obj_out_pulse.h b/src/lib/ecore_audio/ecore_audio_obj_out_pulse.h
index a8e11ad246..0e8ad1b5db 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_out_pulse.h
+++ b/src/lib/ecore_audio/ecore_audio_obj_out_pulse.h
@@ -34,48 +34,6 @@ extern "C"
  * @{
  */
 #include "ecore_audio_out_pulse.eo.h"
-#if 0
-#define ECORE_AUDIO_OBJ_OUT_PULSE_CLASS ecore_audio_obj_out_pulse_class_get() /**< Ecore_Audio pulseaudio output */
-
-/**
- * @brief Get the Eo class ID 
- *
- * @return The Eo class ID
- */
-const Eo_Class *ecore_audio_obj_out_pulse_class_get() EINA_CONST;
-
-extern EAPI Eo_Op ECORE_AUDIO_OBJ_OUT_PULSE_BASE_ID;
-
-enum _Ecore_Audio_Obj_Out_Pulse_Sub_Ids
-{
-   ECORE_AUDIO_OBJ_OUT_PULSE_SUB_ID_LAST
-};
-
-#define ECORE_AUDIO_OBJ_OUT_PULSE_ID(sub_id) (ECORE_AUDIO_OBJ_OUT_PULSE_BASE_ID + EO_TYPECHECK(enum _Ecore_Audio_Obj_Out_Pulse_Sub_Ids, sub_id))
-
-extern EAPI const Eo_Event_Description _ECORE_AUDIO_EV_OUT_PULSE_CONTEXT_READY;
-   
-/**
- * @brief The output context is ready
- *
- * @since 1.8
- *
- * Emitted when the outout context is ready for playback
- */
-#define ECORE_AUDIO_EV_OUT_PULSE_CONTEXT_READY (&(_ECORE_AUDIO_EV_OUT_PULSE_CONTEXT_READY))
-   
-extern EAPI const Eo_Event_Description _ECORE_AUDIO_EV_OUT_PULSE_CONTEXT_FAIL;
-   
-/**
- * @brief The output context has failed
- *
- * @since 1.8
- *
- * Emitted when the outout context has failed. At this point the output is unusable and will never work, so it is advisable to delete it.
- */
-#define ECORE_AUDIO_EV_OUT_PULSE_CONTEXT_FAIL (&(_ECORE_AUDIO_EV_OUT_PULSE_CONTEXT_FAIL))
-
-#endif
 /**
  * @}
  */
@@ -84,4 +42,4 @@ extern EAPI const Eo_Event_Description _ECORE_AUDIO_EV_OUT_PULSE_CONTEXT_FAIL;
 }
 #endif
 
-#endif
+#endif
\ No newline at end of file
diff --git a/src/lib/ecore_audio/ecore_audio_obj_out_sndfile.h b/src/lib/ecore_audio/ecore_audio_obj_out_sndfile.h
index f72d5c86c6..0740cfc82b 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_out_sndfile.h
+++ b/src/lib/ecore_audio/ecore_audio_obj_out_sndfile.h
@@ -34,27 +34,6 @@ extern "C"
  * @{
  */
 #include "ecore_audio_out_sndfile.eo.h"
-#if 0
-
-#define ECORE_AUDIO_OBJ_OUT_SNDFILE_CLASS ecore_audio_obj_out_sndfile_class_get() /**< Ecore_Audio sndfile output */
-
-/**
- * @brief Get the Eo class ID 
- *
- * @return The Eo class ID
- */
-const Eo_Class *ecore_audio_obj_out_sndfile_class_get() EINA_CONST;
-
-extern EAPI Eo_Op ECORE_AUDIO_OBJ_OUT_SNDFILE_BASE_ID;
-
-enum _Ecore_Audio_Obj_Out_Sndfile_Sub_Ids
-{
-   ECORE_AUDIO_OBJ_OUT_SNDFILE_SUB_ID_LAST
-};
-
-#define ECORE_AUDIO_OBJ_OUT_SNDFILE_ID(sub_id) (ECORE_AUDIO_OBJ_OUT_SNDFILE_BASE_ID + EO_TYPECHECK(enum _Ecore_Audio_Obj_Out_Sndfile_Sub_Ids, sub_id))
-
-#endif
 /**
  * @}
  */