DeforaOS/Mixer
DeforaOS/Mixer
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Code cleanup

Browse Source
This commit is contained in:
Pierre Pronchery 2011-08-21 22:40:12 +00:00
parent d38b3e3e8c
commit e738a2f4dc
2 changed files with 40 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
po/fr.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mixer 0.0.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-08-22 00:24+0200\n"
"POT-Creation-Date: 2011-08-22 00:39+0200\n"
"PO-Revision-Date: 2010-04-23 04:08+0200\n"
"Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
"Language-Team: French\n"
@ -84,26 +84,26 @@ msgstr "_Vue"
msgid "_Help"
msgstr "_Aide"
#: ../src/mixer.c:514
#: ../src/mixer.c:523
msgid "Bind"
msgstr "Lier"
#: ../src/mixer.c:669
#: ../src/mixer.c:678
msgid "Mixer properties"
msgstr "Propriétés du mixer"
#: ../src/mixer.c:685
#: ../src/mixer.c:694
msgid "Name: "
msgstr "Nom : "
#: ../src/mixer.c:695
#: ../src/mixer.c:704
msgid "Version: "
msgstr "Version : "
#: ../src/mixer.c:705
#: ../src/mixer.c:714
msgid "Device: "
msgstr "Carte : "
#: ../src/mixer.c:794 ../src/mixer.c:799
#: ../src/mixer.c:803 ../src/mixer.c:808
msgid "Error"
msgstr "Erreur"

57
src/mixer.c
View File

@ -368,43 +368,52 @@ static GtkWidget * _new_frame_label(GdkPixbuf * pixbuf, char const * name,
GtkIconTheme * icontheme;
GtkWidget * hbox;
GtkWidget * widget;
struct
{
char const * name;
char const * icon;
} icons[] = {
{ "cd", "media-cdrom" },
{ "line", "stock_line-in" },
{ "master", "audio-volume-high" },
{ "mic", "audio-input-microphone"},
{ "pcm", "audio-volume-high" },
{ "rec", "gtk-media-record" },
{ "source", "stock_line-in" },
{ "vol", "audio-volume-high" }
};
size_t i;
icontheme = gtk_icon_theme_get_default();
hbox = gtk_hbox_new(FALSE, 4);
for(i = 0; pixbuf == NULL && i < sizeof(icons) / sizeof(*icons); i++)
if(strncmp(icons[i].name, name, strlen(icons[i].name)) == 0)
pixbuf = gtk_icon_theme_load_icon(icontheme,
icons[i].icon, 16,
#if GTK_CHECK_VERSION(2, 12, 0)
GTK_ICON_LOOKUP_GENERIC_FALLBACK, NULL);
#else
0, NULL);
#endif
if(pixbuf == NULL)
{
if(strncmp(name, "cd", 2) == 0)
pixbuf = gtk_icon_theme_load_icon(icontheme,
"media-cdrom", 16,
GTK_ICON_LOOKUP_GENERIC_FALLBACK, NULL);
else if(strncmp(name, "line", 4) == 0
|| strncmp(name, "source", 5) == 0)
pixbuf = gtk_icon_theme_load_icon(icontheme,
"stock_line-in", 16,
GTK_ICON_LOOKUP_GENERIC_FALLBACK, NULL);
else if(strncmp(name, "master", 6) == 0
|| strncmp(name, "pcm", 3) == 0
|| strncmp(name, "vol", 3) == 0)
pixbuf = gtk_icon_theme_load_icon(icontheme,
"audio-volume-high", 16,
GTK_ICON_LOOKUP_GENERIC_FALLBACK, NULL);
else if(strncmp(name, "mic", 3) == 0)
pixbuf = gtk_icon_theme_load_icon(icontheme,
"audio-input-microphone", 16,
GTK_ICON_LOOKUP_GENERIC_FALLBACK, NULL);
else if(strncmp(name, "rec", 3) == 0)
pixbuf = gtk_icon_theme_load_icon(icontheme,
"gtk-media-record", 16,
GTK_ICON_LOOKUP_GENERIC_FALLBACK, NULL);
/* more generic fallbacks */
else if(strstr(name, "sel") != NULL)
if(strstr(name, "sel") != NULL)
pixbuf = gtk_icon_theme_load_icon(icontheme,
"stock_line-in", 16,
#if GTK_CHECK_VERSION(2, 12, 0)
GTK_ICON_LOOKUP_GENERIC_FALLBACK, NULL);
#else
0, NULL);
#endif
else if(strstr(name, ".mute") != NULL)
pixbuf = gtk_icon_theme_load_icon(icontheme,
"audio-volume-muted", 16,
#if GTK_CHECK_VERSION(2, 12, 0)
GTK_ICON_LOOKUP_GENERIC_FALLBACK, NULL);
#else
0, NULL);
#endif
}
if(pixbuf != NULL)
{