app/config.py

@@ -67,9 +67,6 @@ class Config(object):
     MINIMUM_ROW_HEIGHT = 30
     MYSQL_CONNECT = os.environ.get('MYSQL_CONNECT') or "mysql+mysqldb://musicmuster:musicmuster@localhost/musicmuster_v2"  # noqa E501
     NOTE_TIME_FORMAT = "%H:%M:%S"
-    OBS_HOST = "localhost"
-    OBS_PASSWORD = "auster"
-    OBS_PORT = 4455
     PLAY_SETTLE = 500000
     ROOT = os.environ.get('ROOT') or "/home/kae/music"
     IMPORT_DESTINATION = os.path.join(ROOT, "Singles")

app/music.py

@@ -123,8 +123,8 @@ class Music:
         media = self.VLC.media_new_path(path)
         self.player = media.player_new_from_media()
         if self.player:
+            self.player.audio_set_volume(self.max_volume)
             status = self.player.play()
-            self.set_volume(self.max_volume)
             if position:
                 self.player.set_position(position)
 

app/playlists.py

@@ -4,8 +4,6 @@ import stackprinter                         # type: ignore
 import subprocess
 import threading
 
-import obsws_python as obs
-
 from collections import namedtuple
 from datetime import datetime, timedelta
 from typing import Callable, cast, List, Optional, TYPE_CHECKING, Union
@@ -65,10 +63,8 @@ from models import (
 if TYPE_CHECKING:
     from musicmuster import Window, MusicMusterSignals
 
-scene_change_re = re.compile(r"SetScene=\[([^[\]]*)\]")
-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")
-
+section_header_cleanup_re = re.compile(r"(@\d\d:\d\d:\d\d.*)?(\+)?")
 HEADER_NOTES_COLUMN = 2
 
 # Columns
@@ -636,8 +632,6 @@ class PlaylistTab(QTableWidget):
         - Set next track
         - Display track as current
         - Update start/stop times
-        - Change OBS scene if needed
-        - Update hidden tracks
         """
 
         current_row = self._get_current_track_row_number()
@@ -667,9 +661,6 @@ class PlaylistTab(QTableWidget):
         # Update start/stop times
         self._update_start_end_times(session)
 
-        # Change OBS scene if needed
-        self._obs_change_scene(current_row)
-
         # Update hidden tracks
         QTimer.singleShot(Config.HIDE_AFTER_PLAYING_OFFSET,
                           self.hide_or_show_played_tracks)
@@ -1449,44 +1440,6 @@ class PlaylistTab(QTableWidget):
             target=self._run_subprocess, args=(cmd_list,))
         thread.start()
 
-    def _obs_change_scene(self, current_row: int) -> None:
-        """
-        Try to change OBS scene to the name passed
-        """
-
-        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:
-                        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}'")
-                            return
-                        except obs.error.OBSSDKError as e:
-                            log.error(f"OBS SDK error ({e})")
-                            return
-            # 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
-
     def _open_in_audacity(self, row_number: int) -> None:
         """Open track in Audacity. Audacity must be already running"""