Instrument: Remove all "locked instrument" entries from popup menus. …

…The concept has been removed. Fix for #1412
kmatheussen · Mar 3, 2024 · 989f716 · 989f716
1 parent f205ce5
commit 989f716
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 39 deletions.
diff --git a/Qt/Qt_instruments.cpp b/Qt/Qt_instruments.cpp
@@ -858,7 +858,7 @@ static void GFX_PP_Update_internal(struct Patch *patch, bool is_loading, bool op
 
   struct Patch *old_current = PATCH_get_current();
 
-  if (old_current != NULL && g_is_loading==false && open_even_if_locked==false && isCurrentInstrumentLocked())
+  if (old_current != NULL && g_is_loading==false && open_even_if_locked==false)
     return;
 
   called_from_pp_update = true;{

diff --git a/api/api_instruments.cpp b/api/api_instruments.cpp
@@ -3849,8 +3849,9 @@ void setCurrentInstrumentDown(bool set_current_instrument, bool set_current_inst
   S7CALL2(void_bool_bool,"FROM_C-move-current-instrument-down", set_current_instrument, set_current_instrument_under_mouse);
 }
 
-static bool g_curr_instrument_is_locked = true;// = createIllegalInstrument();
+//static bool g_curr_instrument_is_locked = true;// = createIllegalInstrument();
 
+#if 0
 void setCurrentInstrumentLocked(bool lockit){
   if (lockit==g_curr_instrument_is_locked)
     return;
@@ -3867,7 +3868,9 @@ void setCurrentInstrumentLocked(bool lockit){
     g_curr_locked_instrument = createIllegalInstrument();
   */
 }
+#endif
 
+#if 0
 bool isCurrentInstrumentLocked(void){
   return g_curr_instrument_is_locked;
   /*
@@ -3877,7 +3880,9 @@ bool isCurrentInstrumentLocked(void){
     return PATCH_get_from_id(g_curr_locked_instrument) != NULL;
   */
 }
+#endif
 
+#if 0
 void switchSetCurrentInstrumentLocked(void){
   setCurrentInstrumentLocked(!isCurrentInstrumentLocked());
 
@@ -3888,7 +3893,7 @@ void switchSetCurrentInstrumentLocked(void){
     g_curr_locked_instrument = createIllegalInstrument();
   */
 }
-
+#endif
 
 static radium::ProtectedS7FuncVector g_current_instrument_changed_callbacks(true);
 

diff --git a/api/protos.conf b/api/protos.conf
@@ -1249,9 +1249,9 @@ void setCurrentInstrumentRight | bool set_current_instrument ? false | bool set_
 void setCurrentInstrumentUp | bool set_current_instrument ? false | bool set_current_instrument_under_mouse ? true
 void setCurrentInstrumentDown | bool set_current_instrument ? false | bool set_current_instrument_under_mouse ? true
 
-void setCurrentInstrumentLocked | bool lockit # if lockit is true, the program will not (by itself) change current instrument to a different instrument.
-bool isCurrentInstrumentLocked
-switchSetCurrentInstrumentLocked
+#void setCurrentInstrumentLocked | bool lockit # if lockit is true, the program will not (by itself) change current instrument to a different instrument.
+#bool isCurrentInstrumentLocked
+#switchSetCurrentInstrumentLocked
 
 void addCurrentInstrumentChangedCallback | func_t* callback  # If callback returns #f, the callback will not be called again.
 void removeCurrentInstrumentChangedCallback | func_t* callback

diff --git a/bin/scheme/init.scm b/bin/scheme/init.scm
@@ -281,7 +281,7 @@ FROM_C-delete-selected-pianonotes!
 show-keybinding-help-window
 FROM_C-ensure-curr-block-is-visible-in-blocklist
 FROM_C-call-me-after-curr-seqblock-under-mouse-has-been-called
-FROM_C-show-lock-instrument-popup-menu
+;;FROM_C-show-lock-instrument-popup-menu
 FROM_C-show-mixer-popup-menu
 FROM_C-show-mixer-connection-popup-menu
 FROM_C-delete-editor-beat

diff --git a/bin/scheme/instruments.scm b/bin/scheme/instruments.scm
@@ -1716,26 +1716,26 @@
 
 
 ;; Note: used for shortcut
-(delafina (switch-force-as-current-instrument :instrument-id (<ra> :get-current-instrument-under-mouse))
-  (define is-forced (and (<ra> :is-current-instrument-locked)
-                         (equal? instrument-id (<ra> :get-current-instrument-under-mouse))))
-  (if is-forced
-      (<ra> :set-current-instrument-locked #f)
-      (begin
-        (<ra> :set-current-instrument-locked #t)
-        (<ra> :set-current-instrument instrument-id))))
-
-(define (get-forced-as-current-instrument-menu-entry instrument-id)
-  (list "Forced as current instrument"
-        :check (and (<ra> :is-current-instrument-locked)
-                    (equal? instrument-id (<ra> :get-current-instrument)))
-        :shortcut switch-force-as-current-instrument
-        (lambda (setit)
-          (if setit
-              (begin
-                (<ra> :set-current-instrument-locked #t)
-                (<ra> :set-current-instrument instrument-id))
-              (<ra> :set-current-instrument-locked #f)))))
+;;(delafina (switch-force-as-current-instrument :instrument-id (<ra> :get-current-instrument-under-mouse))
+;;  (define is-forced (and (<ra> :is-current-instrument-locked)
+;;                         (equal? instrument-id (<ra> :get-current-instrument-under-mouse))))
+;;  (if is-forced
+;;      (<ra> :set-current-instrument-locked #f)
+;;      (begin
+;;        (<ra> :set-current-instrument-locked #t)
+;;        (<ra> :set-current-instrument instrument-id))))
+
+;;(define (get-forced-as-current-instrument-menu-entry instrument-id)
+;;  (list "Forced as current instrument"
+;;        :check (and (<ra> :is-current-instrument-locked)
+;;                    (equal? instrument-id (<ra> :get-current-instrument)))
+;;        :shortcut switch-force-as-current-instrument
+;;        (lambda (setit)
+;;          (if setit
+;;              (begin
+;;                (<ra> :set-current-instrument-locked #t)
+;;                (<ra> :set-current-instrument instrument-id))
+;;              (<ra> :set-current-instrument-locked #f)))))
 
 (delafina (get-insert-plugin-entry :instrument-id
                                    :enabled #t
@@ -1808,7 +1808,7 @@
            (lambda (doit)
              (switch-connect-instrument-to-main-pipe instrument-id)))
 
-     (get-forced-as-current-instrument-menu-entry instrument-id)     
+     ;;(get-forced-as-current-instrument-menu-entry instrument-id)     
 
      (list "Assign to current editor track"
            :shortcut assign-instrument-to-current-editor-track

diff --git a/bin/scheme/mixer-strips.scm b/bin/scheme/mixer-strips.scm
@@ -151,7 +151,7 @@
                 (lambda ()
                   (strips-config :show-config-gui))))
 
-     (get-forced-as-current-instrument-menu-entry instrument-id)
+     ;;(get-forced-as-current-instrument-menu-entry instrument-id)
 
      (list "Set current instrument..."
            show-set-current-instrument-popup-menu)

diff --git a/bin/scheme/various.scm b/bin/scheme/various.scm
@@ -1044,16 +1044,16 @@
 ;; Instruments
 
 
-(define (FROM_C-show-lock-instrument-popup-menu) 
-  (popup-menu
-   (get-keybinding-configuration-popup-menu-entries "ra:switch-set-current-instrument-locked"
-                                                    '()
-                                                    "")
-   "-------------"
-   "Set current instrument..." show-set-current-instrument-popup-menu
-   "-------------"
-   "Help keybindings" show-keybinding-help-window
-   ))
+;;(define (FROM_C-show-lock-instrument-popup-menu) 
+;;  (popup-menu
+;;   (get-keybinding-configuration-popup-menu-entries "ra:switch-set-current-instrument-locked"
+;;                                                    '()
+;;                                                    "")
+;;   "-------------"
+;;   "Set current instrument..." show-set-current-instrument-popup-menu
+;;   "-------------"
+;;   "Help keybindings" show-keybinding-help-window
+;;   ))