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

start of tracking monitor state correctly

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@10264 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2011-10-21 12:40:06 +00:00
parent 56da993d83
commit cc3d202571
4 changed files with 80 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

62
gtk2_ardour/ardour3_styles.rc.in
View file

@ -154,9 +154,22 @@ style "monitor_input_button" = "small_button"
fg[PRELIGHT] = darker(@@COLPREFIX@_fg) fg[PRELIGHT] = darker(@@COLPREFIX@_fg)
bg[NORMAL] = mix(0.1,@@COLPREFIX@_bright_indicator,darker(@@COLPREFIX@_bg)) bg[NORMAL] = mix(0.1,@@COLPREFIX@_bright_indicator,darker(@@COLPREFIX@_bg))
bg[PRELIGHT] = mix(0.1,@@COLPREFIX@_bright_indicator,darker(@@COLPREFIX@_bg)) bg[PRELIGHT] = mix(0.1,@@COLPREFIX@_bright_indicator,darker(@@COLPREFIX@_bg))
}
fg[ACTIVE] = @@COLPREFIX@_fg style "monitor_input_button_active" = "small_button"
bg[ACTIVE] = @@COLPREFIX@_bright_indicator {
fg[NORMAL] = @@COLPREFIX@_fg
fg[PRELIGHT] = @@COLPREFIX@_fg
bg[NORMAL] = @@COLPREFIX@_bright_indicator
bg[PRELIGHT] = @@COLPREFIX@_bright_indicator
}
style "monitor_input_button_alternate" = "small_button"
{
fg[NORMAL] = @@COLPREFIX@_fg
fg[PRELIGHT] = @@COLPREFIX@_fg
bg[NORMAL] = mix(0.3,@@COLPREFIX@_bright_indicator,darker(@@COLPREFIX@_bg))
bg[PRELIGHT] = mix(0.3,@@COLPREFIX@_bright_indicator,darker(@@COLPREFIX@_bg))
} }
style "monitor_disk_button" = "small_button" style "monitor_disk_button" = "small_button"
@ -165,9 +178,22 @@ style "monitor_disk_button" = "small_button"
fg[PRELIGHT] = darker(@@COLPREFIX@_fg) fg[PRELIGHT] = darker(@@COLPREFIX@_fg)
bg[NORMAL] = mix(0.1,@@COLPREFIX@_bright_indicator,darker(@@COLPREFIX@_bg)) bg[NORMAL] = mix(0.1,@@COLPREFIX@_bright_indicator,darker(@@COLPREFIX@_bg))
bg[PRELIGHT] = mix(0.1,@@COLPREFIX@_bright_indicator,darker(@@COLPREFIX@_bg)) bg[PRELIGHT] = mix(0.1,@@COLPREFIX@_bright_indicator,darker(@@COLPREFIX@_bg))
}
fg[ACTIVE] = @@COLPREFIX@_fg style "monitor_disk_button_active" = "small_button"
bg[ACTIVE] = @@COLPREFIX@_bright_indicator {
fg[NORMAL] = @@COLPREFIX@_fg
fg[PRELIGHT] = @@COLPREFIX@_fg
bg[NORMAL] = @@COLPREFIX@_bright_indicator
bg[PRELIGHT] = @@COLPREFIX@_bright_indicator
}
style "monitor_disk_button_alternate" = "small_button"
{
fg[NORMAL] = @@COLPREFIX@_fg
fg[PRELIGHT] = @@COLPREFIX@_fg
bg[NORMAL] = mix(0.3,@@COLPREFIX@_bright_indicator,darker(@@COLPREFIX@_bg))
bg[PRELIGHT] = mix(0.3,@@COLPREFIX@_bright_indicator,darker(@@COLPREFIX@_bg))
} }
style "solo_button" = "small_button" style "solo_button" = "small_button"
@ -268,13 +294,37 @@ style "mixer_solo_button_active" = "solo_button_active"
ythickness = 0 ythickness = 0
} }
style "mixer_monitor_input_button" = "monitor_input_button" style "mixer_monitor_input" = "monitor_input_button"
{ {
xthickness = 0 xthickness = 0
ythickness = 0 ythickness = 0
} }
style "mixer_monitor_disk_button" = "monitor_disk_button" style "mixer_monitor_input_active" = "monitor_input_button_active"
{
xthickness = 0
ythickness = 0
}
style "mixer_monitor_input_alternate" = "monitor_input_button_alternate"
{
xthickness = 0
ythickness = 0
}
style "mixer_monitor_disk" = "monitor_disk_button"
{
xthickness = 0
ythickness = 0
}
style "mixer_monitor_disk_active" = "monitor_disk_button_active"
{
xthickness = 0
ythickness = 0
}
style "mixer_monitor_disk_alternate" = "monitor_disk_button_alternate"
{ {
xthickness = 0 xthickness = 0
ythickness = 0 ythickness = 0

13
gtk2_ardour/ardour3_widget_list.rc
View file

@ -42,8 +42,6 @@ widget "*MixerSendSwitch" style:highest "default_button"
widget "*MixerInsertButton" style:highest "default_button" widget "*MixerInsertButton" style:highest "default_button"
widget "*MixerInsertButtonLabel" style:highest "default_button" widget "*MixerInsertButtonLabel" style:highest "default_button"
widget "*MixerInsertSwitch" style:highest "default_button" widget "*MixerInsertSwitch" style:highest "default_button"
widget "*MixerMonitorInputButton*" style:highest "very_small_button"
widget "*MixerMonitorInputButton.*" style:highest "very_small_button"
widget "*MixerIOButton" style:highest "very_small_button" widget "*MixerIOButton" style:highest "very_small_button"
widget "*MixerIOButtonLabel" style:highest "very_small_button" widget "*MixerIOButtonLabel" style:highest "very_small_button"
widget "*AddRouteDialogSpinner" style:highest "ardour_adjusters" widget "*AddRouteDialogSpinner" style:highest "ardour_adjusters"
@ -80,8 +78,15 @@ widget "*MixerSoloButton" style:highest "mixer_solo_button"
widget "*MixerSoloButton-alternate" style:highest "mixer_solo_button_alternate" widget "*MixerSoloButton-alternate" style:highest "mixer_solo_button_alternate"
widget "*MixerSoloButton-alternate2" style:highest "mixer_solo_button_alternate2" widget "*MixerSoloButton-alternate2" style:highest "mixer_solo_button_alternate2"
widget "*MixerSoloButton-active" style:highest "mixer_solo_button_active" widget "*MixerSoloButton-active" style:highest "mixer_solo_button_active"
widget "*MixerMonitorInputButton" style:highest "mixer_monitor_input_button"
widget "*MixerMonitorDiskButton" style:highest "mixer_monitor_disk_button" widget "*MixerMonitorInputButton" style:highest "mixer_monitor_input"
widget "*MixerMonitorInputButton-active" style:highest "mixer_monitor_input_active"
widget "*MixerMonitorInputButton-alternate" style:highest "mixer_monitor_input_alternate"
widget "*MixerMonitorDiskButton" style:highest "mixer_monitor_disk"
widget "*MixerMonitorDiskButton-active" style:highest "mixer_monitor_disk_active"
widget "*MixerMonitorDiskButton-alternate" style:highest "mixer_monitor_disk_alternate"
widget "*TrackLoopButton*" style:highest "track_loop_button" widget "*TrackLoopButton*" style:highest "track_loop_button"
widget "*PanAutomationLineSelector*" style:highest "multiline_combo" widget "*PanAutomationLineSelector*" style:highest "multiline_combo"
widget "*EditorTimeButton*" style:highest "time_button" widget "*EditorTimeButton*" style:highest "time_button"

16
gtk2_ardour/route_ui.cc
View file

@ -249,6 +249,8 @@ RouteUI::set_route (boost::shared_ptr<Route> rp)
if (is_track()) { if (is_track()) {
boost::shared_ptr<Track> t = boost::dynamic_pointer_cast<Track>(_route); boost::shared_ptr<Track> t = boost::dynamic_pointer_cast<Track>(_route);
t->MonitoringChanged.connect (route_connections, invalidator (*this), boost::bind (&RouteUI::monitoring_changed, this), gui_context()); t->MonitoringChanged.connect (route_connections, invalidator (*this), boost::bind (&RouteUI::monitoring_changed, this), gui_context());
update_monitoring_display ();
} }
mute_button->unset_flags (Gtk::CAN_FOCUS); mute_button->unset_flags (Gtk::CAN_FOCUS);
@ -584,6 +586,12 @@ RouteUI::rec_enable_press(GdkEventButton* ev)
void void
RouteUI::monitoring_changed () RouteUI::monitoring_changed ()
{
update_monitoring_display ();
}
void
RouteUI::update_monitoring_display ()
{ {
boost::shared_ptr<Track> t = boost::dynamic_pointer_cast<Track>(_route); boost::shared_ptr<Track> t = boost::dynamic_pointer_cast<Track>(_route);
@ -594,15 +602,15 @@ RouteUI::monitoring_changed ()
MonitorChoice mc = t->monitoring(); MonitorChoice mc = t->monitoring();
if (mc & MonitorInput) { if (mc & MonitorInput) {
monitor_input_button->set_active (true); monitor_input_button->set_visual_state (1);
} else { } else {
monitor_input_button->set_active (false); monitor_input_button->set_visual_state (0);
} }
if (mc & MonitorDisk) { if (mc & MonitorDisk) {
monitor_disk_button->set_active (true); monitor_disk_button->set_visual_state (1);
} else { } else {
monitor_disk_button->set_active (false); monitor_disk_button->set_visual_state (0);
} }
} }

1
gtk2_ardour/route_ui.h
View file

@ -131,6 +131,7 @@ class RouteUI : public virtual AxisView
bool monitor_disk_press(GdkEventButton*); bool monitor_disk_press(GdkEventButton*);
bool monitor_disk_release(GdkEventButton*); bool monitor_disk_release(GdkEventButton*);
void monitoring_changed (); void monitoring_changed ();
void update_monitoring_display ();
void step_gain_up (); void step_gain_up ();
void step_gain_down (); void step_gain_down ();