summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlavio Ceolin <flavio.ceolin@gmail.com>2014-08-09 00:29:07 -0300
committerFlavio Ceolin <flavio.ceolin@gmail.com>2014-08-14 23:38:49 -0300
commit77fb1afabb5721f785111d9ee12764cd742f23b5 (patch)
treef4100fab097c322600e785facb00246a8c292359
parentb68c9f556b594fadb7ac43520bb00b8376d418d3 (diff)
Removed all references to epulse
The stand alone application is called now emixer, it makes more sense since it was introduced multiple backends.
-rw-r--r--.gitignore5
-rw-r--r--Makefile.am15
-rw-r--r--configure.ac2
-rw-r--r--data/icons/emixer.png (renamed from data/icons/epulse.png)bin12953 -> 12953 bytes
-rw-r--r--data/xml/emixer.desktop (renamed from data/xml/epulse.desktop)6
-rw-r--r--data/xml/module.desktop.in4
-rw-r--r--po/POTFILES.in14
-rw-r--r--po/pt_BR.po48
-rw-r--r--src/bin/common.c (renamed from src/lib/common.c)12
-rw-r--r--src/bin/common.h (renamed from src/lib/common.h)11
-rw-r--r--src/bin/main.c4
-rw-r--r--src/bin/main_window.c6
-rw-r--r--src/bin/main_window.h2
-rw-r--r--src/bin/playbacks_view.c2
-rw-r--r--src/bin/sinks_view.c2
-rw-r--r--src/bin/sources_view.c2
-rw-r--r--src/bin/translation.h (renamed from src/lib/translation.h)0
-rw-r--r--src/lib/backends/pulseaudio/pulse.c14
-rw-r--r--src/module/e_mod_main.c25
-rw-r--r--src/module/translation.h14
20 files changed, 109 insertions, 79 deletions
diff --git a/.gitignore b/.gitignore
index cd330b9..f21c84c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -69,7 +69,7 @@ missing
69stamp-h1 69stamp-h1
70*.edj 70*.edj
71*.eet 71*.eet
72src/bin/epulse 72src/bin/emixer
73module.desktop 73module.desktop
74po/Makefile.in.in 74po/Makefile.in.in
75po/Makevars.template 75po/Makevars.template
@@ -78,7 +78,8 @@ po/Rules-quot
78po/boldquot.sed 78po/boldquot.sed
79po/en@boldquot.header 79po/en@boldquot.header
80po/en@quot.header 80po/en@quot.header
81po/epulse.pot 81po/emixer.pot
82po/pulse.pot
82po/insert-header.sin 83po/insert-header.sin
83po/quot.sed 84po/quot.sed
84po/remove-potcdate.sed 85po/remove-potcdate.sed
diff --git a/Makefile.am b/Makefile.am
index d701f9e..b16e34d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,13 +27,10 @@ lib_LTLIBRARIES = \
27 src/lib/libemix.la 27 src/lib/libemix.la
28 28
29includes_HEADERS = \ 29includes_HEADERS = \
30 src/lib/common.h
31 src/lib/emix.h 30 src/lib/emix.h
32includesdir = $(includedir)/emix 31includesdir = $(includedir)/emix
33 32
34src_lib_libemix_la_SOURCES = \ 33src_lib_libemix_la_SOURCES = \
35 src/lib/common.h \
36 src/lib/common.c \
37 src/lib/emix.h \ 34 src/lib/emix.h \
38 src/lib/emix.c 35 src/lib/emix.c
39 36
@@ -76,13 +73,15 @@ src_lib_backends_alsa_module_la_LIBTOOLFLAGS = --tag=disable-static
76endif 73endif
77 74
78bin_PROGRAMS = \ 75bin_PROGRAMS = \
79 src/bin/epulse 76 src/bin/emixer
80 77
81src_bin_epulse_LDADD = \ 78src_bin_emixer_LDADD = \
82 $(top_builddir)/src/lib/libemix.la \ 79 $(top_builddir)/src/lib/libemix.la \
83 @EFL_LIBS@ 80 @EFL_LIBS@
84 81
85src_bin_epulse_SOURCES = \ 82src_bin_emixer_SOURCES = \
83 src/bin/common.h \
84 src/bin/common.c \
86 src/bin/main_window.h \ 85 src/bin/main_window.h \
87 src/bin/main_window.c \ 86 src/bin/main_window.c \
88 src/bin/playbacks_view.h \ 87 src/bin/playbacks_view.h \
@@ -113,10 +112,10 @@ SUBDIRS = po
113include Makefile_Theme.am 112include Makefile_Theme.am
114 113
115iconsdir = $(datadir)/icons 114iconsdir = $(datadir)/icons
116icons_DATA = data/icons/epulse.png 115icons_DATA = data/icons/emixer.png
117 116
118desktopdir = $(datadir)/applications 117desktopdir = $(datadir)/applications
119desktop_DATA = data/xml/epulse.desktop 118desktop_DATA = data/xml/emixer.desktop
120 119
121EXTRA_DIST += \ 120EXTRA_DIST += \
122 $(icons_DATA) \ 121 $(icons_DATA) \
diff --git a/configure.ac b/configure.ac
index fbc11b4..ea93bf7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
1ppAC_PREREQ([2.69]) 1ppAC_PREREQ([2.69])
2AC_INIT([epulse], [0.1], [flavio.ceolin@gmail.com]) 2AC_INIT([emixer], [0.1], [flavio.ceolin@gmail.com])
3 3
4AM_INIT_AUTOMAKE([foreign subdir-objects]) 4AM_INIT_AUTOMAKE([foreign subdir-objects])
5AC_CONFIG_HEADER([config.h]) 5AC_CONFIG_HEADER([config.h])
diff --git a/data/icons/epulse.png b/data/icons/emixer.png
index 3d47c55..3d47c55 100644
--- a/data/icons/epulse.png
+++ b/data/icons/emixer.png
Binary files differ
diff --git a/data/xml/epulse.desktop b/data/xml/emixer.desktop
index f590cc2..b8b946b 100644
--- a/data/xml/epulse.desktop
+++ b/data/xml/emixer.desktop
@@ -3,7 +3,7 @@ Encoding=UTF-8
3Type=Application 3Type=Application
4Name=Epulse 4Name=Epulse
5Comment=A module to control audio volume and streams. 5Comment=A module to control audio volume and streams.
6Icon=epulse 6Icon=emixer
7Exec=epulse 7Exec=emixer
8Categories=System;Sound; 8Categories=System;Sound;
9StartupWMClass=epulse 9StartupWMClass=emixer
diff --git a/data/xml/module.desktop.in b/data/xml/module.desktop.in
index bd1441c..7fcd906 100644
--- a/data/xml/module.desktop.in
+++ b/data/xml/module.desktop.in
@@ -2,11 +2,11 @@
2Encoding=UTF-8 2Encoding=UTF-8
3Type=Link 3Type=Link
4Version=1.0 4Version=1.0
5Name=Pulse Mixer 5Name=EMixer
6Comment=A module to control audio volume and streams. 6Comment=A module to control audio volume and streams.
7Icon=e-module-mixer 7Icon=e-module-mixer
8Exec=enlightenment 8Exec=enlightenment
9StartupNotify=true 9StartupNotify=true
10X-Enlightenment-IconClass=epulse-mixer,gadget 10X-Enlightenment-IconClass=emixer,gadget
11X-Enlightenment-ModuleType=utils 11X-Enlightenment-ModuleType=utils
12X-Enlightenment-WaitExit=false 12X-Enlightenment-WaitExit=false
diff --git a/po/POTFILES.in b/po/POTFILES.in
index a99e6cb..ab7d3b1 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,4 +1,6 @@
1./config.h 1./config.h
2./src/bin/common.c
3./src/bin/common.h
2./src/bin/main.c 4./src/bin/main.c
3./src/bin/main_window.c 5./src/bin/main_window.c
4./src/bin/main_window.h 6./src/bin/main_window.h
@@ -8,11 +10,13 @@
8./src/bin/sinks_view.h 10./src/bin/sinks_view.h
9./src/bin/sources_view.c 11./src/bin/sources_view.c
10./src/bin/sources_view.h 12./src/bin/sources_view.h
11./src/lib/common.c 13./src/lib/backends/alsa/alsa.c
12./src/lib/common.h 14./src/lib/backends/pulseaudio/pulse.c
13./src/lib/epulse.c 15./src/lib/backends/pulseaudio/pulse_ml.c
14./src/lib/epulse.h 16./src/lib/emix.c
15./src/lib/epulse_ml.c 17./src/lib/emix.h
16./src/lib/translation.h 18./src/lib/translation.h
19./src/module/e_mod_config.c
20./src/module/e_mod_config.h
17./src/module/e_mod_main.c 21./src/module/e_mod_main.c
18./src/module/e_mod_main.h 22./src/module/e_mod_main.h
diff --git a/po/pt_BR.po b/po/pt_BR.po
index d0a1fa9..4f346d5 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1,11 +1,11 @@
1# Brazilian Portuguese translation for epulse 1# Brazilian Portuguese translation for emixer
2# Flavio Ceolin <flavio.ceolin@gmail.com>, 2014. 2# Flavio Ceolin <flavio.ceolin@gmail.com>, 2014.
3# 3#
4msgid "" 4msgid ""
5msgstr "" 5msgstr ""
6"Project-Id-Version: epulse v1\n" 6"Project-Id-Version: emixer v1\n"
7"Report-Msgid-Bugs-To: flavio.ceolin@gmail.com\n" 7"Report-Msgid-Bugs-To: flavio.ceolin@gmail.com\n"
8"POT-Creation-Date: 2014-08-13 12:12+0900\n" 8"POT-Creation-Date: 2014-08-09 00:11-0300\n"
9"Last-Translator: Flavio Ceolin <flavio.ceolin@gmail.com>\n" 9"Last-Translator: Flavio Ceolin <flavio.ceolin@gmail.com>\n"
10"Language-Team: Enlightenment\n" 10"Language-Team: Enlightenment\n"
11"Language: pt_BR\n" 11"Language: pt_BR\n"
@@ -14,44 +14,42 @@ msgstr ""
14"Content-Transfer-Encoding: 8bit\n" 14"Content-Transfer-Encoding: 8bit\n"
15"Plural-Forms: nplurals=2; plural=(n > 1);\n" 15"Plural-Forms: nplurals=2; plural=(n > 1);\n"
16 16
17#: src/bin/main_window.c:85 17#: src/bin/main_window.c:83
18msgid "Efl Volume Control" 18msgid "Efl Volume Control"
19msgstr "Controle de Volume EFL" 19msgstr "Controle de Volume EFL"
20 20
21#: src/bin/main_window.c:125 21#: src/bin/main_window.c:123
22msgid "Playback" 22msgid "Playback"
23msgstr "Reproducão" 23msgstr "Reproducão"
24 24
25#: src/bin/main_window.c:128 25#: src/bin/main_window.c:126
26msgid "Outputs" 26msgid "Outputs"
27msgstr "Saida" 27msgstr "Saida"
28 28
29#: src/bin/main_window.c:131 29#: src/bin/main_window.c:129
30msgid "Inputs" 30msgid "Inputs"
31msgstr "Entrada" 31msgstr "Entrada"
32 32
33#: src/bin/playbacks_view.c:305 src/bin/sinks_view.c:263 33#: src/bin/playbacks_view.c:209 src/bin/sinks_view.c:185
34#: src/module/e_mod_main.c:414 34#: src/module/e_mod_main.c:440
35msgid "Mute" 35msgid "Mute"
36msgstr "Mudo" 36msgstr "Mudo"
37 37
38#: src/bin/playbacks_view.c:306 src/bin/sinks_view.c:264 38#: src/bin/playbacks_view.c:210 src/bin/sinks_view.c:186
39msgid "Unmute" 39msgid "Unmute"
40msgstr "Ativo" 40msgstr "Ativo"
41 41
42#: src/module/e_mod_main.c:107 42#: src/module/e_mod_main.c:104
43#, fuzzy
44msgid "New volume" 43msgid "New volume"
45msgstr "Mudo" 44msgstr "Novo volume"
46 45
47#: src/module/e_mod_main.c:120 46#: src/module/e_mod_main.c:117
48msgid "EPulse" 47msgid "Emix"
49msgstr "" 48msgstr ""
50 49
51#: src/module/e_mod_main.c:123 50#: src/module/e_mod_main.c:120
52#, fuzzy
53msgid "Volume changed" 51msgid "Volume changed"
54msgstr "Aumentar Volume" 52msgstr "Volume alterado"
55 53
56#: src/module/e_mod_main.c:219 54#: src/module/e_mod_main.c:219
57msgid "Increase Volume" 55msgid "Increase Volume"
@@ -73,6 +71,18 @@ msgstr "Aumentar Volume"
73msgid "Volume Mute" 71msgid "Volume Mute"
74msgstr "Mudo" 72msgstr "Mudo"
75 73
76#: src/module/e_mod_main.c:455 74#: src/module/e_mod_main.c:240
75msgid "Increase Volume"
76msgstr "Aumentar volume"
77
78#: src/module/e_mod_main.c:248
79msgid "Decrease Volume"
80msgstr "Dimiuir volume"
81
82#: src/module/e_mod_main.c:487
77msgid "Advanced" 83msgid "Advanced"
78msgstr "Avancar" 84msgstr "Avancar"
85
86#: src/module/e_mod_main.c:492
87msgid "Settings"
88msgstr ""
diff --git a/src/lib/common.c b/src/bin/common.c
index 8b7f805..7907d05 100644
--- a/src/lib/common.c
+++ b/src/bin/common.c
@@ -3,7 +3,7 @@
3int _log_domain = -1; 3int _log_domain = -1;
4 4
5Eina_Bool 5Eina_Bool
6epulse_common_init(const char *domain) 6emixer_common_init(const char *domain)
7{ 7{
8 EINA_SAFETY_ON_NULL_RETURN_VAL(domain, EINA_FALSE); 8 EINA_SAFETY_ON_NULL_RETURN_VAL(domain, EINA_FALSE);
9 if (!eina_init()) 9 if (!eina_init())
@@ -36,7 +36,7 @@ epulse_common_init(const char *domain)
36} 36}
37 37
38void 38void
39epulse_common_shutdown(void) 39emixer_common_shutdown(void)
40{ 40{
41 eina_shutdown(); 41 eina_shutdown();
42 42
@@ -46,8 +46,9 @@ epulse_common_shutdown(void)
46 ecore_shutdown(); 46 ecore_shutdown();
47} 47}
48 48
49Evas_Object *epulse_layout_add(Evas_Object *parent, const char *group, 49Evas_Object *
50 const char *style) 50emixer_layout_add(Evas_Object *parent, const char *group,
51 const char *style)
51{ 52{
52 EINA_SAFETY_ON_NULL_RETURN_VAL(group, NULL); 53 EINA_SAFETY_ON_NULL_RETURN_VAL(group, NULL);
53 EINA_SAFETY_ON_NULL_RETURN_VAL(style, NULL); 54 EINA_SAFETY_ON_NULL_RETURN_VAL(style, NULL);
@@ -55,7 +56,8 @@ Evas_Object *epulse_layout_add(Evas_Object *parent, const char *group,
55 Evas_Object *layout = elm_layout_add(parent); 56 Evas_Object *layout = elm_layout_add(parent);
56 if (!elm_layout_theme_set(layout, "layout", group, style)) 57 if (!elm_layout_theme_set(layout, "layout", group, style))
57 { 58 {
58 CRIT("No theme for 'elm/layout/%s/%s' at %s", group, style, EPULSE_THEME); 59 CRIT("No theme for 'elm/layout/%s/%s' at %s", group, style,
60 EMIXER_THEME);
59 evas_object_del(layout); 61 evas_object_del(layout);
60 return NULL; 62 return NULL;
61 } 63 }
diff --git a/src/lib/common.h b/src/bin/common.h
index 304ac37..4a399f9 100644
--- a/src/lib/common.h
+++ b/src/bin/common.h
@@ -6,7 +6,6 @@
6#endif 6#endif
7 7
8#include <Ecore.h> 8#include <Ecore.h>
9#include <Evas.h>
10#include <Elementary.h> 9#include <Elementary.h>
11 10
12#include <stdlib.h> 11#include <stdlib.h>
@@ -15,8 +14,8 @@
15 14
16#include "translation.h" 15#include "translation.h"
17 16
18#define EPULSE_THEME PACKAGE_DATA_DIR"/data/themes/default.edj"
19#define BASE_VOLUME_STEP 10 17#define BASE_VOLUME_STEP 10
18#define EMIXER_THEME PACKAGE_DATA_DIR"/data/themes/default.edj"
20 19
21EAPI extern int _log_domain; 20EAPI extern int _log_domain;
22 21
@@ -26,9 +25,9 @@ EAPI extern int _log_domain;
26#define INF(...) EINA_LOG_DOM_INFO(_log_domain, __VA_ARGS__) 25#define INF(...) EINA_LOG_DOM_INFO(_log_domain, __VA_ARGS__)
27#define DBG(...) EINA_LOG_DOM_DBG(_log_domain, __VA_ARGS__) 26#define DBG(...) EINA_LOG_DOM_DBG(_log_domain, __VA_ARGS__)
28 27
29EAPI Eina_Bool epulse_common_init(const char *domain); 28Eina_Bool emixer_common_init(const char *domain);
30EAPI void epulse_common_shutdown(void); 29void emixer_common_shutdown(void);
31EAPI Evas_Object *epulse_layout_add(Evas_Object *parent, const char *group, 30Evas_Object *emixer_layout_add(Evas_Object *parent, const char *group,
32 const char *style); 31 const char *style);
33 32
34#endif /* __COMMON_H__ */ 33#endif /* __COMMON_H__ */
diff --git a/src/bin/main.c b/src/bin/main.c
index 29f66ee..b74940b 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -10,7 +10,7 @@ elm_main(int argc EINA_UNUSED, char *argv[] EINA_UNUSED)
10{ 10{
11 Evas_Object *win; 11 Evas_Object *win;
12 12
13 EINA_SAFETY_ON_FALSE_RETURN_VAL(epulse_common_init("emixer"), EXIT_FAILURE); 13 EINA_SAFETY_ON_FALSE_RETURN_VAL(emixer_common_init("emixer"), EXIT_FAILURE);
14 EINA_SAFETY_ON_FALSE_RETURN_VAL(emix_init() == EINA_TRUE, EXIT_FAILURE); 14 EINA_SAFETY_ON_FALSE_RETURN_VAL(emix_init() == EINA_TRUE, EXIT_FAILURE);
15 15
16 win = main_window_add(); 16 win = main_window_add();
@@ -20,7 +20,7 @@ elm_main(int argc EINA_UNUSED, char *argv[] EINA_UNUSED)
20 emix_backend_set("PULSEAUDIO"); 20 emix_backend_set("PULSEAUDIO");
21 elm_run(); 21 elm_run();
22 22
23 epulse_common_shutdown(); 23 emixer_common_shutdown();
24 emix_shutdown(); 24 emix_shutdown();
25 return 0; 25 return 0;
26} 26}
diff --git a/src/bin/main_window.c b/src/bin/main_window.c
index 5b49b4a..5399d4c 100644
--- a/src/bin/main_window.c
+++ b/src/bin/main_window.c
@@ -68,7 +68,7 @@ main_window_add(void)
68 Evas_Object *tmp, *box, *icon; 68 Evas_Object *tmp, *box, *icon;
69 char buf[4096]; 69 char buf[4096];
70 70
71 elm_theme_extension_add(NULL, EPULSE_THEME); 71 elm_theme_extension_add(NULL, EMIXER_THEME);
72 mw = calloc(1, sizeof(Main_Window)); 72 mw = calloc(1, sizeof(Main_Window));
73 if (!mw) 73 if (!mw)
74 { 74 {
@@ -85,11 +85,11 @@ main_window_add(void)
85 mw->win = tmp; 85 mw->win = tmp;
86 86
87 icon = evas_object_image_add(evas_object_evas_get(mw->win)); 87 icon = evas_object_image_add(evas_object_evas_get(mw->win));
88 snprintf(buf, sizeof(buf), "%s/icons/terminology.png", 88 snprintf(buf, sizeof(buf), "%s/icons/emixer.png",
89 elm_app_data_dir_get()); 89 elm_app_data_dir_get());
90 evas_object_image_file_set(icon, buf, NULL); 90 evas_object_image_file_set(icon, buf, NULL);
91 elm_win_icon_object_set(mw->win, icon); 91 elm_win_icon_object_set(mw->win, icon);
92 elm_win_icon_name_set(mw->win, "epulse"); 92 elm_win_icon_name_set(mw->win, "emixer");
93 93
94 tmp = elm_bg_add(mw->win); 94 tmp = elm_bg_add(mw->win);
95 evas_object_size_hint_weight_set(tmp, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 95 evas_object_size_hint_weight_set(tmp, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
diff --git a/src/bin/main_window.h b/src/bin/main_window.h
index dd63ae7..b979a68 100644
--- a/src/bin/main_window.h
+++ b/src/bin/main_window.h
@@ -1,7 +1,7 @@
1#ifndef _MAIN_WINDOW_H_ 1#ifndef _MAIN_WINDOW_H_
2#define _MAIN_WINDOW_H_ 2#define _MAIN_WINDOW_H_
3 3
4#include <common.h> 4#include "common.h"
5 5
6#ifdef HAVE_CONFIG_H 6#ifdef HAVE_CONFIG_H
7#include "config.h" 7#include "config.h"
diff --git a/src/bin/playbacks_view.c b/src/bin/playbacks_view.c
index 5ac0a6c..9455e5a 100644
--- a/src/bin/playbacks_view.c
+++ b/src/bin/playbacks_view.c
@@ -254,7 +254,7 @@ playbacks_view_add(Evas_Object *parent)
254 pv = calloc(1, sizeof(struct Playbacks_View)); 254 pv = calloc(1, sizeof(struct Playbacks_View));
255 EINA_SAFETY_ON_NULL_RETURN_VAL(pv, NULL); 255 EINA_SAFETY_ON_NULL_RETURN_VAL(pv, NULL);
256 256
257 layout = epulse_layout_add(parent, "playbacks", "default"); 257 layout = emixer_layout_add(parent, "playbacks", "default");
258 EINA_SAFETY_ON_NULL_GOTO(layout, err); 258 EINA_SAFETY_ON_NULL_GOTO(layout, err);
259 259
260 evas_object_event_callback_add(layout, EVAS_CALLBACK_DEL, _del_cb, pv); 260 evas_object_event_callback_add(layout, EVAS_CALLBACK_DEL, _del_cb, pv);
diff --git a/src/bin/sinks_view.c b/src/bin/sinks_view.c
index 15cfba4..f5a7f70 100644
--- a/src/bin/sinks_view.c
+++ b/src/bin/sinks_view.c
@@ -224,7 +224,7 @@ sinks_view_add(Evas_Object *parent)
224 sv = calloc(1, sizeof(struct Sinks_View)); 224 sv = calloc(1, sizeof(struct Sinks_View));
225 EINA_SAFETY_ON_NULL_RETURN_VAL(sv, NULL); 225 EINA_SAFETY_ON_NULL_RETURN_VAL(sv, NULL);
226 226
227 layout = epulse_layout_add(parent, "sinks", "default"); 227 layout = emixer_layout_add(parent, "sinks", "default");
228 EINA_SAFETY_ON_NULL_GOTO(layout, err); 228 EINA_SAFETY_ON_NULL_GOTO(layout, err);
229 229
230 evas_object_event_callback_add(layout, EVAS_CALLBACK_DEL, _del_cb, sv); 230 evas_object_event_callback_add(layout, EVAS_CALLBACK_DEL, _del_cb, sv);
diff --git a/src/bin/sources_view.c b/src/bin/sources_view.c
index bbf4008..80edee2 100644
--- a/src/bin/sources_view.c
+++ b/src/bin/sources_view.c
@@ -188,7 +188,7 @@ sources_view_add(Evas_Object *parent)
188 sv = calloc(1, sizeof(struct Sources_View)); 188 sv = calloc(1, sizeof(struct Sources_View));
189 EINA_SAFETY_ON_NULL_RETURN_VAL(sv, NULL); 189 EINA_SAFETY_ON_NULL_RETURN_VAL(sv, NULL);
190 190
191 layout = epulse_layout_add(parent, "sources", "default"); 191 layout = emixer_layout_add(parent, "sources", "default");
192 EINA_SAFETY_ON_NULL_GOTO(layout, err); 192 EINA_SAFETY_ON_NULL_GOTO(layout, err);
193 193
194 evas_object_event_callback_add(layout, EVAS_CALLBACK_DEL, _del_cb, sv); 194 evas_object_event_callback_add(layout, EVAS_CALLBACK_DEL, _del_cb, sv);
diff --git a/src/lib/translation.h b/src/bin/translation.h
index 6877b33..6877b33 100644
--- a/src/lib/translation.h
+++ b/src/bin/translation.h
diff --git a/src/lib/backends/pulseaudio/pulse.c b/src/lib/backends/pulseaudio/pulse.c
index 97b9467..5909807 100644
--- a/src/lib/backends/pulseaudio/pulse.c
+++ b/src/lib/backends/pulseaudio/pulse.c
@@ -644,11 +644,11 @@ _subscribe_cb(pa_context *c, pa_subscription_event_type_t t,
644 } 644 }
645} 645}
646 646
647static Eina_Bool _epulse_connect(void *data); 647static Eina_Bool _pulse_connect(void *data);
648static void _disconnect_cb(); 648static void _disconnect_cb();
649 649
650static void 650static void
651_epulse_pa_state_cb(pa_context *context, void *data) 651_pulse_pa_state_cb(pa_context *context, void *data)
652{ 652{
653 pa_operation *o; 653 pa_operation *o;
654 654
@@ -715,7 +715,7 @@ _epulse_pa_state_cb(pa_context *context, void *data)
715 case PA_CONTEXT_FAILED: 715 case PA_CONTEXT_FAILED:
716 WRN("PA_CONTEXT_FAILED"); 716 WRN("PA_CONTEXT_FAILED");
717 _disconnect_cb(); 717 _disconnect_cb();
718 _epulse_connect(data); 718 _pulse_connect(data);
719 return; 719 return;
720 720
721 case PA_CONTEXT_TERMINATED: 721 case PA_CONTEXT_TERMINATED:
@@ -727,7 +727,7 @@ _epulse_pa_state_cb(pa_context *context, void *data)
727} 727}
728 728
729static Eina_Bool 729static Eina_Bool
730_epulse_connect(void *data) 730_pulse_connect(void *data)
731{ 731{
732 pa_proplist *proplist; 732 pa_proplist *proplist;
733 Context *c = data; 733 Context *c = data;
@@ -744,7 +744,7 @@ _epulse_connect(void *data)
744 goto err; 744 goto err;
745 } 745 }
746 746
747 pa_context_set_state_callback(c->context, _epulse_pa_state_cb, c); 747 pa_context_set_state_callback(c->context, _pulse_pa_state_cb, c);
748 if (pa_context_connect(c->context, NULL, PA_CONTEXT_NOFLAGS, NULL) < 0) 748 if (pa_context_connect(c->context, NULL, PA_CONTEXT_NOFLAGS, NULL) < 0)
749 { 749 {
750 WRN("Could not connect to pulse"); 750 WRN("Could not connect to pulse");
@@ -784,10 +784,10 @@ _init(sink_event_cb sink_cb, sink_input_event_cb input_cb,
784 ctx->api.userdata = ctx; 784 ctx->api.userdata = ctx;
785 785
786 /* The reason of compares with EINA_TRUE is because ECORE_CALLBACK_RENEW 786 /* The reason of compares with EINA_TRUE is because ECORE_CALLBACK_RENEW
787 is EINA_TRUE. The function _epulse_connect returns ECORE_CALLBACK_RENEW 787 is EINA_TRUE. The function _pulse_connect returns ECORE_CALLBACK_RENEW
788 when could not connect to pulse. 788 when could not connect to pulse.
789 */ 789 */
790 if (_epulse_connect(ctx) == EINA_TRUE) 790 if (_pulse_connect(ctx) == EINA_TRUE)
791 { 791 {
792 free(ctx); 792 free(ctx);
793 ctx = NULL; 793 ctx = NULL;
diff --git a/src/module/e_mod_main.c b/src/module/e_mod_main.c
index ff9df28..e69365e 100644
--- a/src/module/e_mod_main.c
+++ b/src/module/e_mod_main.c
@@ -1,15 +1,16 @@
1#include <common.h>
2
3#include <e.h> 1#include <e.h>
4#include <Eina.h> 2#include <Eina.h>
5#include <emix.h> 3#include <emix.h>
6#include "e_mod_main.h" 4#include "e_mod_main.h"
7#include "e_mod_config.h" 5#include "e_mod_config.h"
6#include "translation.h"
8 7
9#define VOLUME_STEP BASE_VOLUME_STEP 8#define VOLUME_STEP 10
10 9
11int _e_emix_log_domain; 10int _e_emix_log_domain;
12 11
12#define DBG(...) EINA_LOG_DOM_DBG(_e_emix_log_domain, __VA_ARGS__)
13
13/* module requirements */ 14/* module requirements */
14EAPI E_Module_Api e_modapi = 15EAPI E_Module_Api e_modapi =
15 { 16 {
@@ -44,7 +45,7 @@ typedef struct _Context Context;
44struct _Context 45struct _Context
45{ 46{
46 char *theme; 47 char *theme;
47 Ecore_Exe *epulse; 48 Ecore_Exe *emixer;
48 Ecore_Event_Handler *disconnected_handler; 49 Ecore_Event_Handler *disconnected_handler;
49 Ecore_Event_Handler *ready_handler; 50 Ecore_Event_Handler *ready_handler;
50 Ecore_Event_Handler *emix_event_handler; 51 Ecore_Event_Handler *emix_event_handler;
@@ -312,10 +313,10 @@ _popup_comp_del_cb(void *data, Evas_Object *obj EINA_UNUSED)
312} 313}
313 314
314static Eina_Bool 315static Eina_Bool
315_epulse_del_cb(void *data EINA_UNUSED, int type EINA_UNUSED, 316_emixer_del_cb(void *data EINA_UNUSED, int type EINA_UNUSED,
316 void *info EINA_UNUSED) 317 void *info EINA_UNUSED)
317{ 318{
318 mixer_context->epulse = NULL; 319 mixer_context->emixer = NULL;
319 if (mixer_context->emix_event_handler) 320 if (mixer_context->emix_event_handler)
320 ecore_event_handler_del(mixer_context->emix_event_handler); 321 ecore_event_handler_del(mixer_context->emix_event_handler);
321 322
@@ -323,19 +324,19 @@ _epulse_del_cb(void *data EINA_UNUSED, int type EINA_UNUSED,
323} 324}
324 325
325static void 326static void
326_epulse_exec_cb(void *data, void *data2 EINA_UNUSED) 327_emixer_exec_cb(void *data, void *data2 EINA_UNUSED)
327{ 328{
328 Instance *inst = data; 329 Instance *inst = data;
329 330
330 _popup_del(inst); 331 _popup_del(inst);
331 if (mixer_context->epulse) 332 if (mixer_context->emixer)
332 return; 333 return;
333 334
334 mixer_context->epulse = ecore_exe_run("epulse", NULL); 335 mixer_context->emixer = ecore_exe_run("emixer", NULL);
335 if (mixer_context->emix_event_handler) 336 if (mixer_context->emix_event_handler)
336 ecore_event_handler_del(mixer_context->emix_event_handler); 337 ecore_event_handler_del(mixer_context->emix_event_handler);
337 mixer_context->emix_event_handler = 338 mixer_context->emix_event_handler =
338 ecore_event_handler_add(ECORE_EXE_EVENT_DEL, _epulse_del_cb, NULL); 339 ecore_event_handler_add(ECORE_EXE_EVENT_DEL, _emixer_del_cb, NULL);
339} 340}
340 341
341static void 342static void
@@ -444,7 +445,7 @@ _popup_new(Instance *inst)
444 NULL); 445 NULL);
445 446
446 button = e_widget_button_add(evas, NULL, "preferences-system", 447 button = e_widget_button_add(evas, NULL, "preferences-system",
447 _epulse_exec_cb, inst, NULL); 448 _emixer_exec_cb, inst, NULL);
448 e_widget_list_object_append(list, button, 1, 0, 0.5); 449 e_widget_list_object_append(list, button, 1, 0, 0.5);
449 450
450 e_widget_size_min_get(list, &mw, &mh); 451 e_widget_size_min_get(list, &mw, &mh);
@@ -462,7 +463,7 @@ _popup_new(Instance *inst)
462static void 463static void
463_menu_cb(void *data, E_Menu *menu EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) 464_menu_cb(void *data, E_Menu *menu EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED)
464{ 465{
465 _epulse_exec_cb(data, NULL); 466 _emixer_exec_cb(data, NULL);
466} 467}
467 468
468static void 469static void
diff --git a/src/module/translation.h b/src/module/translation.h
new file mode 100644
index 0000000..6877b33
--- /dev/null
+++ b/src/module/translation.h
@@ -0,0 +1,14 @@
1#ifndef __TRANSLATION_H__
2#define __TRANSLATION_H__
3
4#include <libintl.h>
5
6
7#define _(str) gettext(str)
8#define d_(str, dom) dgettext(dom, str)
9#define P_(str, str_p, n) ngettext(str, str_p, n)
10#define dP_(str, str_p, n, dom) dngettext(dom, str, str_p, n)
11#define N_(str) str
12#define NP_(str, str_p) str, str_p
13
14#endif /* __TRANSLATION_H__ */