diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2007-04-03 15:44:46 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2007-04-03 15:44:46 +0000 |
commit | 6532413fa6e8b2343569c0f8e0dc79569345ce28 (patch) | |
tree | 8a527ec6d7571ef9c48ea7cfbe6b3465bf40ab18 /gtk2_ardour | |
parent | 4b35fc4c68fbd4845f7f8f3d2307e97412d7a4d8 (diff) |
fix botched apply of torben's zero line patch, remove sampo's debug output re: ladspa plugin port setting
git-svn-id: svn://localhost/ardour2/trunk@1662 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
-rw-r--r-- | gtk2_ardour/audio_region_view.cc | 18 | ||||
-rw-r--r-- | gtk2_ardour/canvas-waveview.c | 31 |
2 files changed, 23 insertions, 26 deletions
diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc index 9e16390751..ac0d317a13 100644 --- a/gtk2_ardour/audio_region_view.cc +++ b/gtk2_ardour/audio_region_view.cc @@ -755,8 +755,6 @@ AudioRegionView::set_envelope_visible (bool yn) void AudioRegionView::create_waves () { - bool create_zero_line = false; - RouteTimeAxisView& atv (*(dynamic_cast<RouteTimeAxisView*>(&trackview))); // ick if (!atv.get_diskstream()) { @@ -782,25 +780,11 @@ AudioRegionView::create_waves () if (audio_region()->source(n)->peaks_ready (bind (mem_fun(*this, &AudioRegionView::peaks_ready_handler), n), data_ready_connection)) { create_one_wave (n, true); } else { - create_zero_line = false; } } else { create_one_wave (n, true); } } - - // Blame torben - //if (create_zero_line) { - if (0) { - if (zero_line) { - delete zero_line; - } - zero_line = new ArdourCanvas::SimpleLine (*group); - zero_line->property_x1() = (gdouble) 1.0; - zero_line->property_x2() = (gdouble) (_region->length() / samples_per_unit) - 1.0; - zero_line->property_color_rgba() = (guint) color_map[cZeroLine]; - manage_zero_line (); - } } void @@ -1170,8 +1154,6 @@ AudioRegionView::color_handler (ColorID id, uint32_t val) case cMutedWaveForm: case cWaveForm: case cWaveFormClip: - case cGhostTrackWave: - case cGhostTrackWaveClip: case cZeroLine: set_colors (); break; diff --git a/gtk2_ardour/canvas-waveview.c b/gtk2_ardour/canvas-waveview.c index e4c1a80cfa..857eeea286 100644 --- a/gtk2_ardour/canvas-waveview.c +++ b/gtk2_ardour/canvas-waveview.c @@ -1027,6 +1027,7 @@ gnome_canvas_waveview_render (GnomeCanvasItem *item, int cache_index; double half_height; int x, end, begin; + int zbegin, zend; waveview = GNOME_CANVAS_WAVEVIEW (item); @@ -1041,7 +1042,13 @@ gnome_canvas_waveview_render (GnomeCanvasItem *item, buf->is_bg = FALSE; } - begin = MAX(waveview->bbox_ulx,buf->rect.x0); + begin = MAX(waveview->bbox_ulx, buf->rect.x0); + + if (begin == waveview->bbox_ulx) { + zbegin = begin + 1; + } else { + zbegin = begin; + } if (waveview->bbox_lrx >= 0) { end = MIN(waveview->bbox_lrx,buf->rect.x1); @@ -1049,6 +1056,12 @@ gnome_canvas_waveview_render (GnomeCanvasItem *item, end = buf->rect.x1; } + if (end == waveview->bbox_lrx) { + zend = end - 1; + } else { + zend = end; + } + if (begin == end) { return; } @@ -1182,13 +1195,15 @@ gnome_canvas_waveview_render (GnomeCanvasItem *item, cache_index++; } - // Paint zeroline. - //PAINT_HORIZA(buf, waveview->zero_r, waveview->zero_g, waveview->zero_b, waveview->zero_a, begin, endi-1, origin ); - - unsigned char zero_r, zero_g, zero_b, zero_a; - UINT_TO_RGBA( waveview->zero_color, &zero_r, &zero_g, &zero_b, &zero_a ); - int zeroline_y = (int) rint ((item->y1 + origin) * item->canvas->pixels_per_unit); - PAINT_HORIZA(buf, zero_r, zero_g, zero_b, zero_a, begin, end, zeroline_y); + if (!waveview->rectified) { + // Paint zeroline. + //PAINT_HORIZA(buf, waveview->zero_r, waveview->zero_g, waveview->zero_b, waveview->zero_a, begin, endi-1, origin ); + + unsigned char zero_r, zero_g, zero_b, zero_a; + UINT_TO_RGBA( waveview->zero_color, &zero_r, &zero_g, &zero_b, &zero_a ); + int zeroline_y = (int) rint ((item->y1 + origin) * item->canvas->pixels_per_unit); + PAINT_HORIZA(buf, zero_r, zero_g, zero_b, zero_a, zbegin, zend, zeroline_y); + } #undef origin } |