summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlavio Ceolin <flavio.ceolin@gmail.com>2014-08-14 00:24:22 -0300
committerFlavio Ceolin <flavio.ceolin@gmail.com>2014-08-14 23:39:39 -0300
commitfb44db52bb4f462fad71bd0eb8964fefd940ef28 (patch)
tree450f4e94c5c309d03e4aeb1eee7e4978b3631ea5
parent861541dd018675773db7983dbee45bab586cae25 (diff)
module: several fixes
- Fix the problem of none sink selected - Fix the debug/error macros - Replace all Epulse's reference to Emix
-rw-r--r--src/module/e_mod_main.c18
-rw-r--r--src/module/e_mod_main.h8
2 files changed, 10 insertions, 16 deletions
diff --git a/src/module/e_mod_main.c b/src/module/e_mod_main.c
index e69365e..5392970 100644
--- a/src/module/e_mod_main.c
+++ b/src/module/e_mod_main.c
@@ -9,13 +9,11 @@
9 9
10int _e_emix_log_domain; 10int _e_emix_log_domain;
11 11
12#define DBG(...) EINA_LOG_DOM_DBG(_e_emix_log_domain, __VA_ARGS__)
13
14/* module requirements */ 12/* module requirements */
15EAPI E_Module_Api e_modapi = 13EAPI E_Module_Api e_modapi =
16 { 14 {
17 E_MODULE_API_VERSION, 15 E_MODULE_API_VERSION,
18 "Pulse Mixer" 16 "Emixer"
19 }; 17 };
20 18
21/* necessary forward delcaration */ 19/* necessary forward delcaration */
@@ -238,7 +236,7 @@ _actions_register(void)
238 if (mixer_context->actions.incr) 236 if (mixer_context->actions.incr)
239 { 237 {
240 mixer_context->actions.incr->func.go = _volume_increase_cb; 238 mixer_context->actions.incr->func.go = _volume_increase_cb;
241 e_action_predef_name_set("Pulse Mixer", _("Increase Volume"), 239 e_action_predef_name_set("EMixer", _("Increase Volume"),
242 "volume_increase", NULL, NULL, 0); 240 "volume_increase", NULL, NULL, 0);
243 } 241 }
244 242
@@ -246,7 +244,7 @@ _actions_register(void)
246 if (mixer_context->actions.decr) 244 if (mixer_context->actions.decr)
247 { 245 {
248 mixer_context->actions.decr->func.go = _volume_decrease_cb; 246 mixer_context->actions.decr->func.go = _volume_decrease_cb;
249 e_action_predef_name_set("Pulse Mixer", _("Decrease Volume"), 247 e_action_predef_name_set("EMixer", _("Decrease Volume"),
250 "volume_decrease", NULL, NULL, 0); 248 "volume_decrease", NULL, NULL, 0);
251 } 249 }
252 250
@@ -254,7 +252,7 @@ _actions_register(void)
254 if (mixer_context->actions.mute) 252 if (mixer_context->actions.mute)
255 { 253 {
256 mixer_context->actions.mute->func.go = _volume_mute_cb; 254 mixer_context->actions.mute->func.go = _volume_mute_cb;
257 e_action_predef_name_set("Pulse Mixer", _("Mute volume"), "volume_mute", 255 e_action_predef_name_set("EMixer", _("Mute volume"), "volume_mute",
258 NULL, NULL, 0); 256 NULL, NULL, 0);
259 } 257 }
260 258
@@ -611,7 +609,7 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient)
611static const char * 609static const char *
612_gc_label(const E_Gadcon_Client_Class *client_class EINA_UNUSED) 610_gc_label(const E_Gadcon_Client_Class *client_class EINA_UNUSED)
613{ 611{
614 return "Pulse Mixer"; 612 return "EMixer";
615} 613}
616 614
617static Evas_Object * 615static Evas_Object *
@@ -738,11 +736,7 @@ e_modapi_init(E_Module *m)
738 NULL, emix_config_popup_new); 736 NULL, emix_config_popup_new);
739 737
740 if (emix_sink_default_support()) 738 if (emix_sink_default_support())
741 { 739 mixer_context->sink_default = emix_sink_default_get();
742 mixer_context->sink_default = emix_sink_default_get();
743 if (mixer_context->sink_default)
744 _mixer_gadget_update();
745 }
746 740
747 e_gadcon_provider_register(&_gadcon_class); 741 e_gadcon_provider_register(&_gadcon_class);
748 _actions_register(); 742 _actions_register();
diff --git a/src/module/e_mod_main.h b/src/module/e_mod_main.h
index 9d9350d..cfe01f6 100644
--- a/src/module/e_mod_main.h
+++ b/src/module/e_mod_main.h
@@ -11,10 +11,10 @@ extern int _e_emix_log_domain;
11#undef ERR 11#undef ERR
12#undef CRIT 12#undef CRIT
13#define DBG(...) EINA_LOG_DOM_DBG(_e_emix_log_domain, __VA_ARGS__) 13#define DBG(...) EINA_LOG_DOM_DBG(_e_emix_log_domain, __VA_ARGS__)
14#define INF(...) EINA_LOG_DOM_DBG(_e_emix_log_domain, __VA_ARGS__) 14#define INF(...) EINA_LOG_DOM_INF(_e_emix_log_domain, __VA_ARGS__)
15#define WRN(...) EINA_LOG_DOM_DBG(_e_emix_log_domain, __VA_ARGS__) 15#define WRN(...) EINA_LOG_DOM_WARN(_e_emix_log_domain, __VA_ARGS__)
16#define ERR(...) EINA_LOG_DOM_DBG(_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_DBG(_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; 19EAPI extern E_Module_Api e_modapi;
20 20