From 7a250babed5c1319e4e80f288e64bb0bb089ef2b Mon Sep 17 00:00:00 2001
From: waker <wakeroid@gmail.com>
Date: Thu, 31 Mar 2011 22:15:20 +0200
Subject: don't localize alsa plugin name; added IDs to alsa, pulseaudio and
 null out plugins

---
 plugins/alsa/alsa.c       | 1 +
 plugins/gtkui/prefwin.c   | 4 ++--
 plugins/nullout/nullout.c | 1 +
 plugins/pulse/pulse.c     | 1 +
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/plugins/alsa/alsa.c b/plugins/alsa/alsa.c
index 6d619cf1..b5de58ac 100644
--- a/plugins/alsa/alsa.c
+++ b/plugins/alsa/alsa.c
@@ -761,6 +761,7 @@ static DB_output_t plugin = {
     .plugin.version_major = 1,
     .plugin.version_minor = 0,
     .plugin.type = DB_PLUGIN_OUTPUT,
+    .plugin.id = "alsa",
     .plugin.name = "ALSA output plugin",
     .plugin.descr = "plays sound through linux standard alsa library",
     .plugin.copyright = 
diff --git a/plugins/gtkui/prefwin.c b/plugins/gtkui/prefwin.c
index cb1985c0..75fe5d61 100644
--- a/plugins/gtkui/prefwin.c
+++ b/plugins/gtkui/prefwin.c
@@ -470,7 +470,7 @@ on_preferences_activate                (GtkMenuItem     *menuitem,
     // output plugin selection
     combobox = GTK_COMBO_BOX (lookup_widget (w, "pref_output_plugin"));
 
-    const char *outplugname = deadbeef->conf_get_str_fast ("output_plugin", _("ALSA output plugin"));
+    const char *outplugname = deadbeef->conf_get_str_fast ("output_plugin", "ALSA output plugin");
     DB_output_t **out_plugs = deadbeef->plug_get_output_list ();
     for (int i = 0; out_plugs[i]; i++) {
         gtk_combo_box_append_text (combobox, out_plugs[i]->plugin.name);
@@ -667,7 +667,7 @@ on_pref_output_plugin_changed          (GtkComboBox     *combobox,
     DB_output_t *new = NULL;
 
     deadbeef->conf_lock ();
-    const char *outplugname = deadbeef->conf_get_str_fast ("output_plugin", _("ALSA output plugin"));
+    const char *outplugname = deadbeef->conf_get_str_fast ("output_plugin", "ALSA output plugin");
     for (int i = 0; out_plugs[i]; i++) {
         if (!strcmp (out_plugs[i]->plugin.name, outplugname)) {
             prev = out_plugs[i];
diff --git a/plugins/nullout/nullout.c b/plugins/nullout/nullout.c
index 39405ccf..c568f5d2 100644
--- a/plugins/nullout/nullout.c
+++ b/plugins/nullout/nullout.c
@@ -194,6 +194,7 @@ static DB_output_t plugin = {
     .plugin.version_major = 1,
     .plugin.version_minor = 0,
     .plugin.type = DB_PLUGIN_OUTPUT,
+    .plugin.id = "nullout",
     .plugin.name = "null output plugin",
     .plugin.descr = "doesn't play anything",
     .plugin.copyright = 
diff --git a/plugins/pulse/pulse.c b/plugins/pulse/pulse.c
index 2a9ed27a..3a6eacbd 100644
--- a/plugins/pulse/pulse.c
+++ b/plugins/pulse/pulse.c
@@ -359,6 +359,7 @@ static DB_output_t plugin =
     .plugin.version_major = 0,
     .plugin.version_minor = 1,
     .plugin.type = DB_PLUGIN_OUTPUT,
+    .plugin.id = "pulseaudio",
     .plugin.name = "PulseAudio output plugin",
     .plugin.descr = "At the moment of this writing, PulseAudio seems to be very unstable in many (or most) GNU/Linux distributions.\nIf you experience problems - please try switching to ALSA or OSS output.\nIf that doesn't help - please uninstall PulseAudio from your system, and try ALSA or OSS again.\nThanks for understanding",
     .plugin.copyright =
-- 
cgit v1.2.3