diff options
author | Christian Pointner <equinox@helsinki.at> | 2010-01-19 13:20:43 (GMT) |
---|---|---|
committer | Christian Pointner <equinox@helsinki.at> | 2010-01-19 13:20:43 (GMT) |
commit | 57c708218fc8384acefd942e38d54bad881f53d7 (patch) | |
tree | 98b6605dc3f4edd10021adbf4ce6d98ac9b44da2 /options.c | |
parent | f940c6741d6e7c8fcc682d733a15ca7aecd46ddc (diff) |
improved mail output at mode_watch.lua
active channel of both system is now watched
Diffstat (limited to 'options.c')
-rw-r--r-- | options.c | 15 |
1 files changed, 10 insertions, 5 deletions
@@ -218,10 +218,14 @@ int options_parse(options_t* opt, int argc, char* argv[]) } if(channel) { - if(!strcmp(channel, "main")) - opt->channel_ = CHAN_MAIN; - else if(!strcmp(channel, "music")) - opt->channel_ = CHAN_MUSIC; + if(!strcmp(channel, "main")) { + opt->channel_master_ = CHAN_MAIN; + opt->channel_standby_ = CHAN_MAIN; + } + else if(!strcmp(channel, "music")) { + opt->channel_master_ = CHAN_MUSIC; + opt->channel_standby_ = CHAN_MUSIC; + } else { free(channel); return -4; @@ -319,7 +323,8 @@ void options_default(options_t* opt) /* switchctl */ opt->mode_ = MODE_MASTER; - opt->channel_ = CHAN_MAIN; + opt->channel_master_ = CHAN_MAIN; + opt->channel_standby_ = CHAN_MAIN; opt->conf_file_ = strdup("/etc/rhctl/switchctl.conf"); opt->switch_dev_ = strdup("/dev/audioswitch"); key_value_storage_init(&opt->alias_table_); |