'Backup'

Author: lebrunthibault

application/command_handler/LoadMinitaurCommandHandler.py

@@ -1,9 +1,10 @@
 from protocol0.application.command.LoadMinitaurCommand import LoadMinitaurCommand
 from protocol0.application.command_handler.CommandHandlerInterface import CommandHandlerInterface
+from protocol0.domain.lom.instrument.InstrumentInterface import load_instrument_track
 from protocol0.domain.lom.instrument.instrument.InstrumentMinitaur import InstrumentMinitaur
 
 
 class LoadMinitaurCommandHandler(CommandHandlerInterface):
     def handle(self, command):
         # type: (LoadMinitaurCommand) -> None
-        InstrumentMinitaur.load_instrument_track()
+        load_instrument_track(InstrumentMinitaur)

application/command_handler/LoadRev2CommandHandler.py

@@ -1,10 +1,11 @@
 from protocol0.application.command.LoadRev2Command import LoadRev2Command
 from protocol0.application.command_handler.CommandHandlerInterface import CommandHandlerInterface
+from protocol0.domain.lom.instrument.InstrumentInterface import load_instrument_track
 from protocol0.domain.lom.instrument.instrument.InstrumentRev2 import InstrumentRev2
 
 
 class LoadRev2CommandHandler(CommandHandlerInterface):
     def handle(self, command):
         # type: (LoadRev2Command) -> None
-        InstrumentRev2.load_instrument_track()
+        load_instrument_track(InstrumentRev2)
 

domain/lom/instrument/InstrumentInterface.py

@@ -1,5 +1,7 @@
+from functools import partial
+
 from _Framework.SubjectSlot import SlotManager
-from typing import Optional, Type
+from typing import Optional, Type, TYPE_CHECKING
 
 from protocol0.domain.lom.device.Device import Device
 from protocol0.domain.lom.device.DeviceEnum import DeviceEnum
@@ -22,10 +24,48 @@
 from protocol0.domain.lom.instrument.preset.preset_initializer.PresetInitializerInterface import (
     PresetInitializerInterface,
 )
+from protocol0.domain.shared.backend.Backend import Backend
 from protocol0.domain.shared.errors.Protocol0Warning import Protocol0Warning
+from protocol0.shared.SongFacade import SongFacade
 from protocol0.shared.sequence.Sequence import Sequence
 
 
+if TYPE_CHECKING:
+    from protocol0.domain.lom.track.abstract_track.AbstractTrack import AbstractTrack
+
+
+def _get_insert_instrument_track(instrument_cls):
+    # type: (Type["InstrumentInterface"]) -> AbstractTrack
+    """Current track or last instrument track or last track"""
+    target_color = instrument_cls.TRACK_COLOR.value
+
+    if SongFacade.current_track().color == target_color:
+        return SongFacade.current_track()
+
+    instrument_tracks = [
+        t
+        for t in SongFacade.simple_tracks()
+        if t.group_track is None and t.color == target_color
+    ]
+
+    last_track = list(SongFacade.simple_tracks())[-1]
+
+    return next(reversed(instrument_tracks), last_track)
+
+
+def load_instrument_track(instrument_cls):
+    # type: (Type["InstrumentInterface"]) -> Sequence
+    insert_track = _get_insert_instrument_track(instrument_cls)
+    track_color = insert_track.color
+
+    insert_track.focus()
+    seq = Sequence()
+    seq.add(partial(Backend.client().load_instrument_track, instrument_cls.INSTRUMENT_TRACK_NAME))
+    seq.wait_for_backend_event("instrument_loaded")
+    seq.add(partial(setattr, insert_track, "color", track_color))
+    return seq.done()
+
+
 class InstrumentInterface(SlotManager):
     NAME = ""
     DEVICE = None  # type: Optional[DeviceEnum]
@@ -39,6 +79,7 @@ class InstrumentInterface(SlotManager):
     PRESET_OFFSET = 0  # if we store presets not at the beginning of the list
     PRESET_CHANGER = ProgramChangePresetChanger  # type: Type[PresetChangerInterface]
     PRESET_INITIALIZER = PresetInitializerDevicePresetName  # type: Type[PresetInitializerInterface]
+    INSTRUMENT_TRACK_NAME = ""
 
     def __init__(self, device, track_name):
         # type: (Optional[Device], str) -> None

domain/lom/instrument/instrument/InstrumentMinitaur.py

@@ -1,22 +1,18 @@
-from functools import partial
-
 from protocol0.domain.lom.instrument.InstrumentColorEnum import InstrumentColorEnum
 from protocol0.domain.lom.instrument.InstrumentInterface import InstrumentInterface
 from protocol0.domain.lom.instrument.preset.PresetProgramSelectedEvent import \
     PresetProgramSelectedEvent
 from protocol0.domain.lom.instrument.preset.preset_initializer.PresetInitializerGroupTrackName import (
     PresetInitializerGroupTrackName,
 )
-from protocol0.domain.shared.backend.Backend import Backend
 from protocol0.domain.shared.event.DomainEventBus import DomainEventBus
-from protocol0.shared.SongFacade import SongFacade
-from protocol0.shared.sequence.Sequence import Sequence
 
 
 class InstrumentMinitaur(InstrumentInterface):
     NAME = "Minitaur"
     PRESET_EXTENSION = ".syx"
     TRACK_COLOR = InstrumentColorEnum.MINITAUR
+    INSTRUMENT_TRACK_NAME = "Bass"
     CAN_BE_SHOWN = False
     PRESETS_PATH = (
         "C:\\Users\\thiba\\AppData\\Roaming\\Moog Music Inc\\Minitaur\\Presets Library\\User"
@@ -28,18 +24,3 @@ class InstrumentMinitaur(InstrumentInterface):
     def set_default_preset(self):
         # type: () -> None
         DomainEventBus.emit(PresetProgramSelectedEvent(2))
-
-    @classmethod
-    def load_instrument_track(cls):
-        # type: () -> Sequence
-        minitaur_track = next(SongFacade.external_synth_tracks(InstrumentMinitaur), None)
-
-        track_to_focus = minitaur_track or list(SongFacade.simple_tracks())[-1]
-        track_color = track_to_focus.color
-
-        track_to_focus.focus()
-        seq = Sequence()
-        seq.add(Backend.client().load_instrument_track)
-        seq.wait_for_backend_event("instrument_loaded")
-        seq.add(partial(setattr, track_to_focus, "color", track_color))
-        return seq.done()

domain/lom/instrument/instrument/InstrumentRev2.py

@@ -1,11 +1,8 @@
-from functools import partial
-
 from typing import Optional, Any
 
 from protocol0.domain.lom.device.DeviceEnum import DeviceEnum
 from protocol0.domain.lom.instrument.InstrumentColorEnum import InstrumentColorEnum
 from protocol0.domain.lom.instrument.InstrumentInterface import InstrumentInterface
-from protocol0.domain.lom.instrument.instrument.InstrumentMinitaur import InstrumentMinitaur
 from protocol0.domain.lom.track.simple_track.SimpleTrackArmedEvent import SimpleTrackArmedEvent
 from protocol0.domain.shared.backend.Backend import Backend
 from protocol0.domain.shared.event.DomainEventBus import DomainEventBus
@@ -23,6 +20,7 @@ class InstrumentRev2(InstrumentInterface):
     NAME = "Rev2"
     DEVICE = DeviceEnum.REV2_EDITOR
     TRACK_COLOR = InstrumentColorEnum.REV2
+    INSTRUMENT_TRACK_NAME = "Synth"
     ACTIVE_INSTANCE = None  # type: Optional[InstrumentRev2]
 
     def __init__(self, *a, **k):
@@ -39,21 +37,6 @@ def __init__(self, *a, **k):
             ExternalSynthAudioRecordingEndedEvent, self._on_audio_recording_ended_event
         )
 
-    @classmethod
-    def load_instrument_track(cls):
-        # type: () -> Sequence
-        minitaur_track = next(SongFacade.external_synth_tracks(InstrumentMinitaur), None)
-
-        track_to_focus = minitaur_track or list(SongFacade.simple_tracks())[-1]
-        track_color = track_to_focus.color
-
-        track_to_focus.focus()
-        seq = Sequence()
-        seq.add(Backend.client().load_instrument_track)
-        seq.wait_for_backend_event("instrument_loaded")
-        seq.add(partial(setattr, track_to_focus, "color", track_color))
-        return seq.done()
-
     @property
     def needs_exclusive_activation(self):
         # type: () -> bool