ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

manual fixes following rebase on master

Browse Source
This commit is contained in:
Paul Davis 2023-06-13 11:58:09 -06:00
parent 16f682110f
commit 0a530d3c18
5 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk2_ardour/lollipop.cc
View File

@ -29,7 +29,7 @@ using ArdourCanvas::Coord;
using ArdourCanvas::Duple;
Lollipop::Lollipop (
MidiRegionView& region, ArdourCanvas::Item* parent, const boost::shared_ptr<NoteType> note, bool with_events)
MidiRegionView& region, ArdourCanvas::Item* parent, const std::shared_ptr<NoteType> note, bool with_events)
: NoteBase (region, with_events, note)
, _lollipop (new ArdourCanvas::Lollipop (parent))
{

2
gtk2_ardour/lollipop.h
View File

@ -38,7 +38,7 @@ public:
Lollipop (MidiRegionView& region,
ArdourCanvas::Item* parent,
const boost::shared_ptr<NoteType> note = boost::shared_ptr<NoteType>(),
const std::shared_ptr<NoteType> note = std::shared_ptr<NoteType>(),
bool with_events = true);
~Lollipop ();

4
libs/ardour/ardour/midi_track.h
View File

@ -76,7 +76,7 @@ public:
void midi_panic(void);
bool write_immediate_event (Evoral::EventType event_type, size_t size, const uint8_t* buf);
boost::shared_ptr<VelocityControl> velocity_control() const { return _velocity_control; }
std::shared_ptr<VelocityControl> velocity_control() const { return _velocity_control; }
/** A control that will send "immediate" events to a MIDI track when twiddled */
struct MidiControl : public AutomationControl {
@ -169,7 +169,7 @@ private:
MidiChannelFilter _playback_filter;
MidiChannelFilter _capture_filter;
boost::shared_ptr<VelocityControl> _velocity_control;
std::shared_ptr<VelocityControl> _velocity_control;
void set_state_part_two ();
void set_state_part_three ();

2
libs/ardour/ardour/velocity_control.h
View File

@ -21,8 +21,6 @@
#include <string>
#include <boost/shared_ptr.hpp>
#include "pbd/controllable.h"
#include "evoral/Parameter.h"

2
libs/ardour/velocity_control.cc
View File

@ -32,7 +32,7 @@ using namespace std;
VelocityControl::VelocityControl (Session& session)
: SlavableAutomationControl (session, Evoral::Parameter (MidiVelocityAutomation), ParameterDescriptor (Evoral::Parameter (MidiVelocityAutomation)),
boost::shared_ptr<AutomationList> (new AutomationList (Evoral::Parameter (MidiVelocityAutomation), Temporal::BeatTime)),
std::shared_ptr<AutomationList> (new AutomationList (Evoral::Parameter (MidiVelocityAutomation), Temporal::BeatTime)),
_("Velocity"))
{
}