branch: elpa/subed
commit 6122de0ce6e0b9af8d875df8d0057833fc476d2c
Author: Random User <rnd...@posteo.de>
Commit: Random User <rnd...@posteo.de>
Rename adjust-subtitle-start/stop-relative to adjust-subtitle-start/stop
---
subed/subed-srt.el | 4 ++--
subed/subed.el | 16 ++++++++--------
tests/test-subed.el | 8 ++++----
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/subed/subed-srt.el b/subed/subed-srt.el
index 37e1715..f4552ba 100644
--- a/subed/subed-srt.el
+++ b/subed/subed-srt.el
@@ -296,7 +296,7 @@ Return point or nil if there is no previous subtitle."
;;; Manipulation
-(defun subed-srt--adjust-subtitle-start-relative (msecs)
+(defun subed-srt--adjust-subtitle-start (msecs)
"Add MSECS milliseconds to start time (use negative value to subtract).
Return new start time in milliseconds or nil if it didn't change."
(subed-disable-sync-point-to-player-temporarily)
@@ -320,7 +320,7 @@ Return new start time in milliseconds or nil if it didn't
change."
(subed--run-subtitle-time-adjusted-hook)
msecs-new))))))
-(defun subed-srt--adjust-subtitle-stop-relative (msecs)
+(defun subed-srt--adjust-subtitle-stop (msecs)
"Add MSECS milliseconds to stop time (use negative value to subtract).
Return new stop time in milliseconds or nil if it didn't change."
(subed-disable-sync-point-to-player-temporarily)
diff --git a/subed/subed.el b/subed/subed.el
index 29573c1..723ee8b 100644
--- a/subed/subed.el
+++ b/subed/subed.el
@@ -45,8 +45,8 @@
(fset 'subed--subtitle-msecs-stop 'subed-srt--subtitle-msecs-stop)
(fset 'subed--subtitle-text 'subed-srt--subtitle-text)
(fset 'subed--subtitle-relative-point 'subed-srt--subtitle-relative-point)
-(fset 'subed--adjust-subtitle-start-relative
'subed-srt--adjust-subtitle-start-relative)
-(fset 'subed--adjust-subtitle-stop-relative
'subed-srt--adjust-subtitle-stop-relative)
+(fset 'subed--adjust-subtitle-start 'subed-srt--adjust-subtitle-start)
+(fset 'subed--adjust-subtitle-stop 'subed-srt--adjust-subtitle-stop)
(fset 'subed-jump-to-subtitle-id 'subed-srt-jump-to-subtitle-id)
(fset 'subed-jump-to-subtitle-time-start
'subed-srt-jump-to-subtitle-time-start)
@@ -195,7 +195,7 @@ Example usage:
\\[universal-argument] \\[subed-increase-start-time] Increase start
time by 100ms (the default)
\\[subed-increase-start-time] Increase start time by 100ms (the
default) again"
(interactive "P")
- (subed--adjust-subtitle-start-relative (subed--get-milliseconds-adjust arg)))
+ (subed--adjust-subtitle-start (subed--get-milliseconds-adjust arg)))
(defun subed-decrease-start-time (&optional arg)
"Subtract `subed-milliseconds-adjust' milliseconds from start
@@ -203,7 +203,7 @@ time of current subtitle.
Return new start time in milliseconds or nil if it didn't change.
See also `subed-increase-start-time'."
(interactive "P")
- (subed--adjust-subtitle-start-relative (* -1 (subed--get-milliseconds-adjust
arg))))
+ (subed--adjust-subtitle-start (* -1 (subed--get-milliseconds-adjust arg))))
(defun subed-increase-stop-time (&optional arg)
"Add `subed-milliseconds-adjust' milliseconds to stop time of
@@ -211,7 +211,7 @@ current subtitle.
Return new stop time in milliseconds or nil if it didn't change.
See also `subed-increase-start-time'."
(interactive "P")
- (subed--adjust-subtitle-stop-relative (subed--get-milliseconds-adjust arg)))
+ (subed--adjust-subtitle-stop (subed--get-milliseconds-adjust arg)))
(defun subed-decrease-stop-time (&optional arg)
"Subtract `subed-milliseconds-adjust' milliseconds from stop
@@ -219,7 +219,7 @@ time of current subtitle.
Return new stop time in milliseconds or nil if it didn't change.
See also `subed-increase-start-time'."
(interactive "P")
- (subed--adjust-subtitle-stop-relative (* -1 (subed--get-milliseconds-adjust
arg))))
+ (subed--adjust-subtitle-stop (* -1 (subed--get-milliseconds-adjust arg))))
;;; Moving subtitles
@@ -234,8 +234,8 @@ After subtitles are moved is done, replay the first moved
subtitle if replaying is enabled."
(subed--with-subtitle-replay-disabled
(subed--for-each-subtitle beg end
- (subed--adjust-subtitle-start-relative msecs)
- (subed--adjust-subtitle-stop-relative msecs)))
+ (subed--adjust-subtitle-start msecs)
+ (subed--adjust-subtitle-stop msecs)))
(when (subed-replay-adjusted-subtitle-p)
(save-excursion
(when beg (goto-char beg))
diff --git a/tests/test-subed.el b/tests/test-subed.el
index c5b8266..ba83edc 100644
--- a/tests/test-subed.el
+++ b/tests/test-subed.el
@@ -159,9 +159,9 @@
(subed-enable-replay-adjusted-subtitle :quiet)
(spy-on 'subed-enable-replay-adjusted-subtitle
:and-call-through)
(spy-on 'subed-disable-replay-adjusted-subtitle
:and-call-through)
- (spy-on 'subed--adjust-subtitle-start-relative :and-call-fake
+ (spy-on 'subed--adjust-subtitle-start :and-call-fake
(lambda (msecs) (expect
(subed-replay-adjusted-subtitle-p) :to-be nil)))
- (spy-on 'subed--adjust-subtitle-stop-relative :and-call-fake
+ (spy-on 'subed--adjust-subtitle-stop :and-call-fake
(lambda (msecs) (expect
(subed-replay-adjusted-subtitle-p) :to-be nil)))
(subed-move-subtitle-forward 100)
(expect 'subed-disable-replay-adjusted-subtitle
:to-have-been-called-times 1)
@@ -175,9 +175,9 @@
(subed-disable-replay-adjusted-subtitle :quiet)
(spy-on 'subed-enable-replay-adjusted-subtitle
:and-call-through)
(spy-on 'subed-disable-replay-adjusted-subtitle
:and-call-through)
- (spy-on 'subed--adjust-subtitle-start-relative :and-call-fake
+ (spy-on 'subed--adjust-subtitle-start :and-call-fake
(lambda (msecs) (expect
(subed-replay-adjusted-subtitle-p) :to-be nil)))
- (spy-on 'subed--adjust-subtitle-stop-relative :and-call-fake
+ (spy-on 'subed--adjust-subtitle-stop :and-call-fake
(lambda (msecs) (expect
(subed-replay-adjusted-subtitle-p) :to-be nil)))
(subed-move-subtitle-forward 100)
(expect 'subed-disable-replay-adjusted-subtitle
:to-have-been-called-times 1)
