From f941b3faddcb108e76b8fae7fc94ad7e4477095b Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Sun, 15 Mar 2020 14:03:24 +0100 Subject: Add/use default argument for track creation --- libs/ardour/ardour/audio_track.h | 2 +- libs/ardour/ardour/midi_track.h | 2 +- libs/ardour/session_state.cc | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libs/ardour/ardour/audio_track.h b/libs/ardour/ardour/audio_track.h index 9fdcbfeedc..55def29b99 100644 --- a/libs/ardour/ardour/audio_track.h +++ b/libs/ardour/ardour/audio_track.h @@ -35,7 +35,7 @@ class AudioFileSource; class LIBARDOUR_API AudioTrack : public Track { public: - AudioTrack (Session&, std::string name, TrackMode m = Normal); + AudioTrack (Session&, std::string name = "", TrackMode m = Normal); ~AudioTrack (); MonitorState get_auto_monitoring_state () const; diff --git a/libs/ardour/ardour/midi_track.h b/libs/ardour/ardour/midi_track.h index 5232083311..5a1c1aadc4 100644 --- a/libs/ardour/ardour/midi_track.h +++ b/libs/ardour/ardour/midi_track.h @@ -38,7 +38,7 @@ class Session; class LIBARDOUR_API MidiTrack : public Track { public: - MidiTrack (Session&, std::string name, TrackMode m = Normal); + MidiTrack (Session&, std::string name = "", TrackMode m = Normal); ~MidiTrack (); int init (); diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc index 193d2e717f..c84df9f2f8 100644 --- a/libs/ardour/session_state.cc +++ b/libs/ardour/session_state.cc @@ -1873,9 +1873,9 @@ Session::XMLRouteFactory (const XMLNode& node, int version) boost::shared_ptr track; if (type == DataType::AUDIO) { - track.reset (new AudioTrack (*this, string())); // name will be reset from XML in ::set_state() below + track.reset (new AudioTrack (*this)); } else { - track.reset (new MidiTrack (*this, string())); // name will be reset from XML in ::set_state() below + track.reset (new MidiTrack (*this)); } if (track->init()) { @@ -1924,9 +1924,9 @@ Session::XMLRouteFactory_3X (const XMLNode& node, int version) boost::shared_ptr track; if (type == DataType::AUDIO) { - track.reset (new AudioTrack (*this, string())); // name will be reset from XML in ::set_state() below + track.reset (new AudioTrack (*this)); } else { - track.reset (new MidiTrack (*this, string())); // name will be reset from XML in ::set_state() below + track.reset (new MidiTrack (*this)); } if (track->init()) { @@ -1986,9 +1986,9 @@ Session::XMLRouteFactory_2X (const XMLNode& node, int version) boost::shared_ptr track; if (type == DataType::AUDIO) { - track.reset (new AudioTrack (*this, string())); // name will be reset from XML in ::set_state() below + track.reset (new AudioTrack (*this)); } else { - track.reset (new MidiTrack (*this, string())); // name will be reset from XML in ::set_state() below + track.reset (new MidiTrack (*this)); } if (track->init()) { -- cgit v1.2.3