summaryrefslogtreecommitdiff
path: root/gtk2_ardour/ardour_ui.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_ui.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_ui.cc')
-rw-r--r--gtk2_ardour/ardour_ui.cc7
1 files changed, 3 insertions, 4 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 783510977b..2947a6df78 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -167,7 +167,6 @@ typedef uint64_t microseconds_t;
#include "session_dialog.h"
#include "session_metadata_dialog.h"
#include "session_option_editor.h"
-#include "shuttle_control.h"
#include "speaker_dialog.h"
#include "splash.h"
#include "startup.h"
@@ -828,7 +827,7 @@ ARDOUR_UI::set_transport_controllable_state (const XMLNode& node)
rec_controllable->set_id (prop->value());
}
if ((prop = node.property ("shuttle")) != 0) {
- shuttle_box->controllable()->set_id (prop->value());
+ shuttle_box.controllable()->set_id (prop->value());
}
}
@@ -852,7 +851,7 @@ ARDOUR_UI::get_transport_controllable_state ()
node->add_property (X_("play_selection"), buf);
rec_controllable->id().print (buf, sizeof (buf));
node->add_property (X_("rec"), buf);
- shuttle_box->controllable()->id().print (buf, sizeof (buf));
+ shuttle_box.controllable()->id().print (buf, sizeof (buf));
node->add_property (X_("shuttle"), buf);
return *node;
@@ -2513,7 +2512,7 @@ ARDOUR_UI::map_transport_state ()
return;
}
- shuttle_box->map_transport_state ();
+ shuttle_box.map_transport_state ();
float sp = _session->transport_speed();