diff options
| author | David Robillard <d@drobilla.net> | 2006-08-02 02:44:23 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2006-08-02 02:44:23 +0000 |
| commit | 38c7d34d8c449c7ce5f7da9575c24e60c6b31b1a (patch) | |
| tree | e97246ee11a34db98f6fdbdd181bd15ef0217d02 /gtk2_ardour | |
| parent | e51e31dca20d1e636508c61d93a740fdb48eeebd (diff) | |
Merged from trunk R745
git-svn-id: svn://localhost/ardour2/branches/midi@746 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/audio_region_view.cc | 6 | ||||
| -rw-r--r-- | gtk2_ardour/streamview.cc | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc index b6eb90eaf8..b12713433b 100644 --- a/gtk2_ardour/audio_region_view.cc +++ b/gtk2_ardour/audio_region_view.cc @@ -990,12 +990,14 @@ AudioRegionView::set_waveform_shape (WaveformShape shape) GhostRegion* AudioRegionView::add_ghost (AutomationTimeAxisView& atv) { - RouteTimeAxisView& myatv (*(dynamic_cast<RouteTimeAxisView*>(&trackview))); // ick + RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*>(&trackview); + assert(rtv); + double unit_position = _region.position () / samples_per_unit; GhostRegion* ghost = new GhostRegion (atv, unit_position); uint32_t nchans; - nchans = myatv.get_diskstream()->n_channels(); + nchans = rtv->get_diskstream()->n_channels(); for (uint32_t n = 0; n < nchans; ++n) { diff --git a/gtk2_ardour/streamview.cc b/gtk2_ardour/streamview.cc index 13d07f6cb1..d1d163d7a2 100644 --- a/gtk2_ardour/streamview.cc +++ b/gtk2_ardour/streamview.cc @@ -302,7 +302,10 @@ StreamView::region_layered (RegionView* rv) get events - the parent group does instead ... */ - rv->get_canvas_group()->raise (rv->region().layer() + 1); + /* this used to be + 1, but regions to the left ended up below + ..something.. and couldn't receive events. why? good question. + */ + rv->get_canvas_group()->raise (rv->region().layer() + 2); } void |