aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorYossi Kantor <yossi.kantor@samsung.com>2014-03-27 13:34:01 +0200
committerDaniel Zaoui <daniel.zaoui@samsung.com>2014-04-02 15:56:14 +0300
commit7876846f016b3e1d3a4104723361763f2697eb3b (patch)
tree2ac3ed0c51d499521b1ae6c63214a1b89f64fae8 /src
parentEolian: Integration of Ecore Audio Out Sndfile (diff)
downloadefl-7876846f016b3e1d3a4104723361763f2697eb3b.tar.gz
Eolian: Integration of Ecore Audio Out Pulse
Diffstat (limited to 'src')
-rw-r--r--src/Makefile_Ecore_Audio.am10
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj_out_pulse.c100
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj_out_pulse.h6
-rw-r--r--src/lib/ecore_audio/ecore_audio_out_pulse.eo15
4 files changed, 48 insertions, 83 deletions
diff --git a/src/Makefile_Ecore_Audio.am b/src/Makefile_Ecore_Audio.am
index 68ef281a7d..2696d9b691 100644
--- a/src/Makefile_Ecore_Audio.am
+++ b/src/Makefile_Ecore_Audio.am
@@ -12,7 +12,9 @@ BUILT_SOURCES += \
lib/ecore_audio/ecore_audio_in_sndfile.eo.c \
lib/ecore_audio/ecore_audio_in_sndfile.eo.h \
lib/ecore_audio/ecore_audio_out_sndfile.eo.c \
- lib/ecore_audio/ecore_audio_out_sndfile.eo.h
+ lib/ecore_audio/ecore_audio_out_sndfile.eo.h \
+ lib/ecore_audio/ecore_audio_out_pulse.eo.c \
+ lib/ecore_audio/ecore_audio_out_pulse.eo.h
ecore_audioeolianfilesdir = $(datadir)/eolian/include/ecore-@VMAJ@
ecore_audioeolianfiles_DATA = \
@@ -20,7 +22,8 @@ ecore_audioeolianfiles_DATA = \
lib/ecore_audio/ecore_audio_in.eo \
lib/ecore_audio/ecore_audio_out.eo \
lib/ecore_audio/ecore_audio_in_sndfile.eo \
- lib/ecore_audio/ecore_audio_out_sndfile.eo
+ lib/ecore_audio/ecore_audio_out_sndfile.eo \
+ lib/ecore_audio/ecore_audio_out_pulse.eo
EXTRA_DIST += \
${ecore_audioeolianfiles_DATA}
@@ -41,7 +44,8 @@ nodist_installed_ecoreaudiomainheaders_DATA = \
lib/ecore_audio/ecore_audio_in.eo.h \
lib/ecore_audio/ecore_audio_out.eo.h \
lib/ecore_audio/ecore_audio_in_sndfile.eo.h \
- lib/ecore_audio/ecore_audio_out_sndfile.eo.h
+ lib/ecore_audio/ecore_audio_out_sndfile.eo.h \
+ lib/ecore_audio/ecore_audio_out_pulse.eo.h
lib_ecore_audio_libecore_audio_la_SOURCES = \
lib/ecore_audio/ecore_audio.c \
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 f94f4999ba..8e7fc6d900 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c
@@ -20,19 +20,9 @@
extern pa_mainloop_api functable;
-EAPI Eo_Op ECORE_AUDIO_OBJ_OUT_PULSE_BASE_ID = EO_NOOP;
-
#define MY_CLASS ECORE_AUDIO_OBJ_OUT_PULSE_CLASS
#define MY_CLASS_NAME "Ecore_Audio_Out_Pulse"
-EAPI const Eo_Event_Description _ECORE_AUDIO_EV_OUT_PULSE_CONTEXT_READY =
- EO_EVENT_DESCRIPTION("context,ready", "Called when the output is ready for playback.");
-#define ECORE_AUDIO_EV_OUT_PULSE_CONTEXT_READY (&(_ECORE_AUDIO_EV_OUT_PULSE_CONTEXT_READY))
-EAPI const Eo_Event_Description _ECORE_AUDIO_EV_OUT_PULSE_CONTEXT_FAIL =
- EO_EVENT_DESCRIPTION("context,fail", "Called when context fails.");
-#define ECORE_AUDIO_EV_OUT_PULSE_CONTEXT_FAIL (&(_ECORE_AUDIO_EV_OUT_PULSE_CONTEXT_FAIL))
-
-
struct _Ecore_Audio_Pulse_Class {
pa_mainloop_api *api;
pa_context *context;
@@ -45,14 +35,15 @@ static struct _Ecore_Audio_Pulse_Class class_vars = {
.api = &functable,
};
-struct _Ecore_Audio_Pulse
+struct _Ecore_Audio_Out_Pulse_Data
{
char *foo;
};
-typedef struct _Ecore_Audio_Pulse Ecore_Audio_Pulse;
+typedef struct _Ecore_Audio_Out_Pulse_Data Ecore_Audio_Out_Pulse_Data;
-static void _volume_set(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list)
+EOLIAN static void
+_ecore_audio_out_pulse_ecore_audio_volume_set(Eo *eo_obj, Ecore_Audio_Out_Pulse_Data *_pd EINA_UNUSED, double volume)
{
Eo *in;
pa_stream *stream;
@@ -61,8 +52,6 @@ static void _volume_set(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list)
pa_cvolume pa_volume;
Ecore_Audio_Output *out_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_OUT_CLASS);
- double volume = va_arg(*list, double);
-
if (volume < 0)
volume = 0;
@@ -158,28 +147,26 @@ static Eina_Bool _input_attach_internal(Eo *eo_obj, Eo *in)
static Eina_Bool _delayed_attach_cb(void *data, Eo *eo_obj, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
{
Eo *in = data;
- eo_do(eo_obj, eo_event_callback_del(ECORE_AUDIO_EV_OUT_PULSE_CONTEXT_READY, _delayed_attach_cb, in));
+ eo_do(eo_obj, eo_event_callback_del(ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_READY, _delayed_attach_cb, in));
_input_attach_internal(eo_obj, in);
return EINA_TRUE;
}
-static void _input_attach(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list)
+EOLIAN static Eina_Bool
+_ecore_audio_out_pulse_ecore_audio_out_input_attach(Eo *eo_obj, Ecore_Audio_Out_Pulse_Data *_pd EINA_UNUSED, Eo *in)
{
Eina_Bool retval = EINA_TRUE;
- Eo *in = va_arg(*list, Eo *);
- Eina_Bool *ret = va_arg(*list, Eina_Bool *);
-
if (class_vars.state != PA_CONTEXT_READY) {
DBG("Delaying input_attach because PA context is not ready.");
- eo_do(eo_obj, eo_event_callback_add(ECORE_AUDIO_EV_OUT_PULSE_CONTEXT_READY, _delayed_attach_cb, in));
+ eo_do(eo_obj, eo_event_callback_add(ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_READY, _delayed_attach_cb, in));
} else {
retval = _input_attach_internal(eo_obj, in);
}
- if (ret)
- *ret = retval;
+
+ return retval;
}
static void _drain_cb(pa_stream *stream, int success EINA_UNUSED, void *data EINA_UNUSED)
@@ -188,28 +175,22 @@ static void _drain_cb(pa_stream *stream, int success EINA_UNUSED, void *data EIN
pa_stream_unref(stream);
}
-static void _input_detach(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list)
+EOLIAN static Eina_Bool
+_ecore_audio_out_pulse_ecore_audio_out_input_detach(Eo *eo_obj, Ecore_Audio_Out_Pulse_Data *_pd EINA_UNUSED, Eo *in)
{
pa_stream *stream;
Eina_Bool ret2;
- Eo *in = va_arg(*list, Eo *);
- Eina_Bool *ret = va_arg(*list, Eina_Bool *);
-
- if (ret)
- *ret = EINA_FALSE;
-
eo_do_super(eo_obj, MY_CLASS, ecore_audio_obj_out_input_detach(in, &ret2));
if (!ret2)
- return;
+ return EINA_FALSE;
eo_do(in, eo_base_data_get("pulse_data", (void **)&stream));
pa_stream_set_write_callback(stream, NULL, NULL);
pa_operation_unref(pa_stream_drain(stream, _drain_cb, NULL));
- if (ret)
- *ret = EINA_TRUE;
+ return EINA_TRUE;
}
static void _state_cb(pa_context *context, void *data EINA_UNUSED)
@@ -229,12 +210,12 @@ static void _state_cb(pa_context *context, void *data EINA_UNUSED)
if (state == PA_CONTEXT_READY) {
DBG("PA context ready.");
EINA_LIST_FOREACH(class_vars.outputs, out, eo_obj) {
- eo_do(eo_obj, eo_event_callback_call(ECORE_AUDIO_EV_OUT_PULSE_CONTEXT_READY, NULL, NULL));
+ eo_do(eo_obj, eo_event_callback_call(ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_READY, NULL, NULL));
}
} else if ((state == PA_CONTEXT_FAILED) || (state == PA_CONTEXT_TERMINATED)) {
DBG("PA context fail.");
EINA_LIST_FOREACH(class_vars.outputs, out, eo_obj) {
- eo_do(eo_obj, eo_event_callback_call(ECORE_AUDIO_EV_OUT_PULSE_CONTEXT_FAIL, NULL, NULL));
+ eo_do(eo_obj, eo_event_callback_call(ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL, NULL, NULL));
}
} else {
DBG("Connection state %i", state);
@@ -260,7 +241,7 @@ static void _state_job(void *data EINA_UNUSED)
}
// the callback here can delete things in the list..
EINA_LIST_FOREACH(class_vars.outputs, out, eo_obj) {
- eo_do(eo_obj, eo_event_callback_call(ECORE_AUDIO_EV_OUT_PULSE_CONTEXT_FAIL, NULL, NULL));
+ eo_do(eo_obj, eo_event_callback_call(ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL, NULL, NULL));
}
// now unref everything safely
EINA_LIST_FOREACH_SAFE(class_vars.outputs, out, tmp, eo_obj) {
@@ -270,7 +251,8 @@ static void _state_job(void *data EINA_UNUSED)
class_vars.state_job = NULL;
}
-static void _constructor(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
+EOLIAN static void
+_ecore_audio_out_pulse_eo_base_constructor(Eo *eo_obj, Ecore_Audio_Out_Pulse_Data *_pd EINA_UNUSED)
{
int argc;
char **argv;
@@ -297,49 +279,11 @@ static void _constructor(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list EINA_U
class_vars.state_job = ecore_job_add(_state_job, NULL);
}
-static void _destructor(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
+EOLIAN static void
+_ecore_audio_out_pulse_eo_base_destructor(Eo *eo_obj, Ecore_Audio_Out_Pulse_Data *_pd EINA_UNUSED)
{
class_vars.outputs = eina_list_remove(class_vars.outputs, eo_obj);
eo_do_super(eo_obj, MY_CLASS, eo_destructor());
}
-static void _class_constructor(Eo_Class *klass)
-{
- const Eo_Op_Func_Description func_desc[] = {
- /* Virtual functions of parent class implemented in this class */
- 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(ECORE_AUDIO_OBJ_ID(ECORE_AUDIO_OBJ_SUB_ID_VOLUME_SET), _volume_set),
-
- EO_OP_FUNC(ECORE_AUDIO_OBJ_OUT_ID(ECORE_AUDIO_OBJ_OUT_SUB_ID_INPUT_ATTACH), _input_attach),
- EO_OP_FUNC(ECORE_AUDIO_OBJ_OUT_ID(ECORE_AUDIO_OBJ_OUT_SUB_ID_INPUT_DETACH), _input_detach),
- EO_OP_FUNC_SENTINEL
- };
-
- eo_class_funcs_set(klass, func_desc);
-}
-
-static const Eo_Op_Description op_desc[] = {
- EO_OP_DESCRIPTION_SENTINEL
-};
-
-static const Eo_Event_Description *event_desc[] = {
- ECORE_AUDIO_EV_OUT_PULSE_CONTEXT_READY,
- ECORE_AUDIO_EV_OUT_PULSE_CONTEXT_FAIL,
- NULL
-};
-
-
-static const Eo_Class_Description class_desc = {
- EO_VERSION,
- MY_CLASS_NAME,
- EO_CLASS_TYPE_REGULAR,
- EO_CLASS_DESCRIPTION_OPS(&ECORE_AUDIO_OBJ_OUT_PULSE_BASE_ID, op_desc, ECORE_AUDIO_OBJ_OUT_PULSE_SUB_ID_LAST),
- event_desc,
- sizeof(Ecore_Audio_Pulse),
- _class_constructor,
- NULL
-};
-
-EO_DEFINE_CLASS(ecore_audio_obj_out_pulse_class_get, &class_desc, ECORE_AUDIO_OBJ_OUT_CLASS, NULL);
+#include "ecore_audio_out_pulse.eo.c"
diff --git a/src/lib/ecore_audio/ecore_audio_obj_out_pulse.h b/src/lib/ecore_audio/ecore_audio_obj_out_pulse.h
index 667ae5630e..a8e11ad246 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_out_pulse.h
+++ b/src/lib/ecore_audio/ecore_audio_obj_out_pulse.h
@@ -33,7 +33,8 @@ extern "C"
* @ingroup Ecore_Audio_Group
* @{
*/
-
+#include "ecore_audio_out_pulse.eo.h"
+#if 0
#define ECORE_AUDIO_OBJ_OUT_PULSE_CLASS ecore_audio_obj_out_pulse_class_get() /**< Ecore_Audio pulseaudio output */
/**
@@ -73,7 +74,8 @@ extern EAPI const Eo_Event_Description _ECORE_AUDIO_EV_OUT_PULSE_CONTEXT_FAIL;
* Emitted when the outout context has failed. At this point the output is unusable and will never work, so it is advisable to delete it.
*/
#define ECORE_AUDIO_EV_OUT_PULSE_CONTEXT_FAIL (&(_ECORE_AUDIO_EV_OUT_PULSE_CONTEXT_FAIL))
-
+
+#endif
/**
* @}
*/
diff --git a/src/lib/ecore_audio/ecore_audio_out_pulse.eo b/src/lib/ecore_audio/ecore_audio_out_pulse.eo
new file mode 100644
index 0000000000..8c4b886c2c
--- /dev/null
+++ b/src/lib/ecore_audio/ecore_audio_out_pulse.eo
@@ -0,0 +1,15 @@
+class Ecore_Audio_Out_Pulse (Ecore_Audio_Out)
+{
+ eo_prefix: ecore_audio_obj_out_pulse;
+ implements {
+ Eo_Base::constructor;
+ Eo_Base::destructor;
+ Ecore_Audio::volume::set;
+ Ecore_Audio_Out::input_attach;
+ Ecore_Audio_Out::input_detach;
+ }
+ events {
+ context,ready; /*@ Called when the output is ready for playback. */
+ context,fail; /*@ Called when context fails. */
+ }
+} \ No newline at end of file