X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Faudio_region_view.cc;h=ed5665ddb103104866e432a272f90333132e6638;hb=987c1cb94ac7a558a03ae308ff33528b7337d592;hp=a70dcaae0be3f0148e23915350399494a6542ec7;hpb=cf52d6e4b40111eb04b244ec054055a4ec15dbe0;p=ardour.git

diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc
index a70dcaae0b..ed5665ddb1 100644
--- a/gtk2_ardour/audio_region_view.cc
+++ b/gtk2_ardour/audio_region_view.cc
@@ -275,14 +275,6 @@ AudioRegionView::init (bool wfd)
 
 	setup_waveform_visibility ();
 
-	/* reset_width_dependent_items() does this:
-	if (frame_handle_start) {
-		frame_handle_start->raise_to_top ();
-	}
-	if (frame_handle_end) {
-		frame_handle_end->raise_to_top ();
-	}
-	*/
 	/* XXX sync mark drag? */
 }
 
@@ -386,6 +378,7 @@ AudioRegionView::region_scale_amplitude_changed ()
 	for (uint32_t n = 0; n < waves.size(); ++n) {
 		waves[n]->gain_changed ();
 	}
+	region_renamed ();
 }
 
 void
@@ -401,6 +394,14 @@ AudioRegionView::region_renamed ()
 		str = string ("!") + str;
 	}
 
+
+	boost::shared_ptr<AudioRegion> ar (audio_region());
+	if (ar->scale_amplitude() != 1.0) {
+		char tmp[32];
+		snprintf (tmp, 32, " (%.1fdB)", accurate_coefficient_to_dB (ar->scale_amplitude()));
+		str += tmp;
+	}
+
 	set_item_name (str, this);
 	set_name_text (str);
 }
@@ -1346,11 +1347,10 @@ AudioRegionView::add_gain_point_event (ArdourCanvas::Item *item, GdkEvent *ev, b
 	/* don't create points that can't be seen */
 
 	update_envelope_visibility ();
-
 	framepos_t rpos = region ()->position ();
-	framepos_t fx = trackview.editor().pixel_to_sample (mx) + rpos;
-	trackview.editor ().snap_to_with_modifier (fx, ev);
-	fx -= rpos;
+	MusicFrame snap_pos (trackview.editor().pixel_to_sample (mx) + rpos, 0);
+	trackview.editor ().snap_to_with_modifier (snap_pos, ev);
+	framepos_t fx = snap_pos.frame - rpos;
 
 	if (fx > _region->length()) {
 		return;
@@ -1623,17 +1623,14 @@ AudioRegionView::set_fade_visibility (bool yn)
 void
 AudioRegionView::update_coverage_frames (LayerDisplay d)
 {
-	if (d != Stacked) {
-		/* don't do coverage frames unless we're in stacked mode */
-		return;
-	}
-
 	RegionView::update_coverage_frames (d);
 
-	if (fade_in_handle)       { fade_in_handle->raise_to_top (); }
-	if (fade_out_handle)      { fade_out_handle->raise_to_top (); }
-	if (fade_in_trim_handle)  { fade_in_trim_handle->raise_to_top (); }
-	if (fade_out_trim_handle) { fade_out_trim_handle->raise_to_top (); }
+	if (d == Stacked) {
+		if (fade_in_handle)       { fade_in_handle->raise_to_top (); }
+		if (fade_out_handle)      { fade_out_handle->raise_to_top (); }
+		if (fade_in_trim_handle)  { fade_in_trim_handle->raise_to_top (); }
+		if (fade_out_trim_handle) { fade_out_trim_handle->raise_to_top (); }
+	}
 }
 
 void