LADI
/
ardour
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More fixing on the toggling on/off of the track meters 

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2692 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Doug McLain 2007-11-18 16:36:15 +00:00
parent ef3f600a1a
commit 98268578e4
5 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ardour.rc.in
View File

@ -36,6 +36,7 @@
<Option name="destructive-xfade-msecs" value="20"/>
<Option name="periodic-safety-backups" value="1"/>
<Option name="periodic-safety-backup-interval" value="120"/>
<Option name="show-track-meters" value="1"/>
</Config>
<extra>
<Keyboard edit-button="3" edit-modifier="4" delete-button="3" delete-modifier="1" snap-modifier="32"/>

2
gtk2_ardour/ardour_ui_ed.cc
View File

@ -417,6 +417,7 @@ ARDOUR_UI::install_actions ()
ActionManager::register_toggle_action (option_actions, X_("RegionEquivalentsOverlap"), _("Region equivalents overlap"), mem_fun (*this, &ARDOUR_UI::toggle_RegionEquivalentsOverlap));
ActionManager::register_toggle_action (option_actions, X_("PrimaryClockDeltaEditCursor"), _("Primary Clock delta to edit point"), mem_fun (*this, &ARDOUR_UI::toggle_PrimaryClockDeltaEditCursor));
ActionManager::register_toggle_action (option_actions, X_("SecondaryClockDeltaEditCursor"), _("Secondary Clock delta to edit point"), mem_fun (*this, &ARDOUR_UI::toggle_SecondaryClockDeltaEditCursor));
ActionManager::register_toggle_action (option_actions, X_("ShowTrackMeters"), _("Display Editor Meters"), mem_fun (*this, &ARDOUR_UI::toggle_ShowTrackMeters));
ActionManager::register_toggle_action (option_actions, X_("OnlyCopyImportedFiles"), _("Always copy imported files"), mem_fun (*this, &ARDOUR_UI::toggle_only_copy_imported_files));
RadioAction::Group denormal_group;
@ -461,7 +462,6 @@ ARDOUR_UI::install_actions ()
act = ActionManager::register_toggle_action (option_actions, X_("DoNotRunPluginsWhileRecording"), _("Do not run plugins while recording"), mem_fun (*this, &ARDOUR_UI::toggle_DoNotRunPluginsWhileRecording));
ActionManager::session_sensitive_actions.push_back (act);
act = ActionManager::register_toggle_action (option_actions, X_("ShowTrackMeters"), _("Display Editor Meters"), mem_fun (*this, &ARDOUR_UI::toggle_ShowTrackMeters));
act = ActionManager::register_toggle_action (option_actions, X_("LatchedSolo"), _("Latched solo"), mem_fun (*this, &ARDOUR_UI::toggle_LatchedSolo));
ActionManager::session_sensitive_actions.push_back (act);
act = ActionManager::register_toggle_action (option_actions, X_("ShowSoloMutes"), _("Show solo muting"), mem_fun (*this, &ARDOUR_UI::toggle_ShowSoloMutes));

4
gtk2_ardour/editor_audiotrack.cc
View File

@ -112,6 +112,8 @@ Editor::start_updating ()
gint
Editor::stop_updating ()
{
fast_screen_update_connection.disconnect();
AudioTimeAxisView* atv;
cerr << "Editor::stop_updating () called" << endl;
@ -122,7 +124,7 @@ Editor::stop_updating ()
}
}
}
fast_screen_update_connection.disconnect();
return 0;
}

13
gtk2_ardour/gain_meter.cc
View File

@ -965,14 +965,15 @@ GainMeter::gain_automation_state_changed ()
void GainMeter::setup_atv_meter (int len)
{
set_no_show_all();
regular_meter_width = 3;
hide_all();
set_width(Narrow, len);
meter_packer.show_all();
cerr << "Config->get_show_track_meters() = " << Config->get_show_track_meters() << endl;
if (Config->get_show_track_meters()) {
set_no_show_all();
regular_meter_width = 3;
hide_all();
set_width(Narrow, len);
meter_packer.show_all();
hbox.show();
hbox.show();
show();
}
}

2
gtk2_ardour/route_time_axis.cc
View File

@ -1799,7 +1799,7 @@ RouteTimeAxisView::hide_meter ()
void
RouteTimeAxisView::show_meter ()
{
gpm.show ();
reset_meter ();
}
void