smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-15 19:16:40 +01:00
Code Issues Projects Releases Wiki Activity

fix merge errors with master

Browse source
This commit is contained in:
Paul Davis 2014-01-10 14:53:03 -05:00
commit d15fda6d75
32 changed files with 1336 additions and 430 deletions
Download patch file Download diff file Expand all files Collapse all files

7
libs/panners/vbap/vbap.cc
View file

@ -46,7 +46,10 @@ using namespace std;
static PanPluginDescriptor _descriptor = {
"VBAP 2D panner",
"http://ardour.org/plugin/panner_vbap",
"http://ardour.org/plugin/panner_vbap#ui",
-1, -1,
1000,
VBAPanner::factory
};
@ -392,7 +395,9 @@ VBAPanner::distribute_one_automated (AudioBuffer& /*src*/, BufferSet& /*obufs*/,
XMLNode&
VBAPanner::get_state ()
{
XMLNode& node (Panner::get_state());
XMLNode& node (Panner::get_state());
node.add_property (X_("uri"), _descriptor.panner_uri);
/* this is needed to allow new sessions to load with old Ardour: */
node.add_property (X_("type"), _descriptor.name);
return node;
}