[nongnu] elpa/subed ccee647c73 1/4: Rename subed-waveform-ffmpeg-executable to subed-ffmpeg-executable

[ELPA Syncer]

branch: elpa/subed
commit ccee647c733d910ca2078a4e3af5cfbbcbfe6766
Author: Sacha Chua <sacha@sachachua.com>
Commit: Sacha Chua <sacha@sachachua.com>

    Rename subed-waveform-ffmpeg-executable to subed-ffmpeg-executable
    
    * subed/subed-config.el (subed-ffmpeg-executable):
    Rename option from subed-waveform-ffmpeg-executable.
    * subed/subed-waveform.el (subed-waveform-ffmpeg-executable):
    Move to subed-config.el and mark as obsolete.
    * subed/subed-waveform.el (subed-waveform--from-file):
    Call subed-ffmpeg-executable instead.
---
 subed/subed-config.el   | 5 +++++
 subed/subed-waveform.el | 8 ++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/subed/subed-config.el b/subed/subed-config.el
index 563d187c33..0527c3e588 100644
--- a/subed/subed-config.el
+++ b/subed/subed-config.el
@@ -228,6 +228,11 @@ doing so."
   "Remembers whether point-to-player was originally enabled by the user.
 Used when temporarily disabling point-to-player sync.")
 
+(defcustom subed-ffmpeg-executable "ffmpeg"
+  "Path to the FFmpeg executable."
+  :type 'file
+  :group 'subed)
+
 (defcustom subed-ffprobe-executable "ffprobe"
   "Path to the FFprobe executable used for measuring file duration."
   :type 'file
diff --git a/subed/subed-waveform.el b/subed/subed-waveform.el
index ddb3324f55..7b5cacce31 100644
--- a/subed/subed-waveform.el
+++ b/subed/subed-waveform.el
@@ -105,11 +105,6 @@ Nil means show only the waveform for the current subtitle."
   :type 'boolean
   :group 'subed-waveform)
 
-(defcustom subed-waveform-ffmpeg-executable "ffmpeg"
-  "Path to the FFMPEG executable used for generating waveforms."
-  :type 'file
-  :group 'subed-waveform)
-
 (defcustom subed-waveform-ffmpeg-filter-args ":colors=gray"
   "Additional arguments for the showwavespic filter.
 The background is black by default and the foreground gray.
@@ -244,6 +239,7 @@ WIDTH and HEIGHT are given in pixels."
            width height)
    
"[bg][fg]overlay=format=auto,drawbox=x=(iw-w)/2:y=(ih-h)/2:w=iw:h=1:color=#9cf42f"))
 
+(make-obsolete-variable 'subed-waveform-ffmpeg-executable 
'subed-ffmpeg-executable "1.2.22")
 (make-obsolete-variable 'subed-waveform-ffprobe-executable 
'subed-ffprobe-executable "1.2.22")
 (make-obsolete-variable 'subed-waveform-file-duration-ms-cache 
'subed-file-duration-ms-cache "1.2.22")
 (make-obsolete 'subed-waveform-convert-ffprobe-tags-duration-to-ms 
'subed-convert-ffprobe-tags-duration-to-ms "1.2.22")
@@ -282,7 +278,7 @@ and HEIGHT are dimensions in pixels."
             "-c:v" "png"
             "-f" "image2" "-"))))
     (with-temp-buffer
-      (apply 'call-process subed-waveform-ffmpeg-executable nil t nil args)
+      (apply 'call-process subed-ffmpeg-executable nil t nil args)
       (encode-coding-string (buffer-string) 'binary))))
 
 (defun subed-waveform--msecs-to-ffmpeg (msecs)