mirror of
https://github.com/Ardour/ardour.git
synced 2026-01-17 19:06:01 +01:00
fixed the Enable Editor Meters option not being selected on startup
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2831 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
8134233249
commit
ea1e32c785
5 changed files with 8 additions and 4 deletions
|
|
@ -30,6 +30,7 @@
|
|||
#include "ardour_ui.h"
|
||||
#include "actions.h"
|
||||
#include "gui_thread.h"
|
||||
#include "public_editor.h"
|
||||
|
||||
#include "i18n.h"
|
||||
|
||||
|
|
@ -1113,6 +1114,9 @@ ARDOUR_UI::parameter_changed (const char* parameter_name)
|
|||
ActionManager::map_some_state ("options", "SecondaryClockDeltaEditCursor", &Configuration::get_secondary_clock_delta_edit_cursor);
|
||||
} else if (PARAM_IS ("only-copy-imported-files")) {
|
||||
map_only_copy_imported_files ();
|
||||
} else if (PARAM_IS ("show-track-meters")) {
|
||||
ActionManager::map_some_state ("options", "ShowTrackMeters", &Configuration::get_show_track_meters);
|
||||
editor->toggle_meter_updating();
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -355,6 +355,8 @@ class Editor : public PublicEditor
|
|||
bool update_mouse_speed ();
|
||||
bool decelerate_mouse_speed ();
|
||||
|
||||
void toggle_meter_updating();
|
||||
|
||||
protected:
|
||||
void map_transport_state ();
|
||||
void map_position_change (nframes_t);
|
||||
|
|
@ -2025,7 +2027,6 @@ class Editor : public PublicEditor
|
|||
sigc::connection fast_screen_update_connection;
|
||||
gint start_updating ();
|
||||
gint stop_updating ();
|
||||
void toggle_meter_updating();
|
||||
void fast_update_strips ();
|
||||
bool meters_running;
|
||||
|
||||
|
|
|
|||
|
|
@ -1372,9 +1372,6 @@ Editor::parameter_changed (const char* parameter_name)
|
|||
} else if (PARAM_IS ("subframes-per-frame")) {
|
||||
update_subframes_per_frame ();
|
||||
update_just_smpte ();
|
||||
} else if (PARAM_IS ("show-track-meters")) {
|
||||
toggle_meter_updating();
|
||||
track_canvas_allocate(track_canvas.get_allocation());
|
||||
} else if (PARAM_IS ("link-region-and-track-selection")) {
|
||||
ActionManager::map_some_state ("Editor", "link-region-and-track-selection", &Configuration::get_link_region_and_track_selection);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -110,6 +110,7 @@ Editor::toggle_meter_updating()
|
|||
} else {
|
||||
stop_updating ();
|
||||
}
|
||||
track_canvas_allocate(track_canvas.get_allocation());
|
||||
}
|
||||
|
||||
void
|
||||
|
|
|
|||
|
|
@ -156,6 +156,7 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulThingWithGoingAway
|
|||
virtual void maximise_editing_space() = 0;
|
||||
virtual void restore_editing_space() = 0;
|
||||
virtual nframes64_t get_preferred_edit_position (bool ignore_playhead = false) = 0;
|
||||
virtual void toggle_meter_updating() = 0;
|
||||
|
||||
sigc::signal<void> ZoomFocusChanged;
|
||||
sigc::signal<void> ZoomChanged;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue