/*
- * Copyright (C) 1998-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1998-2009 Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
#include "para.h"
#include "fd.h"
-#include <stropts.h>
+#include <sys/ioctl.h>
#include <ctype.h>
#include <stdlib.h> /* EXIT_SUCCESS */
#include <unistd.h>
#include <signal.h>
#include <string.h>
#include <limits.h>
-#include <linux/soundcard.h>
+#include <sys/soundcard.h>
#include "string.h"
#include "error.h"
INIT_FADE_ERRLISTS;
struct fade_args_info conf;
-void para_log(__a_unused int ll, const char *fmt,...)
+__printf_2_3 void para_log(__a_unused int ll, const char *fmt, ...)
{
va_list argp;
time_t t1;
}
/*
- * get volume via mixer_fd
+ * Get channel volume via mixer_fd.
*/
-static int do_get_vol(int mixer_fd)
+static int get_mixer_channel(int mixer_fd)
{
int volume;
- if (ioctl(mixer_fd, MIXER_READ(SOUND_MIXER_VOLUME), &volume) < 0)
+ if (ioctl(mixer_fd, MIXER_READ(conf.mixer_channel_arg), &volume) < 0)
return -ERRNO_TO_PARA_ERROR(errno);
/* take the mean value of left and right volume */
return (volume % 256 + (volume >> 8)) / 2;
}
/*
- * open mixer, get volume and close mixer
+ * Open mixer, get volume and close mixer.
*/
-static int get_vol(void)
+static int open_and_get_mixer_channel(void)
{
int mixer_fd;
int volume;
mixer_fd = open_mixer();
if (mixer_fd < 0)
return mixer_fd;
- volume = do_get_vol(mixer_fd);
+ volume = get_mixer_channel(mixer_fd);
close(mixer_fd);
return volume;
}
/*
- * set volume via mixer_fd
+ * Set channel volume via mixer_fd.
*/
-static int do_set_vol(int mixer_fd, int volume)
+static int set_mixer_channel(int mixer_fd, int volume)
{
int tmp = (volume << 8) + volume;
- if (ioctl(mixer_fd, MIXER_WRITE(SOUND_MIXER_VOLUME), &tmp) < 0)
+ if (ioctl(mixer_fd, MIXER_WRITE(conf.mixer_channel_arg), &tmp) < 0)
return -ERRNO_TO_PARA_ERROR(errno);
return 1;
}
/*
- * open mixer, set volume and close mixer
+ * Open mixer, set volume and close mixer.
*/
-static int set_vol(int volume)
+static int open_and_set_mixer_channel(int volume)
{
int mixer_fd, ret = open_mixer();
if (ret < 0)
return ret;
mixer_fd = ret;
- ret = do_set_vol(mixer_fd, volume);
+ ret = set_mixer_channel(mixer_fd, volume);
close(mixer_fd);
return ret;
}
+static void fixup_mixer_channel_arg(void)
+{
+ int val = SOUND_MIXER_VOLUME; /* STFU, gcc */
+
+ switch (conf.mixer_channel_arg) {
+ case mixer_channel_arg_volume: val = SOUND_MIXER_VOLUME; break;
+ case mixer_channel_arg_bass: val = SOUND_MIXER_BASS; break;
+ case mixer_channel_arg_treble: val = SOUND_MIXER_TREBLE; break;
+ case mixer_channel_arg_synth: val = SOUND_MIXER_SYNTH; break;
+ case mixer_channel_arg_pcm: val = SOUND_MIXER_PCM; break;
+ case mixer_channel_arg_speaker: val = SOUND_MIXER_SPEAKER; break;
+ case mixer_channel_arg_line: val = SOUND_MIXER_LINE; break;
+ case mixer_channel_arg_mic: val = SOUND_MIXER_MIC; break;
+ case mixer_channel_arg_cd: val = SOUND_MIXER_CD; break;
+ case mixer_channel_arg_imix: val = SOUND_MIXER_IMIX; break;
+ case mixer_channel_arg_altpcm: val = SOUND_MIXER_ALTPCM; break;
+ 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;
+ }
+ conf.mixer_channel_arg = val;
+}
+
/*
* Open mixer, get volume, fade to new_vol in secs seconds and
* close mixer
if (ret < 0)
return ret;
mixer_fd = ret;
- ret = do_get_vol(mixer_fd);
+ ret = get_mixer_channel(mixer_fd);
if (ret < 0)
goto out;
vol = ret;
ts.tv_sec = tmp / 1000; /* really nec ?*/
//printf("ts.tv_sec: %i\n", ts.tv_nsec);
vol += incr;
- ret = do_set_vol(mixer_fd, vol);
+ ret = set_mixer_channel(mixer_fd, vol);
if (ret < 0)
goto out;
//printf("vol = %i\n", vol);
tm->tm_sec = 0;
} else {
t1 += 9 * 60 * 60; /* nine hours from now */
- PARA_INFO_LOG("default wake time: %lu\n", t1);
+ PARA_INFO_LOG("default wake time: %lu\n", (long unsigned)t1);
tm = localtime(&t1);
}
wake_time_epoch = mktime(tm);
sleep(1);
if (sf) {
PARA_INFO_LOG("initial volume: %d\n", iv);
- ret = set_vol(iv);
+ ret = open_and_set_mixer_channel(iv);
if (ret < 0)
return ret;
change_afs_mode_and_play(fa_mode);
if (ret < 0)
return ret;
} else {
- ret = set_vol(sf);
+ ret = open_and_set_mixer_channel(sf);
if (ret < 0)
return ret;
}
- change_afs_mode_and_play(sleep_mode);
+ if (conf.sleep_mode_given)
+ change_afs_mode_and_play(sleep_mode);
+ else
+ client_cmd("stop");
if (!wf)
return 1;
for (;;) {
if (conf.snooze_time_arg <= 0)
return 1;
sleep_time = conf.snooze_time_arg;
- if (get_vol() < conf.snooze_out_vol_arg)
- ret = set_vol(conf.snooze_out_vol_arg);
+ if (open_and_get_mixer_channel() < conf.snooze_out_vol_arg)
+ ret = open_and_set_mixer_channel(conf.snooze_out_vol_arg);
else
ret = fade(conf.snooze_out_vol_arg, conf.snooze_out_fade_arg);
if (ret < 0)
fade_cmdline_parser_config_file(conf.config_file_arg,
&conf, ¶ms);
}
+ fixup_mixer_channel_arg();
if (!strcmp(conf.mode_arg, "sleep")) {
ret = sweet_dreams();
goto out;