diff options
| author | Carl Hetherington <carl@carlh.net> | 2010-07-19 23:26:10 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2010-07-19 23:26:10 +0000 |
| commit | 064c6287cd22e9874fe897604201a4e08769471e (patch) | |
| tree | 9e4c2305512df3c0d097d70aa130b2b3988b5e4d /gtk2_ardour/region_view.cc | |
| parent | 61dd34e4356ac9c0b6bbac4165d768117702febd (diff) | |
Remove fade handles from recording regions. Fixes #3322.
git-svn-id: svn://localhost/ardour2/branches/3.0@7444 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/region_view.cc')
| -rw-r--r-- | gtk2_ardour/region_view.cc | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/gtk2_ardour/region_view.cc b/gtk2_ardour/region_view.cc index bbe854a6a3..8a9767bb02 100644 --- a/gtk2_ardour/region_view.cc +++ b/gtk2_ardour/region_view.cc @@ -157,16 +157,19 @@ RegionView::init (Gdk::Color const & basic_color, bool wfd) name_highlight->set_data ("regionview", this); name_highlight->signal_event().connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_region_view_name_highlight_event), name_highlight, this)); - frame_handle_start->set_data ("regionview", this); - frame_handle_start->set_data ("isleft", (void*) 1); - frame_handle_start->signal_event().connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_frame_handle_event), frame_handle_start, this)); - - frame_handle_end->set_data ("regionview", this); - frame_handle_end->set_data ("isleft", (void*) 0); - frame_handle_end->signal_event().connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_frame_handle_event), frame_handle_end, this)); + if (frame_handle_start) { + frame_handle_start->set_data ("regionview", this); + frame_handle_start->set_data ("isleft", (void*) 1); + frame_handle_start->signal_event().connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_frame_handle_event), frame_handle_start, this)); + frame_handle_start->raise_to_top(); + } - frame_handle_start->raise_to_top(); - frame_handle_end->raise_to_top(); + if (frame_handle_end) { + frame_handle_end->set_data ("regionview", this); + frame_handle_end->set_data ("isleft", (void*) 0); + frame_handle_end->signal_event().connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_frame_handle_event), frame_handle_end, this)); + frame_handle_end->raise_to_top(); + } } if (name_pixbuf) { @@ -673,6 +676,8 @@ RegionView::update_coverage_frames (LayerDisplay d) cr->property_x2() = trackview.editor().frame_to_pixel (end - position); } - frame_handle_start->raise_to_top (); - frame_handle_end->raise_to_top (); + if (frame_handle_start) { + frame_handle_start->raise_to_top (); + frame_handle_end->raise_to_top (); + } } |