master_card_index = output_card_index;
} else {
master_card_is_output = false;
- master_card_index = theme->map_signal(master_clock_channel);
+ master_card_index = theme->map_signal_to_card(master_clock_channel);
assert(master_card_index < num_cards + num_video_inputs);
}
pair<string, string> Mixer::get_channels_json()
{
Channels ret;
- for (int channel_idx = 2; channel_idx < theme->get_num_channels(); ++channel_idx) {
+ for (int channel_idx = 0; channel_idx < theme->get_num_channels(); ++channel_idx) {
Channel *channel = ret.add_channel();
- channel->set_index(channel_idx);
- channel->set_name(theme->get_channel_name(channel_idx));
- channel->set_color(theme->get_channel_color(channel_idx));
+ channel->set_index(channel_idx + 2);
+ channel->set_name(theme->get_channel_name(channel_idx + 2));
+ channel->set_color(theme->get_channel_color(channel_idx + 2));
}
string contents;
google::protobuf::util::MessageToJsonString(ret, &contents); // Ignore any errors.