ardour/livetrax
13
0
Fork 0
Code

Merged from trunk R745

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/midi@746 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
David Robillard 2006-08-02 02:44:23 +00:00
parent e51e31dca2
commit 38c7d34d8c
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gtk2_ardour/audio_region_view.cc
View File

@ -990,12 +990,14 @@ AudioRegionView::set_waveform_shape (WaveformShape shape)
GhostRegion* GhostRegion*
AudioRegionView::add_ghost (AutomationTimeAxisView& atv) 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; double unit_position = _region.position () / samples_per_unit;
GhostRegion* ghost = new GhostRegion (atv, unit_position); GhostRegion* ghost = new GhostRegion (atv, unit_position);
uint32_t nchans; uint32_t nchans;
nchans = myatv.get_diskstream()->n_channels(); nchans = rtv->get_diskstream()->n_channels();
for (uint32_t n = 0; n < nchans; ++n) { for (uint32_t n = 0; n < nchans; ++n) {

5
gtk2_ardour/streamview.cc
View File

@ -302,7 +302,10 @@ StreamView::region_layered (RegionView* rv)
get events - the parent group does instead ... 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 void

2
libs/ardour/audioregion.cc
View File

@ -1379,7 +1379,7 @@ AudioRegion::speed_mismatch (float sr) const
float fsr = sources.front()->sample_rate(); float fsr = sources.front()->sample_rate();
return fsr == sr; return fsr != sr;
} }
extern "C" { extern "C" {