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

move cue-behavior to session config (gtk part)

Browse source
This commit is contained in:
Ben Loftis 2022-02-19 10:56:59 -06:00
parent b506a243a2
commit 5f0c7fe3d6
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gtk2_ardour/ardour_ui_options.cc
View file

@ -462,7 +462,7 @@ ARDOUR_UI::parameter_changed (std::string p)
scripts_spacer.show (); scripts_spacer.show ();
} }
} else if (p == "cue-behavior") { } else if (p == "cue-behavior") {
CueBehavior cb (Config->get_cue_behavior()); CueBehavior cb (_session->config.get_cue_behavior());
_cue_play_enable.set_active (cb & ARDOUR::FollowCues); _cue_play_enable.set_active (cb & ARDOUR::FollowCues);
} else if (p == "layered-record-mode") { } else if (p == "layered-record-mode") {
layered_button.set_active (_session->config.get_layered_record_mode ()); layered_button.set_active (_session->config.get_layered_record_mode ());

6
gtk2_ardour/editor_markers.cc
View file

@ -1968,11 +1968,11 @@ Editor::find_marker_from_location_id (PBD::ID const & id, bool is_start) const
void void
Editor::toggle_cue_behavior () Editor::toggle_cue_behavior ()
{ {
CueBehavior cb (Config->get_cue_behavior()); CueBehavior cb (_session->config.get_cue_behavior());
if (cb & ARDOUR::FollowCues) { if (cb & ARDOUR::FollowCues) {
Config->set_cue_behavior (ARDOUR::CueBehavior (cb & ~ARDOUR::FollowCues)); _session->config.set_cue_behavior (ARDOUR::CueBehavior (cb & ~ARDOUR::FollowCues));
} else { } else {
Config->set_cue_behavior (ARDOUR::CueBehavior (cb | ARDOUR::FollowCues)); _session->config.set_cue_behavior (ARDOUR::CueBehavior (cb | ARDOUR::FollowCues));
} }
} }

4
gtk2_ardour/mini_timeline.cc
View file

@ -419,7 +419,7 @@ MiniTimeline::draw_cue (cairo_t* cr, int marker_loc, int next_cue_left_edge, int
uint32_t color = UIConfiguration::instance().color ( uint32_t color = UIConfiguration::instance().color (
prelight ? "entered marker" : "location marker"); prelight ? "entered marker" : "location marker");
CueBehavior cb (Config->get_cue_behavior()); CueBehavior cb (_session->config.get_cue_behavior());
if (!(cb & ARDOUR::FollowCues)) { if (!(cb & ARDOUR::FollowCues)) {
color = Gtkmm2ext::HSV(color).darker(0.5).color(); color = Gtkmm2ext::HSV(color).darker(0.5).color();
}; };
@ -706,7 +706,7 @@ MiniTimeline::render (Cairo::RefPtr<Cairo::Context> const& ctx, cairo_rectangle_
/* if there is a cue off-window immediately to the left, we need to draw its bar to show that Cues are continuous */ /* if there is a cue off-window immediately to the left, we need to draw its bar to show that Cues are continuous */
if (prior_cue_pos < 0 && prior_cue_idx != INT32_MAX) { if (prior_cue_pos < 0 && prior_cue_idx != INT32_MAX) {
uint32_t color = UIConfiguration::instance().color ("location marker"); uint32_t color = UIConfiguration::instance().color ("location marker");
CueBehavior cb (Config->get_cue_behavior()); CueBehavior cb (_session->config.get_cue_behavior());
if (!(cb & ARDOUR::FollowCues)) { if (!(cb & ARDOUR::FollowCues)) {
color = Gtkmm2ext::HSV(color).darker(0.5).color(); color = Gtkmm2ext::HSV(color).darker(0.5).color();
}; };