smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-03 20:29:35 +01:00
Code Issues Projects Releases Wiki Activity

[Summary] Changing the compact meter bridge according to Igor's request.

Browse source
This commit is contained in:
VKamyshniy 2014-08-06 10:19:04 +03:00
parent b2079d730d
commit 5b918f3fda
5 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
gtk2_ardour/compact_meter_bridge.h
View file

@ -67,7 +67,6 @@ class CompactMeterbridge :
std::map <boost::shared_ptr<ARDOUR::Route>, CompactMeterStrip*> _strips;
mutable Glib::Threads::Mutex _resync_mutex;
};
#endif //__ardour_compact_meter_bridge_h__

9
gtk2_ardour/compact_meter_strip.cc
View file

@ -33,7 +33,6 @@ using namespace std;
using namespace ArdourMeter;
PBD::Signal1<void,CompactMeterStrip*> CompactMeterStrip::CatchDeletion;
int CompactMeterStrip::__meter_width = 4;
CompactMeterStrip::CompactMeterStrip (Session* sess, boost::shared_ptr<ARDOUR::Route> rt)
: EventBox()
@ -43,13 +42,16 @@ CompactMeterStrip::CompactMeterStrip (Session* sess, boost::shared_ptr<ARDOUR::R
, _level_meter (sess)
, _record_indicator (get_event_box ("record_indicator"))
, _serial_number (0)
, _meter_width (xml_property (*xml_tree ()->root (), "meterwidth", 1))
, _thin_meter_width (xml_property (*xml_tree ()->root (), "thinmeterwidth", 1))
{
set_attributes (*this, *xml_tree ()->root (), XMLNodeMap ());
_level_meter.set_meter (_route->shared_peak_meter().get());
_level_meter.clear_meters();
_level_meter.set_type (_route->meter_type());
_level_meter.setup_meters (__meter_width, __meter_width);
int width = (_route->n_inputs().n_total() < 2 ) ? _meter_width : _thin_meter_width;
_level_meter.setup_meters (width, width);
_level_meter_home.add (_level_meter);
_route->shared_peak_meter()->ConfigurationChanged.connect (_route_connections,
@ -125,6 +127,7 @@ CompactMeterStrip::fast_update ()
void
CompactMeterStrip::meter_configuration_changed (ChanCount c)
{
_level_meter.setup_meters (__meter_width, __meter_width);
int width = (c.n_total() < 2 ) ? _meter_width : _thin_meter_width;
_level_meter.setup_meters (width, width);
}

3
gtk2_ardour/compact_meter_strip.h
View file

@ -52,7 +52,8 @@ class CompactMeterStrip : public Gtk::EventBox, public WavesUI
LevelMeterHBox _level_meter;
Gtk::EventBox& _record_indicator;
PBD::ScopedConnectionList _route_connections;
static int __meter_width;
int _meter_width;
int _thin_meter_width;
size_t _serial_number;
void meter_configuration_changed (ARDOUR::ChanCount);
void update_rec_display ();

2
gtk2_ardour/ui/compact_meter_bridge.xml
View file

@ -14,7 +14,7 @@
<EventBox bgnormal="#353535">
<VBox>
<Hbox height="8"/>
<Hbox id="compact_meter_strips_home" spacing="2"/>
<Hbox id="compact_meter_strips_home" spacing="3"/>
</VBox>
</EventBox>
</ScrolledWindow>

4
gtk2_ardour/ui/compact_meter_strip.xml
View file

@ -1,6 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<CompactMeterStrip bgnormal="#353535">
<CompactMeterStrip bgnormal="#353535"
meterwidth="5"
thinmeterwidth="2">
<VBox spacing="6">
<Hbox id="level_meter_home"
height="51"/>