allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

merge resolution with master

Browse Source
This commit is contained in:
Paul Davis
2013-05-02 20:21:54 -04:00
parent c358e77e1e 3973ce81b3
commit e2f0c5f91e
66 changed files with 255 additions and 4024 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
gtk2_ardour/editor.cc
View File

@@ -119,10 +119,6 @@
#include "i18n.h"
#ifdef WITH_CMT
#include "imageframe_socket_handler.h"
#endif
using namespace std;
using namespace ARDOUR;
using namespace PBD;
@@ -270,10 +266,6 @@ Editor::Editor ()
, _toolbar_viewport (*manage (new Gtk::Adjustment (0, 0, 1e10)), *manage (new Gtk::Adjustment (0, 0, 1e10)))
#ifdef WITH_CMT
, image_socket_listener(0)
#endif
/* nudge */
, nudge_clock (new AudioClock (X_("nudge"), false, X_("nudge"), true, false, true))
@@ -768,18 +760,6 @@ Editor::Editor ()
Editor::~Editor()
{
#ifdef WITH_CMT
if(image_socket_listener) {
if(image_socket_listener->is_connected())
{
image_socket_listener->close_connection() ;
}
delete image_socket_listener ;
image_socket_listener = 0 ;
}
#endif
delete button_bindings;
delete _routes;
delete _route_groups;
@@ -3333,8 +3313,6 @@ Editor::duplicate_range (bool with_dialog)
win.add_button (_("Duplicate"), RESPONSE_ACCEPT);
win.set_default_response (RESPONSE_ACCEPT);
win.set_position (WIN_POS_MOUSE);
spinner.grab_focus ();
switch (win.run ()) {
@@ -5417,7 +5395,6 @@ Editor::change_region_layering_order (bool from_context_menu)
if (layering_order_editor == 0) {
layering_order_editor = new RegionLayeringOrderEditor (*this);
layering_order_editor->set_position (WIN_POS_MOUSE);
}
layering_order_editor->set_context (clicked_routeview->name(), _session, clicked_routeview, pl, position);