ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

don't show monitor bus inputs in matrix(es); relabel tabs in port matrix; change label for monitoring preference to be clearer 

git-svn-id: svn://localhost/ardour2/branches/3.0@8234 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2010-12-10 15:43:01 +00:00
parent 627385cab4
commit 0108d1d900
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gtk2_ardour/port_group.cc
View File

@ -330,10 +330,10 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp
return;
}
boost::shared_ptr<PortGroup> bus (new PortGroup (_("Bus")));
boost::shared_ptr<PortGroup> track (new PortGroup (_("Track")));
boost::shared_ptr<PortGroup> system (new PortGroup (_("System")));
boost::shared_ptr<PortGroup> ardour (new PortGroup (PROGRAM_NAME));
boost::shared_ptr<PortGroup> bus (new PortGroup (string_compose (PROGRAM_NAME " %1", _("Busses"))));
boost::shared_ptr<PortGroup> track (new PortGroup (string_compose (PROGRAM_NAME " %1", _("Tracks"))));
boost::shared_ptr<PortGroup> system (new PortGroup (_("Hardware")));
boost::shared_ptr<PortGroup> ardour (new PortGroup (string_compose (PROGRAM_NAME " %1", _("Misc"))));
boost::shared_ptr<PortGroup> other (new PortGroup (_("Other")));
/* Find the IOs which have bundles for routes and their processors. We store
@ -346,9 +346,16 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp
for (RouteList::const_iterator i = routes->begin(); i != routes->end(); ++i) {
/* we never show the monitor bus inputs */
if (inputs && (*i)->is_monitor()) {
continue;
}
/* keep track of IOs that we have taken bundles from,
so that we can avoid taking the same IO from both
Route::output() and the main_outs Delivery */
Route::output() and the main_outs Delivery
*/
set<boost::shared_ptr<IO> > used_io;
boost::shared_ptr<IO> io = inputs ? (*i)->input() : (*i)->output();

2
gtk2_ardour/rc_option_editor.cc
View File

@ -1006,7 +1006,7 @@ RCOptionEditor::RCOptionEditor ()
ComboOption<MonitorModel>* mm = new ComboOption<MonitorModel> (
"monitoring-model",
_("Monitoring handled by"),
_("Record monitoring handled by"),
sigc::mem_fun (*_rc_config, &RCConfiguration::get_monitoring_model),
sigc::mem_fun (*_rc_config, &RCConfiguration::set_monitoring_model)
);