3 files changed, 66 insertions, 3 deletions

diff --git a/config.c b/config.c
index 614863bf..d2ad4f12 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'xineliboutput.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c,v 1.30 2007-03-17 15:48:21 phintuka Exp $
+ * $Id: config.c,v 1.31 2007-03-25 02:39:26 phintuka Exp $
  *
  */
 
@@ -250,6 +250,7 @@ config_t::config_t() {
   headphone = 0;
   audio_upmix = 0;
   audio_surround = 0;
+  sw_volume_control = 0;
 
   decoder_priority     = DECODER_PRIORITY_NORMAL;
   pes_buffers          = i_pesBufferSize[PES_BUFFERS_SMALL_250];
@@ -467,6 +468,7 @@ bool config_t::SetupParse(const char *Name, const char *Value)
   else if (!strcasecmp(Name, "Audio.Surround"))  audio_surround = atoi(Value);
   else if (!strcasecmp(Name, "Audio.Upmix"))     audio_upmix = atoi(Value);
   else if (!strcasecmp(Name, "Audio.Headphone")) headphone = atoi(Value);
+  else if (!strcasecmp(Name, "Audio.SoftwareVolumeControl")) sw_volume_control = atoi(Value);
 
   else if (!strcasecmp(Name, "OSD.HideMainMenu"))   hide_main_menu = atoi(Value);
   else if (!strcasecmp(Name, "OSD.Prescale"))       prescale_osd = atoi(Value);
diff --git a/config.h b/config.h
index 63ef71dc..59863e61 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'xineliboutput.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h,v 1.20 2007-03-17 15:48:21 phintuka Exp $
+ * $Id: config.h,v 1.21 2007-03-25 02:39:26 phintuka Exp $
  *
  */
 
@@ -186,6 +186,7 @@ class config_t {
     int  audio_surround;
     int  headphone;
     int  audio_upmix;
+    int  sw_volume_control; /* software (xine-lib) or hardware (alsa) volume control and muting */
     
     int  decoder_priority;
     int  pes_buffers;
diff --git a/i18n.c b/i18n.c
index fb755182..2ccb822a 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'xineliboutput.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c,v 1.16 2007-03-06 17:40:23 phintuka Exp $
+ * $Id: i18n.c,v 1.17 2007-03-25 02:38:54 phintuka Exp $
  *
  * Translations provided by:
  *
@@ -3492,6 +3492,66 @@ const tI18nPhrase Phrases[] = {
     "", // Russian
     "", // Croatian
   },
+  {
+    "Volume control", // English
+    "", // Deutsch
+    "", // Slovenski
+    "", // Italiano
+    "", // Nederlands
+    "", // Portugu<EA>s
+    "", // Fran<E7>ais
+    "", // Norsk
+    "Äänenvoimakkuuden säätö", // Suomi
+    "", // Polski
+    "", // Espa<F1>ol
+    "", // Ellinika
+    "", // Svenska
+    "", // Romaneste
+    "", // Magyar
+    "", // Catala
+    "", // Russian
+    "", // Croatian
+  },
+  {
+    "Hardware", // English
+    "", // Deutsch
+    "", // Slovenski
+    "", // Italiano
+    "", // Nederlands
+    "", // Portugu<EA>s
+    "", // Fran<E7>ais
+    "", // Norsk
+    "Laitteistolla", // Suomi
+    "", // Polski
+    "", // Espa<F1>ol
+    "", // Ellinika
+    "", // Svenska
+    "", // Romaneste
+    "", // Magyar
+    "", // Catala
+    "", // Russian
+    "", // Croatian
+  },
+  {
+    "Software", // English
+    "", // Deutsch
+    "", // Slovenski
+    "", // Italiano
+    "", // Nederlands
+    "", // Portugu<EA>s
+    "", // Fran<E7>ais
+    "", // Norsk
+    "Ohjelmallisesti", // Suomi
+    "", // Polski
+    "", // Espa<F1>ol
+    "", // Ellinika
+    "", // Svenska
+    "", // Romaneste
+    "", // Magyar
+    "", // Catala
+    "", // Russian
+    "", // Croatian
+  },
 
 #if 0
   {