summaryrefslogtreecommitdiff
path: root/src/lib/ecore_audio
diff options
context:
space:
mode:
authorDaniel Willmann <d.willmann@samsung.com>2013-05-03 16:55:21 +0100
committerDaniel Willmann <d.willmann@samsung.com>2013-05-03 17:04:11 +0100
commit96d98696849ac2b141d6eb9d68238ff8c628c1ac (patch)
treec617addad1a662398bab63c7d8ad8a68e590abc0 /src/lib/ecore_audio
parent4db03f700cfaa8261db11a3a0c7162f0e7b71f0d (diff)
ecore_audio: Remove old structs that we don't need anymore
Signed-off-by: Daniel Willmann <d.willmann@samsung.com>
Diffstat (limited to 'src/lib/ecore_audio')
-rw-r--r--src/lib/ecore_audio/Ecore_Audio.h21
-rw-r--r--src/lib/ecore_audio/ecore_audio.c6
-rw-r--r--src/lib/ecore_audio/ecore_audio_private.h43
3 files changed, 2 insertions, 68 deletions
diff --git a/src/lib/ecore_audio/Ecore_Audio.h b/src/lib/ecore_audio/Ecore_Audio.h
index 5e676348f0..6ba515c394 100644
--- a/src/lib/ecore_audio/Ecore_Audio.h
+++ b/src/lib/ecore_audio/Ecore_Audio.h
@@ -37,17 +37,6 @@ extern "C"
37 * @{ 37 * @{
38 */ 38 */
39 39
40 /** @since 1.8
41 */
42enum _Ecore_Audio_Type {
43 ECORE_AUDIO_TYPE_PULSE, /**< Use Pulseaudio module */
44 ECORE_AUDIO_TYPE_ALSA, /**< Use ALSA module*/
45 ECORE_AUDIO_TYPE_SNDFILE, /**< Use libsndfile module */
46 ECORE_AUDIO_TYPE_TONE, /**< Use tone module */
47 ECORE_AUDIO_TYPE_CUSTOM, /**< Use custom module */
48 ECORE_AUDIO_MODULE_LAST, /**< Sentinel */
49};
50
51/** 40/**
52 * @since 1.8 41 * @since 1.8
53 */ 42 */
@@ -72,15 +61,6 @@ enum _Ecore_Audio_Format {
72typedef enum _Ecore_Audio_Format Ecore_Audio_Format; 61typedef enum _Ecore_Audio_Format Ecore_Audio_Format;
73/**< The format of the audio data */ 62/**< The format of the audio data */
74 63
75 /** @since 1.8
76 */
77typedef struct _Ecore_Audio_Module Ecore_Audio_Module;
78/**< The audio module */
79
80 /** @since 1.8
81 */
82typedef struct _Ecore_Audio_Object Ecore_Audio_Object; /**< The audio object */
83
84/* 64/*
85 * @since 1.8 65 * @since 1.8
86 */ 66 */
@@ -212,6 +192,7 @@ EAPI int ecore_audio_shutdown(void);
212 192
213#include <ecore_audio_obj_out_pulse.h> 193#include <ecore_audio_obj_out_pulse.h>
214 194
195
215#include <ecore_audio_obj_out_alsa.h> 196#include <ecore_audio_obj_out_alsa.h>
216 197
217/** 198/**
diff --git a/src/lib/ecore_audio/ecore_audio.c b/src/lib/ecore_audio/ecore_audio.c
index 4d38c13ada..ae052bd9e9 100644
--- a/src/lib/ecore_audio/ecore_audio.c
+++ b/src/lib/ecore_audio/ecore_audio.c
@@ -16,8 +16,6 @@
16 16
17int _ecore_audio_log_dom = -1; 17int _ecore_audio_log_dom = -1;
18static int _ecore_audio_init_count = 0; 18static int _ecore_audio_init_count = 0;
19Eina_List *ecore_audio_modules;
20
21 19
22/* externally accessible functions */ 20/* externally accessible functions */
23 21
@@ -44,8 +42,6 @@ ecore_audio_init(void)
44 } 42 }
45 43
46 DBG("Ecore_Audio init"); 44 DBG("Ecore_Audio init");
47 ecore_audio_modules = NULL;
48
49 45
50 eina_log_timing(_ecore_audio_log_dom, 46 eina_log_timing(_ecore_audio_log_dom,
51 EINA_LOG_STATE_STOP, 47 EINA_LOG_STATE_STOP,
@@ -67,8 +63,6 @@ ecore_audio_shutdown(void)
67 EINA_LOG_STATE_SHUTDOWN); 63 EINA_LOG_STATE_SHUTDOWN);
68 64
69 65
70 eina_list_free(ecore_audio_modules);
71
72 eina_log_domain_unregister(_ecore_audio_log_dom); 66 eina_log_domain_unregister(_ecore_audio_log_dom);
73 _ecore_audio_log_dom = -1; 67 _ecore_audio_log_dom = -1;
74 68
diff --git a/src/lib/ecore_audio/ecore_audio_private.h b/src/lib/ecore_audio/ecore_audio_private.h
index a28ca7c374..29ae400332 100644
--- a/src/lib/ecore_audio/ecore_audio_private.h
+++ b/src/lib/ecore_audio/ecore_audio_private.h
@@ -71,26 +71,10 @@ extern int _ecore_audio_log_dom;
71 * @{ 71 * @{
72 */ 72 */
73 73
74typedef struct _Ecore_Audio_Object Ecore_Audio_Object;
74typedef struct _Ecore_Audio_Input Ecore_Audio_Input; 75typedef struct _Ecore_Audio_Input Ecore_Audio_Input;
75typedef struct _Ecore_Audio_Output Ecore_Audio_Output; 76typedef struct _Ecore_Audio_Output Ecore_Audio_Output;
76 77
77/**
78 * @brief The structure representing an Ecore_Audio module
79 */
80struct _Ecore_Audio_Module
81{
82 ECORE_MAGIC;
83 Ecore_Audio_Type type;
84 char *name;
85 Eina_List *inputs;
86 Eina_List *outputs;
87
88 void *priv;
89
90 struct input_api *in_ops;
91 struct output_api *out_ops;
92};
93
94struct _Ecore_Audio_Vio_Internal { 78struct _Ecore_Audio_Vio_Internal {
95 Ecore_Audio_Vio *vio; 79 Ecore_Audio_Vio *vio;
96 void *data; 80 void *data;
@@ -142,31 +126,6 @@ struct _Ecore_Audio_Input
142 Eina_Bool ended; 126 Eina_Bool ended;
143}; 127};
144 128
145extern Eina_List *ecore_audio_modules;
146
147#ifdef HAVE_ALSA
148/* ecore_audio_alsa */
149Ecore_Audio_Module *ecore_audio_alsa_init(void);
150void ecore_audio_alsa_shutdown(void);
151#endif /* HAVE_ALSA */
152
153#ifdef HAVE_PULSE
154Ecore_Audio_Module *ecore_audio_pulse_init(void);
155void ecore_audio_pulse_shutdown(void);
156#endif /* HAVE_PULSE */
157
158#ifdef HAVE_SNDFILE
159/* ecore_audio_sndfile */
160Ecore_Audio_Module *ecore_audio_sndfile_init(void);
161void ecore_audio_sndfile_shutdown(void);
162#endif /* HAVE_SNDFILE */
163
164Ecore_Audio_Module *ecore_audio_tone_init(void);
165void ecore_audio_tone_shutdown(void);
166
167Ecore_Audio_Module *ecore_audio_custom_init(void);
168void ecore_audio_custom_shutdown(void);
169
170/** 129/**
171 * @} 130 * @}
172 */ 131 */