Skip to content

August 1 2025 Update #50

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

Merged
FunkybotsEvilTwin merged 9 commits into from
Aug 1, 2025
Merged

August 1 2025 Update #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ab73e04
Rebuild TrackColors (Working Version)
FunkybotsEvilTwin Jun 30, 2025
a165705
Rebuild TrackColors (Working Version)
FunkybotsEvilTwin Jun 30, 2025
5860e65
Updated Icon V1M Displays
FunkybotsEvilTwin Jun 30, 2025
ce39caa
Added ClipDetection=Precise Property, Else Legacy Behavior
FunkybotsEvilTwin Jun 28, 2025
3d07dc0
New Feat: Track Mute, Solo, RecordArm Actions with Grouping
FunkybotsEvilTwin Jun 11, 2025
3767add
Reduce MCU and QCON VU meter traffic when levels are low
FunkybotsEvilTwin Jul 12, 2025
2b17559
Code cleanup for MCUVUMeter and QConProXMasterVUMeter
FunkybotsEvilTwin Jul 16, 2025
02cc7b0
Only update meters on change using MeterMode=MCU
FunkybotsEvilTwin Jul 19, 2025
57b96d5
Clear XTouch Colors on Shutdown
FunkybotsEvilTwin Jul 27, 2025
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
155 changes: 154 additions & 1 deletion reaper_csurf_integrator/control_surface_Reaper_actions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1122,9 +1122,58 @@ class TrackRecordArm : public Action
}
};

/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
class TracksRecordArm : public Action
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
{
public:
virtual const char* GetName() override { return "TracksRecordArm"; }

virtual double GetCurrentNormalizedValue(ActionContext* context) override
{
if (MediaTrack* track = context->GetTrack())
return GetMediaTrackInfo_Value(track, "I_RECARM");
return 0.0;
}

virtual void RequestUpdate(ActionContext* context) override
{
if (context->GetTrack())
context->UpdateWidgetValue(GetCurrentNormalizedValue(context));
else
context->ClearWidget();
}

virtual void Do(ActionContext* context, double value) override
{
if (value == ActionContext::BUTTON_RELEASE_MESSAGE_VALUE) return;

MediaTrack* track = context->GetTrack();
if (!track) return;

int selCount = CountSelectedTracks(NULL);
bool isSelected = GetMediaTrackInfo_Value(track, "I_SELECTED") > 0;
bool currentArm = GetMediaTrackInfo_Value(track, "I_RECARM") > 0;
bool newArm = !currentArm;

if (selCount > 1 && isSelected)
{
for (int i = 0; i < selCount; ++i)
{
MediaTrack* selTrack = GetSelectedTrack(NULL, i);
CSurf_SetSurfaceRecArm(selTrack, CSurf_OnRecArmChange(selTrack, newArm), NULL);
}
}
else
{
CSurf_SetSurfaceRecArm(track, CSurf_OnRecArmChange(track, newArm), NULL);
}
}
};

/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
class TrackRecordArmDisplay : public Action
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
{
public:
virtual const char* GetName() override { return "TrackRecordArmDisplay"; }
Expand Down Expand Up @@ -1185,6 +1234,60 @@ class TrackMute : public Action
}
};

/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
class TracksMute : public Action
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
{
public:
virtual const char* GetName() override { return "TracksMute"; }

virtual double GetCurrentNormalizedValue(ActionContext* context) override
{
if (MediaTrack* track = context->GetTrack())
{
bool mute = false;
GetTrackUIMute(track, &mute);
return mute;
}
return 0.0;
}

virtual void RequestUpdate(ActionContext* context) override
{
if (context->GetTrack())
context->UpdateWidgetValue(GetCurrentNormalizedValue(context));
else
context->ClearWidget();
}

virtual void Do(ActionContext* context, double value) override
{
if (value == ActionContext::BUTTON_RELEASE_MESSAGE_VALUE) return;

MediaTrack* track = context->GetTrack();
if (!track) return;

int selCount = CountSelectedTracks(NULL);
bool isSelected = GetMediaTrackInfo_Value(track, "I_SELECTED") > 0;
bool mute = false;
GetTrackUIMute(track, &mute);
bool newMute = !mute;

if (selCount > 1 && isSelected)
{
for (int i = 0; i < selCount; ++i)
{
MediaTrack* selTrack = GetSelectedTrack(NULL, i);
CSurf_SetSurfaceMute(selTrack, CSurf_OnMuteChange(selTrack, newMute), NULL);
}
}
else
{
CSurf_SetSurfaceMute(track, CSurf_OnMuteChange(track, newMute), NULL);
}
}
};

/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
class TrackSolo : public Action
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -1230,6 +1333,56 @@ class TrackSolo : public Action
}
};

/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
class TracksSolo : public Action
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
{
public:
virtual const char* GetName() override { return "TracksSolo"; }

virtual double GetCurrentNormalizedValue(ActionContext* context) override
{
if (MediaTrack* track = context->GetTrack())
return GetMediaTrackInfo_Value(track, "I_SOLO") > 0 ? 1 : 0;
return 0.0;
}

virtual void RequestUpdate(ActionContext* context) override
{
if (context->GetTrack())
context->UpdateWidgetValue(GetCurrentNormalizedValue(context));
else
context->ClearWidget();
}

virtual void Do(ActionContext* context, double value) override
{
if (value == ActionContext::BUTTON_RELEASE_MESSAGE_VALUE) return;

MediaTrack* track = context->GetTrack();
if (!track) return;

int selCount = CountSelectedTracks(NULL);
bool isSelected = GetMediaTrackInfo_Value(track, "I_SELECTED") > 0;
bool currentSolo = GetMediaTrackInfo_Value(track, "I_SOLO") > 0;
bool newSolo = !currentSolo;

if (selCount > 1 && isSelected)
{
for (int i = 0; i < selCount; ++i)
{
MediaTrack* selTrack = GetSelectedTrack(NULL, i);
if (selTrack && selTrack != GetMasterTrack(NULL))
CSurf_SetSurfaceSolo(selTrack, CSurf_OnSoloChange(selTrack, newSolo), NULL);
}
}
else
{
CSurf_SetSurfaceSolo(track, CSurf_OnSoloChange(track, newSolo), NULL);
}
}
};

/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
class TrackInvertPolarity : public Action
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
Expand Down
76 changes: 44 additions & 32 deletions reaper_csurf_integrator/control_surface_integrator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -706,6 +706,19 @@ void Midi_ControlSurface::ProcessMidiWidget(int &lineNumber, ifstream &surfaceTe

AddTrackColorFeedbackProcessor(widget->GetFeedbackProcessors().back().get());
}
else if ((widgetType == "FB_iCON_V1MDisplayUpper" || widgetType == "FB_iCON_V1MDisplayLower" || widgetType == "FB_iCON_V1XDisplayUpper" || widgetType == "FB_iCON_V1XDisplayLower") && size == 2)
{
if (widgetType == "FB_iCON_V1MDisplayUpper")
widget->GetFeedbackProcessors().push_back(make_unique<iCON_V1MDisplay_Midi_FeedbackProcessor>(csi_, this, widget, 0, 0x14, 0x12, atoi(tokenLines[i][1].c_str())));
else if (widgetType == "FB_iCON_V1MDisplayLower")
widget->GetFeedbackProcessors().push_back(make_unique<iCON_V1MDisplay_Midi_FeedbackProcessor>(csi_, this, widget, 1, 0x14, 0x12, atoi(tokenLines[i][1].c_str())));
else if (widgetType == "FB_iCON_V1XDisplayUpper")
widget->GetFeedbackProcessors().push_back(make_unique<iCON_V1MDisplay_Midi_FeedbackProcessor>(csi_, this, widget, 0, 0x15, 0x12, atoi(tokenLines[i][1].c_str())));
else if (widgetType == "FB_iCON_V1XDisplayLower")
widget->GetFeedbackProcessors().push_back(make_unique<iCON_V1MDisplay_Midi_FeedbackProcessor>(csi_, this, widget, 1, 0x15, 0x12, atoi(tokenLines[i][1].c_str())));

AddTrackColorFeedbackProcessor(widget->GetFeedbackProcessors().back().get());
}
else if ((widgetType == "FB_C4DisplayUpper" || widgetType == "FB_C4DisplayLower") && size == 3)
{
if (widgetType == "FB_C4DisplayUpper")
Expand Down Expand Up @@ -1063,9 +1076,12 @@ void CSurfIntegrator::InitActionsDictionary()
actions_.insert(make_pair("TrackUniqueSelect", make_unique<TrackUniqueSelect>()));
actions_.insert(make_pair("TrackRangeSelect", make_unique<TrackRangeSelect>()));
actions_.insert(make_pair("TrackRecordArm", make_unique<TrackRecordArm>()));
actions_.insert(make_pair("TracksRecordArm", make_unique<TracksRecordArm>()));
actions_.insert(make_pair("TrackRecordArmDisplay", make_unique<TrackRecordArmDisplay>()));
actions_.insert(make_pair("TrackMute", make_unique<TrackMute>()));
actions_.insert(make_pair("TracksMute", make_unique<TracksMute>()));
actions_.insert(make_pair("TrackSolo", make_unique<TrackSolo>()));
actions_.insert(make_pair("TracksSolo", make_unique<TracksSolo>()));
actions_.insert(make_pair("ClearAllSolo", make_unique<ClearAllSolo>()));
actions_.insert(make_pair("TrackInvertPolarity", make_unique<TrackInvertPolarity>()));
actions_.insert(make_pair("TrackInvertPolarityDisplay", make_unique<TrackInvertPolarityDisplay>()));
Expand Down Expand Up @@ -1553,6 +1569,10 @@ ActionContext::ActionContext(CSurfIntegrator *const csi, Action *action, Widget
if (meterMode && strlen(meterMode) > 0)
strncpy(meterMode_, meterMode, sizeof(meterMode_) - 1);

const char* clipDetection = widgetProperties_.get_prop(PropertyType_ClipDetection);
if (clipDetection && strlen(clipDetection) > 0)
strncpy(clipDetection_, clipDetection, sizeof(clipDetection_) - 1);

for (int i = 0; i < (int)(paramsAndProperties).size(); ++i)
if (paramsAndProperties[i] == "NoFeedback")
provideFeedback_ = false;
Expand Down Expand Up @@ -3333,48 +3353,26 @@ void ModifierManager::SetLatchModifier(bool value, Modifiers modifier, int latch
////////////////////////////////////////////////////////////////////////////////////////////////////////
// TrackNavigationManager
////////////////////////////////////////////////////////////////////////////////////////////////////////

void TrackNavigationManager::RebuildTracks()
{
int oldTracksSize = (int) tracks_.size();
bool hasChanged = false;

if (oldTracksSize == GetNumTracks())
{
for (int i = 1; i <= GetNumTracks(); ++i)
if (MediaTrack* track = CSurf_TrackFromID(i, followMCP_))
if (tracks_[i] != track || colors_[i] != GetTrackColor(track))
{
hasChanged = true;
break;
}
}
if ( ! hasChanged && isInitialized_)
return;

isInitialized_ = true;
int oldTracksSize = (int)tracks_.size();

tracks_.clear();
colors_.clear();


for (int i = 1; i <= GetNumTracks(); ++i)
{
if (MediaTrack *track = CSurf_TrackFromID(i, followMCP_))
if (MediaTrack* track = CSurf_TrackFromID(i, followMCP_))
if (IsTrackVisible(track, followMCP_))
{
tracks_.push_back(track);
colors_.push_back(GetTrackColor(track));
}
}

if (tracks_.size() < oldTracksSize)
{
for (int i = oldTracksSize; i > tracks_.size(); i--)
page_->ForceClearTrack(i - trackOffset_);
}
page_->ForceUpdateTrackColors();

page_->UpdateTrackColors();
}

void TrackNavigationManager::RebuildSelectedTracks()
Expand All @@ -3395,8 +3393,7 @@ void TrackNavigationManager::RebuildSelectedTracks()
page_->ForceClearTrack(i - selectedTracksOffset_);
}

if (selectedTracks_.size() != oldTracksSize)
page_->ForceUpdateTrackColors();
page_->UpdateTrackColors();
}

void TrackNavigationManager::AdjustSelectedTrackBank(int amount)
Expand Down Expand Up @@ -3473,10 +3470,25 @@ void ControlSurface::ForceClearTrack(int trackNum)
widget->ForceClear();
}

void ControlSurface::ForceUpdateTrackColors()
void ControlSurface::UpdateTrackColors()
{
for (auto trackColorFeedbackProcessor : trackColorFeedbackProcessors_)
trackColorFeedbackProcessor->ForceUpdateTrackColors();
bool hasChanged = false;

for (int i = 0; i < trackColors_.size(); ++i)
if (MediaTrack* track = page_->GetNavigatorForChannel(i + channelOffset_)->GetTrack())
if (trackColors_[i] != DAW::GetTrackColor(track))
{
hasChanged = true;
rgba_color trackColor = DAW::GetTrackColor(track);
trackColors_[i].r = trackColor.r;
trackColors_[i].g = trackColor.g;
trackColors_[i].b = trackColor.b;
trackColors_[i].a = trackColor.a;
}

if (hasChanged)
for (auto trackColorFeedbackProcessor : trackColorFeedbackProcessors_)
trackColorFeedbackProcessor->ForceUpdateTrackColors();
}

rgba_color ControlSurface::GetTrackColorForChannel(int channel)
Expand Down
Loading
Loading