Skip to content

Faderport 14 bit fader -> two byte key #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rhgg2 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Faderport 14 bit fader -> two byte key #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion reaper_csurf_integrator/control_surface_integrator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,6 +492,7 @@ void Midi_ControlSurface::ProcessMidiWidget(int &lineNumber, ifstream &surfaceTe

string oneByteKey = "";
string twoByteKey = "";
string twoByteKeyMsg2 = "";
string threeByteKey = "";
string threeByteKeyMsg2 = "";

Expand All @@ -511,6 +512,7 @@ void Midi_ControlSurface::ProcessMidiWidget(int &lineNumber, ifstream &surfaceTe
message2.midi_message[1] = strToHex(tokenLines[i][5]);
message2.midi_message[2] = strToHex(tokenLines[i][6]);

twoByteKeyMsg2 = to_string(message2.midi_message[0] * 0x10000 + message2.midi_message[1] * 0x100);
threeByteKeyMsg2 = to_string(message2.midi_message[0] * 0x10000 + message2.midi_message[1] * 0x100 + message2.midi_message[2]);
}

Expand All @@ -527,7 +529,11 @@ void Midi_ControlSurface::ProcessMidiWidget(int &lineNumber, ifstream &surfaceTe
else if (widgetType == "Fader14Bit" && size == 4)
CSIMessageGeneratorsByMessage_.insert(make_pair(oneByteKey, make_unique<Fader14Bit_Midi_CSIMessageGenerator>(csi_, widget)));
else if (widgetType == "FaderportClassicFader14Bit" && size == 7)
CSIMessageGeneratorsByMessage_.insert(make_pair(oneByteKey, make_unique<FaderportClassicFader14Bit_Midi_CSIMessageGenerator>(csi_, widget, message1, message2)));
{
shared_ptr<MIDI_event_ex_t> message1Ptr = make_shared<MIDI_event_ex_t>(message1);
CSIMessageGeneratorsByMessage_.insert(make_pair(twoByteKey, make_unique<FaderportClassicFader14Bit_Midi_CSIMessageGenerator>(csi_, widget, message1Ptr, message2)));
CSIMessageGeneratorsByMessage_.insert(make_pair(twoByteKeyMsg2, make_unique<FaderportClassicFader14Bit_Midi_CSIMessageGenerator>(csi_, widget, message1Ptr, message2)));
}
else if (widgetType == "Fader7Bit" && size== 4)
CSIMessageGeneratorsByMessage_.insert(make_pair(twoByteKey, make_unique<Fader7Bit_Midi_CSIMessageGenerator>(csi_, widget)));
else if (widgetType == "Encoder" && widgetClass == "RotaryWidgetClass")
Expand Down
10 changes: 5 additions & 5 deletions reaper_csurf_integrator/control_surface_midi_widgets.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,19 +96,19 @@ class FaderportClassicFader14Bit_Midi_CSIMessageGenerator : public Midi_CSIMessa
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
{
protected:
MIDI_event_ex_t message1_;
shared_ptr<MIDI_event_ex_t> message1_;
MIDI_event_ex_t message2_;

public:
virtual ~FaderportClassicFader14Bit_Midi_CSIMessageGenerator() {}
FaderportClassicFader14Bit_Midi_CSIMessageGenerator(CSurfIntegrator *const csi, Widget *widget, MIDI_event_ex_t message1, MIDI_event_ex_t message2) : Midi_CSIMessageGenerator(csi, widget), message1_(message1), message2_(message2) {}
FaderportClassicFader14Bit_Midi_CSIMessageGenerator(CSurfIntegrator *const csi, Widget *widget, shared_ptr<MIDI_event_ex_t> message1, MIDI_event_ex_t message2) : Midi_CSIMessageGenerator(csi, widget), message1_(message1), message2_(message2) {}

virtual void ProcessMidiMessage(const MIDI_event_ex_t *midiMessage) override
{
if (message1_.midi_message[1] == midiMessage->midi_message[1])
message1_.midi_message[2] = midiMessage->midi_message[2];
if (message1_->midi_message[1] == midiMessage->midi_message[1])
message1_->midi_message[2] = midiMessage->midi_message[2];
else if (message2_.midi_message[1] == midiMessage->midi_message[1])
widget_->GetZoneManager()->DoAction(widget_, int14ToNormalized(message1_.midi_message[2], midiMessage->midi_message[2]));
widget_->GetZoneManager()->DoAction(widget_, int14ToNormalized(message1_->midi_message[2], midiMessage->midi_message[2]));
}
};

Expand Down