smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-24 07:27:44 +01:00
Code Issues Projects Releases Wiki Activity

merge -r 13412:13414 svn+ssh://ardoursvn@subversion.ardour.org/ardour2/branches/3.0

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@13415 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2012-11-09 15:06:15 +00:00
parent e793fbf211
commit f1502da03f
3 changed files with 23 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libs/ardour/ardour/rc_configuration_vars.h
View file

@ -152,6 +152,8 @@ CONFIG_VARIABLE (float, meter_falloff, "meter-falloff", 32.0f)
/* miscellany */
CONFIG_VARIABLE (std::string, auditioner_output_left, "auditioner-output-left", "default")
CONFIG_VARIABLE (std::string, auditioner_output_right, "auditioner-output-right", "default")
CONFIG_VARIABLE (bool, replicate_missing_region_channels, "replicate-missing-region-channels", false)
CONFIG_VARIABLE (bool, hiding_groups_deactivates_groups, "hiding-groups-deactivates-groups", true)
CONFIG_VARIABLE (bool, verify_remove_last_capture, "verify-remove-last-capture", true)

2
libs/ardour/ardour/session_configuration_vars.h
View file

@ -44,8 +44,6 @@ CONFIG_VARIABLE (Timecode::TimecodeFormat, timecode_format, "timecode-format", T
CONFIG_VARIABLE_SPECIAL(std::string, raid_path, "raid-path", "", path_expand)
CONFIG_VARIABLE_SPECIAL(std::string, audio_search_path, "audio-search-path", "", search_path_expand)
CONFIG_VARIABLE_SPECIAL(std::string, midi_search_path, "midi-search-path", "", search_path_expand)
CONFIG_VARIABLE (std::string, auditioner_output_left, "auditioner-output-left", "default")
CONFIG_VARIABLE (std::string, auditioner_output_right, "auditioner-output-right", "default")
CONFIG_VARIABLE (bool, jack_time_master, "jack-time-master", true)
CONFIG_VARIABLE (bool, use_video_sync, "use-video-sync", false)
CONFIG_VARIABLE (float, video_pullup, "video-pullup", 0.0f)

46
libs/ardour/auditioner.cc
View file

@ -61,14 +61,11 @@ Auditioner::init ()
vector<string> outputs;
_session.engine().get_physical_outputs (DataType::AUDIO, outputs);
cerr << "we have " << outputs.size() << " for auditioning, L/R = " << left << " + " << right << endl;
if (left == "default") {
if (_session.monitor_out()) {
left = _session.monitor_out()->input()->audio (0)->name();
via_monitor = true;
} else {
cerr << "here!\n";
if (outputs.size() > 0) {
left = outputs[0];
}
@ -80,31 +77,30 @@ Auditioner::init ()
right = _session.monitor_out()->input()->audio (1)->name();
via_monitor = true;
} else {
cerr << "there!\n";
if (outputs.size() > 1) {
right = outputs[1];
}
}
}
if ((left.length() == 0) && (right.length() == 0)) {
if (left.empty() && right.empty()) {
warning << _("no outputs available for auditioner - manual connection required") << endmsg;
return -1;
} else {
_main_outs->defer_pan_reset ();
if (left.length()) {
_output->add_port (left, this, DataType::AUDIO);
}
if (right.length()) {
_output->add_port (right, this, DataType::AUDIO);
}
_main_outs->allow_pan_reset ();
_main_outs->reset_panner ();
}
_main_outs->defer_pan_reset ();
if (left.length()) {
_output->add_port (left, this, DataType::AUDIO);
}
if (right.length()) {
_output->add_port (right, this, DataType::AUDIO);
}
_main_outs->allow_pan_reset ();
_main_outs->reset_panner ();
_output->changed.connect_same_thread (*this, boost::bind (&Auditioner::output_changed, this, _1, _2));
return 0;
@ -230,12 +226,12 @@ Auditioner::output_changed (IOChange change, void* /*src*/)
phys = outputs[0];
}
if (phys != connections[0]) {
_session.config.set_auditioner_output_left (connections[0]);
Config->set_auditioner_output_left (connections[0]);
} else {
_session.config.set_auditioner_output_left ("default");
Config->set_auditioner_output_left ("default");
}
} else {
_session.config.set_auditioner_output_left ("");
Config->set_auditioner_output_left ("");
}
connections.clear ();
@ -245,12 +241,12 @@ Auditioner::output_changed (IOChange change, void* /*src*/)
phys = outputs[1];
}
if (phys != connections[0]) {
_session.config.set_auditioner_output_right (connections[0]);
Config->set_auditioner_output_right (connections[0]);
} else {
_session.config.set_auditioner_output_right ("default");
Config->set_auditioner_output_right ("default");
}
} else {
_session.config.set_auditioner_output_right ("");
Config->set_auditioner_output_right ("");
}
}
}