Merge remote-tracking branch 'fml/master'
authorAndre Noll <maan@systemlinux.org>
Wed, 16 Mar 2011 19:28:29 +0000 (20:28 +0100)
committerAndre Noll <maan@systemlinux.org>
Wed, 16 Mar 2011 19:28:29 +0000 (20:28 +0100)
fade.c

diff --git a/fade.c b/fade.c
index 8eeb79e..5fbd0dd 100644 (file)
--- a/fade.c
+++ b/fade.c
@@ -125,6 +125,7 @@ static void fixup_mixer_channel_arg(void)
                case mixer_channel_arg_reclev: val = SOUND_MIXER_RECLEV; break;
                case mixer_channel_arg_igain: val = SOUND_MIXER_IGAIN; break;
                case mixer_channel_arg_ogain: val = SOUND_MIXER_OGAIN; break;
+               default: break;
        }
        conf.mixer_channel_arg = val;
 }
@@ -344,15 +345,15 @@ int main(int argc, char *argv[])
        }
        fixup_mixer_channel_arg();
        switch (conf.mode_arg) {
-       case mode_arg_sleep:
-               ret = sweet_dreams();
-               break;
        case mode_arg_fade:
                ret = fade(conf.fade_vol_arg, conf.fade_time_arg);
                break;
        case mode_arg_snooze:
                ret = snooze();
                break;
+       default: /* sleep mode */
+               ret = sweet_dreams();
+               break;
        }
        if (ret < 0)
                PARA_EMERG_LOG("%s\n", para_strerror(-ret));