add $mixer docs

git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1262 7f574dfc-610e-0410-a909-a81674777703

README

@@ -1076,6 +1076,43 @@ conky(1)							      conky(1)
 	      Percentage of memory in use
 
 
+       1mmixer (device)0m
+	      Prints  the  mixer value as reported by the OS. Default mixer is
+	      "vol", but you can specify one of the following  optional	 argu‐
+	      ments:  "vol",  "bass",  "treble",  "synth",  "pcm",  "speaker",
+	      "line", "mic", "cd", "mix",  "pcm2",  "rec",  "igain",  "ogain",
+	      "line1",	"line2",  "line3",  "dig1",  "dig2",  "dig3",  "phin",
+	      "phout", "video", "radio", "monitor". Refer to the definition of
+	      SOUND_DEVICE_NAMES  in  <linux/soundcard.h>  (on Linux), <sound‐
+	      card.h> (on OpenBSD), or <sys/soundcard.h> to find the exact op‐
+	      tions available on your system.
+
+
+       1mmixerbar (device)0m
+	      Displays	mixer  value  in a bar as reported by the OS. See docs
+	      for $mixer for details on arguments.
+
+
+       1mmixerr (device)0m
+	      Prints the right channel mixer value as reported by the OS.  See
+	      docs for $mixer for details on arguments.
+
+
+       1mmixerrbar (device)0m
+	      Displays	the  right channel mixer value in a bar as reported by
+	      the OS. See docs for $mixer for details on arguments.
+
+
+       1mmixerl (device)0m
+	      Prints the left channel mixer value as reported by the  OS.  See
+	      docs for $mixer for details on arguments.
+
+
+       1mmixerlbar (device)0m
+	      Displays	the  left  channel mixer value in a bar as reported by
+	      the OS. See docs for $mixer for details on arguments.
+
+
        1mmoc_state0m
 	      Current state of MOC; playing, stopped etc.
 
@@ -1681,4 +1718,4 @@ conky(1)							      conky(1)
 
 
 
-				  2008-09-11			      conky(1)
+				  2008-09-28			      conky(1)

doc/conky.1

@@ -5,7 +5,7 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH conky 1 2008-09-11 "" ""
+.TH conky 1 2008-09-28 "" ""
 .SH NAME
 conky \- A system monitor for X originally based on the torsmo code, but more kickass. It just keeps on given'er. Yeah.
 .SH SYNOPSIS
@@ -908,6 +908,30 @@ Total amount of memory
 \fB\*(T<\fBmemperc\fR\*(T>\fR 
 Percentage of memory in use
 
+.TP 
+\fB\*(T<\fBmixer\fR\*(T>\fR \*(T<\fB(device)\fR\*(T> 
+Prints the mixer value as reported by the OS. Default mixer is "vol", but you can specify one of the following optional arguments: "vol", "bass", "treble", "synth", "pcm", "speaker", "line", "mic", "cd", "mix", "pcm2", "rec", "igain", "ogain", "line1", "line2", "line3", "dig1", "dig2", "dig3", "phin", "phout", "video", "radio", "monitor". Refer to the definition of SOUND_DEVICE_NAMES in <linux/soundcard.h> (on Linux), <soundcard.h> (on OpenBSD), or <sys/soundcard.h> to find the exact options available on your system.
+
+.TP 
+\fB\*(T<\fBmixerbar\fR\*(T>\fR \*(T<\fB(device)\fR\*(T> 
+Displays mixer value in a bar as reported by the OS. See docs for $mixer for details on arguments.
+
+.TP 
+\fB\*(T<\fBmixerr\fR\*(T>\fR \*(T<\fB(device)\fR\*(T> 
+Prints the right channel mixer value as reported by the OS. See docs for $mixer for details on arguments.
+
+.TP 
+\fB\*(T<\fBmixerrbar\fR\*(T>\fR \*(T<\fB(device)\fR\*(T> 
+Displays the right channel mixer value in a bar as reported by the OS. See docs for $mixer for details on arguments.
+
+.TP 
+\fB\*(T<\fBmixerl\fR\*(T>\fR \*(T<\fB(device)\fR\*(T> 
+Prints the left channel mixer value as reported by the OS. See docs for $mixer for details on arguments.
+
+.TP 
+\fB\*(T<\fBmixerlbar\fR\*(T>\fR \*(T<\fB(device)\fR\*(T> 
+Displays the left channel mixer value in a bar as reported by the OS. See docs for $mixer for details on arguments.
+
 .TP 
 \fB\*(T<\fBmoc_state\fR\*(T>\fR 
 Current state of MOC; playing, stopped etc.

doc/docs.xml

@@ -16,7 +16,7 @@
 			<firstname>Brenden</firstname>
 			<surname>Matthews</surname>
 		</author>
-		<date>2008-09-11</date>
+		<date>2008-09-28</date>
 	</refentryinfo>
 
 	<refmeta>

doc/variables.xml

@@ -1248,6 +1248,66 @@
 			<para></para></listitem>
 	</varlistentry>
 
+	<varlistentry>
+		<term>
+			<command><option>mixer</option></command>
+			<option>(device)</option>
+		</term>
+		<listitem>
+			Prints the mixer value as reported by the OS.  Default mixer is "vol", but you can specify one of the following optional arguments: "vol", "bass", "treble", "synth", "pcm", "speaker", "line", "mic", "cd", "mix", "pcm2", "rec", "igain", "ogain", "line1", "line2", "line3", "dig1", "dig2", "dig3", "phin", "phout", "video", "radio", "monitor".  Refer to the definition of SOUND_DEVICE_NAMES in &lt;linux/soundcard.h&gt; (on Linux), &lt;soundcard.h&gt; (on OpenBSD), or &lt;sys/soundcard.h&gt; to find the exact options available on your system.
+			<para></para></listitem>
+	</varlistentry>
+
+	<varlistentry>
+		<term>
+			<command><option>mixerbar</option></command>
+			<option>(device)</option>
+		</term>
+		<listitem>
+			Displays mixer value in a bar as reported by the OS.  See docs for $mixer for details on arguments.
+			<para></para></listitem>
+	</varlistentry>
+
+	<varlistentry>
+		<term>
+			<command><option>mixerr</option></command>
+			<option>(device)</option>
+		</term>
+		<listitem>
+			Prints the right channel mixer value as reported by the OS.  See docs for $mixer for details on arguments.
+			<para></para></listitem>
+	</varlistentry>
+
+	<varlistentry>
+		<term>
+			<command><option>mixerrbar</option></command>
+			<option>(device)</option>
+		</term>
+		<listitem>
+			Displays the right channel mixer value in a bar as reported by the OS.  See docs for $mixer for details on arguments.
+			<para></para></listitem>
+	</varlistentry>
+
+	<varlistentry>
+		<term>
+			<command><option>mixerl</option></command>
+			<option>(device)</option>
+		</term>
+		<listitem>
+			Prints the left channel mixer value as reported by the OS.  See docs for $mixer for details on arguments.
+			<para></para></listitem>
+	</varlistentry>
+
+	<varlistentry>
+		<term>
+			<command><option>mixerlbar</option></command>
+			<option>(device)</option>
+		</term>
+		<listitem>
+			Displays the left channel mixer value in a bar as reported by the OS.  See docs for $mixer for details on arguments.
+			<para></para></listitem>
+	</varlistentry>
+
 	<varlistentry>
 		<term>
 			<command><option>moc_state</option></command>

src/mixer.c

@@ -65,6 +65,7 @@ int mixer_init(const char *name)
 
 	for (i = 0; i < sizeof(devs) / sizeof(const char *); i++) {
 		if (strcasecmp(devs[i], name) == 0) {
+			printf("dicks @ %i\n", i);
 			return i;
 		}
 	}