smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-07 15:25:01 +01:00
Code Issues Projects Releases Wiki Activity

pianoroll renaming

Browse source
This commit is contained in:
Paul Davis 2025-01-07 11:37:46 -07:00
parent 5635144e42
commit e3ab5849d7
4 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
gtk2_ardour/midi_cue_view.cc
View file

@ -35,7 +35,7 @@
#include "mergeable_line.h" #include "mergeable_line.h"
#include "midi_cue_automation_line.h" #include "midi_cue_automation_line.h"
#include "midi_cue_view.h" #include "midi_cue_view.h"
#include "midi_cue_velocity.h" #include "pianoroll_velocity.h"
#include "note.h" #include "note.h"
#include "ui_config.h" #include "ui_config.h"
#include "velocity_display.h" #include "velocity_display.h"
@ -345,7 +345,7 @@ MidiCueView::update_automation_display (Evoral::Parameter const & param, Selecti
/* Create and add to automation display map */ /* Create and add to automation display map */
velocity_display = new MidiCueVelocityDisplay (editing_context(), midi_context(), *this, *automation_group, 0x312244ff); velocity_display = new PianorollVelocityDisplay (editing_context(), midi_context(), *this, *automation_group, 0x312244ff);
auto res = automation_map.insert (std::make_pair (Evoral::Parameter (ARDOUR::MidiVelocityAutomation, 0, 0), AutomationDisplayState (*velocity_display, true))); auto res = automation_map.insert (std::make_pair (Evoral::Parameter (ARDOUR::MidiVelocityAutomation, 0, 0), AutomationDisplayState (*velocity_display, true)));
ads = &((*res.first).second); ads = &((*res.first).second);

14
gtk2_ardour/midi_cue_velocity.cc → gtk2_ardour/pianoroll_velocity.cc
View file

@ -20,24 +20,24 @@
#include "canvas/debug.h" #include "canvas/debug.h"
#include "editing_context.h" #include "editing_context.h"
#include "midi_cue_velocity.h" #include "pianoroll_velocity.h"
#include "note_base.h" #include "note_base.h"
#include "ui_config.h" #include "ui_config.h"
MidiCueVelocityDisplay::MidiCueVelocityDisplay (EditingContext& ec, MidiViewBackground& background, MidiView& mv, ArdourCanvas::Rectangle& base_rect, Gtkmm2ext::Color oc) PianorollVelocityDisplay::PianorollVelocityDisplay (EditingContext& ec, MidiViewBackground& background, MidiView& mv, ArdourCanvas::Rectangle& base_rect, Gtkmm2ext::Color oc)
: VelocityDisplay (ec, background, mv, base_rect, *(_note_group = new ArdourCanvas::Container (&base_rect)), events, oc) : VelocityDisplay (ec, background, mv, base_rect, *(_note_group = new ArdourCanvas::Container (&base_rect)), events, oc)
{ {
CANVAS_DEBUG_NAME (_note_group, "cue velocity lolli container"); CANVAS_DEBUG_NAME (_note_group, "cue velocity lolli container");
} }
void void
MidiCueVelocityDisplay::set_height (double h) PianorollVelocityDisplay::set_height (double h)
{ {
redisplay (); redisplay ();
} }
void void
MidiCueVelocityDisplay::set_colors () PianorollVelocityDisplay::set_colors ()
{ {
base.set_fill_color (UIConfiguration::instance().color_mod ("ghost track base", "ghost track midi fill")); base.set_fill_color (UIConfiguration::instance().color_mod ("ghost track base", "ghost track midi fill"));
@ -47,7 +47,7 @@ MidiCueVelocityDisplay::set_colors ()
} }
void void
MidiCueVelocityDisplay::remove_note (NoteBase* nb) PianorollVelocityDisplay::remove_note (NoteBase* nb)
{ {
GhostEvent::EventList::iterator f = events.find (nb->note()); GhostEvent::EventList::iterator f = events.find (nb->note());
if (f == events.end()) { if (f == events.end()) {
@ -61,13 +61,13 @@ MidiCueVelocityDisplay::remove_note (NoteBase* nb)
} }
bool bool
MidiCueVelocityDisplay::base_event (GdkEvent* ev) PianorollVelocityDisplay::base_event (GdkEvent* ev)
{ {
return editing_context.canvas_velocity_base_event (ev, &base); return editing_context.canvas_velocity_base_event (ev, &base);
} }
bool bool
MidiCueVelocityDisplay::lollevent (GdkEvent* ev, GhostEvent* gev) PianorollVelocityDisplay::lollevent (GdkEvent* ev, GhostEvent* gev)
{ {
return editing_context.canvas_velocity_event (ev, gev->item); return editing_context.canvas_velocity_event (ev, gev->item);
} }

10
gtk2_ardour/midi_cue_velocity.h → gtk2_ardour/pianoroll_velocity.h
View file

@ -16,16 +16,16 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/ */
#ifndef __gtk2_ardour_midi_cue_velocity_h__ #ifndef __gtk2_ardour_pianoroll_velocity.h__
#define __gtk2_ardour_midi_cue_velocity_h__ #define __gtk2_ardour_pianoroll_velocity.h__
#include "ghost_event.h" #include "ghost_event.h"
#include "velocity_display.h" #include "velocity_display.h"
class MidiCueVelocityDisplay : public VelocityDisplay class PianorollVelocityDisplay : public VelocityDisplay
{ {
public: public:
MidiCueVelocityDisplay (EditingContext&, MidiViewBackground&, MidiView&, ArdourCanvas::Rectangle& base_rect, Gtkmm2ext::Color oc); PianorollVelocityDisplay (EditingContext&, MidiViewBackground&, MidiView&, ArdourCanvas::Rectangle& base_rect, Gtkmm2ext::Color oc);
void remove_note (NoteBase*); void remove_note (NoteBase*);
void set_colors (); void set_colors ();
@ -40,4 +40,4 @@ class MidiCueVelocityDisplay : public VelocityDisplay
bool lollevent (GdkEvent*, GhostEvent*); bool lollevent (GdkEvent*, GhostEvent*);
}; };
#endif /* __gtk2_ardour_midi_cue_velocity_h__ */ #endif /* __gtk2_ardour_pianoroll_velocity.h__ */

2
gtk2_ardour/wscript
View file

@ -160,7 +160,6 @@ gtk2_ardour_sources = [
'midi_channel_selector.cc', 'midi_channel_selector.cc',
'midi_cue_automation_line.cc', 'midi_cue_automation_line.cc',
'midi_cue_background.cc', 'midi_cue_background.cc',
'midi_cue_velocity.cc',
'midi_cue_view.cc', 'midi_cue_view.cc',
'midi_cut_buffer.cc', 'midi_cut_buffer.cc',
'midi_export_dialog.cc', 'midi_export_dialog.cc',
@ -210,6 +209,7 @@ gtk2_ardour_sources = [
'piano_key_bindings.cc', 'piano_key_bindings.cc',
'piano_roll_header.cc', 'piano_roll_header.cc',
'pianoroll.cc', 'pianoroll.cc',
'pianoroll_velocity.cc',
'pingback.cc', 'pingback.cc',
'playlist_selector.cc', 'playlist_selector.cc',
'plugin_display.cc', 'plugin_display.cc',