Compare commits

..

No commits in common. "f1ef2f4d5a3a048e73522b31782bdbfc2a5d1b69" and "1a5bd638c0c5c5c5562b529947a5799f50a66b3f" have entirely different histories.

4 changed files with 22 additions and 14 deletions

1
.gitignore vendored
View File

@ -11,4 +11,3 @@ StudioPlaylist.png
*.howto *.howto
.direnv .direnv
tmp/ tmp/
.coverage

View File

@ -44,7 +44,7 @@ class FadeTrack(QRunnable):
sleep(1 / Config.FADEOUT_STEPS_PER_SECOND) sleep(1 / Config.FADEOUT_STEPS_PER_SECOND)
self.player.stop() self.player.stop()
log.debug(f"Releasing player {self.player=}") log.error(f"Releasing player {self.player=}")
self.player.release() self.player.release()

View File

@ -1146,31 +1146,34 @@ class Window(QMainWindow, Ui_MainWindow):
break break
sleep(0.1) sleep(0.1)
# TODO: remove sleep() calls - used to try to isolate bug #223
# Show closing volume graph # Show closing volume graph
sleep(1)
if track_sequence.now.fade_graph: if track_sequence.now.fade_graph:
track_sequence.now.fade_graph.plot() track_sequence.now.fade_graph.plot()
else: else:
log.error("No fade_graph") log.error("No fade_graph")
# Note that track is playing # Note that track is playing
log.debug("set track_sequence") sleep(1)
log.error("set track_sequence")
track_sequence.now.start() track_sequence.now.start()
self.playing = True self.playing = True
# Disable play next controls # Disable play next controls
sleep(1)
log.error("catch return key") log.error("catch return key")
self.catch_return_key = True self.catch_return_key = True
self.show_status_message("Play controls: Disabled", 0) self.show_status_message("Play controls: Disabled", 0)
# Notify model # Notify model
log.error("Pause before calling active_proxy_model().current_track_started()") sleep(1)
sleep(2) log.error("active_proxy_model().current_track_started()")
self.active_proxy_model().current_track_started() self.active_proxy_model().current_track_started()
sleep(2)
log.error("Pause finished after calling active_proxy_model().current_track_started()")
# Update headers # Update headers
log.debug("update headers") sleep(1)
log.error("update headers")
self.update_headers() self.update_headers()
def preview(self) -> None: def preview(self) -> None:

View File

@ -5,6 +5,7 @@ import re
from datetime import datetime, timedelta from datetime import datetime, timedelta
from enum import auto, Enum from enum import auto, Enum
from operator import attrgetter from operator import attrgetter
from time import sleep
from random import shuffle from random import shuffle
from typing import List, Optional from typing import List, Optional
@ -271,18 +272,21 @@ class PlaylistModel(QAbstractTableModel):
) )
return return
# TODO: remove sleep/log calls, used to debug #223
# Check for OBS scene change # Check for OBS scene change
# TODO: log.error used to debug #223 - change to log.debug later sleep(1)
log.debug("Call OBS scene change") log.error("Call OBS scene change")
self.obs_scene_change(row_number) self.obs_scene_change(row_number)
with Session() as session: with Session() as session:
# Update Playdates in database # Update Playdates in database
log.debug("update playdates") sleep(1)
log.error("update playdates")
Playdates(session, track_sequence.now.track_id) Playdates(session, track_sequence.now.track_id)
# Mark track as played in playlist # Mark track as played in playlist
log.debug("Mark track as played") sleep(1)
log.error("Mark track as played")
plr = session.get(PlaylistRows, track_sequence.now.plr_id) plr = session.get(PlaylistRows, track_sequence.now.plr_id)
if plr: if plr:
plr.played = True plr.played = True
@ -291,7 +295,8 @@ class PlaylistModel(QAbstractTableModel):
log.error(f"Can't retrieve plr, {track_sequence.now.plr_id=}") log.error(f"Can't retrieve plr, {track_sequence.now.plr_id=}")
# Update track times # Update track times
log.debug("Update track times") sleep(1)
log.error("Update track times")
if prd: if prd:
prd.start_time = track_sequence.now.start_time prd.start_time = track_sequence.now.start_time
prd.end_time = track_sequence.now.end_time prd.end_time = track_sequence.now.end_time
@ -308,7 +313,8 @@ class PlaylistModel(QAbstractTableModel):
# Find next track # Find next track
# Get all unplayed track rows # Get all unplayed track rows
log.debug("Find next track") sleep(1)
log.error("Find next track")
next_row = None next_row = None
unplayed_rows = self.get_unplayed_rows() unplayed_rows = self.get_unplayed_rows()
if unplayed_rows: if unplayed_rows: