summaryrefslogtreecommitdiff
path: root/gtk2_ardour/ardour_ui2.cc
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2016-12-20 00:00:14 +0100
committerRobin Gareus <robin@gareus.org>2016-12-20 00:20:00 +0100
commit58124e7544a3e65139f9c44f5fe5d650da7df631 (patch)
tree39f934def0ca45d62025f271548672c02396bbd1 /gtk2_ardour/ardour_ui2.cc
parent0a167f5c99d60ea64f2680a40dbd9ed744e05a69 (diff)
Don't dynamically allocate ShuttleCtrl
With manage() both the button and shuttle were free'ed when the table was destroyed.
Diffstat (limited to 'gtk2_ardour/ardour_ui2.cc')
-rw-r--r--gtk2_ardour/ardour_ui2.cc8
1 files changed, 3 insertions, 5 deletions
diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc
index 9df7d35751..e30c6ff99b 100644
--- a/gtk2_ardour/ardour_ui2.cc
+++ b/gtk2_ardour/ardour_ui2.cc
@@ -56,7 +56,6 @@
#include "theme_manager.h"
#include "midi_tracer.h"
#include "mini_timeline.h"
-#include "shuttle_control.h"
#include "global_port_matrix.h"
#include "location_ui.h"
#include "rc_option_editor.h"
@@ -395,7 +394,6 @@ ARDOUR_UI::setup_transport ()
punch_button_size_group->add_widget (punch_in_button);
punch_button_size_group->add_widget (punch_out_button);
- shuttle_box = manage (new ShuttleControl);
mini_timeline = manage (new MiniTimeline);
/* and now the layout... */
@@ -463,8 +461,8 @@ ARDOUR_UI::setup_transport ()
HBox* ssbox = manage (new HBox);
ssbox->set_spacing (PX_SCALE(2));
ssbox->pack_start (sync_button, false, false, 0);
- ssbox->pack_start (*shuttle_box, true, true, 0);
- ssbox->pack_start (*shuttle_box->info_button(), false, false, 0);
+ ssbox->pack_start (shuttle_box, true, true, 0);
+ ssbox->pack_start (*shuttle_box.info_button(), false, false, 0);
/* and the main table layout */
@@ -716,7 +714,7 @@ void
ARDOUR_UI::set_transport_sensitivity (bool yn)
{
ActionManager::set_sensitive (ActionManager::transport_sensitive_actions, yn);
- shuttle_box->set_sensitive (yn);
+ shuttle_box.set_sensitive (yn);
}
void