branch: elpa/subed commit 96e7fcf72a840716c5c3d554b68f47e9d67c7326 Author: Random User <rnd...@posteo.de> Commit: Random User <rnd...@posteo.de>
Add subed--get-seconds-move --- subed/subed-config.el | 32 ++++++++++++++++++++++++++++++++ subed/subed-srt.el | 18 ++++-------------- 2 files changed, 36 insertions(+), 14 deletions(-) diff --git a/subed/subed-config.el b/subed/subed-config.el index 3fec134..9140f2b 100644 --- a/subed/subed-config.el +++ b/subed/subed-config.el @@ -107,6 +107,7 @@ The first existing file is then passed to `subed-open-video'." :type 'boolean :group 'subed) + (defcustom subed-seconds-adjust 100 "Number of milliseconds to add/subtract to subtitle start/stop time with `subed-increase-start-time', @@ -118,6 +119,37 @@ argument. See `subed-increase-start-time'." :type 'float :group 'subed) +(defun subed--get-seconds-adjust (arg) + "Set `subed-seconds-adjust' to `arg' if it's a number. If +`arg' is non-nil, reset `subed-seconds-adjust' to its default. +Return (new) `subed-seconds-adjust' value." + (cond ((integerp arg) + (setq subed-seconds-adjust arg)) ;; Custom adjustment + ((not (eq nil arg)) + (custom-reevaluate-setting 'subed-seconds-adjust))) ;; Reset to default + subed-seconds-adjust) + +(defcustom subed-seconds-move 100 + "Number of milliseconds to provide to +`subed-move-subtitle-forward' and `subed-move-subtitle-backward' +by default. + +This variable is set if these functions are called with a prefix +argument. See `subed-move-subtitle-forward'." + :type 'float + :group 'subed) + +(defun subed--get-seconds-move (arg) + "Set `subed-seconds-move' to `arg' if it's a number. If `arg' +is non-nil, reset `subed-seconds-move' to its default. +Return (new) `subed-seconds-move' value." + (cond ((integerp arg) + (setq subed-seconds-move arg)) ;; Custom movement + ((not (eq nil arg)) + (custom-reevaluate-setting 'subed-seconds-move))) ;; Reset to default + subed-seconds-move) + + (defcustom subed-playback-speed-while-typing 0.3 "Video playback speed while the user is editing the buffer. If set to zero or smaller, playback is paused." diff --git a/subed/subed-srt.el b/subed/subed-srt.el index e9119ad..fe222c9 100644 --- a/subed/subed-srt.el +++ b/subed/subed-srt.el @@ -318,16 +318,6 @@ Return point or nil if there is no previous subtitle." (let ((sub-id (subed-srt--subtitle-id))) (run-hook-with-args 'subed-subtitle-time-adjusted-hook sub-id msecs-new))))) -(defun subed-srt--get-seconds-adjust (arg) - "Set `subed-seconds-adjust' to `arg' if it's a number. If -`arg' is non-nil, reset `subed-seconds-adjust' to its default." - (subed-debug "arg: %S (%S)" arg (type-of arg)) - (cond ((integerp arg) - (setq subed-seconds-adjust arg)) ;; Custom adjustment - ((not (eq nil arg)) - (custom-reevaluate-setting 'subed-seconds-adjust))) ;; Reset to default - subed-seconds-adjust) - (defun subed-srt-increase-start-time (&optional arg) "Add `subed-seconds-adjust' milliseconds to start time of current subtitle. @@ -346,28 +336,28 @@ Example usage: \\[subed-increase-start-time] Increase start time by 100ms again [...] [...]" (interactive "P") - (subed-srt--adjust-subtitle-start-relative (subed-srt--get-seconds-adjust arg))) + (subed-srt--adjust-subtitle-start-relative (subed--get-seconds-adjust arg))) (defun subed-srt-decrease-start-time (&optional arg) "Subtract `subed-seconds-adjust' milliseconds from start time of current subtitle. See also `subed-increase-start-time'." (interactive "P") - (subed-srt--adjust-subtitle-start-relative (* -1 (subed-srt--get-seconds-adjust arg)))) + (subed-srt--adjust-subtitle-start-relative (* -1 (subed--get-seconds-adjust arg)))) (defun subed-srt-increase-stop-time (&optional arg) "Add `subed-seconds-adjust' milliseconds to stop time of current subtitle. See also `subed-increase-start-time'." (interactive "P") - (subed-srt--adjust-subtitle-stop-relative (subed-srt--get-seconds-adjust arg))) + (subed-srt--adjust-subtitle-stop-relative (subed--get-seconds-adjust arg))) (defun subed-srt-decrease-stop-time (&optional arg) "Subtract `subed-seconds-adjust' milliseconds from stop time of current subtitle. See also `subed-increase-start-time'." (interactive "P") - (subed-srt--adjust-subtitle-stop-relative (* -1 (subed-srt--get-seconds-adjust arg)))) + (subed-srt--adjust-subtitle-stop-relative (* -1 (subed--get-seconds-adjust arg)))) (defun subed-srt-subtitle-insert (&optional arg) "Insert subtitle(s).