[elpa] externals/emms 6c3f1d6ab2 25/42: Use bindat-type in emms-info-opus

[ELPA Syncer]

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

    Use bindat-type in emms-info-opus
---
 emms-info-opus.el | 151 +++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 98 insertions(+), 53 deletions(-)

diff --git a/emms-info-opus.el b/emms-info-opus.el
index 27012b6b9b..665e5e13a5 100644
--- a/emms-info-opus.el
+++ b/emms-info-opus.el
@@ -25,73 +25,118 @@
 
 ;; This file contains Opus-specific code for `emms-info-ogg' feature.
 
+(require 'emms)
 (require 'emms-info-vorbis)
+(require 'bindat)
 
 (defvar emms-info-opus--channel-count 0
-  "Last decoded Opus channel count.
-This is a kludge; it is needed because bindat spec cannot refer
-outside itself.")
+  "Last decoded Opus channel count.")
 
-(defconst emms-info-opus--headers-bindat-spec
-  '((identification-header struct emms-info-opus--id-header-bindat-spec)
-    (comment-header struct emms-info-opus--comment-header-bindat-spec))
-  "Specification for two first Opus header packets.
-They are always an identification header followed by a comment
-header.")
-
-(defconst emms-info-opus--id-header-bindat-spec
-  '((opus-head vec 8)
-    (eval (unless (equal last emms-info-opus--id-magic-pattern)
-            (error "Opus framing mismatch: expected `%s', got `%s'"
-                   emms-info-opus--id-magic-pattern
-                   last)))
-    (opus-version u8)
-    (eval (unless (< last 16)
-            (error "Opus version mismatch: expected < 16, got %s"
-                   last)))
-    (channel-count u8)
-    (eval (setq emms-info-opus--channel-count last))
-    (pre-skip u16r)
-    (sample-rate u32r)
-    (output-gain u16r)
-    (channel-mapping-family u8)
-    (union (channel-mapping-family)
-           (0 nil)
-           (t (struct emms-info-opus--channel-mapping-bindat-spec))))
-  "Opus identification header specification.")
-
-(defconst emms-info-opus--id-magic-pattern
-  (string-to-vector "OpusHead")
+(defconst emms-info-opus--id-magic-pattern "OpusHead"
   "Opus identification header magic pattern.")
 
 (defconst emms-info-opus--channel-mapping-bindat-spec
+  (if emms--use-bindat-type
+      (bindat-type
+        (stream-count u8)
+        (coupled-count u8)
+        (channel-mapping vec emms-info-opus--channel-count))
   '((stream-count u8)
     (coupled-count u8)
-    (channel-mapping vec (eval emms-info-opus--channel-count)))
+    (channel-mapping vec (eval emms-info-opus--channel-count))))
   "Opus channel mapping table specification.")
 
+(defconst emms-info-opus--id-header-bindat-spec
+  (if emms--use-bindat-type
+      (bindat-type
+        (opus-head str 8)
+        (_ unit (unless (equal opus-head emms-info-opus--id-magic-pattern)
+                  (error "Opus framing mismatch: expected `%s', got `%s'"
+                         emms-info-opus--id-magic-pattern
+                         opus-head)))
+        (opus-version u8)
+        (_ unit (unless (< opus-version 16)
+                  (error "Opus version mismatch: expected < 16, got %s"
+                         opus-version)))
+        (channel-count u8)
+        (pre-skip uint 16 'le)
+        (sample-rate uint 32 'le)
+        (output-gain uint 16 'le)
+        (channel-mapping-family u8)
+        (channel-mapping . (if (> channel-mapping-family 0)
+                               (type 
emms-info-opus--channel-mapping-bindat-spec)
+                             (unit nil))))
+    '((opus-head str 8)
+      (eval (unless (equal last emms-info-opus--id-magic-pattern)
+              (error "Opus framing mismatch: expected `%s', got `%s'"
+                     emms-info-opus--id-magic-pattern
+                     last)))
+      (opus-version u8)
+      (eval (unless (< last 16)
+              (error "Opus version mismatch: expected < 16, got %s"
+                     last)))
+      (channel-count u8)
+      (eval (setq emms-info-opus--channel-count last))
+      (pre-skip u16r)
+      (sample-rate u32r)
+      (output-gain u16r)
+      (channel-mapping-family u8)
+      (union (channel-mapping-family)
+             (0 nil)
+             (t (struct emms-info-opus--channel-mapping-bindat-spec)))))
+  "Opus identification header specification.")
+
+(defconst emms-info-opus--tags-magic-pattern "OpusTags"
+  "Opus comment header magic pattern.")
+
 (defconst emms-info-opus--comment-header-bindat-spec
-  '((opus-tags vec 8)
-    (eval (unless (equal last emms-info-opus--tags-magic-pattern)
-            (error "Opus framing mismatch: expected `%s', got `%s'"
-                   emms-info-opus--tags-magic-pattern
-                   last)))
-    (vendor-length u32r)
-    (eval (when (> last emms-info-vorbis--max-vendor-length)
-            (error "Opus vendor length %s is too long" last)))
-    (vendor-string vec (vendor-length))
-    (user-comments-list-length u32r)
-    (eval (when (> last emms-info-vorbis--max-comments)
-            (error "Opus user comment list length %s is too long"
-                   last)))
-    (user-comments repeat
-                   (user-comments-list-length)
-                   (struct emms-info-vorbis--comment-field-bindat-spec)))
+  (if emms--use-bindat-type
+      (bindat-type
+        (opus-tags str 8)
+        (_ unit (unless (equal opus-tags emms-info-opus--tags-magic-pattern)
+                  (error "Opus framing mismatch: expected `%s', got `%s'"
+                         emms-info-opus--tags-magic-pattern
+                         opus-tags)))
+        (vendor-length uint 32 'le)
+        (_ unit (when (> vendor-length emms-info-vorbis--max-vendor-length)
+                  (error "Opus vendor length %s is too long"
+                         vendor-length)))
+        (vendor-string str vendor-length)
+        (user-comments-list-length uint 32 'le)
+        (_ unit (when (> user-comments-list-length
+                         emms-info-vorbis--max-comments)
+                  (error "Opus user comment list length %s is too long"
+                         user-comments-list-length)))
+        (user-comments repeat user-comments-list-length
+                       type emms-info-vorbis--comment-field-bindat-spec))
+    '((opus-tags str 8)
+      (eval (unless (equal last emms-info-opus--tags-magic-pattern)
+              (error "Opus framing mismatch: expected `%s', got `%s'"
+                     emms-info-opus--tags-magic-pattern
+                     last)))
+      (vendor-length u32r)
+      (eval (when (> last emms-info-vorbis--max-vendor-length)
+              (error "Opus vendor length %s is too long" last)))
+      (vendor-string str (vendor-length))
+      (user-comments-list-length u32r)
+      (eval (when (> last emms-info-vorbis--max-comments)
+              (error "Opus user comment list length %s is too long"
+                     last)))
+      (user-comments repeat
+                     (user-comments-list-length)
+                     (struct emms-info-vorbis--comment-field-bindat-spec))))
   "Opus comment header specification.")
 
-(defconst emms-info-opus--tags-magic-pattern
-  (string-to-vector "OpusTags")
-  "Opus comment header magic pattern.")
+(defconst emms-info-opus--headers-bindat-spec
+  (if emms--use-bindat-type
+      (bindat-type
+        (identification-header type emms-info-opus--id-header-bindat-spec)
+        (comment-header type emms-info-opus--comment-header-bindat-spec))
+    '((identification-header struct emms-info-opus--id-header-bindat-spec)
+      (comment-header struct emms-info-opus--comment-header-bindat-spec)))
+  "Specification for two first Opus header packets.
+They are always an identification header followed by a comment
+header.")
 
 (provide 'emms-info-opus)