fix up meter thread management when JACK client starts/stops/is halted ; put focus in plugin search entry when plugin selector is shown ; add WINDOWS_KEY option to gtk2_ardour/SConscript, controlling what X modifier is used for LEVEL4 modifier/bindings ; fix up Keyboard object to properly support LEVEL4 bindings ; fix Playlist::partition_internal() to avoid acting on regions that should not be operated on given the range provided ; fix up more stuff relating to get_regions_for(), including cut/delete ops on edit range vs. regions

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3115 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 4 insertions, 0 deletions

diff --git a/gtk2_ardour/keyboard.h b/gtk2_ardour/keyboard.h
index 39e8e4f78e..25955935f3 100644
--- a/gtk2_ardour/keyboard.h
+++ b/gtk2_ardour/keyboard.h
@@ -50,6 +50,7 @@ class Keyboard : public sigc::trackable, Stateful
 	static uint32_t PrimaryModifier;
 	static uint32_t SecondaryModifier;
 	static uint32_t TertiaryModifier;
+	static uint32_t Level4Modifier;
 	static uint32_t CopyModifier;
 	static uint32_t RangeSelectModifier;
 
@@ -62,6 +63,9 @@ class Keyboard : public sigc::trackable, Stateful
 	static void set_tertiary_modifier (uint32_t newval) {
 		set_modifier (newval, TertiaryModifier);
 	}
+	static void set_level4_modifier (uint32_t newval) {
+		set_modifier (newval, Level4Modifier);
+	}
 	static void set_copy_modifier (uint32_t newval) {
 		set_modifier (newval, CopyModifier);
 	}