ardour/livetrax
13
0
Fork 0
Code

search lib64 for LADSPA plugins, and fix control point box size:track height relationship

Browse Source 
git-svn-id: svn://localhost/ardour2/trunk@1040 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2006-10-31 20:09:41 +00:00
parent 1987df571c
commit 209aeb85ef
3 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
gtk2_ardour/automation_line.cc
View File

@ -270,14 +270,6 @@ AutomationLine::queue_reset ()
} }
} }
void
AutomationLine::set_point_size (double sz)
{
for (vector<ControlPoint*>::iterator i = control_points.begin(); i != control_points.end(); ++i) {
(*i)->set_size (sz);
}
}
void void
AutomationLine::show () AutomationLine::show ()
{ {
@ -302,18 +294,27 @@ AutomationLine::hide ()
_visible = false; _visible = false;
} }
uint32_t
AutomationLine::control_point_box_size ()
{
if (_height > TimeAxisView::hLarger) {
return 8.0;
} else if (_height > (guint32) TimeAxisView::hNormal) {
return 6.0;
}
return 4.0;
}
void void
AutomationLine::set_height (guint32 h) AutomationLine::set_height (guint32 h)
{ {
if (h != _height) { if (h != _height) {
_height = h; _height = h;
if (_height > (guint32) TimeAxisView::Larger) { uint32_t bsz = control_point_box_size();
set_point_size (8.0);
} else if (_height > (guint32) TimeAxisView::Normal) { for (vector<ControlPoint*>::iterator i = control_points.begin(); i != control_points.end(); ++i) {
set_point_size (6.0); (*i)->set_size (bsz);
} else {
set_point_size (4.0);
} }
reset (); reset ();
@ -700,13 +701,8 @@ AutomationLine::determine_visible_control_points (ALPoints& points)
slope[n] = ydelta/xdelta; slope[n] = ydelta/xdelta;
} }
if (_height > (guint32) TimeAxisView::Larger) { box_size = control_point_box_size ();
box_size = 8.0;
} else if (_height > (guint32) TimeAxisView::Normal) {
box_size = 6.0;
} else {
box_size = 4.0;
}
/* read all points and decide which ones to show as control points */ /* read all points and decide which ones to show as control points */
view_index = 0; view_index = 0;

4
gtk2_ardour/automation_line.h
View File

@ -146,8 +146,6 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulThingWithGoin
void show_selection(); void show_selection();
void hide_selection (); void hide_selection ();
void set_point_size (double size);
virtual string get_verbose_cursor_string (float); virtual string get_verbose_cursor_string (float);
virtual void view_to_model_y (double&) = 0; virtual void view_to_model_y (double&) = 0;
virtual void model_to_view_y (double&) = 0; virtual void model_to_view_y (double&) = 0;
@ -219,6 +217,8 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulThingWithGoin
void reset_line_coords (ControlPoint&); void reset_line_coords (ControlPoint&);
void update_line (); void update_line ();
uint32_t control_point_box_size ();
struct ModelRepresentation { struct ModelRepresentation {
ARDOUR::AutomationList::iterator start; ARDOUR::AutomationList::iterator start;
ARDOUR::AutomationList::iterator end; ARDOUR::AutomationList::iterator end;

2
libs/ardour/plugin_manager.cc
View File

@ -106,7 +106,7 @@ PluginManager::ladspa_refresh ()
_ladspa_plugin_info.clear (); _ladspa_plugin_info.clear ();
if (ladspa_path.length() == 0) { if (ladspa_path.length() == 0) {
ladspa_path = "/usr/local/lib/ladspa:/usr/lib/ladspa"; ladspa_path = "/usr/local/lib64/ladspa:/usr/local/lib/ladspa:/usr/lib64/ladspa:/usr/lib/ladspa";
} }
ladspa_discover_from_path (ladspa_path); ladspa_discover_from_path (ladspa_path);