summaryrefslogtreecommitdiff
path: root/src/lib/ecore_audio
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2013-05-02 16:47:16 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2013-05-02 16:47:16 +0900
commitf8c9a8d16708ac52195a8df70493a1fc91872348 (patch)
treec78586a9c486bf2468ac4645521ba24a79c3df09 /src/lib/ecore_audio
parentb64a2994b3b277cbe7fce17d7ee275fd0d78c925 (diff)
revert the revert... damn you git!
Revert "Revert "Efl: replace eo_data_get for objects data referencing."" This reverts commit b64a2994b3b277cbe7fce17d7ee275fd0d78c925.
Diffstat (limited to 'src/lib/ecore_audio')
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj_in.c6
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj_in_sndfile.c14
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj_in_tone.c8
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj_out.c12
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj_out_pulse.c6
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj_out_sndfile.c22
-rw-r--r--src/lib/ecore_audio/ecore_audio_sndfile_vio.c10
7 files changed, 39 insertions, 39 deletions
diff --git a/src/lib/ecore_audio/ecore_audio_obj_in.c b/src/lib/ecore_audio/ecore_audio_obj_in.c
index b85837bf51..116fc50f9e 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_in.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_in.c
@@ -143,7 +143,7 @@ static void _read(Eo *eo_obj, void *_pd, va_list *list)
143{ 143{
144 const Ecore_Audio_Input *obj = _pd; 144 const Ecore_Audio_Input *obj = _pd;
145 ssize_t len_read = 0; 145 ssize_t len_read = 0;
146 const Ecore_Audio_Object *ea_obj = eo_data_get(eo_obj, ECORE_AUDIO_OBJ_CLASS); 146 const Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_CLASS);
147 147
148 void *buf = va_arg(*list, void *); 148 void *buf = va_arg(*list, void *);
149 size_t len = va_arg(*list, size_t); 149 size_t len = va_arg(*list, size_t);
@@ -173,7 +173,7 @@ static void _read(Eo *eo_obj, void *_pd, va_list *list)
173static void _read_internal(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list) 173static void _read_internal(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list)
174{ 174{
175 ssize_t len_read = 0; 175 ssize_t len_read = 0;
176 const Ecore_Audio_Object *ea_obj = eo_data_get(eo_obj, ECORE_AUDIO_OBJ_CLASS); 176 const Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_CLASS);
177 177
178 void *buf = va_arg(*list, void *); 178 void *buf = va_arg(*list, void *);
179 size_t len = va_arg(*list, size_t); 179 size_t len = va_arg(*list, size_t);
@@ -209,7 +209,7 @@ static void _free_vio(Ecore_Audio_Object *ea_obj)
209static void _vio_set(Eo *eo_obj, void *_pd, va_list *list) 209static void _vio_set(Eo *eo_obj, void *_pd, va_list *list)
210{ 210{
211 Ecore_Audio_Input *obj = _pd; 211 Ecore_Audio_Input *obj = _pd;
212 Ecore_Audio_Object *ea_obj = eo_data_get(eo_obj, ECORE_AUDIO_OBJ_CLASS); 212 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_CLASS);
213 213
214 Ecore_Audio_Vio *vio = va_arg(*list, Ecore_Audio_Vio *); 214 Ecore_Audio_Vio *vio = va_arg(*list, Ecore_Audio_Vio *);
215 void *data = va_arg(*list, Ecore_Audio_Vio *); 215 void *data = va_arg(*list, Ecore_Audio_Vio *);
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 33aff76398..ae921eaabf 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_in_sndfile.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_in_sndfile.c
@@ -63,8 +63,8 @@ static void _source_set(Eo *eo_obj, void *_pd, va_list *list)
63{ 63{
64 Ecore_Audio_Sndfile *obj = _pd; 64 Ecore_Audio_Sndfile *obj = _pd;
65 65
66 Ecore_Audio_Object *ea_obj = eo_data_get(eo_obj, ECORE_AUDIO_OBJ_CLASS); 66 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_CLASS);
67 Ecore_Audio_Input *in_obj = eo_data_get(eo_obj, ECORE_AUDIO_OBJ_IN_CLASS); 67 Ecore_Audio_Input *in_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_IN_CLASS);
68 68
69 const char *source = va_arg(*list, const char *); 69 const char *source = va_arg(*list, const char *);
70 Eina_Bool *ret = va_arg(*list, Eina_Bool *); 70 Eina_Bool *ret = va_arg(*list, Eina_Bool *);
@@ -111,7 +111,7 @@ static void _source_set(Eo *eo_obj, void *_pd, va_list *list)
111 111
112static void _source_get(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list) 112static void _source_get(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list)
113{ 113{
114 Ecore_Audio_Object *obj = eo_data_get(eo_obj, ECORE_AUDIO_OBJ_CLASS); 114 Ecore_Audio_Object *obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_CLASS);
115 115
116 const char **ret = va_arg(*list, const char **); 116 const char **ret = va_arg(*list, const char **);
117 117
@@ -122,7 +122,7 @@ static void _source_get(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list)
122static void _format_set(Eo *eo_obj, void *_pd, va_list *list) 122static void _format_set(Eo *eo_obj, void *_pd, va_list *list)
123{ 123{
124 Ecore_Audio_Sndfile *obj = _pd; 124 Ecore_Audio_Sndfile *obj = _pd;
125 Ecore_Audio_Object *ea_obj = eo_data_get(eo_obj, ECORE_AUDIO_OBJ_CLASS); 125 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_CLASS);
126 126
127 Ecore_Audio_Format format= va_arg(*list, Ecore_Audio_Format); 127 Ecore_Audio_Format format= va_arg(*list, Ecore_Audio_Format);
128 Eina_Bool *ret = va_arg(*list, Eina_Bool *); 128 Eina_Bool *ret = va_arg(*list, Eina_Bool *);
@@ -158,7 +158,7 @@ static void _format_set(Eo *eo_obj, void *_pd, va_list *list)
158 158
159static void _format_get(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list) 159static void _format_get(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list)
160{ 160{
161 Ecore_Audio_Object *obj = eo_data_get(eo_obj, ECORE_AUDIO_OBJ_CLASS); 161 Ecore_Audio_Object *obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_CLASS);
162 162
163 Ecore_Audio_Format *ret = va_arg(*list, Ecore_Audio_Format *); 163 Ecore_Audio_Format *ret = va_arg(*list, Ecore_Audio_Format *);
164 164
@@ -178,8 +178,8 @@ static void _free_vio(Ecore_Audio_Object *ea_obj)
178static void _vio_set(Eo *eo_obj, void *_pd, va_list *list) 178static void _vio_set(Eo *eo_obj, void *_pd, va_list *list)
179{ 179{
180 Ecore_Audio_Sndfile *obj = _pd; 180 Ecore_Audio_Sndfile *obj = _pd;
181 Ecore_Audio_Object *ea_obj = eo_data_get(eo_obj, ECORE_AUDIO_OBJ_CLASS); 181 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_CLASS);
182 Ecore_Audio_Input *in_obj = eo_data_get(eo_obj, ECORE_AUDIO_OBJ_IN_CLASS); 182 Ecore_Audio_Input *in_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_IN_CLASS);
183 183
184 Ecore_Audio_Vio *vio = va_arg(*list, Ecore_Audio_Vio *); 184 Ecore_Audio_Vio *vio = va_arg(*list, Ecore_Audio_Vio *);
185 void *data = va_arg(*list, Ecore_Audio_Vio *); 185 void *data = va_arg(*list, Ecore_Audio_Vio *);
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 f641b8a780..ed93f376bd 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_in_tone.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_in_tone.c
@@ -31,7 +31,7 @@ static void _read(Eo *eo_obj, void *_pd, va_list *list)
31{ 31{
32 int i, remain; 32 int i, remain;
33 Ecore_Audio_Tone *obj = _pd; 33 Ecore_Audio_Tone *obj = _pd;
34 Ecore_Audio_Input *in_obj = eo_data_get(eo_obj, ECORE_AUDIO_OBJ_IN_CLASS); 34 Ecore_Audio_Input *in_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_IN_CLASS);
35 35
36 36
37 void *data = va_arg(*list, void *); 37 void *data = va_arg(*list, void *);
@@ -58,7 +58,7 @@ static void _seek(Eo *eo_obj, void *_pd, va_list *list)
58{ 58{
59 int tmp; 59 int tmp;
60 Ecore_Audio_Tone *obj = _pd; 60 Ecore_Audio_Tone *obj = _pd;
61 Ecore_Audio_Input *in_obj = eo_data_get(eo_obj, ECORE_AUDIO_OBJ_IN_CLASS); 61 Ecore_Audio_Input *in_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_IN_CLASS);
62 62
63 double offs = va_arg(*list, double); 63 double offs = va_arg(*list, double);
64 int mode = va_arg(*list, int); 64 int mode = va_arg(*list, int);
@@ -93,7 +93,7 @@ err:
93 93
94static void _length_set(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list) 94static void _length_set(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list)
95{ 95{
96 Ecore_Audio_Input *in_obj = eo_data_get(eo_obj, ECORE_AUDIO_OBJ_IN_CLASS); 96 Ecore_Audio_Input *in_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_IN_CLASS);
97 97
98 double length= va_arg(*list, double); 98 double length= va_arg(*list, double);
99 99
@@ -137,7 +137,7 @@ static void _data_get(Eo *eo_obj, void *_pd, va_list *list)
137static void _constructor(Eo *eo_obj, void *_pd, va_list *list EINA_UNUSED) 137static void _constructor(Eo *eo_obj, void *_pd, va_list *list EINA_UNUSED)
138{ 138{
139 Ecore_Audio_Tone *obj = _pd; 139 Ecore_Audio_Tone *obj = _pd;
140 Ecore_Audio_Input *in_obj = eo_data_get(eo_obj, ECORE_AUDIO_OBJ_IN_CLASS); 140 Ecore_Audio_Input *in_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_IN_CLASS);
141 141
142 eo_do_super(eo_obj, MY_CLASS, eo_constructor()); 142 eo_do_super(eo_obj, MY_CLASS, eo_constructor());
143 143
diff --git a/src/lib/ecore_audio/ecore_audio_obj_out.c b/src/lib/ecore_audio/ecore_audio_obj_out.c
index 4707c4e551..e3822efca3 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_out.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_out.c
@@ -24,8 +24,8 @@ static Eina_Bool _write_cb(void *data)
24 Eo *eo_obj = data; 24 Eo *eo_obj = data;
25 Eo *in; 25 Eo *in;
26 26
27 Ecore_Audio_Output *out_obj = eo_data_get(eo_obj, ECORE_AUDIO_OBJ_OUT_CLASS); 27 Ecore_Audio_Output *out_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_OUT_CLASS);
28 Ecore_Audio_Object *ea_obj = eo_data_get(eo_obj, ECORE_AUDIO_OBJ_CLASS); 28 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_CLASS);
29 29
30 ssize_t written, bread; 30 ssize_t written, bread;
31 float buf[1024]; 31 float buf[1024];
@@ -56,12 +56,12 @@ static void _input_attach(Eo *eo_obj, void *_pd, va_list *list)
56 Ecore_Audio_Output *obj = _pd; 56 Ecore_Audio_Output *obj = _pd;
57 Ecore_Audio_Input *in; 57 Ecore_Audio_Input *in;
58 58
59 Ecore_Audio_Object *ea_obj = eo_data_get(eo_obj, ECORE_AUDIO_OBJ_CLASS); 59 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_CLASS);
60 60
61 Eo *input = va_arg(*list, Eo *); 61 Eo *input = va_arg(*list, Eo *);
62 Eina_Bool *ret = va_arg(*list, Eina_Bool *); 62 Eina_Bool *ret = va_arg(*list, Eina_Bool *);
63 63
64 in = eo_data_get(input, ECORE_AUDIO_OBJ_IN_CLASS); 64 in = eo_data_scope_get(input, ECORE_AUDIO_OBJ_IN_CLASS);
65 65
66 if (ret) 66 if (ret)
67 *ret = EINA_FALSE; 67 *ret = EINA_FALSE;
@@ -93,7 +93,7 @@ static void _input_detach(Eo *eo_obj, void *_pd, va_list *list)
93 Eo *input = va_arg(*list, Eo *); 93 Eo *input = va_arg(*list, Eo *);
94 Eina_Bool *ret = va_arg(*list, Eina_Bool *); 94 Eina_Bool *ret = va_arg(*list, Eina_Bool *);
95 95
96 in = eo_data_get(input, ECORE_AUDIO_OBJ_IN_CLASS); 96 in = eo_data_scope_get(input, ECORE_AUDIO_OBJ_IN_CLASS);
97 97
98 if (ret) 98 if (ret)
99 *ret = EINA_FALSE; 99 *ret = EINA_FALSE;
@@ -134,7 +134,7 @@ static void _free_vio(Ecore_Audio_Object *ea_obj)
134 134
135static void _vio_set(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list) 135static void _vio_set(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list)
136{ 136{
137 Ecore_Audio_Object *ea_obj = eo_data_get(eo_obj, ECORE_AUDIO_OBJ_CLASS); 137 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_CLASS);
138 138
139 Ecore_Audio_Vio *vio = va_arg(*list, Ecore_Audio_Vio *); 139 Ecore_Audio_Vio *vio = va_arg(*list, Ecore_Audio_Vio *);
140 void *data = va_arg(*list, Ecore_Audio_Vio *); 140 void *data = va_arg(*list, Ecore_Audio_Vio *);
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 eebb9cb1d4..5c413050b7 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c
@@ -53,7 +53,7 @@ static void _volume_set(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list)
53 Eina_List *input; 53 Eina_List *input;
54 uint32_t idx; 54 uint32_t idx;
55 pa_cvolume pa_volume; 55 pa_cvolume pa_volume;
56 Ecore_Audio_Output *out_obj = eo_data_get(eo_obj, ECORE_AUDIO_OBJ_OUT_CLASS); 56 Ecore_Audio_Output *out_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_OUT_CLASS);
57 57
58 double volume = va_arg(*list, double); 58 double volume = va_arg(*list, double);
59 59
@@ -114,7 +114,7 @@ static Eina_Bool _input_attach_internal(Eo *eo_obj, Eo *in)
114 double speed; 114 double speed;
115 pa_stream *stream; 115 pa_stream *stream;
116 Eina_Bool ret; 116 Eina_Bool ret;
117 Ecore_Audio_Object *ea_obj = eo_data_get(eo_obj, ECORE_AUDIO_OBJ_CLASS); 117 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_CLASS);
118 118
119 eo_do_super(eo_obj, MY_CLASS, ecore_audio_obj_out_input_attach(in, &ret)); 119 eo_do_super(eo_obj, MY_CLASS, ecore_audio_obj_out_input_attach(in, &ret));
120 if (!ret) 120 if (!ret)
@@ -230,7 +230,7 @@ static void _constructor(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list EINA_U
230{ 230{
231 int argc; 231 int argc;
232 char **argv; 232 char **argv;
233 Ecore_Audio_Output *out_obj = eo_data_get(eo_obj, ECORE_AUDIO_OBJ_OUT_CLASS); 233 Ecore_Audio_Output *out_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_OUT_CLASS);
234 234
235 eo_do_super(eo_obj, MY_CLASS, eo_constructor()); 235 eo_do_super(eo_obj, MY_CLASS, eo_constructor());
236 236
diff --git a/src/lib/ecore_audio/ecore_audio_obj_out_sndfile.c b/src/lib/ecore_audio/ecore_audio_obj_out_sndfile.c
index 2545164c20..6d2d95c974 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_out_sndfile.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_out_sndfile.c
@@ -35,9 +35,9 @@ static Eina_Bool _write_cb(void *data)
35 Eo *eo_obj = data; 35 Eo *eo_obj = data;
36 Eo *in; 36 Eo *in;
37 37
38 Ecore_Audio_Sndfile *obj = eo_data_get(eo_obj, ECORE_AUDIO_OBJ_OUT_SNDFILE_CLASS); 38 Ecore_Audio_Sndfile *obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_OUT_SNDFILE_CLASS);
39 Ecore_Audio_Output *out_obj = eo_data_get(eo_obj, ECORE_AUDIO_OBJ_OUT_CLASS); 39 Ecore_Audio_Output *out_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_OUT_CLASS);
40 Ecore_Audio_Object *ea_obj = eo_data_get(eo_obj, ECORE_AUDIO_OBJ_CLASS); 40 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_CLASS);
41 41
42 ssize_t written, bread; 42 ssize_t written, bread;
43 float buf[1024]; 43 float buf[1024];
@@ -64,8 +64,8 @@ static Eina_Bool _write_cb(void *data)
64static void _input_attach(Eo *eo_obj, void *_pd, va_list *list) 64static void _input_attach(Eo *eo_obj, void *_pd, va_list *list)
65{ 65{
66 Ecore_Audio_Sndfile *obj = _pd; 66 Ecore_Audio_Sndfile *obj = _pd;
67 Ecore_Audio_Object *ea_obj = eo_data_get(eo_obj, ECORE_AUDIO_OBJ_CLASS); 67 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_CLASS);
68 Ecore_Audio_Output *out_obj = eo_data_get(eo_obj, ECORE_AUDIO_OBJ_OUT_CLASS); 68 Ecore_Audio_Output *out_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_OUT_CLASS);
69 Eina_Bool ret2; 69 Eina_Bool ret2;
70 70
71 Eo *in = va_arg(*list, Eo *); 71 Eo *in = va_arg(*list, Eo *);
@@ -105,7 +105,7 @@ static void _source_set(Eo *eo_obj, void *_pd, va_list *list)
105{ 105{
106 Ecore_Audio_Sndfile *obj = _pd; 106 Ecore_Audio_Sndfile *obj = _pd;
107 107
108 Ecore_Audio_Object *ea_obj = eo_data_get(eo_obj, ECORE_AUDIO_OBJ_CLASS); 108 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_CLASS);
109 109
110 const char *source = va_arg(*list, const char *); 110 const char *source = va_arg(*list, const char *);
111 Eina_Bool *ret = va_arg(*list, Eina_Bool *); 111 Eina_Bool *ret = va_arg(*list, Eina_Bool *);
@@ -132,7 +132,7 @@ static void _source_set(Eo *eo_obj, void *_pd, va_list *list)
132 132
133static void _source_get(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list) 133static void _source_get(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list)
134{ 134{
135 Ecore_Audio_Object *obj = eo_data_get(eo_obj, ECORE_AUDIO_OBJ_CLASS); 135 Ecore_Audio_Object *obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_CLASS);
136 136
137 const char **ret = va_arg(*list, const char **); 137 const char **ret = va_arg(*list, const char **);
138 138
@@ -143,7 +143,7 @@ static void _source_get(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list)
143static void _format_set(Eo *eo_obj, void *_pd, va_list *list) 143static void _format_set(Eo *eo_obj, void *_pd, va_list *list)
144{ 144{
145 Ecore_Audio_Sndfile *obj = _pd; 145 Ecore_Audio_Sndfile *obj = _pd;
146 Ecore_Audio_Object *ea_obj = eo_data_get(eo_obj, ECORE_AUDIO_OBJ_CLASS); 146 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_CLASS);
147 147
148 Ecore_Audio_Format format= va_arg(*list, Ecore_Audio_Format); 148 Ecore_Audio_Format format= va_arg(*list, Ecore_Audio_Format);
149 Eina_Bool *ret = va_arg(*list, Eina_Bool *); 149 Eina_Bool *ret = va_arg(*list, Eina_Bool *);
@@ -180,7 +180,7 @@ static void _format_set(Eo *eo_obj, void *_pd, va_list *list)
180 180
181static void _format_get(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list) 181static void _format_get(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list)
182{ 182{
183 Ecore_Audio_Object *obj = eo_data_get(eo_obj, ECORE_AUDIO_OBJ_CLASS); 183 Ecore_Audio_Object *obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_CLASS);
184 184
185 Ecore_Audio_Format *ret = va_arg(*list, Ecore_Audio_Format *); 185 Ecore_Audio_Format *ret = va_arg(*list, Ecore_Audio_Format *);
186 186
@@ -190,7 +190,7 @@ static void _format_get(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list)
190 190
191static void _constructor(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED) 191static void _constructor(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
192{ 192{
193 Ecore_Audio_Output *out_obj = eo_data_get(eo_obj, ECORE_AUDIO_OBJ_OUT_CLASS); 193 Ecore_Audio_Output *out_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_OUT_CLASS);
194 194
195 eo_do_super(eo_obj, MY_CLASS, eo_constructor()); 195 eo_do_super(eo_obj, MY_CLASS, eo_constructor());
196 196
@@ -203,7 +203,7 @@ static void _constructor(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list EINA_U
203static void _destructor(Eo *eo_obj, void *_pd, va_list *list EINA_UNUSED) 203static void _destructor(Eo *eo_obj, void *_pd, va_list *list EINA_UNUSED)
204{ 204{
205 Ecore_Audio_Sndfile *obj = _pd; 205 Ecore_Audio_Sndfile *obj = _pd;
206 Ecore_Audio_Output *out_obj = eo_data_get(eo_obj, ECORE_AUDIO_OBJ_OUT_CLASS); 206 Ecore_Audio_Output *out_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_OUT_CLASS);
207 207
208 if (obj->handle) 208 if (obj->handle)
209 sf_close(obj->handle); 209 sf_close(obj->handle);
diff --git a/src/lib/ecore_audio/ecore_audio_sndfile_vio.c b/src/lib/ecore_audio/ecore_audio_sndfile_vio.c
index 06268069aa..7fc595677c 100644
--- a/src/lib/ecore_audio/ecore_audio_sndfile_vio.c
+++ b/src/lib/ecore_audio/ecore_audio_sndfile_vio.c
@@ -16,7 +16,7 @@
16static sf_count_t _wrap_get_filelen(void *data) 16static sf_count_t _wrap_get_filelen(void *data)
17{ 17{
18 Eo *eo_obj = data; 18 Eo *eo_obj = data;
19 Ecore_Audio_Object *ea_obj = eo_data_get(eo_obj, ECORE_AUDIO_OBJ_CLASS); 19 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_CLASS);
20 20
21 if (!ea_obj->vio->vio) 21 if (!ea_obj->vio->vio)
22 goto error; 22 goto error;
@@ -31,7 +31,7 @@ error:
31static sf_count_t _wrap_seek(sf_count_t offset, int whence, void *data) 31static sf_count_t _wrap_seek(sf_count_t offset, int whence, void *data)
32{ 32{
33 Eo *eo_obj = data; 33 Eo *eo_obj = data;
34 Ecore_Audio_Object *ea_obj = eo_data_get(eo_obj, ECORE_AUDIO_OBJ_CLASS); 34 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_CLASS);
35 35
36 if (!ea_obj->vio->vio) 36 if (!ea_obj->vio->vio)
37 goto error; 37 goto error;
@@ -46,7 +46,7 @@ error:
46static sf_count_t _wrap_read(void *buffer, sf_count_t count, void *data) 46static sf_count_t _wrap_read(void *buffer, sf_count_t count, void *data)
47{ 47{
48 Eo *eo_obj = data; 48 Eo *eo_obj = data;
49 Ecore_Audio_Object *ea_obj = eo_data_get(eo_obj, ECORE_AUDIO_OBJ_CLASS); 49 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_CLASS);
50 50
51 if (!ea_obj->vio->vio) 51 if (!ea_obj->vio->vio)
52 goto error; 52 goto error;
@@ -61,7 +61,7 @@ error:
61static sf_count_t _wrap_write(const void *buffer, sf_count_t count, void *data) 61static sf_count_t _wrap_write(const void *buffer, sf_count_t count, void *data)
62{ 62{
63 Eo *eo_obj = data; 63 Eo *eo_obj = data;
64 Ecore_Audio_Object *ea_obj = eo_data_get(eo_obj, ECORE_AUDIO_OBJ_CLASS); 64 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_CLASS);
65 65
66 if (!ea_obj->vio->vio) 66 if (!ea_obj->vio->vio)
67 goto error; 67 goto error;
@@ -76,7 +76,7 @@ error:
76static sf_count_t _wrap_tell(void *data) 76static sf_count_t _wrap_tell(void *data)
77{ 77{
78 Eo *eo_obj = data; 78 Eo *eo_obj = data;
79 Ecore_Audio_Object *ea_obj = eo_data_get(eo_obj, ECORE_AUDIO_OBJ_CLASS); 79 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_CLASS);
80 80
81 if (!ea_obj->vio->vio) 81 if (!ea_obj->vio->vio)
82 goto error; 82 goto error;