ardour/livetrax
13
0
Fork 0
Code

move some solo/listen related options to correct prefs tab

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@10339 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2011-10-29 19:40:19 +00:00
parent bde8437387
commit 780cd2fabc
1 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
gtk2_ardour/rc_option_editor.cc
View File

@ -1110,6 +1110,8 @@ RCOptionEditor::RCOptionEditor ()
sigc::mem_fun (*_rc_config, &RCConfiguration::set_monitoring_model)
);
add_option (_("Audio"), mm);
#ifndef __APPLE__
/* no JACK monitoring on CoreAudio */
if (AudioEngine::instance()->can_request_hardware_monitoring()) {
@ -1119,32 +1121,6 @@ RCOptionEditor::RCOptionEditor ()
mm->add (SoftwareMonitoring, _("ardour"));
mm->add (ExternalMonitoring, _("audio hardware"));
add_option (_("Audio"), mm);
ComboOption<PFLPosition>* pp = new ComboOption<PFLPosition> (
"pfl-position",
_("PFL signals come from"),
sigc::mem_fun (*_rc_config, &RCConfiguration::get_pfl_position),
sigc::mem_fun (*_rc_config, &RCConfiguration::set_pfl_position)
);
pp->add (PFLFromBeforeProcessors, _("before pre-fader processors"));
pp->add (PFLFromAfterProcessors, _("pre-fader but after pre-fader processors"));
add_option (_("Audio"), pp);
ComboOption<AFLPosition>* pa = new ComboOption<AFLPosition> (
"afl-position",
_("AFL signals come from"),
sigc::mem_fun (*_rc_config, &RCConfiguration::get_afl_position),
sigc::mem_fun (*_rc_config, &RCConfiguration::set_afl_position)
);
pa->add (AFLFromBeforeProcessors, _("post-fader but before post-fader processors"));
pa->add (AFLFromAfterProcessors, _("after post-fader processors"));
add_option (_("Audio"), pa);
add_option (_("Audio"),
new BoolOption (
"tape-machine-mode",
@ -1291,11 +1267,35 @@ RCOptionEditor::RCOptionEditor ()
sigc::mem_fun (*_rc_config, &RCConfiguration::set_listen_position)
);
_listen_position->add (AfterFaderListen, _("after-fader listen"));
_listen_position->add (PreFaderListen, _("pre-fader listen"));
_listen_position->add (AfterFaderListen, _("after-fader (AFL)"));
_listen_position->add (PreFaderListen, _("pre-fader (PFL)"));
add_option (_("Solo / mute"), _listen_position);
ComboOption<PFLPosition>* pp = new ComboOption<PFLPosition> (
"pfl-position",
_("PFL signals come from"),
sigc::mem_fun (*_rc_config, &RCConfiguration::get_pfl_position),
sigc::mem_fun (*_rc_config, &RCConfiguration::set_pfl_position)
);
pp->add (PFLFromBeforeProcessors, _("before pre-fader processors"));
pp->add (PFLFromAfterProcessors, _("pre-fader but after pre-fader processors"));
add_option (_("Solo / mute"), pp);
ComboOption<AFLPosition>* pa = new ComboOption<AFLPosition> (
"afl-position",
_("AFL signals come from"),
sigc::mem_fun (*_rc_config, &RCConfiguration::get_afl_position),
sigc::mem_fun (*_rc_config, &RCConfiguration::set_afl_position)
);
pa->add (AFLFromBeforeProcessors, _("post-fader but before post-fader processors"));
pa->add (AFLFromAfterProcessors, _("after post-fader processors"));
add_option (_("Solo / mute"), pa);
parameter_changed ("use-monitor-bus");
add_option (_("Solo / mute"),