diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2008-09-11 06:24:57 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2008-09-11 06:24:57 +0000 |
| commit | 4b27094a39cbbe43c3ca2bc3ed64c08f26db22e4 (patch) | |
| tree | 840f3f794f188ff2026fe3baffa9cadb200e9e00 /gtk2_ardour | |
| parent | efc5d1678e6b52e1552a51f337a948fa70a4c506 (diff) | |
make link (rubberband) work
git-svn-id: svn://localhost/ardour2/branches/3.0@3715 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/editor.cc | 12 | ||||
| -rw-r--r-- | gtk2_ardour/editor_canvas.cc | 2 |
2 files changed, 4 insertions, 10 deletions
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index 6c276f3b0c..5fe9e000d0 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -504,8 +504,8 @@ Editor::Editor () edit_packer.set_name ("EditorWindow"); edit_packer.attach (edit_vscrollbar, 0, 1, 0, 4, FILL, FILL|EXPAND, 0, 0); - edit_packer.attach (ruler_label_event_box, 1, 2, 0, 1, FILL, SHRINK, 0, 0); - edit_packer.attach (time_button_event_box, 1, 2, 1, 2, FILL, SHRINK, 0, 0); + edit_packer.attach (ruler_label_event_box, 1, 2, 0, 1, FILL, SHRINK, 0, 0); + edit_packer.attach (time_button_event_box, 1, 2, 1, 2, FILL, SHRINK, 0, 0); edit_packer.attach (time_canvas_event_box, 2, 3, 0, 1, FILL|EXPAND, FILL, 0, 0); edit_packer.attach (controls_layout, 1, 2, 2, 3, FILL, FILL|EXPAND, 0, 0); @@ -826,8 +826,7 @@ Editor::Editor () Editor::~Editor() { #ifdef WITH_CMT - if(image_socket_listener) - { + if(image_socket_listener) { if(image_socket_listener->is_connected()) { image_socket_listener->close_connection() ; @@ -842,11 +841,6 @@ Editor::~Editor() delete track_canvas; track_canvas = 0; } - - if (track_canvas) { - delete track_canvas; - track_canvas = 0; - } } void diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc index 9e0ecca93c..2decb03099 100644 --- a/gtk2_ardour/editor_canvas.cc +++ b/gtk2_ardour/editor_canvas.cc @@ -429,7 +429,7 @@ Editor::controls_layout_size_request (Requisition* req) vertical_adjustment.set_upper (pos + canvas_timebars_vsize); } - //cerr << "sizes = " << req->width << " " << edit_controls_vbox.get_width() << " " << controls_layout.get_width() << " " << zoom_box.get_width() << " " << time_button_frame.get_width() << endl;//DEBUG + cerr << "sizes = " << req->width << " " << edit_controls_vbox.get_width() << " " << controls_layout.get_width() << " " << zoom_box.get_width() << " " << endl;//DEBUG } bool |