add option to blink rec-enables

5 files changed, 19 insertions, 1 deletions

diff --git a/gtk2_ardour/ardour3_ui_default.conf.in b/gtk2_ardour/ardour3_ui_default.conf.in
index 938bb9d6d0..10e97a7d62 100644
--- a/gtk2_ardour/ardour3_ui_default.conf.in
+++ b/gtk2_ardour/ardour3_ui_default.conf.in
@@ -3,6 +3,9 @@
   <UI>
     <Option name="ui-rc-file" value="ardour3_ui_dark.rc"/>
     <Option name="flat-buttons" value="00000000"/>
+    <Option name="square-buttons" value="00000000"/>
+    <Option name="blink-rec-arm" value="00000000"/>
+    <Option name="led-meters" value="00000000"/>
     <Option name="waveform-gradient-depth" value="0"/>
     <Option name="timeline-item-gradient-depth" value="00000.5"/>
     <Option name="all-floating-windows-are-dialogs" value="00000000"/>
diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc
index e86cfc9d4e..38fd851999 100644
--- a/gtk2_ardour/route_ui.cc
+++ b/gtk2_ardour/route_ui.cc
@@ -1257,7 +1257,7 @@ RouteUI::blink_rec_display (bool blinkOn)
 
                 case Session::Disabled:
                 case Session::Enabled:
-                        if ( false )  //TODO:  Need a blink option
+                        if ( ARDOUR_UI::config()->get_blink_rec_arm() )
 							rec_enable_button->set_active_state ( blinkOn ? Gtkmm2ext::ExplicitActive : Gtkmm2ext::Off );
 						else
 							rec_enable_button->set_active_state ( ImplicitActive );
diff --git a/gtk2_ardour/theme_manager.cc b/gtk2_ardour/theme_manager.cc
index 38f8aac4c9..8dd600ff7a 100644
--- a/gtk2_ardour/theme_manager.cc
+++ b/gtk2_ardour/theme_manager.cc
@@ -64,6 +64,7 @@ ThemeManager::ThemeManager()
 	, light_button (_("Light Theme"))
 	, reset_button (_("Restore Defaults"))
 	, flat_buttons (_("Draw \"flat\" buttons"))
+	, blink_rec_button (_("Blink Rec-Arm buttons"))
 	, region_color_button (_("Color regions using their track's color"))
 	, show_clipping_button (_("Show waveform clipping"))
 	, waveform_gradient_depth (0, 1.0, 0.05)
@@ -110,6 +111,7 @@ ThemeManager::ThemeManager()
 	vbox->pack_start (all_dialogs, PACK_SHRINK);
 #endif
 	vbox->pack_start (flat_buttons, PACK_SHRINK);
+	vbox->pack_start (blink_rec_button, PACK_SHRINK);
 	vbox->pack_start (region_color_button, PACK_SHRINK);
 	vbox->pack_start (show_clipping_button, PACK_SHRINK);
 
@@ -156,6 +158,7 @@ ThemeManager::ThemeManager()
 	color_dialog.get_colorsel()->set_has_palette (true);
 
 	flat_buttons.set_active (ARDOUR_UI::config()->get_flat_buttons());
+	blink_rec_button.set_active (ARDOUR_UI::config()->get_blink_rec_arm());
 	region_color_button.set_active (ARDOUR_UI::config()->get_color_regions_using_track_color());
 	show_clipping_button.set_active (ARDOUR_UI::config()->get_show_waveform_clipping());
 
@@ -165,6 +168,7 @@ ThemeManager::ThemeManager()
 	light_button.signal_toggled().connect (sigc::mem_fun (*this, &ThemeManager::on_light_theme_button_toggled));
 	reset_button.signal_clicked().connect (sigc::mem_fun (*this, &ThemeManager::reset_canvas_colors));
 	flat_buttons.signal_toggled().connect (sigc::mem_fun (*this, &ThemeManager::on_flat_buttons_toggled));
+	blink_rec_button.signal_toggled().connect (sigc::mem_fun (*this, &ThemeManager::on_blink_rec_arm_toggled));
 	region_color_button.signal_toggled().connect (sigc::mem_fun (*this, &ThemeManager::on_region_color_toggled));
 	show_clipping_button.signal_toggled().connect (sigc::mem_fun (*this, &ThemeManager::on_show_clip_toggled));
 	waveform_gradient_depth.signal_value_changed().connect (sigc::mem_fun (*this, &ThemeManager::on_waveform_gradient_depth_change));
@@ -313,6 +317,13 @@ ThemeManager::on_flat_buttons_toggled ()
 }
 
 void
+ThemeManager::on_blink_rec_arm_toggled ()
+{
+	ARDOUR_UI::config()->set_blink_rec_arm (blink_rec_button.get_active());
+	ARDOUR_UI::config()->set_dirty ();
+}
+
+void
 ThemeManager::on_region_color_toggled ()
 {
 	ARDOUR_UI::config()->set_color_regions_using_track_color (region_color_button.get_active());
@@ -468,6 +479,7 @@ ThemeManager::setup_theme ()
 	}
 	
 	flat_buttons.set_active (ARDOUR_UI::config()->get_flat_buttons());
+	blink_rec_button.set_active (ARDOUR_UI::config()->get_blink_rec_arm());
 	waveform_gradient_depth.set_value (ARDOUR_UI::config()->get_waveform_gradient_depth());
 	timeline_item_gradient_depth.set_value (ARDOUR_UI::config()->get_timeline_item_gradient_depth());
 	all_dialogs.set_active (ARDOUR_UI::config()->get_all_floating_windows_are_dialogs());
diff --git a/gtk2_ardour/theme_manager.h b/gtk2_ardour/theme_manager.h
index e52c4630f3..dee5b705c0 100644
--- a/gtk2_ardour/theme_manager.h
+++ b/gtk2_ardour/theme_manager.h
@@ -44,6 +44,7 @@ class ThemeManager : public ArdourWindow
 	void on_dark_theme_button_toggled ();
 	void on_light_theme_button_toggled ();
 	void on_flat_buttons_toggled ();
+	void on_blink_rec_arm_toggled ();
         void on_region_color_toggled ();
         void on_show_clip_toggled ();
         void on_waveform_gradient_depth_change ();
@@ -76,6 +77,7 @@ class ThemeManager : public ArdourWindow
 	Gtk::RadioButton light_button;
 	Gtk::Button reset_button;
 	Gtk::CheckButton flat_buttons;
+	Gtk::CheckButton blink_rec_button;
 	Gtk::CheckButton region_color_button;
 	Gtk::CheckButton show_clipping_button;
         Gtk::HScale waveform_gradient_depth;
diff --git a/gtk2_ardour/ui_config_vars.h b/gtk2_ardour/ui_config_vars.h
index 44c2837abe..4a2eb70d2f 100644
--- a/gtk2_ardour/ui_config_vars.h
+++ b/gtk2_ardour/ui_config_vars.h
@@ -20,6 +20,7 @@
 UI_CONFIG_VARIABLE(std::string, icon_set, "icon-set", "default")
 UI_CONFIG_VARIABLE(std::string, ui_rc_file, "ui-rc-file", "ardour3_ui_dark.rc")
 UI_CONFIG_VARIABLE(bool, flat_buttons, "flat-buttons", false)
+UI_CONFIG_VARIABLE(bool, blink_rec_arm, "blink-rec-arm", false)
 UI_CONFIG_VARIABLE(float, waveform_gradient_depth, "waveform-gradient-depth", 0)
 UI_CONFIG_VARIABLE(float, timeline_item_gradient_depth, "timeline-item-gradient-depth", 0.5)
 UI_CONFIG_VARIABLE(bool, all_floating_windows_are_dialogs, "all-floating-windows-are-dialogs", false)