summaryrefslogtreecommitdiff
path: root/src/lib/ecore_audio
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2014-04-02 12:01:16 +0100
committerTom Hacohen <tom@stosb.com>2014-04-10 04:20:21 +0100
commit92cc33c46ff04db9a4a3a88e563a66a52f22cbe0 (patch)
tree15b8d4d5924fb2d4580ad19de72baafaa6380649 /src/lib/ecore_audio
parent374af9b9cad96e499cfd9d3de99b30d2096d8cab (diff)
Eo: EO_BASE_CLASS->EO_CLASS.
Diffstat (limited to 'src/lib/ecore_audio')
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj.h2
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj_in.c2
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj_in_sndfile.c2
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj_in_tone.c8
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj_in_tone.h2
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj_out.c2
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj_out_pulse.c8
-rw-r--r--src/lib/ecore_audio/ecore_audio_private.h2
8 files changed, 14 insertions, 14 deletions
diff --git a/src/lib/ecore_audio/ecore_audio_obj.h b/src/lib/ecore_audio/ecore_audio_obj.h
index b473a55f11..153a638292 100644
--- a/src/lib/ecore_audio/ecore_audio_obj.h
+++ b/src/lib/ecore_audio/ecore_audio_obj.h
@@ -175,7 +175,7 @@ enum Ecore_Audio_Obj_Sub_Ids
175 * @param[in] free_func This function takes care to clean up @ref data when 175 * @param[in] free_func This function takes care to clean up @ref data when
176 * the VIO is destroyed. NULL means do nothing. 176 * the VIO is destroyed. NULL means do nothing.
177 */ 177 */
178#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_base_data_free_func, free_func) 178#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)
179 179
180#endif 180#endif
181/** 181/**
diff --git a/src/lib/ecore_audio/ecore_audio_obj_in.c b/src/lib/ecore_audio/ecore_audio_obj_in.c
index f77374f551..db88b03e64 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_in.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_in.c
@@ -149,7 +149,7 @@ static void _free_vio(Ecore_Audio_Object *ea_obj)
149} 149}
150 150
151EOLIAN static void 151EOLIAN static void
152_ecore_audio_in_ecore_audio_vio_set(Eo *eo_obj, Ecore_Audio_Input *obj, Ecore_Audio_Vio *vio, void *data, eo_base_data_free_func free_func) 152_ecore_audio_in_ecore_audio_vio_set(Eo *eo_obj, Ecore_Audio_Input *obj, Ecore_Audio_Vio *vio, void *data, eo_key_data_free_func free_func)
153{ 153{
154 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_CLASS); 154 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_CLASS);
155 155
diff --git a/src/lib/ecore_audio/ecore_audio_obj_in_sndfile.c b/src/lib/ecore_audio/ecore_audio_obj_in_sndfile.c
index d18908da79..6860f9dd5a 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_in_sndfile.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_in_sndfile.c
@@ -142,7 +142,7 @@ static void _free_vio(Ecore_Audio_Object *ea_obj)
142} 142}
143 143
144EOLIAN static void 144EOLIAN static void
145_ecore_audio_in_sndfile_ecore_audio_vio_set(Eo *eo_obj, Ecore_Audio_In_Sndfile_Data *obj, Ecore_Audio_Vio *vio, void *data, eo_base_data_free_func free_func) 145_ecore_audio_in_sndfile_ecore_audio_vio_set(Eo *eo_obj, Ecore_Audio_In_Sndfile_Data *obj, Ecore_Audio_Vio *vio, void *data, eo_key_data_free_func free_func)
146{ 146{
147 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_CLASS); 147 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_CLASS);
148 Ecore_Audio_Input *in_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_IN_CLASS); 148 Ecore_Audio_Input *in_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_IN_CLASS);
diff --git a/src/lib/ecore_audio/ecore_audio_obj_in_tone.c b/src/lib/ecore_audio/ecore_audio_obj_in_tone.c
index 60f634881f..1be57a426b 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_in_tone.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_in_tone.c
@@ -83,26 +83,26 @@ _ecore_audio_in_tone_ecore_audio_in_length_set(Eo *eo_obj, Ecore_Audio_In_Tone_D
83} 83}
84 84
85EOLIAN static void 85EOLIAN static void
86_ecore_audio_in_tone_eo_base_data_set(Eo *eo_obj, Ecore_Audio_In_Tone_Data *obj, const char *key, const void *val, eo_base_data_free_func func) 86_ecore_audio_in_tone_eo_key_data_set(Eo *eo_obj, Ecore_Audio_In_Tone_Data *obj, const char *key, const void *val, eo_key_data_free_func func)
87{ 87{
88 if (!key) return; 88 if (!key) return;
89 89
90 if (!strcmp(key, ECORE_AUDIO_ATTR_TONE_FREQ)) { 90 if (!strcmp(key, ECORE_AUDIO_ATTR_TONE_FREQ)) {
91 obj->freq = *(int *)val; 91 obj->freq = *(int *)val;
92 } else { 92 } else {
93 eo_do_super(eo_obj, MY_CLASS, eo_base_data_set(key, val, func)); 93 eo_do_super(eo_obj, MY_CLASS, eo_key_data_set(key, val, func));
94 } 94 }
95 95
96} 96}
97 97
98EOLIAN static void* 98EOLIAN static void*
99_ecore_audio_in_tone_eo_base_data_get(Eo *eo_obj, Ecore_Audio_In_Tone_Data *obj, const char *key) 99_ecore_audio_in_tone_eo_key_data_get(Eo *eo_obj, Ecore_Audio_In_Tone_Data *obj, const char *key)
100{ 100{
101 if (!strcmp(key, ECORE_AUDIO_ATTR_TONE_FREQ)) { 101 if (!strcmp(key, ECORE_AUDIO_ATTR_TONE_FREQ)) {
102 return (void *) (intptr_t) obj->freq; 102 return (void *) (intptr_t) obj->freq;
103 } else { 103 } else {
104 void *ret = NULL; 104 void *ret = NULL;
105 eo_do_super(eo_obj, MY_CLASS, eo_base_data_get(key, &ret)); 105 eo_do_super(eo_obj, MY_CLASS, eo_key_data_get(key, &ret));
106 return ret; 106 return ret;
107 } 107 }
108} 108}
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 6bfd505a28..738f49a55a 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_in_tone.h
+++ b/src/lib/ecore_audio/ecore_audio_obj_in_tone.h
@@ -37,7 +37,7 @@ extern "C"
37/** 37/**
38 * @brief The frequency of the tone in Hz 38 * @brief The frequency of the tone in Hz
39 * 39 *
40 * Set with @ref eo_base_data_set() 40 * Set with @ref eo_key_data_set()
41 */ 41 */
42#define ECORE_AUDIO_ATTR_TONE_FREQ "ecore_audio_freq" 42#define ECORE_AUDIO_ATTR_TONE_FREQ "ecore_audio_freq"
43 43
diff --git a/src/lib/ecore_audio/ecore_audio_obj_out.c b/src/lib/ecore_audio/ecore_audio_obj_out.c
index 40d16004e9..52e379fa3b 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_out.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_out.c
@@ -113,7 +113,7 @@ static void _free_vio(Ecore_Audio_Object *ea_obj)
113} 113}
114 114
115EOLIAN static void 115EOLIAN static void
116_ecore_audio_out_ecore_audio_vio_set(Eo *eo_obj, Ecore_Audio_Output *_pd EINA_UNUSED, Ecore_Audio_Vio *vio, void *data, eo_base_data_free_func free_func) 116_ecore_audio_out_ecore_audio_vio_set(Eo *eo_obj, Ecore_Audio_Output *_pd EINA_UNUSED, Ecore_Audio_Vio *vio, void *data, eo_key_data_free_func free_func)
117{ 117{
118 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_CLASS); 118 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_CLASS);
119 119
diff --git a/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c b/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c
index 8e7fc6d900..4da2d0b77f 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c
@@ -60,7 +60,7 @@ _ecore_audio_out_pulse_ecore_audio_volume_set(Eo *eo_obj, Ecore_Audio_Out_Pulse_
60 eo_do_super(eo_obj, MY_CLASS, ecore_audio_obj_volume_set(volume)); 60 eo_do_super(eo_obj, MY_CLASS, ecore_audio_obj_volume_set(volume));
61 61
62 EINA_LIST_FOREACH(out_obj->inputs, input, in) { 62 EINA_LIST_FOREACH(out_obj->inputs, input, in) {
63 eo_do(in, eo_base_data_get("pulse_data", (void **)&stream)); 63 eo_do(in, eo_key_data_get("pulse_data", (void **)&stream));
64 idx = pa_stream_get_index(stream); 64 idx = pa_stream_get_index(stream);
65 pa_operation_unref(pa_context_set_sink_input_volume(class_vars.context, idx, &pa_volume, NULL, NULL)); 65 pa_operation_unref(pa_context_set_sink_input_volume(class_vars.context, idx, &pa_volume, NULL, NULL));
66 } 66 }
@@ -95,7 +95,7 @@ static Eina_Bool _update_samplerate_cb(void *data EINA_UNUSED, Eo *eo_obj, const
95 eo_do(eo_obj, ecore_audio_obj_in_samplerate_get(&samplerate)); 95 eo_do(eo_obj, ecore_audio_obj_in_samplerate_get(&samplerate));
96 eo_do(eo_obj, ecore_audio_obj_in_speed_get(&speed)); 96 eo_do(eo_obj, ecore_audio_obj_in_speed_get(&speed));
97 97
98 eo_do(eo_obj, eo_base_data_get("pulse_data", (void **)&stream)); 98 eo_do(eo_obj, eo_key_data_get("pulse_data", (void **)&stream));
99 99
100 pa_operation_unref(pa_stream_update_sample_rate(stream, samplerate * speed, NULL, NULL)); 100 pa_operation_unref(pa_stream_update_sample_rate(stream, samplerate * speed, NULL, NULL));
101 101
@@ -132,7 +132,7 @@ static Eina_Bool _input_attach_internal(Eo *eo_obj, Eo *in)
132 132
133 eo_do(in, eo_event_callback_add(ECORE_AUDIO_IN_EVENT_IN_SAMPLERATE_CHANGED, _update_samplerate_cb, eo_obj)); 133 eo_do(in, eo_event_callback_add(ECORE_AUDIO_IN_EVENT_IN_SAMPLERATE_CHANGED, _update_samplerate_cb, eo_obj));
134 134
135 eo_do(in, eo_base_data_set("pulse_data", stream, NULL)); 135 eo_do(in, eo_key_data_set("pulse_data", stream, NULL));
136 136
137 137
138 pa_stream_set_write_callback(stream, _write_cb, in); 138 pa_stream_set_write_callback(stream, _write_cb, in);
@@ -185,7 +185,7 @@ _ecore_audio_out_pulse_ecore_audio_out_input_detach(Eo *eo_obj, Ecore_Audio_Out_
185 if (!ret2) 185 if (!ret2)
186 return EINA_FALSE; 186 return EINA_FALSE;
187 187
188 eo_do(in, eo_base_data_get("pulse_data", (void **)&stream)); 188 eo_do(in, eo_key_data_get("pulse_data", (void **)&stream));
189 189
190 pa_stream_set_write_callback(stream, NULL, NULL); 190 pa_stream_set_write_callback(stream, NULL, NULL);
191 pa_operation_unref(pa_stream_drain(stream, _drain_cb, NULL)); 191 pa_operation_unref(pa_stream_drain(stream, _drain_cb, NULL));
diff --git a/src/lib/ecore_audio/ecore_audio_private.h b/src/lib/ecore_audio/ecore_audio_private.h
index b997ea8e03..36a06f5f4c 100644
--- a/src/lib/ecore_audio/ecore_audio_private.h
+++ b/src/lib/ecore_audio/ecore_audio_private.h
@@ -94,7 +94,7 @@ struct _Ecore_Audio_Module
94struct _Ecore_Audio_Vio_Internal { 94struct _Ecore_Audio_Vio_Internal {
95 Ecore_Audio_Vio *vio; 95 Ecore_Audio_Vio *vio;
96 void *data; 96 void *data;
97 eo_base_data_free_func free_func; 97 eo_key_data_free_func free_func;
98}; 98};
99typedef struct _Ecore_Audio_Vio_Internal Ecore_Audio_Vio_Internal; 99typedef struct _Ecore_Audio_Vio_Internal Ecore_Audio_Vio_Internal;
100 100