summaryrefslogtreecommitdiff
path: root/src/lib/ecore_audio
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2014-06-02 14:47:59 +0100
committerTom Hacohen <tom@stosb.com>2014-06-03 11:28:01 +0100
commit0fc3279db966a5329b80c84794f9bff97e7a7ef0 (patch)
treea9a5e8a5c4d3291ceef4889955ed60b91432641f /src/lib/ecore_audio
parent62a3522fcc4bbb6389d1c81b439cf9cc2f4a4e28 (diff)
Efl: Update code to use the new class names generated by eolian.
Diffstat (limited to 'src/lib/ecore_audio')
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj.c2
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj_in.c8
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj_in_sndfile.c18
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj_in_tone.c10
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj_out.c14
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj_out_pulse.c8
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj_out_sndfile.c24
-rw-r--r--src/lib/ecore_audio/ecore_audio_sndfile_vio.c10
8 files changed, 47 insertions, 47 deletions
diff --git a/src/lib/ecore_audio/ecore_audio_obj.c b/src/lib/ecore_audio/ecore_audio_obj.c
index 98468a0f74..43fc821aaa 100644
--- a/src/lib/ecore_audio/ecore_audio_obj.c
+++ b/src/lib/ecore_audio/ecore_audio_obj.c
@@ -15,7 +15,7 @@
15#include <Eo.h> 15#include <Eo.h>
16#include "ecore_audio_private.h" 16#include "ecore_audio_private.h"
17 17
18#define MY_CLASS ECORE_AUDIO_OBJ_CLASS 18#define MY_CLASS ECORE_AUDIO_CLASS
19#define MY_CLASS_NAME "Ecore_Audio" 19#define MY_CLASS_NAME "Ecore_Audio"
20 20
21EOLIAN static void 21EOLIAN static void
diff --git a/src/lib/ecore_audio/ecore_audio_obj_in.c b/src/lib/ecore_audio/ecore_audio_obj_in.c
index 970e2adba3..ece944059b 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_in.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_in.c
@@ -14,7 +14,7 @@
14 14
15#include "ecore_audio_private.h" 15#include "ecore_audio_private.h"
16 16
17#define MY_CLASS ECORE_AUDIO_OBJ_IN_CLASS 17#define MY_CLASS ECORE_AUDIO_IN_CLASS
18#define MY_CLASS_NAME "Ecore_Audio_In" 18#define MY_CLASS_NAME "Ecore_Audio_In"
19 19
20EOLIAN static void 20EOLIAN static void
@@ -98,7 +98,7 @@ EOLIAN static ssize_t
98_ecore_audio_in_read(Eo *eo_obj, Ecore_Audio_Input *obj, void *buf, size_t len) 98_ecore_audio_in_read(Eo *eo_obj, Ecore_Audio_Input *obj, void *buf, size_t len)
99{ 99{
100 ssize_t len_read = 0; 100 ssize_t len_read = 0;
101 const Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_CLASS); 101 const Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
102 102
103 if (ea_obj->paused) { 103 if (ea_obj->paused) {
104 memset(buf, 0, len); 104 memset(buf, 0, len);
@@ -124,7 +124,7 @@ EOLIAN static ssize_t
124_ecore_audio_in_read_internal(Eo *eo_obj, Ecore_Audio_Input *_pd EINA_UNUSED, void *buf, size_t len) 124_ecore_audio_in_read_internal(Eo *eo_obj, Ecore_Audio_Input *_pd EINA_UNUSED, void *buf, size_t len)
125{ 125{
126 ssize_t len_read = 0; 126 ssize_t len_read = 0;
127 const Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_CLASS); 127 const Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
128 128
129 if (ea_obj->vio && ea_obj->vio->vio->read) { 129 if (ea_obj->vio && ea_obj->vio->vio->read) {
130 len_read = ea_obj->vio->vio->read(ea_obj->vio->data, eo_obj, buf, len); 130 len_read = ea_obj->vio->vio->read(ea_obj->vio->data, eo_obj, buf, len);
@@ -151,7 +151,7 @@ static void _free_vio(Ecore_Audio_Object *ea_obj)
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_key_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_CLASS);
155 155
156 if (ea_obj->vio) 156 if (ea_obj->vio)
157 _free_vio(ea_obj); 157 _free_vio(ea_obj);
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 6860f9dd5a..f6c725ea18 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_in_sndfile.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_in_sndfile.c
@@ -14,7 +14,7 @@
14#include "ecore_audio_private.h" 14#include "ecore_audio_private.h"
15#include <sndfile.h> 15#include <sndfile.h>
16 16
17#define MY_CLASS ECORE_AUDIO_OBJ_IN_SNDFILE_CLASS 17#define MY_CLASS ECORE_AUDIO_IN_SNDFILE_CLASS
18#define MY_CLASS_NAME "Ecore_Audio_In_Sndfile" 18#define MY_CLASS_NAME "Ecore_Audio_In_Sndfile"
19 19
20extern SF_VIRTUAL_IO vio_wrapper; 20extern SF_VIRTUAL_IO vio_wrapper;
@@ -47,8 +47,8 @@ _ecore_audio_in_sndfile_ecore_audio_in_seek(Eo *eo_obj EINA_UNUSED, Ecore_Audio_
47EOLIAN static Eina_Bool 47EOLIAN static Eina_Bool
48_ecore_audio_in_sndfile_ecore_audio_source_set(Eo *eo_obj, Ecore_Audio_In_Sndfile_Data *obj, const char *source) 48_ecore_audio_in_sndfile_ecore_audio_source_set(Eo *eo_obj, Ecore_Audio_In_Sndfile_Data *obj, const char *source)
49{ 49{
50 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_CLASS); 50 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
51 Ecore_Audio_Input *in_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_IN_CLASS); 51 Ecore_Audio_Input *in_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_IN_CLASS);
52 52
53 if (obj->handle) { 53 if (obj->handle) {
54 sf_close(obj->handle); 54 sf_close(obj->handle);
@@ -89,14 +89,14 @@ _ecore_audio_in_sndfile_ecore_audio_source_set(Eo *eo_obj, Ecore_Audio_In_Sndfil
89EOLIAN static const char* 89EOLIAN static const char*
90_ecore_audio_in_sndfile_ecore_audio_source_get(Eo *eo_obj, Ecore_Audio_In_Sndfile_Data *_pd EINA_UNUSED) 90_ecore_audio_in_sndfile_ecore_audio_source_get(Eo *eo_obj, Ecore_Audio_In_Sndfile_Data *_pd EINA_UNUSED)
91{ 91{
92 Ecore_Audio_Object *obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_CLASS); 92 Ecore_Audio_Object *obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
93 return obj->source; 93 return obj->source;
94} 94}
95 95
96EOLIAN static Eina_Bool 96EOLIAN static Eina_Bool
97_ecore_audio_in_sndfile_ecore_audio_format_set(Eo *eo_obj, Ecore_Audio_In_Sndfile_Data *obj, Ecore_Audio_Format format) 97_ecore_audio_in_sndfile_ecore_audio_format_set(Eo *eo_obj, Ecore_Audio_In_Sndfile_Data *obj, Ecore_Audio_Format format)
98{ 98{
99 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_CLASS); 99 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
100 100
101 if (ea_obj->source) { 101 if (ea_obj->source) {
102 ERR("Input is already open - cannot change format"); 102 ERR("Input is already open - cannot change format");
@@ -128,7 +128,7 @@ _ecore_audio_in_sndfile_ecore_audio_format_set(Eo *eo_obj, Ecore_Audio_In_Sndfil
128EOLIAN static Ecore_Audio_Format 128EOLIAN static Ecore_Audio_Format
129_ecore_audio_in_sndfile_ecore_audio_format_get(Eo *eo_obj, Ecore_Audio_In_Sndfile_Data *_pd EINA_UNUSED) 129_ecore_audio_in_sndfile_ecore_audio_format_get(Eo *eo_obj, Ecore_Audio_In_Sndfile_Data *_pd EINA_UNUSED)
130{ 130{
131 Ecore_Audio_Object *obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_CLASS); 131 Ecore_Audio_Object *obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
132 return obj->format;; 132 return obj->format;;
133} 133}
134 134
@@ -144,8 +144,8 @@ static void _free_vio(Ecore_Audio_Object *ea_obj)
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_key_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_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_IN_CLASS);
149 149
150 if (obj->handle) { 150 if (obj->handle) {
151 sf_close(obj->handle); 151 sf_close(obj->handle);
@@ -204,7 +204,7 @@ _ecore_audio_in_sndfile_eo_base_constructor(Eo *eo_obj, Ecore_Audio_In_Sndfile_D
204EOLIAN static void 204EOLIAN static void
205_ecore_audio_in_sndfile_eo_base_destructor(Eo *eo_obj, Ecore_Audio_In_Sndfile_Data *obj) 205_ecore_audio_in_sndfile_eo_base_destructor(Eo *eo_obj, Ecore_Audio_In_Sndfile_Data *obj)
206{ 206{
207 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_CLASS); 207 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
208 208
209 if (obj->handle) 209 if (obj->handle)
210 sf_close(obj->handle); 210 sf_close(obj->handle);
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 749772f401..bdecc21860 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_in_tone.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_in_tone.c
@@ -14,7 +14,7 @@
14#include "ecore_audio_private.h" 14#include "ecore_audio_private.h"
15#include <math.h> 15#include <math.h>
16 16
17#define MY_CLASS ECORE_AUDIO_OBJ_IN_TONE_CLASS 17#define MY_CLASS ECORE_AUDIO_IN_TONE_CLASS
18#define MY_CLASS_NAME "Ecore_Audio_In_Tone" 18#define MY_CLASS_NAME "Ecore_Audio_In_Tone"
19 19
20struct _Ecore_Audio_In_Tone_Data 20struct _Ecore_Audio_In_Tone_Data
@@ -29,7 +29,7 @@ EOLIAN static ssize_t
29_ecore_audio_in_tone_ecore_audio_in_read_internal(Eo *eo_obj, Ecore_Audio_In_Tone_Data *obj, void *data, size_t len) 29_ecore_audio_in_tone_ecore_audio_in_read_internal(Eo *eo_obj, Ecore_Audio_In_Tone_Data *obj, void *data, size_t len)
30{ 30{
31 size_t i, remain; 31 size_t i, remain;
32 Ecore_Audio_Input *in_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_IN_CLASS); 32 Ecore_Audio_Input *in_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_IN_CLASS);
33 33
34 float *val = data; 34 float *val = data;
35 35
@@ -50,7 +50,7 @@ EOLIAN static double
50_ecore_audio_in_tone_ecore_audio_in_seek(Eo *eo_obj, Ecore_Audio_In_Tone_Data *obj, double offs, int mode) 50_ecore_audio_in_tone_ecore_audio_in_seek(Eo *eo_obj, Ecore_Audio_In_Tone_Data *obj, double offs, int mode)
51{ 51{
52 int tmp; 52 int tmp;
53 Ecore_Audio_Input *in_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_IN_CLASS); 53 Ecore_Audio_Input *in_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_IN_CLASS);
54 54
55 switch (mode) { 55 switch (mode) {
56 case SEEK_SET: 56 case SEEK_SET:
@@ -78,7 +78,7 @@ err:
78EOLIAN static void 78EOLIAN static void
79_ecore_audio_in_tone_ecore_audio_in_length_set(Eo *eo_obj, Ecore_Audio_In_Tone_Data *_pd EINA_UNUSED, double length) 79_ecore_audio_in_tone_ecore_audio_in_length_set(Eo *eo_obj, Ecore_Audio_In_Tone_Data *_pd EINA_UNUSED, double length)
80{ 80{
81 Ecore_Audio_Input *in_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_IN_CLASS); 81 Ecore_Audio_Input *in_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_IN_CLASS);
82 in_obj->length = length; 82 in_obj->length = length;
83} 83}
84 84
@@ -110,7 +110,7 @@ _ecore_audio_in_tone_eo_base_key_data_get(Eo *eo_obj, Ecore_Audio_In_Tone_Data *
110EOLIAN static void 110EOLIAN static void
111_ecore_audio_in_tone_eo_base_constructor(Eo *eo_obj, Ecore_Audio_In_Tone_Data *obj) 111_ecore_audio_in_tone_eo_base_constructor(Eo *eo_obj, Ecore_Audio_In_Tone_Data *obj)
112{ 112{
113 Ecore_Audio_Input *in_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_IN_CLASS); 113 Ecore_Audio_Input *in_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_IN_CLASS);
114 114
115 eo_do_super(eo_obj, MY_CLASS, eo_constructor()); 115 eo_do_super(eo_obj, MY_CLASS, eo_constructor());
116 116
diff --git a/src/lib/ecore_audio/ecore_audio_obj_out.c b/src/lib/ecore_audio/ecore_audio_obj_out.c
index 495e05c701..2d8522b58e 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_out.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_out.c
@@ -14,7 +14,7 @@
14 14
15#include "ecore_audio_private.h" 15#include "ecore_audio_private.h"
16 16
17#define MY_CLASS ECORE_AUDIO_OBJ_OUT_CLASS 17#define MY_CLASS ECORE_AUDIO_OUT_CLASS
18#define MY_CLASS_NAME "Ecore_Audio_Out" 18#define MY_CLASS_NAME "Ecore_Audio_Out"
19 19
20static Eina_Bool _write_cb(void *data) 20static Eina_Bool _write_cb(void *data)
@@ -22,8 +22,8 @@ static Eina_Bool _write_cb(void *data)
22 Eo *eo_obj = data; 22 Eo *eo_obj = data;
23 Eo *in; 23 Eo *in;
24 24
25 Ecore_Audio_Output *out_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_OUT_CLASS); 25 Ecore_Audio_Output *out_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS);
26 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_CLASS); 26 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
27 27
28 ssize_t written, bread = 0; 28 ssize_t written, bread = 0;
29 float buf[1024]; 29 float buf[1024];
@@ -54,9 +54,9 @@ _ecore_audio_out_input_attach(Eo *eo_obj, Ecore_Audio_Output *obj, Eo *input)
54{ 54{
55 Ecore_Audio_Input *in; 55 Ecore_Audio_Input *in;
56 56
57 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_CLASS); 57 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
58 58
59 in = eo_data_scope_get(input, ECORE_AUDIO_OBJ_IN_CLASS); 59 in = eo_data_scope_get(input, ECORE_AUDIO_IN_CLASS);
60 60
61 if (in->output == eo_obj) 61 if (in->output == eo_obj)
62 return EINA_FALSE; 62 return EINA_FALSE;
@@ -81,7 +81,7 @@ _ecore_audio_out_input_detach(Eo *eo_obj, Ecore_Audio_Output *obj, Eo *input)
81{ 81{
82 Ecore_Audio_Input *in; 82 Ecore_Audio_Input *in;
83 83
84 in = eo_data_scope_get(input, ECORE_AUDIO_OBJ_IN_CLASS); 84 in = eo_data_scope_get(input, ECORE_AUDIO_IN_CLASS);
85 85
86 if (in->output != eo_obj) 86 if (in->output != eo_obj)
87 return EINA_FALSE; 87 return EINA_FALSE;
@@ -115,7 +115,7 @@ static void _free_vio(Ecore_Audio_Object *ea_obj)
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_key_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_CLASS);
119 119
120 if (ea_obj->vio) 120 if (ea_obj->vio)
121 _free_vio(ea_obj); 121 _free_vio(ea_obj);
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 d958d2153b..4b5986f7d8 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c
@@ -20,7 +20,7 @@
20 20
21extern pa_mainloop_api functable; 21extern pa_mainloop_api functable;
22 22
23#define MY_CLASS ECORE_AUDIO_OBJ_OUT_PULSE_CLASS 23#define MY_CLASS ECORE_AUDIO_OUT_PULSE_CLASS
24#define MY_CLASS_NAME "Ecore_Audio_Out_Pulse" 24#define MY_CLASS_NAME "Ecore_Audio_Out_Pulse"
25 25
26struct _Ecore_Audio_Pulse_Class { 26struct _Ecore_Audio_Pulse_Class {
@@ -50,7 +50,7 @@ _ecore_audio_out_pulse_ecore_audio_volume_set(Eo *eo_obj, Ecore_Audio_Out_Pulse_
50 Eina_List *input; 50 Eina_List *input;
51 uint32_t idx; 51 uint32_t idx;
52 pa_cvolume pa_volume; 52 pa_cvolume pa_volume;
53 Ecore_Audio_Output *out_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_OUT_CLASS); 53 Ecore_Audio_Output *out_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS);
54 54
55 if (volume < 0) 55 if (volume < 0)
56 volume = 0; 56 volume = 0;
@@ -109,7 +109,7 @@ static Eina_Bool _input_attach_internal(Eo *eo_obj, Eo *in)
109 double speed = 0; 109 double speed = 0;
110 pa_stream *stream; 110 pa_stream *stream;
111 Eina_Bool ret = EINA_FALSE; 111 Eina_Bool ret = EINA_FALSE;
112 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_CLASS); 112 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
113 113
114 eo_do_super(eo_obj, MY_CLASS, ret = ecore_audio_obj_out_input_attach(in)); 114 eo_do_super(eo_obj, MY_CLASS, ret = ecore_audio_obj_out_input_attach(in));
115 if (!ret) 115 if (!ret)
@@ -256,7 +256,7 @@ _ecore_audio_out_pulse_eo_base_constructor(Eo *eo_obj, Ecore_Audio_Out_Pulse_Dat
256{ 256{
257 int argc; 257 int argc;
258 char **argv; 258 char **argv;
259 Ecore_Audio_Output *out_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_OUT_CLASS); 259 Ecore_Audio_Output *out_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS);
260 260
261 eo_do_super(eo_obj, MY_CLASS, eo_constructor()); 261 eo_do_super(eo_obj, MY_CLASS, eo_constructor());
262 262
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 5e0e02f061..fc552b8257 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_out_sndfile.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_out_sndfile.c
@@ -14,7 +14,7 @@
14#include "ecore_audio_private.h" 14#include "ecore_audio_private.h"
15#include <sndfile.h> 15#include <sndfile.h>
16 16
17#define MY_CLASS ECORE_AUDIO_OBJ_OUT_SNDFILE_CLASS 17#define MY_CLASS ECORE_AUDIO_OUT_SNDFILE_CLASS
18#define MY_CLASS_NAME "Ecore_Audio_Out_Sndfile" 18#define MY_CLASS_NAME "Ecore_Audio_Out_Sndfile"
19 19
20extern SF_VIRTUAL_IO vio_wrapper; 20extern SF_VIRTUAL_IO vio_wrapper;
@@ -33,9 +33,9 @@ static Eina_Bool _write_cb(void *data)
33 Eo *eo_obj = data; 33 Eo *eo_obj = data;
34 Eo *in; 34 Eo *in;
35 35
36 Ecore_Audio_Out_Sndfile_Data *obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_OUT_SNDFILE_CLASS); 36 Ecore_Audio_Out_Sndfile_Data *obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OUT_SNDFILE_CLASS);
37 Ecore_Audio_Output *out_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_OUT_CLASS); 37 Ecore_Audio_Output *out_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS);
38 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_CLASS); 38 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
39 39
40 ssize_t written, bread = 0; 40 ssize_t written, bread = 0;
41 float buf[1024]; 41 float buf[1024];
@@ -62,8 +62,8 @@ static Eina_Bool _write_cb(void *data)
62EOLIAN static Eina_Bool 62EOLIAN static Eina_Bool
63_ecore_audio_out_sndfile_ecore_audio_out_input_attach(Eo *eo_obj, Ecore_Audio_Out_Sndfile_Data *obj, Eo *in) 63_ecore_audio_out_sndfile_ecore_audio_out_input_attach(Eo *eo_obj, Ecore_Audio_Out_Sndfile_Data *obj, Eo *in)
64{ 64{
65 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_CLASS); 65 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
66 Ecore_Audio_Output *out_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_OUT_CLASS); 66 Ecore_Audio_Output *out_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS);
67 Eina_Bool ret2 = EINA_FALSE; 67 Eina_Bool ret2 = EINA_FALSE;
68 68
69 eo_do_super(eo_obj, MY_CLASS, ret2 = ecore_audio_obj_out_input_attach(in)); 69 eo_do_super(eo_obj, MY_CLASS, ret2 = ecore_audio_obj_out_input_attach(in));
@@ -95,7 +95,7 @@ _ecore_audio_out_sndfile_ecore_audio_out_input_attach(Eo *eo_obj, Ecore_Audio_Ou
95EOLIAN static Eina_Bool 95EOLIAN static Eina_Bool
96_ecore_audio_out_sndfile_ecore_audio_source_set(Eo *eo_obj, Ecore_Audio_Out_Sndfile_Data *obj, const char *source) 96_ecore_audio_out_sndfile_ecore_audio_source_set(Eo *eo_obj, Ecore_Audio_Out_Sndfile_Data *obj, const char *source)
97{ 97{
98 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_CLASS); 98 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
99 99
100 if (obj->handle) { 100 if (obj->handle) {
101 sf_close(obj->handle); 101 sf_close(obj->handle);
@@ -115,14 +115,14 @@ _ecore_audio_out_sndfile_ecore_audio_source_set(Eo *eo_obj, Ecore_Audio_Out_Sndf
115EOLIAN static const char* 115EOLIAN static const char*
116_ecore_audio_out_sndfile_ecore_audio_source_get(Eo *eo_obj, Ecore_Audio_Out_Sndfile_Data *_pd EINA_UNUSED) 116_ecore_audio_out_sndfile_ecore_audio_source_get(Eo *eo_obj, Ecore_Audio_Out_Sndfile_Data *_pd EINA_UNUSED)
117{ 117{
118 Ecore_Audio_Object *obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_CLASS); 118 Ecore_Audio_Object *obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
119 return obj->source; 119 return obj->source;
120} 120}
121 121
122EOLIAN static Eina_Bool 122EOLIAN static Eina_Bool
123_ecore_audio_out_sndfile_ecore_audio_format_set(Eo *eo_obj, Ecore_Audio_Out_Sndfile_Data *obj, Ecore_Audio_Format format) 123_ecore_audio_out_sndfile_ecore_audio_format_set(Eo *eo_obj, Ecore_Audio_Out_Sndfile_Data *obj, Ecore_Audio_Format format)
124{ 124{
125 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_CLASS); 125 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
126 126
127 if (ea_obj->source) { 127 if (ea_obj->source) {
128 ERR("Input is already open - cannot change format"); 128 ERR("Input is already open - cannot change format");
@@ -154,14 +154,14 @@ _ecore_audio_out_sndfile_ecore_audio_format_set(Eo *eo_obj, Ecore_Audio_Out_Sndf
154EOLIAN static Ecore_Audio_Format 154EOLIAN static Ecore_Audio_Format
155_ecore_audio_out_sndfile_ecore_audio_format_get(Eo *eo_obj, Ecore_Audio_Out_Sndfile_Data *_pd EINA_UNUSED) 155_ecore_audio_out_sndfile_ecore_audio_format_get(Eo *eo_obj, Ecore_Audio_Out_Sndfile_Data *_pd EINA_UNUSED)
156{ 156{
157 Ecore_Audio_Object *obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_CLASS); 157 Ecore_Audio_Object *obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
158 return obj->format; 158 return obj->format;
159} 159}
160 160
161EOLIAN static void 161EOLIAN static void
162_ecore_audio_out_sndfile_eo_base_constructor(Eo *eo_obj, Ecore_Audio_Out_Sndfile_Data *_pd EINA_UNUSED) 162_ecore_audio_out_sndfile_eo_base_constructor(Eo *eo_obj, Ecore_Audio_Out_Sndfile_Data *_pd EINA_UNUSED)
163{ 163{
164 Ecore_Audio_Output *out_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_OUT_CLASS); 164 Ecore_Audio_Output *out_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS);
165 165
166 eo_do_super(eo_obj, MY_CLASS, eo_constructor()); 166 eo_do_super(eo_obj, MY_CLASS, eo_constructor());
167 167
@@ -174,7 +174,7 @@ _ecore_audio_out_sndfile_eo_base_constructor(Eo *eo_obj, Ecore_Audio_Out_Sndfile
174EOLIAN static void 174EOLIAN static void
175_ecore_audio_out_sndfile_eo_base_destructor(Eo *eo_obj, Ecore_Audio_Out_Sndfile_Data *obj) 175_ecore_audio_out_sndfile_eo_base_destructor(Eo *eo_obj, Ecore_Audio_Out_Sndfile_Data *obj)
176{ 176{
177 Ecore_Audio_Output *out_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_OUT_CLASS); 177 Ecore_Audio_Output *out_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS);
178 178
179 if (obj->handle) 179 if (obj->handle)
180 sf_close(obj->handle); 180 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 7fc595677c..4a629c8acf 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_scope_get(eo_obj, ECORE_AUDIO_OBJ_CLASS); 19 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_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_scope_get(eo_obj, ECORE_AUDIO_OBJ_CLASS); 34 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_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_scope_get(eo_obj, ECORE_AUDIO_OBJ_CLASS); 49 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_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_scope_get(eo_obj, ECORE_AUDIO_OBJ_CLASS); 64 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_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_scope_get(eo_obj, ECORE_AUDIO_OBJ_CLASS); 79 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
80 80
81 if (!ea_obj->vio->vio) 81 if (!ea_obj->vio->vio)
82 goto error; 82 goto error;