projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix horizontal positioning of PC flags.
[ardour.git]
/
gtk2_ardour
/
audio_region_view.cc
diff --git
a/gtk2_ardour/audio_region_view.cc
b/gtk2_ardour/audio_region_view.cc
index 40046cd9a1a8f0f6f81e6812af55159ca526a464..2a6bd2e1fe9f259015b5ccb61c10a8c0a42233f3 100644
(file)
--- a/
gtk2_ardour/audio_region_view.cc
+++ b/
gtk2_ardour/audio_region_view.cc
@@
-161,7
+161,7
@@
AudioRegionView::init (Gdk::Color& basic_color, bool wfd)
store_flags ();
}
store_flags ();
}
- if (trackview.editor.new_regionviews_display_gain()) {
+ if (trackview.editor
()
.new_regionviews_display_gain()) {
_flags |= EnvelopeVisible;
}
_flags |= EnvelopeVisible;
}
@@
-196,6
+196,10
@@
AudioRegionView::init (Gdk::Color& basic_color, bool wfd)
setup_fade_handle_positions ();
setup_fade_handle_positions ();
+ if (!Config->get_show_region_fades()) {
+ set_fade_visibility (false);
+ }
+
string line_name = _region->name();
line_name += ':';
line_name += "gain";
string line_name = _region->name();
line_name += ':';
line_name += "gain";
@@
-247,9
+251,7
@@
AudioRegionView::~AudioRegionView ()
/* all waveviews etc will be destroyed when the group is destroyed */
/* all waveviews etc will be destroyed when the group is destroyed */
- if (gain_line) {
- delete gain_line;
- }
+ delete gain_line;
}
boost::shared_ptr<ARDOUR::AudioRegion>
}
boost::shared_ptr<ARDOUR::AudioRegion>
@@
-410,8
+412,10
@@
AudioRegionView::reset_width_dependent_items (double pixel_width)
fade_in_handle->hide();
fade_out_handle->hide();
} else {
fade_in_handle->hide();
fade_out_handle->hide();
} else {
- fade_in_handle->show();
- fade_out_handle->show();
+ if (Config->get_show_region_fades()) {
+ fade_in_handle->show();
+ fade_out_handle->show();
+ }
}
}
}
}
}
}
@@
-992,7
+996,7
@@
AudioRegionView::add_gain_point_event (ArdourCanvas::Item *item, GdkEvent *ev)
item->w2i (x, y);
item->w2i (x, y);
- nframes_t fx = trackview.editor.pixel_to_frame (x);
+ nframes_t fx = trackview.editor
()
.pixel_to_frame (x);
if (fx > _region->length()) {
return;
if (fx > _region->length()) {
return;
@@
-1000,8
+1004,8
@@
AudioRegionView::add_gain_point_event (ArdourCanvas::Item *item, GdkEvent *ev)
/* compute vertical fractional position */
/* compute vertical fractional position */
- y = 1.0 - (y / (
trackview.current_height()
- NAME_HIGHLIGHT_SIZE));
-
+ y = 1.0 - (y / (
_height
- NAME_HIGHLIGHT_SIZE));
+
/* map using gain line */
gain_line->view_to_model_y (y);
/* map using gain line */
gain_line->view_to_model_y (y);