smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-09 16:24:57 +01:00
Code Issues Projects Releases Wiki Activity

Move UIConfiguration Singleton into UIConfiguration header

Browse source 
This removes the direct dependence on ardour_ui.h from 39 files
This commit is contained in:
Tim Mayberry 2015-01-02 21:44:54 +07:00 • committed by Paul Davis
parent 45d487f16e
commit 6b019a4953
84 changed files with 726 additions and 712 deletions
Download patch file Download diff file Expand all files Collapse all files

9
gtk2_ardour/route_ui.cc
View file

@ -47,6 +47,7 @@
#include "route_time_axis.h"
#include "group_tabs.h"
#include "timers.h"
#include "ui_config.h"
#include "ardour/audio_track.h"
#include "ardour/audioengine.h"
@ -151,7 +152,7 @@ RouteUI::init ()
rec_enable_button->set_icon (ArdourIcon::RecButton);
UI::instance()->set_tip (rec_enable_button, _("Enable recording on this track"), "");
if (ARDOUR_UI::config()->get_blink_rec_arm()) {
if (UIConfiguration::instance().get_blink_rec_arm()) {
rec_blink_connection = Timers::blink_connect (sigc::mem_fun (*this, &RouteUI::blink_rec_display));
}
@ -313,7 +314,7 @@ RouteUI::set_route (boost::shared_ptr<Route> rp)
update_mute_display ();
update_solo_display ();
if (!ARDOUR_UI::config()->get_blink_rec_arm()) {
if (!UIConfiguration::instance().get_blink_rec_arm()) {
blink_rec_display(true); // set initial rec-en button state
}
@ -1264,7 +1265,7 @@ RouteUI::blink_rec_display (bool blinkOn)
case Session::Disabled:
case Session::Enabled:
if ( ARDOUR_UI::config()->get_blink_rec_arm() )
if ( UIConfiguration::instance().get_blink_rec_arm() )
rec_enable_button->set_active_state ( blinkOn ? Gtkmm2ext::ExplicitActive : Gtkmm2ext::Off );
else
rec_enable_button->set_active_state ( ImplicitActive );
@ -1865,7 +1866,7 @@ RouteUI::parameter_changed (string const & p)
} else if (p == "auto-input") {
update_monitoring_display ();
} else if (p == "blink-rec-arm") {
if (ARDOUR_UI::config()->get_blink_rec_arm()) {
if (UIConfiguration::instance().get_blink_rec_arm()) {
rec_blink_connection.disconnect ();
rec_blink_connection = Timers::blink_connect (sigc::mem_fun (*this, &RouteUI::blink_rec_display));
} else {