ardour/livetrax
13
0
Fork 0
Code

make link (rubberband) work

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@3715 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2008-09-11 06:24:57 +00:00
parent efc5d1678e
commit 4b27094a39
3 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SConstruct
View File

@ -1245,8 +1245,8 @@ else:
#
timefx_subdirs = ['libs/soundtouch']
#if env['RUBBERBAND']:
# timefx_subdirs += ['libs/rubberband']
if env['RUBBERBAND']:
timefx_subdirs += ['libs/rubberband']
opts.Save('scache.conf', env)
Help(opts.GenerateHelpText(env))

12
gtk2_ardour/editor.cc
View File

@ -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

2
gtk2_ardour/editor_canvas.cc
View File

@ -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