From 11d2bfa26f09d2321d1e4e90699e0a6540c68214 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 30 Dec 2010 18:35:16 +0000 Subject: Fix up midi ghost regions. Should fix #3629. git-svn-id: svn://localhost/ardour2/branches/3.0@8388 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/ghostregion.cc | 67 +++++++++++++++++++++++------------------- gtk2_ardour/ghostregion.h | 2 ++ gtk2_ardour/route_time_axis.cc | 12 ++++---- 3 files changed, 44 insertions(+), 37 deletions(-) (limited to 'gtk2_ardour') diff --git a/gtk2_ardour/ghostregion.cc b/gtk2_ardour/ghostregion.cc index 5f07f1388f..0145aafc10 100644 --- a/gtk2_ardour/ghostregion.cc +++ b/gtk2_ardour/ghostregion.cc @@ -90,22 +90,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 @@ -155,22 +155,32 @@ 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) { - 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) { base_rect->lower_to_bottom(); + update_range (); + + midi_view()->NoteRangeChanged.connect (sigc::mem_fun (*this, &MidiGhostRegion::update_range)); } MidiGhostRegion::~MidiGhostRegion() @@ -221,21 +231,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(); @@ -258,7 +267,7 @@ MidiGhostRegion::set_colors() } void -MidiGhostRegion::update_range() +MidiGhostRegion::update_range () { MidiStreamView* mv = midi_view(); @@ -267,21 +276,19 @@ MidiGhostRegion::update_range() } 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(); + uint8_t const note_num = note->event->note()->note(); if (note_num < mv->lowest_note() || note_num > mv->highest_note()) { note->rect->hide(); - } - else { + } else { note->rect->show(); - y = mv->note_to_y(note_num); + double const y = trackview.current_height() - (note_num + 1 - mv->lowest_note()) * h + 1; note->rect->property_y1() = y; - note->rect->property_y2() = y + mv->note_height(); + note->rect->property_y2() = y + h; } } } diff --git a/gtk2_ardour/ghostregion.h b/gtk2_ardour/ghostregion.h index 3939c46a4b..9f0442decb 100644 --- a/gtk2_ardour/ghostregion.h +++ b/gtk2_ardour/ghostregion.h @@ -52,7 +52,9 @@ public: guint source_track_color(unsigned char alpha = 0xff); bool is_automation_ghost(); + /** TimeAxisView that is the AutomationTimeAxisView that we are on */ TimeAxisView& trackview; + /** TimeAxisView that we are a ghost for */ TimeAxisView& source_trackview; ArdourCanvas::Group* group; ArdourCanvas::SimpleRect* base_rect; diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc index b6cea2a11a..f2e48fe6ce 100644 --- a/gtk2_ardour/route_time_axis.cc +++ b/gtk2_ardour/route_time_axis.cc @@ -1751,13 +1751,11 @@ void RouteTimeAxisView::region_view_added (RegionView* rv) { /* XXX need to find out if automation children have automationstreamviews. If yes, no ghosts */ - if (is_audio_track()) { - for (Children::iterator i = children.begin(); i != children.end(); ++i) { - boost::shared_ptr atv; - - if ((atv = boost::dynamic_pointer_cast (*i)) != 0) { - atv->add_ghost(rv); - } + for (Children::iterator i = children.begin(); i != children.end(); ++i) { + boost::shared_ptr atv; + + if ((atv = boost::dynamic_pointer_cast (*i)) != 0) { + atv->add_ghost(rv); } } -- cgit v1.2.3