Fix PolyKeyPressure, consolidate AutomationType checks
This commit is contained in:
parent
2d18d512e3
commit
895b9c2051
@ -67,7 +67,7 @@ midi_parameter(const uint8_t* buf, const uint32_t len)
|
||||
case MidiChannelPressureAutomation:
|
||||
return Evoral::Parameter(MidiChannelPressureAutomation, channel);
|
||||
case MidiNotePressureAutomation:
|
||||
return Evoral::Parameter(MidiChannelPressureAutomation, channel);
|
||||
return Evoral::Parameter(MidiNotePressureAutomation, channel);
|
||||
case MidiPitchBenderAutomation:
|
||||
return Evoral::Parameter(MidiPitchBenderAutomation, channel);
|
||||
case MidiSystemExclusiveAutomation:
|
||||
@ -80,7 +80,14 @@ midi_parameter(const uint8_t* buf, const uint32_t len)
|
||||
inline bool
|
||||
parameter_is_midi(AutomationType type)
|
||||
{
|
||||
return (type >= MidiCCAutomation) && (type <= MidiChannelPressureAutomation);
|
||||
return (type >= MidiCCAutomation) && (type <= MidiNotePressureAutomation);
|
||||
}
|
||||
|
||||
inline bool
|
||||
parameter_is_midi(Evoral::ParameterType t)
|
||||
{
|
||||
AutomationType type = (AutomationType) t;
|
||||
return (type >= MidiCCAutomation) && (type <= MidiNotePressureAutomation);
|
||||
}
|
||||
|
||||
} // namespace ARDOUR
|
||||
|
@ -521,7 +521,7 @@ Automatable::control_factory(const Evoral::Parameter& param)
|
||||
ParameterDescriptor desc(param);
|
||||
boost::shared_ptr<AutomationList> list;
|
||||
|
||||
if (param.type() >= MidiCCAutomation && param.type() <= MidiChannelPressureAutomation) {
|
||||
if (parameter_is_midi (param.type())) {
|
||||
MidiTrack* mt = dynamic_cast<MidiTrack*>(this);
|
||||
if (mt) {
|
||||
control = new MidiTrack::MidiControl(mt, param);
|
||||
|
@ -26,6 +26,7 @@
|
||||
#include "ardour/amp.h"
|
||||
#include "ardour/dB.h"
|
||||
#include "ardour/parameter_descriptor.h"
|
||||
#include "ardour/parameter_types.h"
|
||||
#include "ardour/rc_configuration.h"
|
||||
#include "ardour/types.h"
|
||||
#include "ardour/utils.h"
|
||||
@ -43,8 +44,7 @@ ParameterDescriptor::ParameterDescriptor(const Evoral::Parameter& parameter)
|
||||
, step(0)
|
||||
, smallstep(0)
|
||||
, largestep(0)
|
||||
, integer_step(parameter.type() >= MidiCCAutomation &&
|
||||
parameter.type() <= MidiChannelPressureAutomation)
|
||||
, integer_step(parameter_is_midi (parameter.type ()))
|
||||
, sr_dependent(false)
|
||||
, enumeration(false)
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user