diff options
| author | Doug McLain <doug@nostar.net> | 2007-11-17 23:31:56 +0000 |
|---|---|---|
| committer | Doug McLain <doug@nostar.net> | 2007-11-17 23:31:56 +0000 |
| commit | 8683ccfd80e9cb222ba94684954caff7cf318670 (patch) | |
| tree | 2f8cb59a6263a1481417816dba8572b2fd3c679a /libs | |
| parent | 6220b80b9b5f81e7058e44a829d1b198db472f29 (diff) | |
Level meters added to editor tracks, smaller and above
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2690 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/ardour/ardour/configuration_vars.h | 2 | ||||
| -rw-r--r-- | libs/gtkmm2ext/fastmeter.cc | 14 | ||||
| -rw-r--r-- | libs/gtkmm2ext/gtkmm2ext/fastmeter.h | 2 |
3 files changed, 11 insertions, 7 deletions
diff --git a/libs/ardour/ardour/configuration_vars.h b/libs/ardour/ardour/configuration_vars.h index 8473f0f4d0..d730ad583a 100644 --- a/libs/ardour/ardour/configuration_vars.h +++ b/libs/ardour/ardour/configuration_vars.h @@ -115,7 +115,7 @@ CONFIG_VARIABLE (ShuttleUnits, shuttle_units, "shuttle-units", Percentage) CONFIG_VARIABLE (bool, quieten_at_speed, "quieten-at-speed", true) CONFIG_VARIABLE (bool, primary_clock_delta_edit_cursor, "primary-clock-delta-edit-cursor", false) CONFIG_VARIABLE (bool, secondary_clock_delta_edit_cursor, "secondary-clock-delta-edit-cursor", false) - +CONFIG_VARIABLE (bool, show_track_meters, "show-track-meters", true) /* timecode and sync */ CONFIG_VARIABLE (bool, jack_time_master, "jack-time-master", true) diff --git a/libs/gtkmm2ext/fastmeter.cc b/libs/gtkmm2ext/fastmeter.cc index ab1e1472b3..03745765ab 100644 --- a/libs/gtkmm2ext/fastmeter.cc +++ b/libs/gtkmm2ext/fastmeter.cc @@ -34,16 +34,16 @@ using namespace Gtkmm2ext; using namespace std; -int FastMeter::min_v_pixbuf_size = 50; +int FastMeter::min_v_pixbuf_size = 10; int FastMeter::max_v_pixbuf_size = 1024; Glib::RefPtr<Gdk::Pixbuf>* FastMeter::v_pixbuf_cache = 0; -int FastMeter::min_h_pixbuf_size = 50; +int FastMeter::min_h_pixbuf_size = 10; int FastMeter::max_h_pixbuf_size = 1024; Glib::RefPtr<Gdk::Pixbuf>* FastMeter::h_pixbuf_cache = 0; -FastMeter::FastMeter (long hold, unsigned long dimen, Orientation o) +FastMeter::FastMeter (long hold, unsigned long dimen, Orientation o, int len) { orientation = o; hold_cnt = hold; @@ -57,9 +57,13 @@ FastMeter::FastMeter (long hold, unsigned long dimen, Orientation o) pixrect.y = 0; if (orientation == Vertical) { - pixbuf = request_vertical_meter(dimen, 250); + if (!len) + len = 250; + pixbuf = request_vertical_meter(dimen, len); } else { - pixbuf = request_horizontal_meter(186, dimen); + if (!len) + len = 186; + pixbuf = request_horizontal_meter(len, dimen); } pixheight = pixbuf->get_height(); diff --git a/libs/gtkmm2ext/gtkmm2ext/fastmeter.h b/libs/gtkmm2ext/gtkmm2ext/fastmeter.h index 48bed3d150..31e05d9b14 100644 --- a/libs/gtkmm2ext/gtkmm2ext/fastmeter.h +++ b/libs/gtkmm2ext/gtkmm2ext/fastmeter.h @@ -32,7 +32,7 @@ class FastMeter : public Gtk::DrawingArea { Vertical }; - FastMeter (long hold_cnt, unsigned long width, Orientation); + FastMeter (long hold_cnt, unsigned long width, Orientation, int len=0); virtual ~FastMeter (); void set (float level); |