feat: add timecode seek sync mode

Author: vzhd1701

gridplayer/dialogs/settings.py

@@ -12,6 +12,7 @@
 from gridplayer.params.static import (
  SUPPORTED_LANGUAGES,
  GridMode,
+ SeekSyncMode,
  VideoAspect,
  VideoDriver,
  VideoRepeat,
@@ -73,7 +74,7 @@ def __init__(self, parent):
  "playlist/save_position": self.playlistSavePosition,
  "playlist/save_state": self.playlistSaveState,
  "playlist/save_window": self.playlistSaveWindow,
- "playlist/seek_synced": self.playlistSeekSync,
+ "playlist/seek_sync_mode": self.playlistSeekSyncMode,
  "playlist/track_changes": self.playlistTrackChanges,
  "video_defaults/aspect": self.videoAspect,
  "video_defaults/repeat": self.repeatMode,
@@ -139,6 +140,7 @@ def ui_fill(self):
  self.fill_logLevelVLC()
  self.fill_language()
  self.fill_streamQuality()
+ self.fill_playlistSeekSyncMode()
 
  def ui_customize_dynamic(self):
  self.driver_selected(self.playerVideoDriver.currentIndex())
@@ -292,6 +294,15 @@ def fill_streamQuality(self):
 
  _fill_combo_box(self.streamQuality, quality_codes)
 
+ def fill_playlistSeekSyncMode(self):
+ seek_modes = {
+ SeekSyncMode.NONE: self.tr("None"),
+ SeekSyncMode.PERCENT: self.tr("Percent"),
+ SeekSyncMode.TIMECODE: self.tr("Timecode"),
+ }
+
+ _fill_combo_box(self.playlistSeekSyncMode, seek_modes)
+
  def driver_selected(self, idx):
  driver_id = self.playerVideoDriver.itemData(idx)
 

gridplayer/dialogs/settings_dialog_ui.py

@@ -52,12 +52,22 @@ def setupUi(self, SettingsDialog):
  self.playlistSaveState = QtWidgets.QCheckBox(SettingsDialog)
  self.playlistSaveState.setObjectName("playlistSaveState")
  self.lay_section_playlist.addWidget(self.playlistSaveState)
- self.playlistSeekSync = QtWidgets.QCheckBox(SettingsDialog)
- self.playlistSeekSync.setObjectName("playlistSeekSync")
- self.lay_section_playlist.addWidget(self.playlistSeekSync)
  self.playlistTrackChanges = QtWidgets.QCheckBox(SettingsDialog)
  self.playlistTrackChanges.setObjectName("playlistTrackChanges")
  self.lay_section_playlist.addWidget(self.playlistTrackChanges)
+ self.lay_seek_sync = QtWidgets.QHBoxLayout()
+ self.lay_seek_sync.setObjectName("lay_seek_sync")
+ self.playlistSeekSyncModeLabel = QtWidgets.QLabel(SettingsDialog)
+ self.playlistSeekSyncModeLabel.setObjectName("playlistSeekSyncModeLabel")
+ self.lay_seek_sync.addWidget(self.playlistSeekSyncModeLabel)
+ self.playlistSeekSyncMode = QtWidgets.QComboBox(SettingsDialog)
+ self.playlistSeekSyncMode.setObjectName("playlistSeekSyncMode")
+ self.lay_seek_sync.addWidget(self.playlistSeekSyncMode)
+ spacerItem = QtWidgets.QSpacerItem(
+ 40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum
+ )
+ self.lay_seek_sync.addItem(spacerItem)
+ self.lay_section_playlist.addLayout(self.lay_seek_sync)
  self.lay_left_column.addLayout(self.lay_section_playlist)
  self.lay_section_grid = QtWidgets.QVBoxLayout()
  self.lay_section_grid.setObjectName("lay_section_grid")
@@ -76,10 +86,10 @@ def setupUi(self, SettingsDialog):
  self.gridMode = QtWidgets.QComboBox(SettingsDialog)
  self.gridMode.setObjectName("gridMode")
  self.lay_gridMode.addWidget(self.gridMode)
- spacerItem = QtWidgets.QSpacerItem(
+ spacerItem1 = QtWidgets.QSpacerItem(
  40, 0, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum
  )
- self.lay_gridMode.addItem(spacerItem)
+ self.lay_gridMode.addItem(spacerItem1)
  self.lay_section_grid.addLayout(self.lay_gridMode)
  self.lay_gridSize = QtWidgets.QHBoxLayout()
  self.lay_gridSize.setObjectName("lay_gridSize")
@@ -89,10 +99,10 @@ def setupUi(self, SettingsDialog):
  self.gridSizeLabel = QtWidgets.QLabel(SettingsDialog)
  self.gridSizeLabel.setObjectName("gridSizeLabel")
  self.lay_gridSize.addWidget(self.gridSizeLabel)
- spacerItem1 = QtWidgets.QSpacerItem(
+ spacerItem2 = QtWidgets.QSpacerItem(
  40, 0, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum
  )
- self.lay_gridSize.addItem(spacerItem1)
+ self.lay_gridSize.addItem(spacerItem2)
  self.lay_section_grid.addLayout(self.lay_gridSize)
  self.gridFit = QtWidgets.QCheckBox(SettingsDialog)
  self.gridFit.setObjectName("gridFit")
@@ -115,10 +125,10 @@ def setupUi(self, SettingsDialog):
  self.streamQuality = QtWidgets.QComboBox(SettingsDialog)
  self.streamQuality.setObjectName("streamQuality")
  self.lay_stream_quality.addWidget(self.streamQuality)
- spacerItem2 = QtWidgets.QSpacerItem(
+ spacerItem3 = QtWidgets.QSpacerItem(
  40, 0, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum
  )
- self.lay_stream_quality.addItem(spacerItem2)
+ self.lay_stream_quality.addItem(spacerItem3)
  self.lay_section_video_defaults.addLayout(self.lay_stream_quality)
  self.lay_aspect = QtWidgets.QHBoxLayout()
  self.lay_aspect.setObjectName("lay_aspect")
@@ -128,10 +138,10 @@ def setupUi(self, SettingsDialog):
  self.videoAspect = QtWidgets.QComboBox(SettingsDialog)
  self.videoAspect.setObjectName("videoAspect")
  self.lay_aspect.addWidget(self.videoAspect)
- spacerItem3 = QtWidgets.QSpacerItem(
+ spacerItem4 = QtWidgets.QSpacerItem(
  40, 0, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum
  )
- self.lay_aspect.addItem(spacerItem3)
+ self.lay_aspect.addItem(spacerItem4)
  self.lay_section_video_defaults.addLayout(self.lay_aspect)
  self.lay_repeat = QtWidgets.QHBoxLayout()
  self.lay_repeat.setObjectName("lay_repeat")
@@ -141,10 +151,10 @@ def setupUi(self, SettingsDialog):
  self.repeatMode = QtWidgets.QComboBox(SettingsDialog)
  self.repeatMode.setObjectName("repeatMode")
  self.lay_repeat.addWidget(self.repeatMode)
- spacerItem4 = QtWidgets.QSpacerItem(
+ spacerItem5 = QtWidgets.QSpacerItem(
  40, 0, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum
  )
- self.lay_repeat.addItem(spacerItem4)
+ self.lay_repeat.addItem(spacerItem5)
  self.lay_section_video_defaults.addLayout(self.lay_repeat)
  self.videoRandomLoop = QtWidgets.QCheckBox(SettingsDialog)
  self.videoRandomLoop.setObjectName("videoRandomLoop")
@@ -156,10 +166,10 @@ def setupUi(self, SettingsDialog):
  self.videoMuted.setObjectName("videoMuted")
  self.lay_section_video_defaults.addWidget(self.videoMuted)
  self.lay_left_column.addLayout(self.lay_section_video_defaults)
- spacerItem5 = QtWidgets.QSpacerItem(
+ spacerItem6 = QtWidgets.QSpacerItem(
  0, 0, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding
  )
- self.lay_left_column.addItem(spacerItem5)
+ self.lay_left_column.addItem(spacerItem6)
  self.lay_body.addLayout(self.lay_left_column)
  self.lay_right_column = QtWidgets.QVBoxLayout()
  self.lay_right_column.setObjectName("lay_right_column")
@@ -271,10 +281,10 @@ def setupUi(self, SettingsDialog):
  self.lay_section_misc = QtWidgets.QVBoxLayout()
  self.lay_section_misc.setObjectName("lay_section_misc")
  self.lay_right_column.addLayout(self.lay_section_misc)
- spacerItem6 = QtWidgets.QSpacerItem(
+ spacerItem7 = QtWidgets.QSpacerItem(
  0, 0, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding
  )
- self.lay_right_column.addItem(spacerItem6)
+ self.lay_right_column.addItem(spacerItem7)
  self.lay_body.addLayout(self.lay_right_column)
  self.lay_body.setStretch(0, 1)
  self.lay_main.addLayout(self.lay_body)
@@ -325,12 +335,12 @@ def retranslateUi(self, SettingsDialog):
  self.playlistSaveState.setText(
  _translate("SettingsDialog", "Save videos playing / paused status")
  )
- self.playlistSeekSync.setText(
- _translate("SettingsDialog", "Synchronize seek by default")
- )
  self.playlistTrackChanges.setText(
  _translate("SettingsDialog", "Warn about unsaved changes")
  )
+ self.playlistSeekSyncModeLabel.setText(
+ _translate("SettingsDialog", "Seek sync mode")
+ )
  self.section_grid.setText(
  _translate("SettingsDialog", "Default Grid Parameters")
  )

gridplayer/models/playlist.py

@@ -7,7 +7,7 @@
 
 from gridplayer.models.grid_state import GridState
 from gridplayer.models.video import Video
-from gridplayer.params.static import WindowState
+from gridplayer.params.static import SeekSyncMode, WindowState
 from gridplayer.settings import Settings, default_field
 
 logger = logging.getLogger(__name__)
@@ -17,7 +17,7 @@ class Playlist(BaseModel):
  grid_state: GridState = GridState()
  window_state: Optional[WindowState]
  videos: Optional[List[Video]]
- is_seek_synced: bool = default_field("playlist/seek_synced")
+ seek_sync_mode: SeekSyncMode = default_field("playlist/seek_sync_mode")
 
  @classmethod
  def read(cls, filename):

gridplayer/params/static.py

@@ -45,6 +45,12 @@ class VideoDriver(AutoName):
  DUMMY = auto()
 
 
+class SeekSyncMode(AutoName):
+ NONE = auto()
+ PERCENT = auto()
+ TIMECODE = auto()
+
+
 class WindowState(NamedTuple):
  is_maximized: bool
  is_fullscreen: bool

gridplayer/player/managers/actions.py

@@ -5,7 +5,7 @@
 from PyQt5.QtGui import QIcon, QKeySequence
 from PyQt5.QtWidgets import QAction, QMenu
 
-from gridplayer.params.static import GridMode, VideoAspect, VideoRepeat
+from gridplayer.params.static import GridMode, SeekSyncMode, VideoAspect, VideoRepeat
 from gridplayer.player.managers.base import ManagerBase
 from gridplayer.utils.qt import translate
 
@@ -271,12 +271,23 @@
  "func": "close_playlist",
  "enable_if": "is_videos",
  },
- "Seek Sync": {
- "title": translate("Actions", "Seek Sync"),
- "key": "Shift+S",
- "icon": "seek-sync",
- "func": "switch_seek_synced",
- "check_if": "is_seek_synced",
+ "Seek Sync (None)": {
+ "title": translate("Actions", "None"),
+ "icon": "empty",
+ "func": ("set_seek_sync_mode", SeekSyncMode.NONE),
+ "check_if": ("is_seek_sync_mode_set_to", SeekSyncMode.NONE),
+ },
+ "Seek Sync (Percent)": {
+ "title": translate("Actions", "Percent"),
+ "icon": "seek-sync-percent",
+ "func": ("set_seek_sync_mode", SeekSyncMode.PERCENT),
+ "check_if": ("is_seek_sync_mode_set_to", SeekSyncMode.PERCENT),
+ },
+ "Seek Sync (Timecode)": {
+ "title": translate("Actions", "Timecode"),
+ "icon": "seek-sync-time",
+ "func": ("set_seek_sync_mode", SeekSyncMode.TIMECODE),
+ "check_if": ("is_seek_sync_mode_set_to", SeekSyncMode.TIMECODE),
  },
  "+1%": {
  "title": "+1%",

gridplayer/player/managers/menu.py

@@ -27,6 +27,7 @@
  "icon": "jump-to",
  },
  "Grid": {"title": translate("Actions", "Grid"), "icon": "grid"},
+ "Seek Sync": {"title": translate("Actions", "Seek Sync"), "icon": "seek-sync"},
  }
 )
 
@@ -81,8 +82,6 @@
  "Play / Pause [ALL]",
  (
  "Jump (to) [ALL]",
- "Seek Sync",
- "---",
  "Random",
  "---",
  "+1%",
@@ -99,6 +98,12 @@
  "-15s",
  "-30s",
  ),
+ (
+ "Seek Sync",
+ "Seek Sync (None)",
+ "Seek Sync (Percent)",
+ "Seek Sync (Timecode)",
+ ),
  (
  "Grid",
  "Rows First",

gridplayer/player/managers/playlist.py

@@ -7,7 +7,7 @@
 from gridplayer.models.grid_state import GridState
 from gridplayer.models.playlist import Playlist
 from gridplayer.models.video import filter_video_uris
-from gridplayer.params.static import WindowState
+from gridplayer.params.static import SeekSyncMode, WindowState
 from gridplayer.player.managers.base import ManagerBase
 from gridplayer.settings import Settings
 from gridplayer.utils.files import get_playlist_path
@@ -19,7 +19,7 @@ class PlaylistManager(ManagerBase):
  playlist_loaded = pyqtSignal()
  window_state_loaded = pyqtSignal(WindowState)
  grid_state_loaded = pyqtSignal(GridState)
- is_seek_synced_loaded = pyqtSignal(bool)
+ seek_sync_mode_loaded = pyqtSignal(SeekSyncMode)
  videos_loaded = pyqtSignal(list)
 
  alert = pyqtSignal()
@@ -147,7 +147,7 @@ def load_playlist(self, playlist: Playlist):
  if playlist.window_state is not None:
  self.window_state_loaded.emit(playlist.window_state)
 
- self.is_seek_synced_loaded.emit(playlist.is_seek_synced)
+ self.seek_sync_mode_loaded.emit(playlist.seek_sync_mode)
 
  self.alert.emit()
 
@@ -193,5 +193,5 @@ def _make_playlist(self):
  grid_state=self._ctx.grid_state,
  window_state=self._ctx.window_state,
  videos=self._ctx.video_blocks.videos,
- is_seek_synced=self._ctx.is_seek_synced,
+ seek_sync_mode=self._ctx.seek_sync_mode,
  )

gridplayer/player/managers/video_blocks.py

@@ -3,6 +3,7 @@
 from PyQt5.QtCore import Qt, pyqtSignal
 
 from gridplayer.models.video import Video
+from gridplayer.params.static import SeekSyncMode
 from gridplayer.player.managers.base import ManagerBase
 from gridplayer.settings import Settings
 from gridplayer.utils.qt import qt_connect
@@ -67,13 +68,14 @@ class VideoBlocksManager(ManagerBase):
  seek_shift_ms = pyqtSignal(int)
  seek_random = pyqtSignal()
  seek_percent = pyqtSignal(float)
+ seek_timecode = pyqtSignal(int)
 
  close_all_signal = pyqtSignal()
 
  def __init__(self, **kwargs):
  super().__init__(**kwargs)
 
- self._ctx.is_seek_synced = Settings().get("playlist/seek_synced")
+ self._ctx.seek_sync_mode = Settings().get("playlist/seek_sync_mode")
 
  self._ctx.video_blocks = VideoBlocks()
 
@@ -85,13 +87,14 @@ def commands(self):
  return {
  "play_pause_all": self.cmd_play_pause_all,
  "loop_random": self.seek_random.emit,
+ "seek_timecode": self.seek_random.emit,
  "seek_shift_all": self.cmd_seek_shift_all,
  "seek_shift_ms_all": self.cmd_seek_shift_ms_all,
  "step_forward": self.cmd_step_forward,
  "step_backward": self.cmd_step_backward,
  "is_videos": lambda: bool(self._ctx.video_blocks),
- "is_seek_synced": lambda: self._ctx.is_seek_synced,
- "switch_seek_synced": self.switch_seek_synced,
+ "is_seek_sync_mode_set_to": self.is_seek_sync_mode_set_to,
+ "set_seek_sync_mode": self.set_seek_sync_mode,
  "reload_all": self.reload_videos,
  }
 
@@ -117,15 +120,19 @@ def cmd_step_backward(self):
  self.pause_all()
  self.step_frame.emit(1)
 
- def seek_sync(self, percent):
- if self._ctx.is_seek_synced:
+ def seek_sync_percent(self, percent):
+ if self._ctx.seek_sync_mode == SeekSyncMode.PERCENT:
  self.seek_percent.emit(percent)
 
- def switch_seek_synced(self):
- self._ctx.is_seek_synced = not self._ctx.is_seek_synced
+ def seek_sync_timecode(self, timecode):
+ if self._ctx.seek_sync_mode == SeekSyncMode.TIMECODE:
+ self.seek_timecode.emit(timecode)
 
- def set_seek_synced(self, is_seek_synced):
- self._ctx.is_seek_synced = is_seek_synced
+ def is_seek_sync_mode_set_to(self, mode):
+ return self._ctx.seek_sync_mode == mode
+
+ def set_seek_sync_mode(self, mode):
+ self._ctx.seek_sync_mode = mode
 
  def pause_all(self):
  self.set_pause.emit(True)
@@ -192,13 +199,15 @@ def _add_video_block(self, video):
  qt_connect(
  (vb.about_to_close, self.close_single),
  (vb.is_paused_change, self.playing_count_change),
- (vb.percent_changed, self.seek_sync),
+ (vb.seeked_percent, self.seek_sync_percent),
+ (vb.seeked_time, self.seek_sync_timecode),
  (vb.destroyed, self._video_block_destroyed),
  (self.set_pause, vb.set_pause),
  (self.seek_shift, vb.seek_shift_percent),
  (self.seek_shift_ms, vb.seek_shift),
  (self.seek_random, vb.seek_random),
  (self.seek_percent, vb.seek_percent),
+ (self.seek_timecode, vb.seek),
  (self.hide_overlay, vb.hide_overlay),
  (self.close_all_signal, vb.close_silently),
  )