diff --git a/gtk2_ardour/editor_selection.cc b/gtk2_ardour/editor_selection.cc index a4e4e48ef1..b52c8ca716 100644 --- a/gtk2_ardour/editor_selection.cc +++ b/gtk2_ardour/editor_selection.cc @@ -2404,7 +2404,7 @@ Editor::move_selected_tracks (bool up) for (auto & s : sl) { if (s->is_selected()) { - if (up && (s->presentation_info().order() <= 1)) { + if (up && (s->presentation_info().order() <= 0)) { return; } else if (!up && (s->presentation_info().order() >= sl.size() - 1)) { return; diff --git a/libs/ardour/delivery.cc b/libs/ardour/delivery.cc index 40586a7c0c..bdcae17b43 100644 --- a/libs/ardour/delivery.cc +++ b/libs/ardour/delivery.cc @@ -693,8 +693,6 @@ Delivery::set_name (const std::string& name) return ret; } -bool ignore_output_change = false; - void Delivery::output_changed (IOChange change, void* /*src*/) { diff --git a/libs/ardour/export_channel.cc b/libs/ardour/export_channel.cc index efe148a272..5085fb9217 100644 --- a/libs/ardour/export_channel.cc +++ b/libs/ardour/export_channel.cc @@ -385,6 +385,11 @@ RouteExportChannel::create_from_route (std::list& result, std: void RouteExportChannel::create_from_state (std::list& result, Session& s, XMLNode* node) { + uint32_t chn; + if (node->get_property ("number", chn) && chn > 1) { + /* create_from_route adds ExportChannel for all channels of a given Route */ + return; + } XMLNode* xml_route = node->child ("Route"); if (!xml_route) { return; diff --git a/share/patchfiles/Korg_X50.midnam b/share/patchfiles/Korg_X50.midnam new file mode 100644 index 0000000000..2ea760e169 --- /dev/null +++ b/share/patchfiles/Korg_X50.midnam @@ -0,0 +1,746 @@ + + + + Steffen Klein + + Korg + X50 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +