Merge branch 'maint'

[paraslash.git] / fade.c

diff --git a/fade.c b/fade.c
index 44904ac54088124f695a63bb62a7e49867442f78..8eeb79e7d3f335b08ed1d2b8f3606e2fdec4cd6d 100644 (file)
--- a/fade.c
+++ b/fade.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1998-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1998-2011 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -46,6 +46,7 @@ __printf_2_3 void para_log(__a_unused int ll, const char *fmt, ...)
  */
 static int open_mixer(void)
 {
+       PARA_INFO_LOG("opening %s\n", conf.mixer_device_arg);
        return para_open(conf.mixer_device_arg, O_RDWR, 42);
 }
 
@@ -107,7 +108,7 @@ static int open_and_set_mixer_channel(int volume)
 
 static void fixup_mixer_channel_arg(void)
 {
-       int val;
+       int val = SOUND_MIXER_VOLUME; /* STFU, gcc */
 
        switch (conf.mixer_channel_arg) {
                case mixer_channel_arg_volume: val = SOUND_MIXER_VOLUME; break;