asdfuser pushed a commit to branch master.
commit 38b3738384b0c832f202dd545ca79fd9769f7c79
Author: Daniel Willmann <[email protected]>
Date: Wed Apr 17 18:43:51 2013 +0100
ecore_audio: Allow setting frequency and length in tone input
Signed-off-by: Daniel Willmann <[email protected]>
---
src/lib/ecore_audio/ecore_audio_obj_in.c | 3 +-
src/lib/ecore_audio/ecore_audio_obj_in.h | 11 ++++---
src/lib/ecore_audio/ecore_audio_obj_in_tone.c | 47 +++++++++++++++++++++++++++
src/lib/ecore_audio/ecore_audio_obj_in_tone.h | 2 ++
4 files changed, 58 insertions(+), 5 deletions(-)
diff --git a/src/lib/ecore_audio/ecore_audio_obj_in.c
b/src/lib/ecore_audio/ecore_audio_obj_in.c
index d5bb9a3..704e27d 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_in.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_in.c
@@ -238,11 +238,12 @@ static const Eo_Op_Description op_desc[] = {
EO_OP_DESCRIPTION(ECORE_AUDIO_OBJ_IN_SUB_ID_PRELOADED_GET, G(preloaded)),
EO_OP_DESCRIPTION(ECORE_AUDIO_OBJ_IN_SUB_ID_LOOPED_SET, S(looped)),
EO_OP_DESCRIPTION(ECORE_AUDIO_OBJ_IN_SUB_ID_LOOPED_GET, G(looped)),
+ EO_OP_DESCRIPTION(ECORE_AUDIO_OBJ_IN_SUB_ID_LENGTH_SET, S(length)),
+ EO_OP_DESCRIPTION(ECORE_AUDIO_OBJ_IN_SUB_ID_LENGTH_GET, G(length)),
EO_OP_DESCRIPTION(ECORE_AUDIO_OBJ_IN_SUB_ID_READ, "Read from the input"),
EO_OP_DESCRIPTION(ECORE_AUDIO_OBJ_IN_SUB_ID_READ_INTERNAL, "Internal
implementation for the read"),
EO_OP_DESCRIPTION(ECORE_AUDIO_OBJ_IN_SUB_ID_SEEK, "Seek within the input"),
EO_OP_DESCRIPTION(ECORE_AUDIO_OBJ_IN_SUB_ID_OUTPUT_GET, G(output)),
- EO_OP_DESCRIPTION(ECORE_AUDIO_OBJ_IN_SUB_ID_LENGTH_GET, G(length)),
EO_OP_DESCRIPTION(ECORE_AUDIO_OBJ_IN_SUB_ID_REMAINING_GET, G(remaining)),
EO_OP_DESCRIPTION_SENTINEL
};
diff --git a/src/lib/ecore_audio/ecore_audio_obj_in.h
b/src/lib/ecore_audio/ecore_audio_obj_in.h
index 10becd0..6da0ec2 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_in.h
+++ b/src/lib/ecore_audio/ecore_audio_obj_in.h
@@ -51,11 +51,12 @@ enum Ecore_Audio_Obj_In_Sub_Ids
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_LENGTH_GET,
ECORE_AUDIO_OBJ_IN_SUB_ID_REMAINING_GET,
ECORE_AUDIO_OBJ_IN_SUB_ID_LAST
};
@@ -97,7 +98,11 @@ enum Ecore_Audio_Obj_In_Sub_Ids
#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)
-#define ecore_audio_obj_in_looped_get(preloaded)
ECORE_AUDIO_OBJ_IN_ID(ECORE_AUDIO_OBJ_IN_SUB_ID_LOOPED_GET),
EO_TYPECHECK(Eina_Bool *, looped)
+#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)
+
+#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)
+
+#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)
#define ecore_audio_obj_in_read(buf, len, ret)
ECORE_AUDIO_OBJ_IN_ID(ECORE_AUDIO_OBJ_IN_SUB_ID_READ), EO_TYPECHECK(char *,
buf), EO_TYPECHECK(int, len), EO_TYPECHECK(int *, ret)
@@ -105,8 +110,6 @@ enum Ecore_Audio_Obj_In_Sub_Ids
#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)
-#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)
-
#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;
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 53286cb..e8969c7 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_in_tone.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_in_tone.c
@@ -146,6 +146,49 @@ static void _format_get(Eo *eo_obj, void *_pd EINA_UNUSED,
va_list *list)
*ret = obj->format;
}
+static void _length_set(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list)
+{
+ Ecore_Audio_Input *in_obj = eo_data_get(eo_obj, ECORE_AUDIO_OBJ_IN_CLASS);
+
+ double length= va_arg(*list, double);
+
+ in_obj->length = length;
+}
+
+static void _data_set(Eo *eo_obj, void *_pd, va_list *list)
+{
+ Ecore_Audio_Tone *obj = _pd;
+
+ const char *key = va_arg(*list, const char *);
+ const void *val = va_arg(*list, const void *);
+ eo_base_data_free_func func = va_arg(*list, eo_base_data_free_func);
+
+ if (!key) return;
+
+ if (!strcmp(key, ECORE_AUDIO_ATTR_TONE_FREQ)) {
+ obj->freq = *(int *)val;
+ } else {
+ eo_do_super(eo_obj, MY_CLASS, eo_base_data_set(key, val, func));
+ }
+
+}
+
+static void _data_get(Eo *eo_obj, void *_pd, va_list *list)
+{
+ Ecore_Audio_Tone *obj = _pd;
+
+ const char *key = va_arg(*list, const char*);
+ void **ret = va_arg(*list, void **);
+
+ if (!strcmp(key, ECORE_AUDIO_ATTR_TONE_FREQ)) {
+ if (ret)
+ *(int *)ret = obj->freq;
+ } else {
+ eo_do_super(eo_obj, MY_CLASS, eo_base_data_get(key, ret));
+ }
+
+}
+
static void _constructor(Eo *eo_obj, void *_pd, va_list *list EINA_UNUSED)
{
Ecore_Audio_Tone *obj = _pd;
@@ -167,11 +210,15 @@ static void _class_constructor(Eo_Class *klass)
EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
//EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_DESTRUCTOR), _destructor),
+ EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_DATA_GET), _data_get),
+ EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_DATA_SET), _data_set),
+
EO_OP_FUNC(ECORE_AUDIO_OBJ_ID(ECORE_AUDIO_OBJ_SUB_ID_SOURCE_SET),
_source_set),
EO_OP_FUNC(ECORE_AUDIO_OBJ_ID(ECORE_AUDIO_OBJ_SUB_ID_SOURCE_GET),
_source_get),
EO_OP_FUNC(ECORE_AUDIO_OBJ_ID(ECORE_AUDIO_OBJ_SUB_ID_FORMAT_SET),
_format_set),
EO_OP_FUNC(ECORE_AUDIO_OBJ_ID(ECORE_AUDIO_OBJ_SUB_ID_FORMAT_GET),
_format_get),
+ EO_OP_FUNC(ECORE_AUDIO_OBJ_IN_ID(ECORE_AUDIO_OBJ_IN_SUB_ID_LENGTH_SET),
_length_set),
EO_OP_FUNC(ECORE_AUDIO_OBJ_IN_ID(ECORE_AUDIO_OBJ_IN_SUB_ID_SEEK), _seek),
EO_OP_FUNC(ECORE_AUDIO_OBJ_IN_ID(ECORE_AUDIO_OBJ_IN_SUB_ID_READ_INTERNAL),
_read),
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 a026691..7faa0db 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_in_tone.h
+++ b/src/lib/ecore_audio/ecore_audio_obj_in_tone.h
@@ -33,6 +33,8 @@ extern "C"
* @{
*/
+#define ECORE_AUDIO_ATTR_TONE_FREQ "ecore_audio_freq"
+
#define ECORE_AUDIO_OBJ_IN_TONE_CLASS ecore_audio_obj_in_tone_class_get()
const Eo_Class *ecore_audio_obj_in_tone_class_get() EINA_CONST;
--
------------------------------------------------------------------------------
Precog is a next-generation analytics platform capable of advanced
analytics on semi-structured data. The platform includes APIs for building
apps and a phenomenal toolset for data science. Developers can use
our toolset for easy data analysis & visualization. Get a free account!
http://www2.precog.com/precogplatform/slashdotnewsletter
