Display region gain automation if it is 'interesting' (ie not just the default)
git-svn-id: svn://localhost/ardour2/branches/3.0@6991 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
e950e5de0b
commit
ad40083d4d
@ -162,7 +162,8 @@ AudioRegionView::init (Gdk::Color const & basic_color, bool wfd)
|
|||||||
store_flags ();
|
store_flags ();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (trackview.editor().new_regionviews_display_gain()) {
|
/* make envelope visible if it has anything interesting in it */
|
||||||
|
if (audio_region()->envelope()->size() > 2) {
|
||||||
_flags |= EnvelopeVisible;
|
_flags |= EnvelopeVisible;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -360,7 +360,6 @@ Editor::Editor ()
|
|||||||
entered_regionview = 0;
|
entered_regionview = 0;
|
||||||
entered_marker = 0;
|
entered_marker = 0;
|
||||||
clear_entered_track = false;
|
clear_entered_track = false;
|
||||||
_new_regionviews_show_envelope = false;
|
|
||||||
current_timefx = 0;
|
current_timefx = 0;
|
||||||
playhead_cursor = 0;
|
playhead_cursor = 0;
|
||||||
button_release_can_deselect = true;
|
button_release_can_deselect = true;
|
||||||
|
@ -390,7 +390,6 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
|
|||||||
void scroll_tracks_down_line ();
|
void scroll_tracks_down_line ();
|
||||||
void scroll_tracks_up_line ();
|
void scroll_tracks_up_line ();
|
||||||
|
|
||||||
bool new_regionviews_display_gain () { return _new_regionviews_show_envelope; }
|
|
||||||
void prepare_for_cleanup ();
|
void prepare_for_cleanup ();
|
||||||
void finish_cleanup ();
|
void finish_cleanup ();
|
||||||
|
|
||||||
@ -1922,8 +1921,6 @@ public:
|
|||||||
void ensure_track_visible (TimeAxisView*);
|
void ensure_track_visible (TimeAxisView*);
|
||||||
gint left_automation_track ();
|
gint left_automation_track ();
|
||||||
|
|
||||||
bool _new_regionviews_show_envelope;
|
|
||||||
|
|
||||||
void reset_canvas_action_sensitivity (bool);
|
void reset_canvas_action_sensitivity (bool);
|
||||||
void toggle_gain_envelope_visibility ();
|
void toggle_gain_envelope_visibility ();
|
||||||
void toggle_gain_envelope_active ();
|
void toggle_gain_envelope_active ();
|
||||||
|
@ -170,11 +170,6 @@ Editor::split_regions_at (nframes64_t where, RegionSelection& regions)
|
|||||||
pl->freeze();
|
pl->freeze();
|
||||||
}
|
}
|
||||||
|
|
||||||
AudioRegionView* const arv = dynamic_cast<AudioRegionView*>(*a);
|
|
||||||
if (arv) {
|
|
||||||
_new_regionviews_show_envelope = arv->envelope_visible();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (pl) {
|
if (pl) {
|
||||||
pl->clear_history ();
|
pl->clear_history ();
|
||||||
pl->split_region ((*a)->region(), where);
|
pl->split_region ((*a)->region(), where);
|
||||||
@ -191,7 +186,6 @@ Editor::split_regions_at (nframes64_t where, RegionSelection& regions)
|
|||||||
}
|
}
|
||||||
|
|
||||||
commit_reversible_command ();
|
commit_reversible_command ();
|
||||||
_new_regionviews_show_envelope = false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
boost::shared_ptr<Region>
|
boost::shared_ptr<Region>
|
||||||
|
@ -250,7 +250,6 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulDestructible {
|
|||||||
virtual void temporal_zoom_step (bool coarser) = 0;
|
virtual void temporal_zoom_step (bool coarser) = 0;
|
||||||
virtual void scroll_tracks_down_line () = 0;
|
virtual void scroll_tracks_down_line () = 0;
|
||||||
virtual void scroll_tracks_up_line () = 0;
|
virtual void scroll_tracks_up_line () = 0;
|
||||||
virtual bool new_regionviews_display_gain () = 0;
|
|
||||||
virtual void prepare_for_cleanup () = 0;
|
virtual void prepare_for_cleanup () = 0;
|
||||||
virtual void finish_cleanup () = 0;
|
virtual void finish_cleanup () = 0;
|
||||||
virtual void reset_x_origin (nframes64_t frame) = 0;
|
virtual void reset_x_origin (nframes64_t frame) = 0;
|
||||||
|
Loading…
Reference in New Issue
Block a user