diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2006-10-31 22:16:00 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2006-10-31 22:16:00 +0000 |
| commit | 80ef7a84153f83e60147839c2a04a83f21b62719 (patch) | |
| tree | 07ab8303b40dccf9a822b16a812e266638296d1b /gtk2_ardour | |
| parent | 34cd3457a2f04526f96342edf52d453973cf21b9 (diff) | |
fix sndfile reference in gtk2_ardour/SConscript
git-svn-id: svn://localhost/ardour2/trunk@1043 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/SConscript | 2 | ||||
| -rw-r--r-- | gtk2_ardour/automation_line.cc | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/gtk2_ardour/SConscript b/gtk2_ardour/SConscript index 077937540d..a97bc234b8 100644 --- a/gtk2_ardour/SConscript +++ b/gtk2_ardour/SConscript @@ -34,7 +34,7 @@ gtkardour.Merge ([ libraries['libgnomecanvas2'], libraries['libgnomecanvasmm'], libraries['sysmidi'], - libraries['sndfile'], + libraries['sndfile-ardour'], libraries['flac'], libraries['lrdf'], libraries['glibmm2'], diff --git a/gtk2_ardour/automation_line.cc b/gtk2_ardour/automation_line.cc index 9b04a9d0d4..50f58b827c 100644 --- a/gtk2_ardour/automation_line.cc +++ b/gtk2_ardour/automation_line.cc @@ -311,7 +311,7 @@ AutomationLine::set_height (guint32 h) if (h != _height) { _height = h; - uint32_t bsz = control_point_box_size(); + double bsz = control_point_box_size(); for (vector<ControlPoint*>::iterator i = control_points.begin(); i != control_points.end(); ++i) { (*i)->set_size (bsz); @@ -671,7 +671,7 @@ AutomationLine::determine_visible_control_points (ALPoints& points) uint32_t this_ry = 0; uint32_t prev_ry = 0; double* slope; - double box_size; + uint32_t box_size; uint32_t cpsize; /* hide all existing points, and the line */ @@ -701,7 +701,7 @@ AutomationLine::determine_visible_control_points (ALPoints& points) slope[n] = ydelta/xdelta; } - box_size = control_point_box_size (); + box_size = (uint32_t) control_point_box_size (); /* read all points and decide which ones to show as control points */ |