[elpa] externals/emms 5a52c1b129 22/42: Remove dependency on cl-lib

[ELPA Syncer]

branch: externals/emms
commit 5a52c1b129d95fcf12baabedf591e485d858cc34
Author: Petteri Hintsanen <petterih@iki.fi>
Commit: Petteri Hintsanen <petterih@iki.fi>

    Remove dependency on cl-lib
    
    Replace cl-incf with setq.
---
 emms-info-flac.el | 4 +---
 emms-info-mp3.el  | 9 ++++-----
 emms-info-ogg.el  | 9 +++++----
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/emms-info-flac.el b/emms-info-flac.el
index 4c8b321902..1ece4f5ac1 100644
--- a/emms-info-flac.el
+++ b/emms-info-flac.el
@@ -33,8 +33,6 @@
 (require 'bindat)
 (require 'emms)
 (require 'emms-info-vorbis)
-(eval-when-compile
-  (require 'cl-lib))
 
 (defconst emms-info-flac--max-peek-size (* 2048 1024)
   "Maximum buffer size for metadata decoding.
@@ -130,7 +128,7 @@ info blocks.  Extract and return them in a list, if found."
     (set-buffer-multibyte nil)
     (let (comment-block stream-info-block last-flag (offset 4))
       (while (not last-flag)
-        (funcall read-func offset (cl-incf offset 4))
+        (funcall read-func offset (setq offset (+ offset 4)))
         (let* ((header
                 (bindat-unpack emms-info-flac--meta-header-bindat-spec
                                (buffer-string)))
diff --git a/emms-info-mp3.el b/emms-info-mp3.el
index ed83caed11..a07002b201 100644
--- a/emms-info-mp3.el
+++ b/emms-info-mp3.el
@@ -42,8 +42,6 @@
 
 (require 'bindat)
 (require 'emms)
-(eval-when-compile
-  (require 'cl-lib))
 
 
 ;;; id3 code
@@ -392,7 +390,7 @@ data."
           (while (and (re-search-forward (string 255 0) nil t)
                       (< (point) end))
             (replace-match (string 255))
-            (cl-incf end 1))
+            (setq end (1+ end)))
           (delete-region (1+ num-bytes) (point-max))
           (cons (+ begin end) (buffer-string)))
       ;; No unsynchronization: read the data as-is.
@@ -528,8 +526,9 @@ See `emms-info-id3v2--frame-to-info' for recognized fields."
          (offset 10))
     (when (memq 6 (bindat-get-field header 'flags))
       ;; Skip the extended header.
-      (cl-incf offset
-               (emms-info-id3v2--checked-ext-header-size filename)))
+      (setq offset (+ offset
+                      (emms-info-id3v2--checked-ext-header-size
+                       filename))))
     (let ((tags
            (emms-info-id3v2--decode-frames
             filename offset (+ tag-size 10) unsync))
diff --git a/emms-info-ogg.el b/emms-info-ogg.el
index 1db154ecd0..c0d3645a23 100644
--- a/emms-info-ogg.el
+++ b/emms-info-ogg.el
@@ -43,8 +43,6 @@
 (require 'emms)
 (require 'emms-info-opus)
 (require 'emms-info-vorbis)
-(eval-when-compile
-  (require 'cl-lib))
 
 (defconst emms-info-ogg--page-size 65307
   "Maximum size for a single Ogg container page.")
@@ -194,8 +192,11 @@ different streams will be mixed together without an error."
       (when (> offset emms-info-ogg--max-peek-size)
         (error "Ogg payload is too large"))
       (let ((page (emms-info-ogg--read-and-decode-page filename offset)))
-        (cl-incf num-packets (emms-info-ogg--num-packets page))
-        (cl-incf offset (bindat-length emms-info-ogg--page-bindat-spec page))
+        (setq num-packets (+ num-packets
+                             (emms-info-ogg--num-packets page)))
+        (setq offset (+ offset
+                        (bindat-length
+                         emms-info-ogg--page-bindat-spec page)))
         (push (bindat-get-field page 'payload) stream)))
     (reverse (mapconcat #'nreverse stream))))