First pass of OBS scene change
This commit is contained in:
parent
7dac80dcf6
commit
a923f32070
@ -67,6 +67,9 @@ class Config(object):
|
|||||||
MINIMUM_ROW_HEIGHT = 30
|
MINIMUM_ROW_HEIGHT = 30
|
||||||
MYSQL_CONNECT = os.environ.get('MYSQL_CONNECT') or "mysql+mysqldb://musicmuster:musicmuster@localhost/musicmuster_v2" # noqa E501
|
MYSQL_CONNECT = os.environ.get('MYSQL_CONNECT') or "mysql+mysqldb://musicmuster:musicmuster@localhost/musicmuster_v2" # noqa E501
|
||||||
NOTE_TIME_FORMAT = "%H:%M:%S"
|
NOTE_TIME_FORMAT = "%H:%M:%S"
|
||||||
|
OBS_HOST = "localhost"
|
||||||
|
OBS_PASSWORD = "auster"
|
||||||
|
OBS_PORT = 4455
|
||||||
PLAY_SETTLE = 500000
|
PLAY_SETTLE = 500000
|
||||||
ROOT = os.environ.get('ROOT') or "/home/kae/music"
|
ROOT = os.environ.get('ROOT') or "/home/kae/music"
|
||||||
IMPORT_DESTINATION = os.path.join(ROOT, "Singles")
|
IMPORT_DESTINATION = os.path.join(ROOT, "Singles")
|
||||||
|
|||||||
@ -4,6 +4,8 @@ import stackprinter # type: ignore
|
|||||||
import subprocess
|
import subprocess
|
||||||
import threading
|
import threading
|
||||||
|
|
||||||
|
import obsws_python as obs
|
||||||
|
|
||||||
from collections import namedtuple
|
from collections import namedtuple
|
||||||
from datetime import datetime, timedelta
|
from datetime import datetime, timedelta
|
||||||
from typing import Callable, cast, List, Optional, TYPE_CHECKING, Union
|
from typing import Callable, cast, List, Optional, TYPE_CHECKING, Union
|
||||||
@ -63,8 +65,10 @@ from models import (
|
|||||||
if TYPE_CHECKING:
|
if TYPE_CHECKING:
|
||||||
from musicmuster import Window, MusicMusterSignals
|
from musicmuster import Window, MusicMusterSignals
|
||||||
|
|
||||||
start_time_re = re.compile(r"@\d\d:\d\d:\d\d")
|
scene_change_re = re.compile(r"SetScene=\[([^[\]]*)\]")
|
||||||
section_header_cleanup_re = re.compile(r"(@\d\d:\d\d:\d\d.*)?(\+)?")
|
section_header_cleanup_re = re.compile(r"(@\d\d:\d\d:\d\d.*)?(\+)?")
|
||||||
|
start_time_re = re.compile(r"@\d\d:\d\d:\d\d")
|
||||||
|
|
||||||
HEADER_NOTES_COLUMN = 2
|
HEADER_NOTES_COLUMN = 2
|
||||||
|
|
||||||
# Columns
|
# Columns
|
||||||
@ -632,6 +636,8 @@ class PlaylistTab(QTableWidget):
|
|||||||
- Set next track
|
- Set next track
|
||||||
- Display track as current
|
- Display track as current
|
||||||
- Update start/stop times
|
- Update start/stop times
|
||||||
|
- Change OBS scene if needed
|
||||||
|
- Update hidden tracks
|
||||||
"""
|
"""
|
||||||
|
|
||||||
current_row = self._get_current_track_row_number()
|
current_row = self._get_current_track_row_number()
|
||||||
@ -661,6 +667,27 @@ class PlaylistTab(QTableWidget):
|
|||||||
# Update start/stop times
|
# Update start/stop times
|
||||||
self._update_start_end_times(session)
|
self._update_start_end_times(session)
|
||||||
|
|
||||||
|
# Change OBS scene if needed
|
||||||
|
check_row = current_row
|
||||||
|
while True:
|
||||||
|
# If we have a note and it has a scene change command,
|
||||||
|
# execute it
|
||||||
|
note_text = self._get_row_note(check_row)
|
||||||
|
if note_text:
|
||||||
|
match_obj = scene_change_re.search(note_text)
|
||||||
|
if match_obj:
|
||||||
|
scene_name = match_obj.group(1)
|
||||||
|
if scene_name:
|
||||||
|
self._obs_change_scene(scene_name)
|
||||||
|
break
|
||||||
|
# After current track row, only check header rows and stop
|
||||||
|
# at first non-header row
|
||||||
|
check_row -= 1
|
||||||
|
if check_row < 0:
|
||||||
|
break
|
||||||
|
if self._get_row_track_id(check_row):
|
||||||
|
break
|
||||||
|
|
||||||
# Update hidden tracks
|
# Update hidden tracks
|
||||||
QTimer.singleShot(Config.HIDE_AFTER_PLAYING_OFFSET,
|
QTimer.singleShot(Config.HIDE_AFTER_PLAYING_OFFSET,
|
||||||
self.hide_or_show_played_tracks)
|
self.hide_or_show_played_tracks)
|
||||||
@ -1440,6 +1467,26 @@ class PlaylistTab(QTableWidget):
|
|||||||
target=self._run_subprocess, args=(cmd_list,))
|
target=self._run_subprocess, args=(cmd_list,))
|
||||||
thread.start()
|
thread.start()
|
||||||
|
|
||||||
|
def _obs_change_scene(self, scene_name: str) -> None:
|
||||||
|
"""
|
||||||
|
Try to change OBS scene to the name passed
|
||||||
|
"""
|
||||||
|
|
||||||
|
try:
|
||||||
|
cl = obs.ReqClient(host=Config.OBS_HOST,
|
||||||
|
port=Config.OBS_PORT,
|
||||||
|
password=Config.OBS_PASSWORD)
|
||||||
|
except ConnectionRefusedError:
|
||||||
|
log.error(f"OBS connection refused")
|
||||||
|
return
|
||||||
|
|
||||||
|
try:
|
||||||
|
cl.set_current_program_scene(scene_name)
|
||||||
|
log.info(f"OBS scene changed to '{scene_name}'")
|
||||||
|
except obs.error.OBSSDKError as e:
|
||||||
|
log.error(f"OBS SDK error ({e})")
|
||||||
|
return
|
||||||
|
|
||||||
def _open_in_audacity(self, row_number: int) -> None:
|
def _open_in_audacity(self, row_number: int) -> None:
|
||||||
"""Open track in Audacity. Audacity must be already running"""
|
"""Open track in Audacity. Audacity must be already running"""
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user