[Pkg-wmaker-commits] [wmrack] 15/97: add new short mixer device names

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch master
in repository wmrack.

commit c8736afa392cd2be7fdd253ef3d894343d687fdc
Author: Chris Waters <xtifr.w at gmail.com>
Date:   Thu Mar 8 16:59:31 2012 -0800

    add new short mixer device names
---
 mixer.c  | 9 ++++++---
 wmrack.c | 5 ++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/mixer.c b/mixer.c
index f5889ef..a6f99b1 100644
--- a/mixer.c
+++ b/mixer.c
@@ -1,5 +1,5 @@
 /*
- * $Id: mixer.c,v 1.1.1.1 2001/02/12 22:25:53 xtifr Exp $
+ * $Id: mixer.c,v 1.1.1.1.2.1 2003/09/30 01:56:55 xtifr Exp $
  *
  * mixer utility functions for WMRack
  *
@@ -23,8 +23,11 @@
 
 char *mixer_labels[]=SOUND_DEVICE_LABELS;
 char *mixer_names[]=SOUND_DEVICE_NAMES;
-char *mixer_shortnames[]={"VO", "BA", "TR", "SY", "PC", "SP", "LI", "MI",
-			  "CD", "MX", "P2", "RE", "IG", "OG", "L1", "L2", "L3"};
+char *mixer_shortnames[]={"VO", "BA", "TR", "SY", "PC", "SP",
+			  "LI", "MI", "CD", "MX", "P2", "RE",
+			  "IG", "OG", "L1", "L2", "L3",
+			  "D1", "D2", "D3", "PI", "PO",
+			  "VI", "RA", "MO"};
 int mixer_devices=SOUND_MIXER_NRDEVICES;
 
 /*
diff --git a/wmrack.c b/wmrack.c
index 6f47d21..6e4a1d8 100644
--- a/wmrack.c
+++ b/wmrack.c
@@ -1,5 +1,5 @@
 /*
- * $Id: wmrack.c,v 1.2.2.3 2003/09/30 00:50:01 xtifr Exp $
+ * $Id: wmrack.c,v 1.2.2.4 2003/09/30 01:56:55 xtifr Exp $
  *
  * WMRack - WindowMaker Sound Control Panel
  *
@@ -1532,8 +1532,7 @@ loadMixerRC ()
 	fprintf (stderr, "wmrack: setting default mixer_order\n");
 #endif
 	for (j = i = 0; i < mixer_devices; i++)
-	    /* next line is a bit of a hack... */
-	    if (mixer_isdevice (mixer, i) && mixer_shortnames[i])
+	    if (mixer_isdevice (mixer, i))
 		mixer_order[j++] = i;
 	mixer_max = j;
     }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmrack.git