X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fghostregion.cc;h=31e6de390ba23186068c8510da2bcfd80e249853;hb=e65d84d37c965dfe4cd6f3dbc91a1e3ddea08fe6;hp=9fb0deb98a0639076a25b2f80eaf55888f4b08a3;hpb=bb9cc45cd22af67ac275a5e73accbe14fee664d8;p=ardour.git diff --git a/gtk2_ardour/ghostregion.cc b/gtk2_ardour/ghostregion.cc index 9fb0deb98a..31e6de390b 100644 --- a/gtk2_ardour/ghostregion.cc +++ b/gtk2_ardour/ghostregion.cc @@ -20,7 +20,6 @@ #include "evoral/Note.hpp" #include "ardour_ui.h" #include "automation_time_axis.h" -#include "canvas-hit.h" #include "canvas-note.h" #include "ghostregion.h" #include "midi_streamview.h" @@ -34,6 +33,8 @@ using namespace Editing; using namespace ArdourCanvas; using namespace ARDOUR; +PBD::Signal1 GhostRegion::CatchDeletion; + GhostRegion::GhostRegion (ArdourCanvas::Group* parent, TimeAxisView& tv, TimeAxisView& source_tv, double initial_pos) : trackview (tv) , source_trackview (source_tv) @@ -61,7 +62,7 @@ GhostRegion::GhostRegion (ArdourCanvas::Group* parent, TimeAxisView& tv, TimeAxi GhostRegion::~GhostRegion () { - GoingAway (this); + CatchDeletion (this); delete base_rect; delete group; } @@ -88,22 +89,22 @@ GhostRegion::set_colors () } guint -GhostRegion::source_track_color(unsigned char alpha) { +GhostRegion::source_track_color(unsigned char alpha) +{ Gdk::Color color = source_trackview.color(); - unsigned char r,g,b ; - r = color.get_red()/256; - g = color.get_green()/256; - b = color.get_blue()/256; - return RGBA_TO_UINT(r, g, b, alpha); + return RGBA_TO_UINT (color.get_red() / 256, color.get_green() / 256, color.get_blue() / 256, alpha); } bool -GhostRegion::is_automation_ghost() { +GhostRegion::is_automation_ghost() +{ return (dynamic_cast(&trackview)) != 0; } AudioGhostRegion::AudioGhostRegion(TimeAxisView& tv, TimeAxisView& source_tv, double initial_unit_pos) - : GhostRegion(tv.ghost_group(), tv, source_tv, initial_unit_pos) { + : GhostRegion(tv.ghost_group(), tv, source_tv, initial_unit_pos) +{ + } void @@ -153,65 +154,51 @@ AudioGhostRegion::set_colors () } } -/* - * This is the general constructor, and is called when the destination timeaxisview doesn't have - * a midistreamview. But what to do when positioning the midi ghost here? For example, there is - * no range controller in these tracks. maybe show the whole range. +/** The general constructor; called when the destination timeaxisview doesn't have + * a midistreamview. + * + * @param tv TimeAxisView that this ghost region is on. + * @param source_tv TimeAxisView that we are the ghost for. */ MidiGhostRegion::MidiGhostRegion(TimeAxisView& tv, TimeAxisView& source_tv, double initial_unit_pos) : GhostRegion(tv.ghost_group(), tv, source_tv, initial_unit_pos) + , _optimization_iterator (events.end ()) { - base_rect->lower_to_bottom(); + update_range (); + + midi_view()->NoteRangeChanged.connect (sigc::mem_fun (*this, &MidiGhostRegion::update_range)); } +/** + * @param msv MidiStreamView that this ghost region is on. + * @param source_tv TimeAxisView that we are the ghost for. + */ MidiGhostRegion::MidiGhostRegion(MidiStreamView& msv, TimeAxisView& source_tv, double initial_unit_pos) : GhostRegion(msv.midi_underlay_group, msv.trackview(), source_tv, initial_unit_pos) + , _optimization_iterator (events.end ()) { base_rect->lower_to_bottom(); -} - -MidiGhostRegion::~MidiGhostRegion() -{ - //clear_events(); -} + update_range (); -MidiGhostRegion::Event::Event(ArdourCanvas::CanvasNoteEvent* e) - : event(e) -{ + midi_view()->NoteRangeChanged.connect (sigc::mem_fun (*this, &MidiGhostRegion::update_range)); } -MidiGhostRegion::Note::Note(ArdourCanvas::CanvasNote* n, ArdourCanvas::Group* g) - : Event(n) -{ - rect = new ArdourCanvas::SimpleRect(*g, n->x1(), n->y1(), n->x2(), n->y2()); -} - -MidiGhostRegion::Note::~Note() -{ - //delete rect; -} - -void -MidiGhostRegion::Note::x_changed() -{ - rect->property_x1() = event->x1(); - rect->property_x2() = event->x2(); -} - -MidiGhostRegion::Hit::Hit(ArdourCanvas::CanvasHit* h, ArdourCanvas::Group*) - : Event(h) +MidiGhostRegion::~MidiGhostRegion() { - cerr << "Hit ghost item does not work yet" << endl; + clear_events (); } -MidiGhostRegion::Hit::~Hit() +MidiGhostRegion::Event::Event (ArdourCanvas::CanvasNoteEvent* e, ArdourCanvas::Group* g) + : event (e) { + rect = new ArdourCanvas::SimpleRect (*g, e->x1(), e->y1(), e->x2(), e->y2()); } -void -MidiGhostRegion::Hit::x_changed() +MidiGhostRegion::Event::~Event () { + /* event is not ours to delete */ + delete rect; } void @@ -219,21 +206,20 @@ MidiGhostRegion::set_samples_per_unit (double /*spu*/) { } +/** @return MidiStreamView that we are providing a ghost for */ MidiStreamView* -MidiGhostRegion::midi_view() +MidiGhostRegion::midi_view () { - MidiTimeAxisView* mtv; + StreamView* sv = source_trackview.view (); + assert (sv); + MidiStreamView* msv = dynamic_cast (sv); + assert (msv); - if ((mtv = dynamic_cast(&trackview)) != 0) { - return mtv->midi_view(); - } - else { - return 0; - } + return msv; } void -MidiGhostRegion::set_height() +MidiGhostRegion::set_height () { GhostRegion::set_height(); update_range(); @@ -242,21 +228,18 @@ MidiGhostRegion::set_height() void MidiGhostRegion::set_colors() { - MidiGhostRegion::Note* note; guint fill = source_track_color(200); GhostRegion::set_colors(); for (EventList::iterator it = events.begin(); it != events.end(); ++it) { - if ((note = dynamic_cast(*it)) != 0) { - note->rect->property_fill_color_rgba() = fill; - note->rect->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_GhostTrackMidiOutline.get(); - } + (*it)->rect->property_fill_color_rgba() = fill; + (*it)->rect->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_GhostTrackMidiOutline.get(); } } void -MidiGhostRegion::update_range() +MidiGhostRegion::update_range () { MidiStreamView* mv = midi_view(); @@ -264,23 +247,18 @@ MidiGhostRegion::update_range() return; } - MidiGhostRegion::Note* note; - uint8_t note_num; - double y; + double const h = trackview.current_height() / double (mv->contents_note_range ()); for (EventList::iterator it = events.begin(); it != events.end(); ++it) { - if ((note = dynamic_cast(*it)) != 0) { - note_num = note->event->note()->note(); - - if (note_num < mv->lowest_note() || note_num > mv->highest_note()) { - note->rect->hide(); - } - else { - note->rect->show(); - y = mv->note_to_y(note_num); - note->rect->property_y1() = y; - note->rect->property_y2() = y + mv->note_height(); - } + uint8_t const note_num = (*it)->event->note()->note(); + + if (note_num < mv->lowest_note() || note_num > mv->highest_note()) { + (*it)->rect->hide(); + } else { + (*it)->rect->show(); + double const y = trackview.current_height() - (note_num + 1 - mv->lowest_note()) * h + 1; + (*it)->rect->property_y1() = y; + (*it)->rect->property_y2() = y + h; } } } @@ -288,11 +266,11 @@ MidiGhostRegion::update_range() void MidiGhostRegion::add_note(ArdourCanvas::CanvasNote* n) { - Note* note = new Note(n, group); - events.push_back(note); + Event* event = new Event (n, group); + events.push_back (event); - note->rect->property_fill_color_rgba() = source_track_color(200); - note->rect->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_GhostTrackMidiOutline.get(); + event->rect->property_fill_color_rgba() = source_track_color(200); + event->rect->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_GhostTrackMidiOutline.get(); MidiStreamView* mv = midi_view(); @@ -300,21 +278,15 @@ MidiGhostRegion::add_note(ArdourCanvas::CanvasNote* n) const uint8_t note_num = n->note()->note(); if (note_num < mv->lowest_note() || note_num > mv->highest_note()) { - note->rect->hide(); + event->rect->hide(); } else { const double y = mv->note_to_y(note_num); - note->rect->property_y1() = y; - note->rect->property_y2() = y + mv->note_height(); + event->rect->property_y1() = y; + event->rect->property_y2() = y + mv->note_height(); } } } -void -MidiGhostRegion::add_hit(ArdourCanvas::CanvasHit* /*h*/) -{ - //events.push_back(new Hit(h, group)); -} - void MidiGhostRegion::clear_events() { @@ -323,5 +295,64 @@ MidiGhostRegion::clear_events() } events.clear(); + _optimization_iterator = events.end (); } +/** Update the x positions of our representation of a parent's note. + * @param parent The CanvasNote from the parent MidiRegionView. + */ +void +MidiGhostRegion::update_note (ArdourCanvas::CanvasNote* parent) +{ + Event* ev = find_event (parent); + if (!ev) { + return; + } + + double const x1 = parent->property_x1 (); + double const x2 = parent->property_x2 (); + ev->rect->property_x1 () = x1; + ev->rect->property_x2 () = x2; +} + +void +MidiGhostRegion::remove_note (ArdourCanvas::CanvasNoteEvent* note) +{ + Event* ev = find_event (note); + if (!ev) { + return; + } + + events.remove (ev); + delete ev; + _optimization_iterator = events.end (); +} + +/** Given a note in our parent region (ie the actual MidiRegionView), find our + * representation of it. + * @return Our Event, or 0 if not found. + */ + +MidiGhostRegion::Event * +MidiGhostRegion::find_event (ArdourCanvas::CanvasNoteEvent* parent) +{ + /* we are using _optimization_iterator to speed up the common case where a caller + is going through our notes in order. + */ + + if (_optimization_iterator != events.end()) { + ++_optimization_iterator; + } + + if (_optimization_iterator != events.end() && (*_optimization_iterator)->event == parent) { + return *_optimization_iterator; + } + + for (_optimization_iterator = events.begin(); _optimization_iterator != events.end(); ++_optimization_iterator) { + if ((*_optimization_iterator)->event == parent) { + return *_optimization_iterator; + } + } + + return 0; +}