Merge branch 'refs/heads/t/format-signedness'

[paraslash.git] / fade.c

diff --git a/fade.c b/fade.c
index 95bb1d59ffd60f277f4569e44c8909c3fe060c76..2a001ebacde964eb1f710413540cc23f2bc85699 100644 (file)
--- a/fade.c
+++ b/fade.c
@@ -67,7 +67,7 @@ static int fade(struct mixer *m, struct mixer_handle *h, int new_vol, int fade_t
        if (ret < 0)
                goto out;
        vol = ret;
        if (ret < 0)
                goto out;
        vol = ret;

-       PARA_NOTICE_LOG("fading %s from %d to %d in %d seconds\n",
+       PARA_NOTICE_LOG("fading %s from %d to %d in %u seconds\n",

                conf.mixer_channel_arg, vol, new_vol, secs);
        diff = new_vol - vol;
        if (!diff) {
                conf.mixer_channel_arg, vol, new_vol, secs);
        diff = new_vol - vol;
        if (!diff) {


@@ -203,7 +203,7 @@ static int sweet_dreams(struct mixer *m, struct mixer_handle *h)
                tm = localtime(&t1);
        }
        wake_time_epoch = mktime(tm);
                tm = localtime(&t1);
        }
        wake_time_epoch = mktime(tm);

-       PARA_INFO_LOG("waketime: %u:%02u\n", tm->tm_hour, tm->tm_min);
+       PARA_INFO_LOG("waketime: %d:%02d\n", tm->tm_hour, tm->tm_min);

        client_cmd("stop");
        sleep(1);
        if (fot) {
        client_cmd("stop");
        sleep(1);
        if (fot) {