From 522e9041cd9514b986b0fd5c57507dc64c01403b Mon Sep 17 00:00:00 2001
From: Tim Bentley <tim.bentley@gmail.com>
Date: Sat, 21 Jan 2023 05:29:31 +0000
Subject: [PATCH] Add debugging for VLC and fix strange state.

---
 openlp/core/common/mixins.py            |  2 +-
 openlp/core/ui/media/mediacontroller.py |  3 +++
 openlp/core/ui/media/vlcplayer.py       | 16 +++++++++-------
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/openlp/core/common/mixins.py b/openlp/core/common/mixins.py
index 0bf452836..985b88dcb 100644
--- a/openlp/core/common/mixins.py
+++ b/openlp/core/common/mixins.py
@@ -30,7 +30,7 @@ from openlp.core.common.registry import Registry
 
 
 DO_NOT_TRACE_EVENTS = ['timerEvent', 'paintEvent', 'drag_enter_event', 'drop_event', 'on_controller_size_changed',
-                       'preview_size_changed', 'resizeEvent', 'eventFilter', 'tick']
+                       'preview_size_changed', 'resizeEvent', 'eventFilter', 'tick', 'resize', 'update_ui']
 
 
 class LogMixin(object):
diff --git a/openlp/core/ui/media/mediacontroller.py b/openlp/core/ui/media/mediacontroller.py
index 23b10d9e2..57a2784f3 100644
--- a/openlp/core/ui/media/mediacontroller.py
+++ b/openlp/core/ui/media/mediacontroller.py
@@ -683,6 +683,9 @@ class MediaController(RegistryBase, LogMixin, RegistryProperties):
                 else:
                     self._media_set_visibility(controller, False)
                 del self.current_media_players[controller.controller_type]
+            controller.mediabar.actions['playbackPlay'].setVisible(True)
+            controller.mediabar.actions['playbackStop'].setDisabled(True)
+            controller.mediabar.actions['playbackPause'].setVisible(False)
 
     def media_hide_msg(self, msg):
         """
diff --git a/openlp/core/ui/media/vlcplayer.py b/openlp/core/ui/media/vlcplayer.py
index b3c06ebd1..777238b67 100644
--- a/openlp/core/ui/media/vlcplayer.py
+++ b/openlp/core/ui/media/vlcplayer.py
@@ -32,6 +32,7 @@ from time import sleep
 from PyQt5 import QtCore, QtWidgets
 
 from openlp.core.common.i18n import translate
+from openlp.core.common.mixins import LogMixin
 from openlp.core.common.platform import is_linux, is_macosx, is_win
 from openlp.core.display.screens import ScreenList
 from openlp.core.lib.ui import critical_error_message_box
@@ -83,7 +84,7 @@ if is_linux() and 'pytest' not in sys.argv[0] and get_vlc():
         log.exception('Failed to run XInitThreads(), VLC might not work properly!')
 
 
-class VlcPlayer(MediaPlayer):
+class VlcPlayer(MediaPlayer, LogMixin):
     """
     A specialised version of the MediaPlayer class, which provides a VLC display.
     """
@@ -133,7 +134,7 @@ class VlcPlayer(MediaPlayer):
             controller.vlc_instance = vlc.Instance(command_line_options)
             if not controller.vlc_instance:
                 return
-        log.debug(f"VLC version: {vlc.libvlc_get_version()}")
+        self.log_debug(f"VLC version: {vlc.libvlc_get_version()}")
         # creating an empty vlc media player
         controller.vlc_media_player = controller.vlc_instance.media_player_new()
         controller.vlc_widget.resize(controller.size())
@@ -172,7 +173,7 @@ class VlcPlayer(MediaPlayer):
         """
         if not controller.vlc_instance:
             return False
-        log.debug('load video in VLC Controller')
+        self.log_debug('load video in VLC Controller')
         path = None
         if file and not controller.media_info.media_type == MediaType.Stream:
             path = os.path.normcase(file)
@@ -201,7 +202,7 @@ class VlcPlayer(MediaPlayer):
                 path = '/' + path
             dvd_location = 'dvd://' + path + '#' + controller.media_info.title_track
             controller.vlc_media = controller.vlc_instance.media_new_location(dvd_location)
-            log.debug(f"vlc dvd load: {dvd_location}")
+            self.log_debug(f"vlc dvd load: {dvd_location}")
             controller.vlc_media.add_option(f"start-time={int(controller.media_info.start_time // 1000)}")
             controller.vlc_media.add_option(f"stop-time={int(controller.media_info.end_time // 1000)}")
             controller.vlc_media_player.set_media(controller.vlc_media)
@@ -210,10 +211,11 @@ class VlcPlayer(MediaPlayer):
             self.media_state_wait(controller, VlCState.Playing)
             if controller.media_info.audio_track > 0:
                 res = controller.vlc_media_player.audio_set_track(controller.media_info.audio_track)
-                log.debug('vlc play, audio_track set: ' + str(controller.media_info.audio_track) + ' ' + str(res))
+                self.log_debug('vlc play, audio_track set: ' + str(controller.media_info.audio_track) + ' ' + str(res))
             if controller.media_info.subtitle_track > 0:
                 res = controller.vlc_media_player.video_set_spu(controller.media_info.subtitle_track)
-                log.debug('vlc play, subtitle_track set: ' + str(controller.media_info.subtitle_track) + ' ' + str(res))
+                self.log_debug('vlc play, subtitle_track set: ' +
+                               str(controller.media_info.subtitle_track) + ' ' + str(res))
         elif controller.media_info.media_type == MediaType.Stream:
             controller.vlc_media = controller.vlc_instance.media_new_location(file[0])
             controller.vlc_media.add_options(file[1])
@@ -269,7 +271,7 @@ class VlcPlayer(MediaPlayer):
         :param output_display: The display where the media is
         :return:
         """
-        log.debug('vlc play, mediatype: ' + str(controller.media_info.media_type))
+        self.log_debug('vlc play, mediatype: ' + str(controller.media_info.media_type))
         threading.Thread(target=controller.vlc_media_player.play).start()
         if not self.media_state_wait(controller, VlCState.Playing):
             return False