Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2026-02-09 13:12:17 +01:00
Code Issues Releases Wiki Activity

Fix midi channel toggling

Browse Source 
This reintroduces the buttons to toggle display of individual midi
channels, and cleans up the code behind that feature.

This functionality has actually been present in production versions of
audacity for a while, at least for clicking.  However, the buttons
themselves were not drawn, making it exteremly painful (but possible) to
use.

As requested by PRL, this is always enabled if USE_MIDI is defined.
This commit is contained in:
Pokechu22
2017-03-28 11:29:40 -07:00
committed by Paul Licameli
parent c07caade9f
commit a76ad22c91
6 changed files with 83 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
src/NoteTrack.cpp
View File

@@ -213,13 +213,11 @@ void NoteTrack::WarpAndTransposeNotes(double t0, double t1,
iter.begin();
Alg_event_ptr event;
while (0 != (event = iter.next()) && event->time < t1) {
if (event->is_note() && event->time >= t0 &&
// Allegro data structure does not restrict channels to 16.
// Since there is not way to select more than 16 channels,
// map all channel numbers mod 16. This will have no effect
// on MIDI files, but it will allow users to at least select
// all channels on non-MIDI event sequence data.
IsVisibleChan(event->chan % 16)) {
if (event->is_note() && event->time >= t0
#ifdef EXPERIMENTAL_MIDI_CONTROLS
&& IsVisibleChan(event->chan)
#endif
) {
event->set_pitch(event->get_pitch() + semitones);
}
}
@@ -238,19 +236,15 @@ void NoteTrack::WarpAndTransposeNotes(double t0, double t1,
mSeq->convert_to_seconds();
}
int NoteTrack::DrawLabelControls(wxDC & dc, const wxRect &r)
// Draws the midi channel toggle buttons within the given rect.
// The rect should be evenly divisible by 4 on both axis.
void NoteTrack::DrawLabelControls(wxDC & dc, const wxRect &rect)
{
int wid = 23;
int ht = 16;
wxASSERT_MSG(rect.width % 4 == 0, "Midi channel control rect width must be divisible by 4");
wxASSERT_MSG(rect.height % 4 == 0, "Midi channel control rect height must be divisible by 4");
if (r.height < ht * 4) {
return r.y + 5 + ht * 4;
}
int x = r.x + (r.width / 2 - wid * 2) + 2;
int y = r.y + 5;
auto cellWidth = rect.width / 4;
auto cellHeight = rect.height / 4;
wxRect box;
for (int row = 0; row < 4; row++) {
@@ -259,10 +253,10 @@ int NoteTrack::DrawLabelControls(wxDC & dc, const wxRect &r)
// used by AColor and button labels
int chanName = row * 4 + col + 1;
box.x = x + col * wid;
box.y = y + row * ht;
box.width = wid;
box.height = ht;
box.x = rect.x + col * cellWidth;
box.y = rect.y + row * cellHeight;
box.width = cellWidth;
box.height = cellHeight;
if (IsVisibleChan(chanName - 1)) {
AColor::MIDIChannel(&dc, chanName);
@@ -315,47 +309,39 @@ int NoteTrack::DrawLabelControls(wxDC & dc, const wxRect &r)
}
wxString t;
wxString text;
wxCoord w;
wxCoord h;
t.Printf(wxT("%d"), chanName);
dc.GetTextExtent(t, &w, &h);
text.Printf(wxT("%d"), chanName);
dc.GetTextExtent(text, &w, &h);
dc.DrawText(t, box.x + (box.width - w) / 2, box.y + (box.height - h) / 2);
dc.DrawText(text, box.x + (box.width - w) / 2, box.y + (box.height - h) / 2);
}
}
AColor::MIDIChannel(&dc, 0); // always return with gray color selected
return box.GetBottom();
}
bool NoteTrack::LabelClick(const wxRect &r, int mx, int my, bool right)
// Handles clicking within the midi controls rect (same as DrawLabelControls).
// This is somewhat oddly written, as these aren't real buttons - they act
// when the mouse goes down; you can't hold it pressed and move off of it.
// Left-clicking toggles a single channel; right-clicking turns off all other channels.
bool NoteTrack::LabelClick(const wxRect &rect, int mx, int my, bool right)
{
int wid = 23;
int ht = 16;
wxASSERT_MSG(rect.width % 4 == 0, "Midi channel control rect width must be divisible by 4");
wxASSERT_MSG(rect.height % 4 == 0, "Midi channel control rect height must be divisible by 4");
if (r.height < ht * 4)
return false;
auto cellWidth = rect.width / 4;
auto cellHeight = rect.height / 4;
int x = r.x + (r.width / 2 - wid * 2);
int y = r.y + 1;
// after adding Mute and Solo buttons, mapping is broken, so hack in the offset
y += 12;
int col = (mx - x) / wid;
int row = (my - y) / ht;
if (row < 0 || row >= 4 || col < 0 || col >= 4)
return false;
int col = (mx - rect.x) / cellWidth;
int row = (my - rect.y) / cellHeight;
int channel = row * 4 + col;
if (right) {
if (mVisibleChannels == CHANNEL_BIT(channel))
mVisibleChannels = ALL_CHANNELS;
else
mVisibleChannels = CHANNEL_BIT(channel);
} else
if (right)
SoloVisibleChan(channel);
else
ToggleVisibleChan(channel);
return true;
@@ -428,11 +414,6 @@ void NoteTrack::PrintSequence()
fclose(debugOutput);
}
int NoteTrack::GetVisibleChannels()
{
return mVisibleChannels;
}
Track::Holder NoteTrack::Cut(double t0, double t1)
{
if (t1 < t0)