/*
* 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 */
*/
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;
}
*/
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;
}
*/
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;
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,...)
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);
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, ¶ms);
+ }
+ 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;
}
ret = -1;
out:
- return ret;
+ return ret < 0? EXIT_FAILURE : EXIT_SUCCESS;
}