smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-09 23:25:43 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into mixer-snapshots

Browse source
This commit is contained in:
Nikolaus Gullotta 2019-04-04 13:17:52 -05:00
commit b27399c5fc
2 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
libs/ardour/plugin_manager.cc
View file

@ -1536,6 +1536,14 @@ PluginManager::save_tags ()
XMLNode* root = new XMLNode (X_("PluginTags"));
for (PluginTagList::iterator i = ptags.begin(); i != ptags.end(); ++i) {
#ifdef MIXBUS
if ((*i).type == LADSPA) {
uint32_t id = atoi ((*i).unique_id);
if (id >= 9300 && id <= 9399) {
continue; /* do not write mixbus channelstrip ladspa's in the tagfile */
}
}
#endif
if ((*i).tagtype == FromFactoryFile || (*i).tagtype == FromUserFile) {
/* user file should contain only plugins that are (a) newly user-tagged or (b) previously unknown */
continue;

6
libs/surfaces/osc/osc.cc
View file

@ -1224,7 +1224,7 @@ OSC::routes_list (lo_message msg)
} else if (boost::dynamic_pointer_cast<Route>(s) && !boost::dynamic_pointer_cast<Track>(s)) {
if (!(s->presentation_info().flags() & PresentationInfo::MidiBus)) {
// r->feeds (session->master_out()) may make more sense
if (r->direct_feeds_according_to_reality (session->master_out())) {
if (session->master_out() && r->direct_feeds_according_to_reality (session->master_out())) {
// this is a bus
lo_message_add_string (reply, "B");
} else {
@ -6379,7 +6379,9 @@ OSC::get_sorted_stripables(std::bitset<32> types, bool cue, uint32_t custom, Sor
if (!custom) {
// Master/Monitor might be anywhere... we put them at the end - Sorry ;)
if (types[5]) {
sorted.push_back (session->master_out());
if (session->master_out()) {
sorted.push_back (session->master_out());
}
}
if (types[6]) {
if (session->monitor_out()) {