[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/subed 9557ba9 273/389: Standardize/Rename subtitle loop fu
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/subed 9557ba9 273/389: Standardize/Rename subtitle loop functions |
Date: |
Fri, 3 Dec 2021 11:00:40 -0500 (EST) |
branch: elpa/subed
commit 9557ba915bd04bf2de5395f2b398131b4b48ff80
Author: Random User <rndusr@posteo.de>
Commit: Random User <rndusr@posteo.de>
Standardize/Rename subtitle loop functions
All the other optional features have enable/disable/toggle functions, but
the
looping feature had enable/disable functions missing.
I've also renamed the functions to make it clearer what they do.
---
subed/subed-common.el | 43 ++++++++++++++++++++++++++++++-------------
subed/subed-config.el | 2 +-
2 files changed, 31 insertions(+), 14 deletions(-)
diff --git a/subed/subed-common.el b/subed/subed-common.el
index 54f53f6..35461dd 100644
--- a/subed/subed-common.el
+++ b/subed/subed-common.el
@@ -781,28 +781,45 @@ If QUIET is non-nil, do not display a message in the
minibuffer."
;;; Loop over single subtitle
-(defun subed-subtitle-loop-p ()
+(defun subed-loop-over-current-subtitle-p ()
"Whether the player is looping over the current subtitle."
(or subed--subtitle-loop-start subed--subtitle-loop-stop))
-(defun subed-toggle-subtitle-loop (&optional quiet)
- "Enable or disable looping in player over the current subtitle.
+(defun subed-enable-loop-over-current-subtitle (&optional quiet)
+ "Enable looping over the current subtitle in the player.
If QUIET is non-nil, do not display a message in the minibuffer."
(interactive)
- (if (subed-subtitle-loop-p)
- (progn
- (remove-hook 'subed-mpv-playback-position-hook
#'subed--ensure-subtitle-loop :local)
- (remove-hook 'subed-subtitle-motion-hook #'subed--set-subtitle-loop
:local)
- (setq subed--subtitle-loop-start nil
- subed--subtitle-loop-stop nil)
- (subed-debug "Disabling loop: %s - %s" subed--subtitle-loop-start
subed--subtitle-loop-stop)
- (unless quiet
- (message "Disabled looping")))
+ (unless (subed-loop-over-current-subtitle-p)
(subed--set-subtitle-loop (subed-subtitle-id))
(add-hook 'subed-mpv-playback-position-hook #'subed--ensure-subtitle-loop
:append :local)
(add-hook 'subed-subtitle-motion-hook #'subed--set-subtitle-loop :append
:local)
- (subed-debug "Enabling loop: %s - %s" subed--subtitle-loop-start
subed--subtitle-loop-stop)))
+ (subed-debug "Enabling loop: %s - %s" subed--subtitle-loop-start
subed--subtitle-loop-stop)
+ (unless quiet
+ (message "Enabled looping over current subtitle"))))
+
+(defun subed-disable-loop-over-current-subtitle (&optional quiet)
+ "Disable looping over the current subtitle in the player.
+
+If QUIET is non-nil, do not display a message in the minibuffer."
+ (interactive)
+ (when (subed-loop-over-current-subtitle-p)
+ (remove-hook 'subed-mpv-playback-position-hook
#'subed--ensure-subtitle-loop :local)
+ (remove-hook 'subed-subtitle-motion-hook #'subed--set-subtitle-loop :local)
+ (setq subed--subtitle-loop-start nil
+ subed--subtitle-loop-stop nil)
+ (subed-debug "Disabling loop: %s - %s" subed--subtitle-loop-start
subed--subtitle-loop-stop)
+ (unless quiet
+ (message "Disabled looping over current subtitle"))))
+
+(defun subed-toggle-loop-over-current-subtitle (&optional quiet)
+ "Enable or disable looping over the current subtitle in the player.
+
+If QUIET is non-nil, do not display a message in the minibuffer."
+ (interactive)
+ (if (subed-loop-over-current-subtitle-p)
+ (subed-disable-loop-over-current-subtitle quiet)
+ (subed-enable-loop-over-current-subtitle quiet)))
(defun subed--set-subtitle-loop (&optional sub-id)
"Set loop positions to start/stop time of SUB-ID or current subtitle."
diff --git a/subed/subed-config.el b/subed/subed-config.el
index 7833d59..57af80b 100644
--- a/subed/subed-config.el
+++ b/subed/subed-config.el
@@ -61,7 +61,7 @@
(define-key subed-mode-map (kbd "C-c C-d") #'subed-toggle-debugging)
(define-key subed-mode-map (kbd "C-c C-v") #'subed-mpv-find-video)
(define-key subed-mode-map (kbd "C-c C-p")
#'subed-toggle-pause-while-typing)
- (define-key subed-mode-map (kbd "C-c C-l") #'subed-toggle-subtitle-loop)
+ (define-key subed-mode-map (kbd "C-c C-l")
#'subed-toggle-loop-over-current-subtitle)
(define-key subed-mode-map (kbd "C-c C-r")
#'subed-toggle-replay-adjusted-subtitle)
(define-key subed-mode-map (kbd "C-c [")
#'subed-copy-player-pos-to-start-time)
(define-key subed-mode-map (kbd "C-c ]")
#'subed-copy-player-pos-to-stop-time)
- [nongnu] elpa/subed 17b5e1d 238/389: Adjust some test descriptions, (continued)
- [nongnu] elpa/subed 17b5e1d 238/389: Adjust some test descriptions, ELPA Syncer, 2021/12/03
- [nongnu] elpa/subed bd6e798 247/389: subed-copy-player-pos-to-start/stop-time: Return playback position, ELPA Syncer, 2021/12/03
- [nongnu] elpa/subed c3e67ec 250/389: Add/Reword some features, ELPA Syncer, 2021/12/03
- [nongnu] elpa/subed d27e55a 253/389: Move most stuff from subed.el to subed-common.el, ELPA Syncer, 2021/12/03
- [nongnu] elpa/subed b988a17 257/389: subed-replay-adjusted-subtitle-p: Fix if/when in docstring, ELPA Syncer, 2021/12/03
- [nongnu] elpa/subed 080e512 262/389: Make variable subed-subtitle-format private, ELPA Syncer, 2021/12/03
- [nongnu] elpa/subed e7e791f 265/389: Activate support for multiple subtitle formats, ELPA Syncer, 2021/12/03
- [nongnu] elpa/subed 831b0ea 267/389: Produce better error message when buffer-file-name is nil, ELPA Syncer, 2021/12/03
- [nongnu] elpa/subed 864748c 270/389: Point to subed-mode docstring in "Commentary", ELPA Syncer, 2021/12/03
- [nongnu] elpa/subed 802a603 272/389: Add a real version number, ELPA Syncer, 2021/12/03
- [nongnu] elpa/subed 9557ba9 273/389: Standardize/Rename subtitle loop functions,
ELPA Syncer <=
- [nongnu] elpa/subed ccc4c0e 274/389: Loop over current subtitle by default, ELPA Syncer, 2021/12/03
- [nongnu] elpa/subed 11a1993 275/389: Don't modify kill-ring when regenerating IDs, ELPA Syncer, 2021/12/03
- [nongnu] elpa/subed e3d4f46 283/389: Reword test description, ELPA Syncer, 2021/12/03
- [nongnu] elpa/subed fcc1951 288/389: Add subed-mpv-file-loaded-hook, ELPA Syncer, 2021/12/03
- [nongnu] elpa/subed d87e2cd 290/389: Add save-place-local-mode to example config, ELPA Syncer, 2021/12/03
- [nongnu] elpa/subed e7ae26e 292/389: Add target: clean, ELPA Syncer, 2021/12/03
- [nongnu] elpa/subed 73e11d4 291/389: Define subed-mode as derived mode, ELPA Syncer, 2021/12/03
- [nongnu] elpa/subed df96747 297/389: Rename subed-mpv--handle-event -> subed-mpv--client-handle-event, ELPA Syncer, 2021/12/03
- [nongnu] elpa/subed 4ef1646 298/389: subed-mpv-find-video: Kill previous mpv instance if existing, ELPA Syncer, 2021/12/03
- [nongnu] elpa/subed 0872ab7 299/389: Remove "subed-mode enabled" message, ELPA Syncer, 2021/12/03