ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

change type of MidiTrack's key enforcement to new enum type

This commit is contained in:
Paul Davis 2021-11-18 11:16:50 -07:00
parent 987c4de725
commit 9f4bf02980
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gtk2_ardour/midi_time_axis.cc
View File

@ -642,9 +642,9 @@ MidiTimeAxisView::append_extra_display_menu_items ()
items.push_back (MenuElem (_("Scale"), *build_musical_mode_menu ()));
items.push_back (MenuElem (_("Tonic (Root)"), *build_musical_root_menu ()));
items.push_back (CheckMenuElem (_("Enforce Key")));
Gtk::CheckMenuItem* eki = dynamic_cast<Gtk::CheckMenuItem *> (&items.back());
eki->set_active (midi_track ()->enforce_key ());
// items.push_back (CheckMenuElem (_("Enforce Key")));
// Gtk::CheckMenuItem* eki = dynamic_cast<Gtk::CheckMenuItem *> (&items.back());
// eki->set_active (midi_track ()->enforce_key ());
// eki->signal_activate().connect (sigc::mem_fun (*this, &MidiTimeAxisView::toggle_enforce_musical_key));
items.push_back (MenuElem (_("Color Mode"), *build_color_mode_menu ()));

6
libs/ardour/ardour/midi_track.h
View File

@ -155,8 +155,8 @@ public:
MusicalKey const & key() const { return _key; }
void set_key (MusicalKey const & key);
bool enforce_key () const;
void set_enforce_key (bool yn);
KeyEnforcementPolicy key_enforcment_policy () const;
void set_key_enforcement_policy (KeyEnforcementPolicy);
protected:
@ -181,7 +181,7 @@ private:
MidiChannelFilter _capture_filter;
MusicalKey _key;
bool _enforce_key;
KeyEnforcementPolicy _key_enforcement_policy;
void set_state_part_two ();
void set_state_part_three ();

12
libs/ardour/midi_track.cc
View File

@ -103,7 +103,7 @@ MidiTrack::MidiTrack (Session& sess, string name, TrackMode mode)
, _input_active (true)
, _restore_pgm_on_load (true)
, _key (MusicalKey (MusicalMode::IonianMajor, 0))
, _enforce_key (false)
, _key_enforcement_policy (KeyEnforcementPolicy (0))
{
_session.SessionLoaded.connect_same_thread (*this, boost::bind (&MidiTrack::restore_controls, this));
@ -138,15 +138,15 @@ MidiTrack::init ()
}
void
MidiTrack::set_enforce_key (bool yn)
MidiTrack::set_key_enforcement_policy (KeyEnforcementPolicy kep)
{
_enforce_key = yn;
_key_enforcement_policy = kep;
}
bool
MidiTrack::enforce_key () const
KeyEnforcementPolicy
MidiTrack::key_enforcment_policy () const
{
return _enforce_key;
return _key_enforcement_policy;
}
void