diff options
Diffstat (limited to 'solo-tool-project/src')
| -rw-r--r-- | solo-tool-project/src/solo_tool/handlers.py | 65 | ||||
| -rw-r--r-- | solo-tool-project/src/solo_tool/midi_controller_actition.py | 46 | ||||
| -rw-r--r-- | solo-tool-project/src/solo_tool/midi_controller_launchpad_mini.py | 135 | ||||
| -rw-r--r-- | solo-tool-project/src/solo_tool/midi_wrapper_mido.py | 28 | ||||
| -rw-r--r-- | solo-tool-project/src/solo_tool/notifier.py | 4 | ||||
| -rw-r--r-- | solo-tool-project/src/solo_tool/player_mpv.py | 53 | ||||
| -rw-r--r-- | solo-tool-project/src/solo_tool/player_vlc.py | 55 | ||||
| -rw-r--r-- | solo-tool-project/src/solo_tool/session_manager.py | 130 | ||||
| -rw-r--r-- | solo-tool-project/src/solo_tool/solo_tool.py | 73 |
9 files changed, 393 insertions, 196 deletions
diff --git a/solo-tool-project/src/solo_tool/handlers.py b/solo-tool-project/src/solo_tool/handlers.py index 13e982b..3beb0fb 100644 --- a/solo-tool-project/src/solo_tool/handlers.py +++ b/solo-tool-project/src/solo_tool/handlers.py @@ -2,7 +2,15 @@ from collections.abc import Callable from solo_tool.solo_tool import SoloTool -def changeSong(st: SoloTool, delta: int) -> Callable[[], None]: +def playPause(st: SoloTool) -> Callable[[], None]: + def f(): + if st.playing: + st.pause() + else: + st.play() + return f + +def songRelative(st: SoloTool, delta: int) -> Callable[[], None]: def f(): if st.song is None: st.song = 0 @@ -10,12 +18,67 @@ def changeSong(st: SoloTool, delta: int) -> Callable[[], None]: st.song += delta return f +def restartOrPreviousSong(st: SoloTool, threshold: float) -> Callable[[], None]: + def f(): + if st.position < threshold and st.song > 0: + st.song -= 1 + else: + st.position = 0.0 + return f + +def songAbsolute(st: SoloTool, index: int, followUp: Callable[[], None]=None) -> Callable[[], None]: + def f(): + st.song = index + if followUp is not None: + followUp() + return f + def seekRelative(st: SoloTool, delta: float) -> Callable[[], None]: def f(): st.position += delta return f +def seekAbsolute(st: SoloTool, new: float) -> Callable[[], None]: + def f(): + st.position = new + return f + def positionToKeyPoint(st: SoloTool) -> Callable[[], None]: def f(): st.keyPoint = st.position return f + +def keyPointAbsolute(st: SoloTool, kp: float) -> Callable[[], None]: + def f(): + st.keyPoint = kp + return f + +def keyPointRelative(st: SoloTool, delta: int) -> Callable[[], None]: + from bisect import bisect_right, bisect_left + def f(): + l = sorted(set(st.keyPoints + [st.keyPoint])) + if delta > 0: + pivot = bisect_right(l, st.keyPoint) - 1 + elif delta < 0: + pivot = bisect_left(l, st.keyPoint) + else: + return + new = max(min(pivot + delta, len(l) - 1), 0) + st.keyPoint = l[new] + return f + +def rateAbsolute(st: SoloTool, value: float) -> Callable[[], None]: + def f(): + st.rate = value + return f + +def rateRelative(st: SoloTool, delta: float) -> Callable[[], None]: + def f(): + st.rate += delta + return f + +def volumeAbsolute(st: SoloTool, value: float) -> Callable[[], None]: + def f(): + st.volume = value + return f + diff --git a/solo-tool-project/src/solo_tool/midi_controller_actition.py b/solo-tool-project/src/solo_tool/midi_controller_actition.py new file mode 100644 index 0000000..f4e6642 --- /dev/null +++ b/solo-tool-project/src/solo_tool/midi_controller_actition.py @@ -0,0 +1,46 @@ +import mido +from collections.abc import Callable + +from . import handlers +from .solo_tool import SoloTool + +class ActitionController: + class _MidoMidiWrapper: + def __init__(self): + self._callback = None + try: + self._inPort = mido.open_input("f_midi") + self._inPort.callback = self._midoCallback + except: + print("Failed to open f_midi port for Actition controller") + + def setCallback(self, callback: Callable[[int, int], None]) -> None: + self._callback = callback + + def _midoCallback(self, msg: mido.Message) -> None: + if msg.type != "control_change": + return + if self._callback: + self._callback(msg.control, msg.channel) + + def __init__(self, midiWrapperOverride=None): + self._handlers = {} + if midiWrapperOverride: + self._midiWrapper = midiWrapperOverride + else: + self._midiWrapper = ActitionController._MidoMidiWrapper() + self._midiWrapper.setCallback(self._callback) + + def _callback(self, control: int, channel: int) -> None: + if channel != 14: + return + if control in self._handlers: + self._handlers[control]() + + def setSoloTool(self, soloTool: SoloTool) -> None: + self._handlers = { + 102: handlers.seekAbsolute(soloTool, 0.0), + 103: handlers.positionToKeyPoint(soloTool), + 104: soloTool.jump, + 105: handlers.playPause(soloTool) + } diff --git a/solo-tool-project/src/solo_tool/midi_controller_launchpad_mini.py b/solo-tool-project/src/solo_tool/midi_controller_launchpad_mini.py index 3dc8ec6..e79b60c 100644 --- a/solo-tool-project/src/solo_tool/midi_controller_launchpad_mini.py +++ b/solo-tool-project/src/solo_tool/midi_controller_launchpad_mini.py @@ -1,7 +1,34 @@ -from .midi_wrapper_mido import MidiWrapper +import mido from . import handlers +from .solo_tool import SoloTool -class MidiController: +class MidiWrapper: + def __init__(self): + self._inPort = None + self._outPort = None + + def connect(self, deviceName, callback): + if self._inPort is None and self._outPort is None: + self._inPort = mido.open_input(deviceName) + self._inPort.callback = callback + self._outPort = mido.open_output(deviceName) + + def disconnect(self): + if self._inPort is not None: + self._inPort.close() + self._inPort = None + + if self._outPort is not None: + self._outPort.reset() + self._outPort.close() + self._outPort = None + + def sendNoteOn(self, note, velocity, channel): + if self._outPort is not None: + msg = mido.Message("note_on", channel=channel, velocity=velocity, note=note) + self._outPort.send(msg) + +class LaunchpadMiniController: DEVICE_NAME = "Launchpad Mini MIDI 1" LIGHT_CONTROL_CHANNEL = 0 LED_GREEN = 124 @@ -18,7 +45,7 @@ class MidiController: MAX_PLAYBACK_VOLUME = 1.2 PLAYBACK_VOLUME_STEP = 0.1 - def __init__(self, soloTool, midiWrapperOverride=None): + def __init__(self, soloTool: SoloTool, midiWrapperOverride=None): self._soloTool = soloTool if midiWrapperOverride is not None: self._midiWrapper = midiWrapperOverride @@ -32,36 +59,36 @@ class MidiController: def _registerHandlers(self): self._handlers = { - 96 : self._soloTool.stop, + 96 : handlers.seekAbsolute(self._soloTool, 0.0), 114 : self._soloTool.jump, - 112 : self._playPause, - #118 : self._soloTool.previousStoredAbLimits, - #119 : self._soloTool.nextStoredAbLimits, + 112 : handlers.playPause(self._soloTool), + 118 : handlers.keyPointRelative(self._soloTool, -1), + 119 : handlers.keyPointRelative(self._soloTool, 1), 117 : handlers.positionToKeyPoint(self._soloTool), - 48 : handlers.changeSong(self._soloTool, -1), + 48 : handlers.songRelative(self._soloTool, -1), 49 : handlers.seekRelative(self._soloTool, -0.25), 50 : handlers.seekRelative(self._soloTool, -0.05), 51 : handlers.seekRelative(self._soloTool, -0.01), 52 : handlers.seekRelative(self._soloTool, 0.01), 53 : handlers.seekRelative(self._soloTool, 0.05), 54 : handlers.seekRelative(self._soloTool, 0.25), - 55 : handlers.changeSong(self._soloTool, 1), + 55 : handlers.songRelative(self._soloTool, 1), } for i in range(0, 8): - volume = round(MidiController.MIN_PLAYBACK_VOLUME + MidiController.PLAYBACK_VOLUME_STEP * i, 1) - self._handlers[i] = self._createSetPlaybackVolumeCallback(volume) + volume = round(LaunchpadMiniController.MIN_PLAYBACK_VOLUME + LaunchpadMiniController.PLAYBACK_VOLUME_STEP * i, 1) + self._handlers[i] = handlers.volumeAbsolute(self._soloTool, volume) for i, button in enumerate(range(16, 24)): - rate = round(MidiController.MIN_PLAYBACK_RATE + MidiController.PLAYBACK_RATE_STEP * i, 1) - self._handlers[button] = self._createSetPlaybackRateCallback(rate) + rate = round(LaunchpadMiniController.MIN_PLAYBACK_RATE + LaunchpadMiniController.PLAYBACK_RATE_STEP * i, 1) + self._handlers[button] = handlers.rateAbsolute(self._soloTool, rate) def connect(self): - self._midiWrapper.connect(MidiController.DEVICE_NAME, self._callback) + self._midiWrapper.connect(LaunchpadMiniController.DEVICE_NAME, self._callback) self._initialiseButtonLEDs() def disconnect(self): - self._allLEDsOff() + self._setAllLEDs(LaunchpadMiniController.LED_OFF) self._midiWrapper.disconnect() def _callback(self, msg): @@ -71,61 +98,39 @@ class MidiController: if msg.note in self._handlers: handler = self._handlers[msg.note]() - def _playPause(self): - if self._soloTool.isPlaying(): - self._soloTool.pause() - else: - self._soloTool.play() - def _updatePlayPauseButton(self, playing): if playing: - self._setButtonLED(7, 0, MidiController.LED_GREEN) - else: - self._setButtonLED(7, 0, MidiController.LED_YELLOW) - - def _updateToggleAbLimitEnableButton(self, enabled): - if enabled: - self._setButtonLED(6, 2, MidiController.LED_GREEN) + self._setButtonLED(7, 0, LaunchpadMiniController.LED_GREEN) else: - self._setButtonLED(6, 2, MidiController.LED_RED) + self._setButtonLED(7, 0, LaunchpadMiniController.LED_YELLOW) def _updateVolumeRow(self, volume): - t1 = int(round(volume / MidiController.PLAYBACK_VOLUME_STEP, 1)) - t2 = int(round(MidiController.MIN_PLAYBACK_VOLUME / MidiController.PLAYBACK_VOLUME_STEP, 1)) + t1 = int(round(volume / LaunchpadMiniController.PLAYBACK_VOLUME_STEP, 1)) + t2 = int(round(LaunchpadMiniController.MIN_PLAYBACK_VOLUME / LaunchpadMiniController.PLAYBACK_VOLUME_STEP, 1)) lastColumnLit = t1 - t2 + 1 - self._lightRowUntilColumn(0, lastColumnLit, MidiController.LED_GREEN) + self._lightRowUntilColumn(0, lastColumnLit, LaunchpadMiniController.LED_GREEN) def _updateRateRow(self, rate): - t1 = int(round(rate / MidiController.PLAYBACK_RATE_STEP, 1)) - t2 = int(round(MidiController.MIN_PLAYBACK_RATE / MidiController.PLAYBACK_RATE_STEP, 1)) + t1 = int(round(rate / LaunchpadMiniController.PLAYBACK_RATE_STEP, 1)) + t2 = int(round(LaunchpadMiniController.MIN_PLAYBACK_RATE / LaunchpadMiniController.PLAYBACK_RATE_STEP, 1)) lastColumnLit = t1 - t2 + 1 - self._lightRowUntilColumn(1, lastColumnLit, MidiController.LED_YELLOW) - - def _createSetPlaybackRateCallback(self, rate): - def f(): - self._soloTool.rate = rate - return f - - def _createSetPlaybackVolumeCallback(self, volume): - def f(): - self._soloTool.volume = volume - return f + self._lightRowUntilColumn(1, lastColumnLit, LaunchpadMiniController.LED_YELLOW) def _setButtonLED(self, row, col, colour): - self._midiWrapper.sendMessage(MidiController.BUTTON_MATRIX[row][col], colour, MidiController.LIGHT_CONTROL_CHANNEL) + self._midiWrapper.sendNoteOn(LaunchpadMiniController.BUTTON_MATRIX[row][col], colour, LaunchpadMiniController.LIGHT_CONTROL_CHANNEL) def _lightRowUntilColumn(self, row, column, litColour): - colours = [litColour] * column + [MidiController.LED_OFF] * (8 - column) + colours = [litColour] * column + [LaunchpadMiniController.LED_OFF] * (8 - column) for col in range(0, 8): self._setButtonLED(row, col, colours[col]) - def _allLEDsOff(self): + def _setAllLEDs(self, colour): for row in range(0, 8): for col in range(0, 8): - self._setButtonLED(row, col, MidiController.LED_OFF) + self._setButtonLED(row, col, colour) def _initialiseButtonLEDs(self): - self._allLEDsOff() + self._setAllLEDs(LaunchpadMiniController.LED_OFF) # volume buttons self._updateVolumeRow(self._soloTool.volume) @@ -134,22 +139,22 @@ class MidiController: self._updateRateRow(self._soloTool.rate) # playback control - self._setButtonLED(6, 0, MidiController.LED_RED) - self._updatePlayPauseButton(self._soloTool.isPlaying()) + self._setButtonLED(6, 0, LaunchpadMiniController.LED_YELLOW) + self._updatePlayPauseButton(self._soloTool.playing) - # AB control - self._setButtonLED(7, 2, MidiController.LED_YELLOW) - self._setButtonLED(7, 6, MidiController.LED_RED) - self._setButtonLED(7, 7, MidiController.LED_GREEN) - self._setButtonLED(7, 5, MidiController.LED_YELLOW) + # Key point control + self._setButtonLED(7, 2, LaunchpadMiniController.LED_YELLOW) + self._setButtonLED(7, 6, LaunchpadMiniController.LED_RED) + self._setButtonLED(7, 7, LaunchpadMiniController.LED_GREEN) + self._setButtonLED(7, 5, LaunchpadMiniController.LED_YELLOW) # Song control - self._setButtonLED(3, 0, MidiController.LED_RED) - self._setButtonLED(3, 1, MidiController.LED_RED) - self._setButtonLED(3, 2, MidiController.LED_RED) - self._setButtonLED(3, 3, MidiController.LED_RED) - self._setButtonLED(3, 4, MidiController.LED_GREEN) - self._setButtonLED(3, 5, MidiController.LED_GREEN) - self._setButtonLED(3, 6, MidiController.LED_GREEN) - self._setButtonLED(3, 7, MidiController.LED_GREEN) + self._setButtonLED(3, 0, LaunchpadMiniController.LED_RED) + self._setButtonLED(3, 1, LaunchpadMiniController.LED_RED) + self._setButtonLED(3, 2, LaunchpadMiniController.LED_RED) + self._setButtonLED(3, 3, LaunchpadMiniController.LED_RED) + self._setButtonLED(3, 4, LaunchpadMiniController.LED_GREEN) + self._setButtonLED(3, 5, LaunchpadMiniController.LED_GREEN) + self._setButtonLED(3, 6, LaunchpadMiniController.LED_GREEN) + self._setButtonLED(3, 7, LaunchpadMiniController.LED_GREEN) diff --git a/solo-tool-project/src/solo_tool/midi_wrapper_mido.py b/solo-tool-project/src/solo_tool/midi_wrapper_mido.py deleted file mode 100644 index 34f1031..0000000 --- a/solo-tool-project/src/solo_tool/midi_wrapper_mido.py +++ /dev/null @@ -1,28 +0,0 @@ -import mido - -class MidiWrapper: - def __init__(self): - self._inPort = None - self._outPort = None - - def connect(self, deviceName, callback): - if self._inPort is None and self._outPort is None: - self._inPort = mido.open_input(deviceName) - self._inPort.callback = callback - self._outPort = mido.open_output(deviceName) - - def disconnect(self): - if self._inPort is not None: - self._inPort.close() - self._inPort = None - - if self._outPort is not None: - self._outPort.reset() - self._outPort.close() - self._outPort = None - - def sendMessage(self, note, velocity, channel): - if self._outPort is not None: - msg = mido.Message('note_on', channel=channel, velocity=velocity, note=note) - self._outPort.send(msg) - diff --git a/solo-tool-project/src/solo_tool/notifier.py b/solo-tool-project/src/solo_tool/notifier.py index 73b84b7..5b3539c 100644 --- a/solo-tool-project/src/solo_tool/notifier.py +++ b/solo-tool-project/src/solo_tool/notifier.py @@ -3,7 +3,9 @@ class Notifier: PLAYBACK_VOLUME_EVENT = 1 PLAYBACK_RATE_EVENT = 2 CURRENT_SONG_EVENT = 3 - CURRENT_KEY_POINT_EVENT = 3 + SONG_LIST_EVENT = 4 + CURRENT_KEY_POINT_EVENT = 5 + KEY_POINT_LIST_EVENT = 6 def __init__(self, player): self._callbacks = dict() diff --git a/solo-tool-project/src/solo_tool/player_mpv.py b/solo-tool-project/src/solo_tool/player_mpv.py new file mode 100644 index 0000000..ff7fd1a --- /dev/null +++ b/solo-tool-project/src/solo_tool/player_mpv.py @@ -0,0 +1,53 @@ +import mpv + +class Player: + def __init__(self): + self._player = mpv.MPV() + self._player.loop = "inf" + self._playingStateCallback = self._dummyCallback + self._volumeCallback = self._dummyCallback + self._player.observe_property("pause", lambda name, value: self._playingStateCallback()) + self._player.observe_property("volume", lambda name, value: self._volumeCallback()) + + def __del__(self): + self._player.close() + + def _dummyCallback(self): + pass + + def play(self): + self._player.pause = False + + def pause(self): + self._player.pause = True + + def isPlaying(self): + return not self._player.pause + + def setPlaybackRate(self, rate): + self._player.speed = rate + + def getPlaybackRate(self): + return self._player.speed + + def setPlaybackPosition(self, position): + self._player.percent_pos = int(position * 100) + + def getPlaybackPosition(self): + return float(self._player.percent_pos or 0.0) / 100.0 + + def setPlaybackVolume(self, volume): + self._player.volume = int(volume * 100) + + def getPlaybackVolume(self): + return float(self._player.volume) / 100.0 + + def setCurrentSong(self, path): + self.pause() + self._player.play(str(path)) + + def setPlayingStateChangedCallback(self, callback): + self._playingStateCallback = callback + + def setPlaybackVolumeChangedCallback(self, callback): + self._volumeCallback = callback diff --git a/solo-tool-project/src/solo_tool/player_vlc.py b/solo-tool-project/src/solo_tool/player_vlc.py deleted file mode 100644 index 283102e..0000000 --- a/solo-tool-project/src/solo_tool/player_vlc.py +++ /dev/null @@ -1,55 +0,0 @@ -import vlc - -class Player: - def __init__(self): - self._player = vlc.MediaPlayer() - - def play(self): - self._player.play() - - def stop(self): - self._player.stop() - - def pause(self): - self._player.pause() - - def isPlaying(self): - playing = self._player.is_playing() == 1 - return playing - - def setPlaybackRate(self, rate): - self._player.set_rate(rate) - - def getPlaybackRate(self): - return self._player.get_rate() - - def setPlaybackPosition(self, position): - self._player.set_position(position) - - def getPlaybackPosition(self): - return self._player.get_position() - - def setPlaybackVolume(self, volume): - self._player.audio_set_volume(int(volume * 100)) - - def getPlaybackVolume(self): - return self._player.audio_get_volume() / 100.0 - - def setCurrentSong(self, path): - self._player.stop() - media = vlc.Media(path) - self._player.set_media(media) - - def setPlayingStateChangedCallback(self, callback): - events = [ - vlc.EventType.MediaPlayerStopped, - vlc.EventType.MediaPlayerPlaying, - vlc.EventType.MediaPlayerPaused - ] - manager = self._player.event_manager() - for e in events: - manager.event_attach(e, callback) - - def setPlaybackVolumeChangedCallback(self, callback): - manager = self._player.event_manager() - manager.event_attach(vlc.EventType.MediaPlayerAudioVolume, callback) diff --git a/solo-tool-project/src/solo_tool/session_manager.py b/solo-tool-project/src/solo_tool/session_manager.py index a4dabc0..8624207 100644 --- a/solo-tool-project/src/solo_tool/session_manager.py +++ b/solo-tool-project/src/solo_tool/session_manager.py @@ -1,29 +1,117 @@ +from typing import Protocol +from abc import abstractmethod +from . import SoloTool + +from pathlib import Path +from glob import glob import json +import requests +from os import getenv + +class SessionManager(): + def __init__(self, sessionPath: str): + self._sessionPath = sessionPath + + from re import search + match = search(r"^([a-z0-9]+://)", sessionPath) + if not match or match.group(0) == "file://": + self._backend = _FileSystemBackend(sessionPath) + elif match.group(0) in ["http://", "https://"]: + self._backend = _FileBrowserBackend(sessionPath) + else: + raise ValueError(f"Unsupported session path: {sessionPath}") -def loadSession(file, songList, abController): - jsonStr = file.read() - session = json.loads(jsonStr) + def getSessions(self) -> list[str]: + return self._backend.listIds() - songList.clear() - abController.clear() + def loadSession(self, id: str, player=None) -> SoloTool: + session = self._backend.read(id) - for entry in session: - songPath = entry["path"] - abLimits = entry["ab_limits"] - songList.append(songPath) + st = SoloTool(player=player) + for i, entry in enumerate(session): + songPath = entry["path"] + keyPoints = entry.get("key_points", []) + volume = entry.get("vol", 1.0) - if abLimits is not None: - for l in abLimits: - abController.storeLimits(l[0], l[1], songPath) + st.addSong(songPath, keyPoints=keyPoints, volume=volume) -def saveSession(file, songList, abController): - session = list() + return st + + def saveSession(self, soloTool: SoloTool, id: str) -> None: + session = [] + + for i, song in enumerate(soloTool.songs): + entry = { + "path": song, + "key_points" : soloTool._keyPoints[i], + "vol" : soloTool._volumes[i] + } + session.append(entry) + + self._backend.write(session, id) + +class _Backend(Protocol): + @abstractmethod + def listIds(self) -> list[str]: + raise NotImplementedError + + @abstractmethod + def read(self, id: str) -> dict: + raise NotImplementedError + + @abstractmethod + def write(self, session: dict, id: str) -> None: + raise NotImplementedError + +class _FileSystemBackend(_Backend): + def __init__(self, sessionPath: str): + self._sessionPath = Path(sessionPath) + + def listIds(self) -> list[str]: + return [Path(f).stem for f in glob(f"{self._sessionPath}/*.json")] + + def read(self, id: str) -> dict: + with open(self._sessionPath / f"{id}.json", "r") as f: + session = json.load(f) + return session + + def write(self, session: dict, id: str) -> None: + with open(self._sessionPath / f"{id}.json", "w") as f: + json.dump(session, f) + +class _FileBrowserBackend(_Backend): + def __init__(self, serverUrl: str): + self._baseUrl = serverUrl + self._username = getenv("ST_USER") + self._password = getenv("ST_PASS") + self._apiKey = self._getApiKey() + + def listIds(self) -> list[str]: + url = f"{self._baseUrl}/api/resources" + response = self._request("GET", url) + return [item["name"][0:-5] for item in response.json()["items"] if item["extension"] == ".json"] + + def read(self, id: str) -> dict: + url = f"{self._baseUrl}/api/raw/{id}.json" + response = self._request("GET", url) + return json.loads(response.content) + + def write(self, session: dict, id: str) -> None: + url = f"{self._baseUrl}/api/resources/{id}.json" + self._request("PUT", url, json=session) + + def _getApiKey(self) -> str: + response = requests.post(f"{self._baseUrl}/api/login", json={"username":self._username, "password":self._password}) + return response.content - for s in songList: - entry = { - "path": s, - "ab_limits" : abController.getStoredLimits(s) - } - session.append(entry) + def _request(self, verb: str, url: str, **kwargs): + headers = {"X-Auth" : self._apiKey} + response = requests.request(verb, url, headers=headers, **kwargs) + if response.status_code == requests.codes.UNAUTHORIZED: + # if unauthorized, the key might have expired + self._apiKey = self._getApiKey() + headers["X-Auth"] = self._apiKey + response = requests.request(verb, url, headers=headers, **kwargs) + response.raise_for_status() + return response - file.write(json.dumps(session)) diff --git a/solo-tool-project/src/solo_tool/solo_tool.py b/solo-tool-project/src/solo_tool/solo_tool.py index 97c3495..e8474e6 100644 --- a/solo-tool-project/src/solo_tool/solo_tool.py +++ b/solo-tool-project/src/solo_tool/solo_tool.py @@ -1,24 +1,37 @@ import os -from .session_manager import loadSession, saveSession from .notifier import Notifier -from .player_vlc import Player +from .player_mpv import Player class SoloTool: - def __init__(self, playerOverride=None): - self._player = Player() if playerOverride is None else playerOverride + def __init__(self, player=None): + self._player = Player() if player is None else player self._notifier = Notifier(self._player) self._songs = [] self._song = None self._keyPoints = [] self._keyPoint = None + self._volumes = [] + + def __del__(self): + del self._player def _updateSong(self, index): + previousSong = self._song self._song = index - path = self._songs[index] - self._player.setCurrentSong(path) + self._player.pause() + self._player.setCurrentSong(self._songs[index]) self._notifier.notify(Notifier.CURRENT_SONG_EVENT, index) - self._keyPoint = 0.0 + + previousKp = self._keyPoint + self._keyPoint = self.keyPoints[0] if len(self.keyPoints) > 0 else 0.0 + if previousKp != self._keyPoint: + self._notifier.notify(Notifier.CURRENT_KEY_POINT_EVENT, self._keyPoint) + + if previousSong is None or self._keyPoints[previousSong] != self._keyPoints[index]: + self._notifier.notify(Notifier.KEY_POINT_LIST_EVENT, self.keyPoints) + + self.volume = self._volumes[index] @staticmethod def _keyPointValid(kp: float) -> bool: @@ -28,11 +41,15 @@ class SoloTool: def songs(self) -> list[str]: return self._songs.copy() - def addSong(self, path: str) -> None: - if not os.path.isfile(path): - raise FileNotFoundError() + def addSong(self, path: str, keyPoints: list[float]=[], volume: float=1.0) -> None: + if path in self._songs: + return self._songs.append(path) - self._keyPoints.append([]) + self._keyPoints.append(keyPoints) + self._volumes.append(volume) + self._notifier.notify(Notifier.SONG_LIST_EVENT, self.songs) + if self.song is None: + self.song = 0 @property def song(self) -> int: @@ -50,17 +67,18 @@ class SoloTool: def keyPoints(self) -> list[float]: if self._song is None: return None - return self._keyPoints[self._song] + return self._keyPoints[self._song].copy() @keyPoints.setter def keyPoints(self, new: list[float]) -> None: if new is not None and self._song is not None: sanitized = sorted(list(set([p for p in new if SoloTool._keyPointValid(p)]))) - self._keyPoints[self._song] = sanitized + self._keyPoints[self._song] = sanitized.copy() + self._notifier.notify(Notifier.KEY_POINT_LIST_EVENT, self.keyPoints) @property def keyPoint(self) -> float: - return self._keyPoint + return float(self._keyPoint) if self._keyPoint is not None else None @keyPoint.setter def keyPoint(self, new: float) -> None: @@ -74,10 +92,8 @@ class SoloTool: def pause(self): self._player.pause() - def stop(self): - self._player.stop() - - def isPlaying(self): + @property + def playing(self) -> bool: return self._player.isPlaying() def jump(self): @@ -100,6 +116,8 @@ class SoloTool: @volume.setter def volume(self, new: float) -> None: if new is not None and new >= 0.0 and new != self._player.getPlaybackVolume(): + if self._song is not None: + self._volumes[self._song] = new self._player.setPlaybackVolume(new) self._notifier.notify(Notifier.PLAYBACK_VOLUME_EVENT, new) @@ -109,10 +127,21 @@ class SoloTool: @position.setter def position(self, new: float) -> None: - # TODO stop playback before changing position? if new is not None and new != self._player.getPlaybackPosition(): self._player.setPlaybackPosition(min(max(0.0, new), 1.0)) + def registerSongSelectionCallback(self, callback): + self._notifier.registerCallback(Notifier.CURRENT_SONG_EVENT, callback) + + def registerSongListCallback(self, callback): + self._notifier.registerCallback(Notifier.SONG_LIST_EVENT, callback) + + def registerKeyPointSelectionCallback(self, callback): + self._notifier.registerCallback(Notifier.CURRENT_KEY_POINT_EVENT, callback) + + def registerKeyPointListCallback(self, callback): + self._notifier.registerCallback(Notifier.KEY_POINT_LIST_EVENT, callback) + def registerPlayingStateCallback(self, callback): self._notifier.registerCallback(Notifier.PLAYING_STATE_EVENT, callback) @@ -122,9 +151,3 @@ class SoloTool: def registerRateCallback(self, callback): self._notifier.registerCallback(Notifier.PLAYBACK_RATE_EVENT, callback) - def registerCurrentSongCallback(self, callback): - self._notifier.registerCallback(Notifier.CURRENT_SONG_EVENT, callback) - - def registerCurrentKeyPointCallback(self, callback): - self._notifier.registerCallback(Notifier.CURRENT_KEY_POINT_EVENT, callback) - |