Rewrite chunk queueing.

[paraslash.git] / fade.c

diff --git a/fade.c b/fade.c
index 8da91134a5208d36700e6aba4aafbc02ebc685ff..d9834a2b173eeffc2b3bc6744e20065ea2052647 100644 (file)
--- a/fade.c
+++ b/fade.c
@@ -1,19 +1,7 @@
 /*
  * Copyright (C) 1998-2007 Andre Noll <maan@systemlinux.org>
  *
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file fade.c a volume fader and alarm clock */
@@ -55,11 +43,7 @@ void para_log(__a_unused int ll, const char *fmt,...)
  */
 static int open_mixer(void)
 {
-       int mixer_fd;
-
-       if ((mixer_fd = open(conf.mixer_device_arg, O_RDWR, 0)) < 0)
-               return -1;
-       return mixer_fd;
+       return open(conf.mixer_device_arg, O_RDWR, 0);
 }
 
 /*
@@ -96,10 +80,10 @@ static int get_vol(void)
  */
 static int do_set_vol(int mixer_fd, int volume)
 {
-       int tmp;
-       tmp = (volume << 8) + volume;
+       int tmp = (volume << 8) + volume;
+
        if (ioctl(mixer_fd, MIXER_WRITE(SOUND_MIXER_VOLUME), &tmp) < 0)
-               return 0;
+               return -1;
        return 1;
 }
 
@@ -108,18 +92,13 @@ static int do_set_vol(int mixer_fd, int volume)
  */
 static int set_vol(int volume)
 {
-       int mixer_fd;
-       int ret;
+       int mixer_fd, ret = open_mixer();
 
-       mixer_fd = open_mixer();
-       ret = 0;
-       if (mixer_fd < 0)
-               goto out;
-       if (!do_set_vol(mixer_fd, volume))
-               goto out;
-       ret = 1;
+       if (ret < 0)
+               return ret;
+       mixer_fd = ret;
+       ret = do_set_vol(mixer_fd, volume);
        close(mixer_fd);
-out:
        return ret;
 }
 
@@ -129,18 +108,18 @@ out:
  */
 static void fade(int new_vol, int fade_time)
 {
-       int vol, mixer_fd = -1, diff, incr;
+       int vol, mixer_fd, diff, incr;
        unsigned secs;
        struct timespec ts;
        unsigned long long tmp, tmp2; /* Careful with that axe, Eugene! */
 
        if (fade_time <= 0)
-               goto out;
+               return;
        secs = fade_time;
        PARA_NOTICE_LOG("fading to %d in %d seconds\n", new_vol, secs);
        mixer_fd = open_mixer();
        if (mixer_fd < 0)
-               goto out;
+               return;
        vol = do_get_vol(mixer_fd);
        if (vol < 0)
                goto out;
@@ -158,14 +137,13 @@ static void fade(int new_vol, int fade_time)
                ts.tv_sec = tmp / 1000; /* really nec ?*/
                //printf("ts.tv_sec: %i\n", ts.tv_nsec);
                vol += incr;
-               if (!do_set_vol(mixer_fd, vol))
+               if (do_set_vol(mixer_fd, vol) < 0)
                        goto out;
                //printf("vol = %i\n", vol);
                nanosleep(&ts, NULL);
        }
 out:
-       if (mixer_fd >= 0)
-               close(mixer_fd);
+       close(mixer_fd);
 }
 
 static int client_cmd(const char *cmd,...)
@@ -173,6 +151,7 @@ static int client_cmd(const char *cmd,...)
        int ret, fds[3] = {0, 0, 0};
        pid_t pid;
        char *cmdline = make_message(BINDIR "/para_client %s", cmd);
+
        PARA_INFO_LOG("%s\n", cmdline);
        ret = para_exec_cmdline_pid(&pid, cmdline, fds);
        free(cmdline);
@@ -297,17 +276,25 @@ int main(int argc, char *argv[])
                        conf.config_file_arg);
                exit(EXIT_FAILURE);
        }
-       if (ret)
-               fade_cmdline_parser_configfile(conf.config_file_arg,
-                       &conf, 0, 0, 0);
-       if ((ret = open_mixer()) < 0) {
+       if (ret) {
+               struct fade_cmdline_parser_params params = {
+                       .override = 0,
+                       .initialize = 0,
+                       .check_required = 0,
+                       .check_ambiguity = 0
+               };
+               fade_cmdline_parser_config_file(conf.config_file_arg,
+                       &conf, &params);
+       }
+       ret = open_mixer();
+       if (ret < 0) {
                PARA_EMERG_LOG("can not open mixer device %s.",
                        conf.mixer_device_arg);
                exit(EXIT_FAILURE);
-       } else
-               close(ret);
+       }
+       close(ret);
        ret = 0;
-       setlinebuf(stdout);
+//     setlinebuf(stdout);
        if (!strcmp(conf.mode_arg, "sleep")) {
                sweet_dreams();
                goto out;
@@ -322,5 +309,5 @@ int main(int argc, char *argv[])
        }
        ret = -1;
 out:
-       return ret;
+       return ret < 0? EXIT_FAILURE : EXIT_SUCCESS;
 }