Merge branch 'xft' of ssh://git.ucw.cz/home/mj/GIT/osdd into xft

osd-alsa.c

@@ -66,7 +66,7 @@ static int get_mute(void)
       for (snd_mixer_selem_channel_id_t ch=0; ch < SND_MIXER_SCHN_LAST; ch++)
 	{
 	  int val;
-	  if (snd_mixer_selem_get_playback_switch(elem, ch, &val))
+	  if (!snd_mixer_selem_get_playback_switch(elem, ch, &val))
 	    {
 	      if (val)
 		mute_off++;
@@ -92,7 +92,7 @@ static long get_volume(long *pmin, long *pmax)
   for (snd_mixer_selem_channel_id_t ch=0; ch < SND_MIXER_SCHN_LAST; ch++)
     {
       long val;
-      if (snd_mixer_selem_get_playback_volume(elem, ch, &val))
+      if (!snd_mixer_selem_get_playback_volume(elem, ch, &val))
 	{
 	  if (val > curr)
 	    curr = val;
@@ -126,7 +126,6 @@ static void show_mixer(void)
   char buf[256];
   snprintf(buf, sizeof(buf), "%s volume", mixer_control);
   osd_add_line(msg, NULL, buf);
-  osd_add_line(msg, NULL, "");
   if (muted)
     osd_add_line(msg, NULL, "[mute]");
   else if (min < max)