manual fixes following rebase on master
This commit is contained in:
parent
16f682110f
commit
0a530d3c18
@ -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))
|
||||
{
|
||||
|
@ -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 ();
|
||||
|
@ -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 ();
|
||||
|
@ -21,8 +21,6 @@
|
||||
|
||||
#include <string>
|
||||
|
||||
#include <boost/shared_ptr.hpp>
|
||||
|
||||
#include "pbd/controllable.h"
|
||||
|
||||
#include "evoral/Parameter.h"
|
||||
|
@ -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"))
|
||||
{
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user