summaryrefslogtreecommitdiff
path: root/libs/ardour/ardour/session.h
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2016-05-17 08:21:05 -0400
committerPaul Davis <paul@linuxaudiosystems.com>2016-05-31 15:30:42 -0400
commit2c9c2102138f20e32545f8bda7d1dc72587663e8 (patch)
tree5fc48fa8131d7b10dda47cd3c1eb97d5cf72b36a /libs/ardour/ardour/session.h
parent4b0a235f91c43a0011b2bc466a910c5b015560e0 (diff)
manually fix rebase/merge issues caused by addition of plugin presets to methods which add a new track/bus
Diffstat (limited to 'libs/ardour/ardour/session.h')
-rw-r--r--libs/ardour/ardour/session.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
index eee58432f7..fbac73ae75 100644
--- a/libs/ardour/ardour/session.h
+++ b/libs/ardour/ardour/session.h
@@ -611,7 +611,7 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop
std::list<boost::shared_ptr<MidiTrack> > new_midi_track (
const ChanCount& input, const ChanCount& output,
boost::shared_ptr<PluginInfo> instrument,
- Plugin::PresetRecord* pset = 0,
+ Plugin::PresetRecord* pset,
RouteGroup* route_group, uint32_t how_many, std::string name_template,
PresentationInfo::order_t,
TrackMode mode = Normal