diff options
author | Cedric Bail <cedric.bail@free.fr> | 2013-05-05 14:08:57 +0900 |
---|---|---|
committer | Cedric Bail <cedric.bail@free.fr> | 2013-05-05 14:08:57 +0900 |
commit | c232458de50716811d810725c82b9083859fae00 (patch) | |
tree | e3dfdd73fd2bf26fe21a884ddf858f8c35e407cd /src/lib/ecore_audio | |
parent | 4e6fe47ea04ddd50cbeb757ecb9b1d01d744f40d (diff) |
ecore_audio: _read is a system defined symbol on Windows.
Diffstat (limited to 'src/lib/ecore_audio')
-rw-r--r-- | src/lib/ecore_audio/ecore_audio_obj_in.c | 4 | ||||
-rw-r--r-- | src/lib/ecore_audio/ecore_audio_obj_in_sndfile.c | 4 | ||||
-rw-r--r-- | src/lib/ecore_audio/ecore_audio_obj_in_tone.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/ecore_audio/ecore_audio_obj_in.c b/src/lib/ecore_audio/ecore_audio_obj_in.c index 116fc50f9e..1abaae4d09 100644 --- a/src/lib/ecore_audio/ecore_audio_obj_in.c +++ b/src/lib/ecore_audio/ecore_audio_obj_in.c | |||
@@ -139,7 +139,7 @@ static void _remaining_get(Eo *eo_obj, void *_pd, va_list *list) | |||
139 | } | 139 | } |
140 | } | 140 | } |
141 | 141 | ||
142 | static void _read(Eo *eo_obj, void *_pd, va_list *list) | 142 | static void _in_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; |
@@ -271,7 +271,7 @@ static void _class_constructor(Eo_Class *klass) | |||
271 | EO_OP_FUNC(ECORE_AUDIO_OBJ_IN_ID(ECORE_AUDIO_OBJ_IN_SUB_ID_LOOPED_GET), _looped_get), | 271 | EO_OP_FUNC(ECORE_AUDIO_OBJ_IN_ID(ECORE_AUDIO_OBJ_IN_SUB_ID_LOOPED_GET), _looped_get), |
272 | EO_OP_FUNC(ECORE_AUDIO_OBJ_IN_ID(ECORE_AUDIO_OBJ_IN_SUB_ID_LENGTH_GET), _length_get), | 272 | EO_OP_FUNC(ECORE_AUDIO_OBJ_IN_ID(ECORE_AUDIO_OBJ_IN_SUB_ID_LENGTH_GET), _length_get), |
273 | EO_OP_FUNC(ECORE_AUDIO_OBJ_IN_ID(ECORE_AUDIO_OBJ_IN_SUB_ID_REMAINING_GET), _remaining_get), | 273 | EO_OP_FUNC(ECORE_AUDIO_OBJ_IN_ID(ECORE_AUDIO_OBJ_IN_SUB_ID_REMAINING_GET), _remaining_get), |
274 | EO_OP_FUNC(ECORE_AUDIO_OBJ_IN_ID(ECORE_AUDIO_OBJ_IN_SUB_ID_READ), _read), | 274 | EO_OP_FUNC(ECORE_AUDIO_OBJ_IN_ID(ECORE_AUDIO_OBJ_IN_SUB_ID_READ), _in_read), |
275 | EO_OP_FUNC(ECORE_AUDIO_OBJ_IN_ID(ECORE_AUDIO_OBJ_IN_SUB_ID_READ_INTERNAL), _read_internal), | 275 | EO_OP_FUNC(ECORE_AUDIO_OBJ_IN_ID(ECORE_AUDIO_OBJ_IN_SUB_ID_READ_INTERNAL), _read_internal), |
276 | EO_OP_FUNC(ECORE_AUDIO_OBJ_IN_ID(ECORE_AUDIO_OBJ_IN_SUB_ID_OUTPUT_GET), _output_get), | 276 | EO_OP_FUNC(ECORE_AUDIO_OBJ_IN_ID(ECORE_AUDIO_OBJ_IN_SUB_ID_OUTPUT_GET), _output_get), |
277 | 277 | ||
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 ae921eaabf..82646eeb81 100644 --- a/src/lib/ecore_audio/ecore_audio_obj_in_sndfile.c +++ b/src/lib/ecore_audio/ecore_audio_obj_in_sndfile.c | |||
@@ -29,7 +29,7 @@ struct _Ecore_Audio_Sndfile | |||
29 | 29 | ||
30 | typedef struct _Ecore_Audio_Sndfile Ecore_Audio_Sndfile; | 30 | typedef struct _Ecore_Audio_Sndfile Ecore_Audio_Sndfile; |
31 | 31 | ||
32 | static void _read(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list) | 32 | static void _sndfile_read(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list) |
33 | { | 33 | { |
34 | Ecore_Audio_Sndfile *obj = _pd; | 34 | Ecore_Audio_Sndfile *obj = _pd; |
35 | int read; | 35 | int read; |
@@ -251,7 +251,7 @@ static void _class_constructor(Eo_Class *klass) | |||
251 | EO_OP_FUNC(ECORE_AUDIO_OBJ_ID(ECORE_AUDIO_OBJ_SUB_ID_FORMAT_GET), _format_get), | 251 | EO_OP_FUNC(ECORE_AUDIO_OBJ_ID(ECORE_AUDIO_OBJ_SUB_ID_FORMAT_GET), _format_get), |
252 | 252 | ||
253 | EO_OP_FUNC(ECORE_AUDIO_OBJ_IN_ID(ECORE_AUDIO_OBJ_IN_SUB_ID_SEEK), _seek), | 253 | EO_OP_FUNC(ECORE_AUDIO_OBJ_IN_ID(ECORE_AUDIO_OBJ_IN_SUB_ID_SEEK), _seek), |
254 | EO_OP_FUNC(ECORE_AUDIO_OBJ_IN_ID(ECORE_AUDIO_OBJ_IN_SUB_ID_READ_INTERNAL), _read), | 254 | EO_OP_FUNC(ECORE_AUDIO_OBJ_IN_ID(ECORE_AUDIO_OBJ_IN_SUB_ID_READ_INTERNAL), _sndfile_read), |
255 | EO_OP_FUNC(ECORE_AUDIO_OBJ_ID(ECORE_AUDIO_OBJ_SUB_ID_VIO_SET), _vio_set), | 255 | EO_OP_FUNC(ECORE_AUDIO_OBJ_ID(ECORE_AUDIO_OBJ_SUB_ID_VIO_SET), _vio_set), |
256 | 256 | ||
257 | EO_OP_FUNC_SENTINEL | 257 | EO_OP_FUNC_SENTINEL |
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 ed93f376bd..f0fec98dcb 100644 --- a/src/lib/ecore_audio/ecore_audio_obj_in_tone.c +++ b/src/lib/ecore_audio/ecore_audio_obj_in_tone.c | |||
@@ -27,7 +27,7 @@ struct _Ecore_Audio_Tone | |||
27 | 27 | ||
28 | typedef struct _Ecore_Audio_Tone Ecore_Audio_Tone; | 28 | typedef struct _Ecore_Audio_Tone Ecore_Audio_Tone; |
29 | 29 | ||
30 | static void _read(Eo *eo_obj, void *_pd, va_list *list) | 30 | static void _tone_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; |
@@ -161,7 +161,7 @@ static void _class_constructor(Eo_Class *klass) | |||
161 | 161 | ||
162 | EO_OP_FUNC(ECORE_AUDIO_OBJ_IN_ID(ECORE_AUDIO_OBJ_IN_SUB_ID_LENGTH_SET), _length_set), | 162 | EO_OP_FUNC(ECORE_AUDIO_OBJ_IN_ID(ECORE_AUDIO_OBJ_IN_SUB_ID_LENGTH_SET), _length_set), |
163 | EO_OP_FUNC(ECORE_AUDIO_OBJ_IN_ID(ECORE_AUDIO_OBJ_IN_SUB_ID_SEEK), _seek), | 163 | EO_OP_FUNC(ECORE_AUDIO_OBJ_IN_ID(ECORE_AUDIO_OBJ_IN_SUB_ID_SEEK), _seek), |
164 | EO_OP_FUNC(ECORE_AUDIO_OBJ_IN_ID(ECORE_AUDIO_OBJ_IN_SUB_ID_READ_INTERNAL), _read), | 164 | EO_OP_FUNC(ECORE_AUDIO_OBJ_IN_ID(ECORE_AUDIO_OBJ_IN_SUB_ID_READ_INTERNAL), _tone_read), |
165 | 165 | ||
166 | EO_OP_FUNC_SENTINEL | 166 | EO_OP_FUNC_SENTINEL |
167 | }; | 167 | }; |