summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlavio Ceolin <flavio.ceolin@gmail.com>2015-05-22 22:42:12 -0300
committerFlavio Ceolin <flavio.ceolin@gmail.com>2015-05-22 22:42:12 -0300
commit33115c280c1b08d3d07d6b031f6ef8167ea92f80 (patch)
tree4da60843152f9d3f4b527b9fdeca53d38231a641
parentda5dc86a7de37a19f9f3de855b03b7ceb48bdc10 (diff)
Follow E changes, s/EAPI/E_API/
-rw-r--r--src/bin/common.h16
-rw-r--r--src/bin/main.c2
-rw-r--r--src/lib/backends/alsa/alsa.c4
-rw-r--r--src/lib/backends/pulseaudio/pulse.c4
-rw-r--r--src/lib/emix.h56
-rw-r--r--src/module/e_mod_main.c8
-rw-r--r--src/module/e_mod_main.h8
7 files changed, 56 insertions, 42 deletions
diff --git a/src/bin/common.h b/src/bin/common.h
index 4a399f9..74771e9 100644
--- a/src/bin/common.h
+++ b/src/bin/common.h
@@ -5,6 +5,20 @@
5#define _GNU_SOURCE 5#define _GNU_SOURCE
6#endif 6#endif
7 7
8#ifdef E_API
9#undef E_API
10#endif
11
12#ifdef __GNUC__
13# if __GNUC__ >= 4
14# define E_API __attribute__ ((visibility("default")))
15# else
16# define E_API
17# endif
18#else
19# define E_API
20#endif
21
8#include <Ecore.h> 22#include <Ecore.h>
9#include <Elementary.h> 23#include <Elementary.h>
10 24
@@ -17,7 +31,7 @@
17#define BASE_VOLUME_STEP 10 31#define BASE_VOLUME_STEP 10
18#define EMIXER_THEME PACKAGE_DATA_DIR"/data/themes/default.edj" 32#define EMIXER_THEME PACKAGE_DATA_DIR"/data/themes/default.edj"
19 33
20EAPI extern int _log_domain; 34E_API extern int _log_domain;
21 35
22#define CRIT(...) EINA_LOG_DOM_CRIT(_log_domain, __VA_ARGS__) 36#define CRIT(...) EINA_LOG_DOM_CRIT(_log_domain, __VA_ARGS__)
23#define ERR(...) EINA_LOG_DOM_ERR(_log_domain, __VA_ARGS__) 37#define ERR(...) EINA_LOG_DOM_ERR(_log_domain, __VA_ARGS__)
diff --git a/src/bin/main.c b/src/bin/main.c
index 179444c..e38e5a3 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -5,7 +5,7 @@
5#define DEFAULT_HEIGHT 600 5#define DEFAULT_HEIGHT 600
6#define DEFAULT_WIDTH 800 6#define DEFAULT_WIDTH 800
7 7
8EAPI int 8E_API int
9elm_main(int argc EINA_UNUSED, char *argv[] EINA_UNUSED) 9elm_main(int argc EINA_UNUSED, char *argv[] EINA_UNUSED)
10{ 10{
11 Evas_Object *win; 11 Evas_Object *win;
diff --git a/src/lib/backends/alsa/alsa.c b/src/lib/backends/alsa/alsa.c
index 3640068..802d2b5 100644
--- a/src/lib/backends/alsa/alsa.c
+++ b/src/lib/backends/alsa/alsa.c
@@ -511,10 +511,10 @@ _alsa_backend = {
511 NULL /* advanced options */ 511 NULL /* advanced options */
512}; 512};
513 513
514EAPI Emix_Backend * 514E_API Emix_Backend *
515emix_backend_get(void) 515emix_backend_get(void)
516{ 516{
517 return &_alsa_backend; 517 return &_alsa_backend;
518} 518}
519 519
520EAPI const char emix_backend_name[] = "ALSA"; 520E_API const char emix_backend_name[] = "ALSA";
diff --git a/src/lib/backends/pulseaudio/pulse.c b/src/lib/backends/pulseaudio/pulse.c
index 91efe7f..69a9411 100644
--- a/src/lib/backends/pulseaudio/pulse.c
+++ b/src/lib/backends/pulseaudio/pulse.c
@@ -1034,10 +1034,10 @@ _pulseaudio_backend = {
1034 NULL, 1034 NULL,
1035}; 1035};
1036 1036
1037EAPI Emix_Backend * 1037E_API Emix_Backend *
1038emix_backend_get(void) 1038emix_backend_get(void)
1039{ 1039{
1040 return &_pulseaudio_backend; 1040 return &_pulseaudio_backend;
1041} 1041}
1042 1042
1043EAPI const char emix_backend_name[] = "PULSEAUDIO"; 1043E_API const char emix_backend_name[] = "PULSEAUDIO";
diff --git a/src/lib/emix.h b/src/lib/emix.h
index ec91e40..887a8cb 100644
--- a/src/lib/emix.h
+++ b/src/lib/emix.h
@@ -4,18 +4,18 @@
4#include <Eina.h> 4#include <Eina.h>
5#include <Evas.h> 5#include <Evas.h>
6 6
7#ifdef EAPI 7#ifdef E_API
8#undef EAPI 8#undef E_API
9#endif 9#endif
10 10
11#ifdef __GNUC__ 11#ifdef __GNUC__
12# if __GNUC__ >= 4 12# if __GNUC__ >= 4
13# define EAPI __attribute__ ((visibility("default"))) 13# define E_API __attribute__ ((visibility("default")))
14# else 14# else
15# define EAPI 15# define E_API
16# endif 16# endif
17#else 17#else
18# define EAPI 18# define E_API
19#endif 19#endif
20 20
21 21
@@ -105,39 +105,39 @@ typedef struct _Emix_Backend {
105} Emix_Backend; 105} Emix_Backend;
106 106
107 107
108EAPI Eina_Bool emix_init(void); 108E_API Eina_Bool emix_init(void);
109EAPI void emix_shutdown(void); 109E_API void emix_shutdown(void);
110EAPI const Eina_List* emix_backends_available(void); 110E_API const Eina_List* emix_backends_available(void);
111EAPI Eina_Bool emix_backend_set(const char *backend); 111E_API Eina_Bool emix_backend_set(const char *backend);
112 112
113EAPI Eina_Bool emix_event_callback_add(Emix_Event_Cb cb, 113E_API Eina_Bool emix_event_callback_add(Emix_Event_Cb cb,
114 const void *data); 114 const void *data);
115EAPI Eina_Bool emix_event_callback_del(Emix_Event_Cb cb); 115E_API Eina_Bool emix_event_callback_del(Emix_Event_Cb cb);
116 116
117EAPI const Eina_List* emix_sinks_get(void); 117E_API const Eina_List* emix_sinks_get(void);
118EAPI Eina_Bool emix_sink_default_support(void); 118E_API Eina_Bool emix_sink_default_support(void);
119EAPI const Emix_Sink* emix_sink_default_get(void); 119E_API const Emix_Sink* emix_sink_default_get(void);
120EAPI Eina_Bool emix_sink_port_set(Emix_Sink *sink, Emix_Port *port); 120E_API Eina_Bool emix_sink_port_set(Emix_Sink *sink, Emix_Port *port);
121EAPI void emix_sink_default_set(Emix_Sink *sink); 121E_API void emix_sink_default_set(Emix_Sink *sink);
122EAPI void emix_sink_mute_set(Emix_Sink *sink, Eina_Bool mute); 122E_API void emix_sink_mute_set(Emix_Sink *sink, Eina_Bool mute);
123EAPI void emix_sink_volume_set(Emix_Sink *sink, 123E_API void emix_sink_volume_set(Emix_Sink *sink,
124 Emix_Volume volume); 124 Emix_Volume volume);
125EAPI Eina_Bool emix_sink_change_support(void); 125E_API Eina_Bool emix_sink_change_support(void);
126 126
127EAPI const Eina_List* emix_sink_inputs_get(void); 127E_API const Eina_List* emix_sink_inputs_get(void);
128EAPI void emix_sink_input_mute_set(Emix_Sink_Input *input, 128E_API void emix_sink_input_mute_set(Emix_Sink_Input *input,
129 Eina_Bool mute); 129 Eina_Bool mute);
130EAPI void emix_sink_input_volume_set(Emix_Sink_Input *input, 130E_API void emix_sink_input_volume_set(Emix_Sink_Input *input,
131 Emix_Volume volume); 131 Emix_Volume volume);
132EAPI void emix_sink_input_sink_change(Emix_Sink_Input *input, 132E_API void emix_sink_input_sink_change(Emix_Sink_Input *input,
133 Emix_Sink *sink); 133 Emix_Sink *sink);
134 134
135EAPI const Eina_List* emix_sources_get(void); 135E_API const Eina_List* emix_sources_get(void);
136EAPI void emix_source_mute_set(Emix_Source *source, 136E_API void emix_source_mute_set(Emix_Source *source,
137 Eina_Bool mute); 137 Eina_Bool mute);
138EAPI void emix_source_volume_set(Emix_Source *source, 138E_API void emix_source_volume_set(Emix_Source *source,
139 Emix_Volume volume); 139 Emix_Volume volume);
140 140
141EAPI Evas_Object* emix_advanced_options_add(Evas_Object *parent); 141E_API Evas_Object* emix_advanced_options_add(Evas_Object *parent);
142 142
143#endif /* EMIX_H */ 143#endif /* EMIX_H */
diff --git a/src/module/e_mod_main.c b/src/module/e_mod_main.c
index 57f5a5d..54830db 100644
--- a/src/module/e_mod_main.c
+++ b/src/module/e_mod_main.c
@@ -10,7 +10,7 @@
10int _e_emix_log_domain; 10int _e_emix_log_domain;
11 11
12/* module requirements */ 12/* module requirements */
13EAPI E_Module_Api e_modapi = 13E_API E_Module_Api e_modapi =
14 { 14 {
15 E_MODULE_API_VERSION, 15 E_MODULE_API_VERSION,
16 "Emixer" 16 "Emixer"
@@ -718,7 +718,7 @@ _backend_changed(const char *backend, void *data EINA_UNUSED)
718 ERR("Could not load backend: %s", backend); 718 ERR("Could not load backend: %s", backend);
719} 719}
720 720
721EAPI void * 721E_API void *
722e_modapi_init(E_Module *m) 722e_modapi_init(E_Module *m)
723{ 723{
724 Eina_List *l; 724 Eina_List *l;
@@ -785,7 +785,7 @@ err:
785 return NULL; 785 return NULL;
786} 786}
787 787
788EAPI int 788E_API int
789e_modapi_shutdown(E_Module *m EINA_UNUSED) 789e_modapi_shutdown(E_Module *m EINA_UNUSED)
790{ 790{
791 _actions_unregister(); 791 _actions_unregister();
@@ -804,7 +804,7 @@ e_modapi_shutdown(E_Module *m EINA_UNUSED)
804 return 1; 804 return 1;
805} 805}
806 806
807EAPI int 807E_API int
808e_modapi_save(E_Module *m EINA_UNUSED) 808e_modapi_save(E_Module *m EINA_UNUSED)
809{ 809{
810 return 1; 810 return 1;
diff --git a/src/module/e_mod_main.h b/src/module/e_mod_main.h
index cfe01f6..bb624a1 100644
--- a/src/module/e_mod_main.h
+++ b/src/module/e_mod_main.h
@@ -16,10 +16,10 @@ extern int _e_emix_log_domain;
16#define ERR(...) EINA_LOG_DOM_ERR(_e_emix_log_domain, __VA_ARGS__) 16#define ERR(...) EINA_LOG_DOM_ERR(_e_emix_log_domain, __VA_ARGS__)
17#define CRIT(...) EINA_LOG_DOM_CRIT(_e_emix_log_domain, __VA_ARGS__) 17#define CRIT(...) EINA_LOG_DOM_CRIT(_e_emix_log_domain, __VA_ARGS__)
18 18
19EAPI extern E_Module_Api e_modapi; 19E_API extern E_Module_Api e_modapi;
20 20
21EAPI void *e_modapi_init(E_Module *m); 21E_API void *e_modapi_init(E_Module *m);
22EAPI int e_modapi_shutdown(E_Module *m); 22E_API int e_modapi_shutdown(E_Module *m);
23EAPI int e_modapi_save(E_Module *m); 23E_API int e_modapi_save(E_Module *m);
24 24
25#endif /* _E_MOD_MAIN_H_ */ 25#endif /* _E_MOD_MAIN_H_ */