mirror of
https://github.com/Ardour/ardour.git
synced 2025-12-10 16:46:35 +01:00
pianoroll renaming
This commit is contained in:
parent
b9c5927abb
commit
0f43ad3376
5 changed files with 14 additions and 14 deletions
|
|
@ -21,9 +21,9 @@
|
||||||
#include "editing_context.h"
|
#include "editing_context.h"
|
||||||
#include "editor_drag.h"
|
#include "editor_drag.h"
|
||||||
#include "keyboard.h"
|
#include "keyboard.h"
|
||||||
#include "midi_cue_automation_line.h"
|
#include "pianoroll_automation_line.h"
|
||||||
|
|
||||||
MidiCueAutomationLine::MidiCueAutomationLine (const std::string& name,
|
PianorollAutomationLine::PianorollAutomationLine (const std::string& name,
|
||||||
EditingContext& ec,
|
EditingContext& ec,
|
||||||
ArdourCanvas::Item& parent,
|
ArdourCanvas::Item& parent,
|
||||||
ArdourCanvas::Rectangle* drag_base,
|
ArdourCanvas::Rectangle* drag_base,
|
||||||
|
|
@ -32,17 +32,17 @@ MidiCueAutomationLine::MidiCueAutomationLine (const std::string&
|
||||||
: AutomationLine (name, ec, parent, drag_base, al, desc)
|
: AutomationLine (name, ec, parent, drag_base, al, desc)
|
||||||
{
|
{
|
||||||
_drag_base->set_data ("line", this);
|
_drag_base->set_data ("line", this);
|
||||||
_drag_base->Event.connect (sigc::mem_fun (*this, &MidiCueAutomationLine::base_event_handler));
|
_drag_base->Event.connect (sigc::mem_fun (*this, &PianorollAutomationLine::base_event_handler));
|
||||||
}
|
}
|
||||||
|
|
||||||
bool
|
bool
|
||||||
MidiCueAutomationLine::base_event_handler (GdkEvent* ev)
|
PianorollAutomationLine::base_event_handler (GdkEvent* ev)
|
||||||
{
|
{
|
||||||
return _editing_context.typed_event (_drag_base, ev, AutomationTrackItem);
|
return _editing_context.typed_event (_drag_base, ev, AutomationTrackItem);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool
|
bool
|
||||||
MidiCueAutomationLine::event_handler (GdkEvent* ev)
|
PianorollAutomationLine::event_handler (GdkEvent* ev)
|
||||||
{
|
{
|
||||||
return _editing_context.typed_event (line, ev, EditorAutomationLineItem);
|
return _editing_context.typed_event (line, ev, EditorAutomationLineItem);
|
||||||
}
|
}
|
||||||
|
|
@ -16,15 +16,15 @@
|
||||||
* 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_automation_line_h__
|
#ifndef __gtk2_ardour_pianoroll_automation_line.h__
|
||||||
#define __gtk2_ardour_midi_cue_automation_line_h__
|
#define __gtk2_ardour_pianoroll_automation_line.h__
|
||||||
|
|
||||||
#include "automation_line.h"
|
#include "automation_line.h"
|
||||||
|
|
||||||
class MidiCueAutomationLine : public AutomationLine
|
class PianorollAutomationLine : public AutomationLine
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
MidiCueAutomationLine (const std::string& name,
|
PianorollAutomationLine (const std::string& name,
|
||||||
EditingContext& ec,
|
EditingContext& ec,
|
||||||
ArdourCanvas::Item& parent,
|
ArdourCanvas::Item& parent,
|
||||||
ArdourCanvas::Rectangle* drag_base,
|
ArdourCanvas::Rectangle* drag_base,
|
||||||
|
|
@ -33,7 +33,7 @@
|
||||||
#include "hit.h"
|
#include "hit.h"
|
||||||
#include "keyboard.h"
|
#include "keyboard.h"
|
||||||
#include "mergeable_line.h"
|
#include "mergeable_line.h"
|
||||||
#include "midi_cue_automation_line.h"
|
#include "pianoroll_automation_line.h"
|
||||||
#include "pianoroll_midi_view.h"
|
#include "pianoroll_midi_view.h"
|
||||||
#include "pianoroll_velocity.h"
|
#include "pianoroll_velocity.h"
|
||||||
#include "note.h"
|
#include "note.h"
|
||||||
|
|
@ -364,7 +364,7 @@ PianorollMidiView::update_automation_display (Evoral::Parameter const & param, S
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
CueAutomationLine line (new MidiCueAutomationLine (ARDOUR::EventTypeMap::instance().to_symbol (param),
|
CueAutomationLine line (new PianorollAutomationLine (ARDOUR::EventTypeMap::instance().to_symbol (param),
|
||||||
_editing_context,
|
_editing_context,
|
||||||
*automation_group,
|
*automation_group,
|
||||||
automation_group,
|
automation_group,
|
||||||
|
|
|
||||||
|
|
@ -31,7 +31,7 @@
|
||||||
#include "midi_view.h"
|
#include "midi_view.h"
|
||||||
|
|
||||||
class VelocityDisplay;
|
class VelocityDisplay;
|
||||||
class MidiCueAutomationLine;
|
class PianorollAutomationLine;
|
||||||
|
|
||||||
namespace ArdourCanvas {
|
namespace ArdourCanvas {
|
||||||
class Box;
|
class Box;
|
||||||
|
|
@ -84,7 +84,7 @@ class PianorollMidiView : public MidiView
|
||||||
|
|
||||||
ArdourCanvas::Rectangle* automation_group;
|
ArdourCanvas::Rectangle* automation_group;
|
||||||
|
|
||||||
typedef std::shared_ptr<MidiCueAutomationLine> CueAutomationLine;
|
typedef std::shared_ptr<PianorollAutomationLine> CueAutomationLine;
|
||||||
typedef std::shared_ptr<ARDOUR::AutomationControl> CueAutomationControl;
|
typedef std::shared_ptr<ARDOUR::AutomationControl> CueAutomationControl;
|
||||||
|
|
||||||
struct AutomationDisplayState {
|
struct AutomationDisplayState {
|
||||||
|
|
|
||||||
|
|
@ -158,7 +158,6 @@ gtk2_ardour_sources = [
|
||||||
'midi_automation_line.cc',
|
'midi_automation_line.cc',
|
||||||
'midi_channel_dialog.cc',
|
'midi_channel_dialog.cc',
|
||||||
'midi_channel_selector.cc',
|
'midi_channel_selector.cc',
|
||||||
'midi_cue_automation_line.cc',
|
|
||||||
'midi_cut_buffer.cc',
|
'midi_cut_buffer.cc',
|
||||||
'midi_export_dialog.cc',
|
'midi_export_dialog.cc',
|
||||||
'midi_list_editor.cc',
|
'midi_list_editor.cc',
|
||||||
|
|
@ -207,6 +206,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_automation_line.cc',
|
||||||
'pianoroll_background.cc',
|
'pianoroll_background.cc',
|
||||||
'pianoroll_velocity.cc',
|
'pianoroll_velocity.cc',
|
||||||
'pianoroll_midi_view.cc',
|
'pianoroll_midi_view.cc',
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue