[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/emms b3c2f9cf09 39/42: Use uintr for little-endian unsi
From: |
ELPA Syncer |
Subject: |
[elpa] externals/emms b3c2f9cf09 39/42: Use uintr for little-endian unsigned integer fields |
Date: |
Wed, 1 Nov 2023 15:58:02 -0400 (EDT) |
branch: externals/emms
commit b3c2f9cf09a9132c0361b472f7a27ec980b6c502
Author: Petteri Hintsanen <petterih@iki.fi>
Commit: Petteri Hintsanen <petterih@iki.fi>
Use uintr for little-endian unsigned integer fields
Unlike Emacs 29, bindat-type in Emacs 28 does not have 'uint BITLEN
[LE]' type, so let us fall back to 'uintr BITLEN' for compatibility.
---
emms-info-native-flac.el | 4 ++--
emms-info-native-ogg.el | 6 +++---
emms-info-native-opus.el | 10 +++++-----
emms-info-native-vorbis.el | 16 ++++++++--------
4 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/emms-info-native-flac.el b/emms-info-native-flac.el
index 937fe3157b..132ee33bd9 100644
--- a/emms-info-native-flac.el
+++ b/emms-info-native-flac.el
@@ -81,12 +81,12 @@ exhaustion in case of garbled or malicious inputs.")
(defconst emms-info-native-flac--comment-block-bindat-spec
(if (eval-when-compile (fboundp 'bindat-type))
(bindat-type
- (vendor-length uint 32 'le)
+ (vendor-length uintr 32)
(_ unit (when (> vendor-length
emms-info-native-vorbis--max-vendor-length)
(error "FLAC vendor length %s is too long"
vendor-length)))
(vendor-string str vendor-length)
- (user-comments-list-length uint 32 'le)
+ (user-comments-list-length uintr 32)
(_ unit (when (> user-comments-list-length
emms-info-native-vorbis--max-comments)
(error "FLAC user comment list length %s is too long"
user-comments-list-length)))
diff --git a/emms-info-native-ogg.el b/emms-info-native-ogg.el
index c2422702fc..457dc696f7 100644
--- a/emms-info-native-ogg.el
+++ b/emms-info-native-ogg.el
@@ -76,9 +76,9 @@ exhaustion in case of garbled or malicious inputs.")
stream-structure-version)))
(header-type-flag u8)
(granule-position sint 64 'le)
- (stream-serial-number uint 32 'le)
- (page-sequence-no uint 32 'le)
- (page-checksum uint 32 'le)
+ (stream-serial-number uintr 32)
+ (page-sequence-no uintr 32)
+ (page-checksum uintr 32)
(page-segments u8)
(segment-table vec page-segments)
(payload str (seq-reduce #'+ segment-table 0)))
diff --git a/emms-info-native-opus.el b/emms-info-native-opus.el
index 83fee14c88..efec5e9033 100644
--- a/emms-info-native-opus.el
+++ b/emms-info-native-opus.el
@@ -62,9 +62,9 @@
opus-version)))
(channel-count u8)
(_ unit (progn (setq emms-info-native-opus--channel-count
channel-count) nil))
- (pre-skip uint 16 'le)
- (sample-rate uint 32 'le)
- (output-gain uint 16 'le)
+ (pre-skip uintr 16)
+ (sample-rate uintr 32)
+ (output-gain uintr 16)
(channel-mapping-family u8)
(_ . (if (> channel-mapping-family 0)
(type emms-info-native-opus--channel-mapping-bindat-spec)
@@ -100,12 +100,12 @@
(error "Opus framing mismatch: expected `%s', got `%s'"
emms-info-native-opus--tags-magic-pattern
opus-tags)))
- (vendor-length uint 32 'le)
+ (vendor-length uintr 32)
(_ unit (when (> vendor-length
emms-info-native-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)
+ (user-comments-list-length uintr 32)
(_ unit (when (> user-comments-list-length
emms-info-native-vorbis--max-comments)
(error "Opus user comment list length %s is too long"
diff --git a/emms-info-native-vorbis.el b/emms-info-native-vorbis.el
index fc054611ae..77a49a7f32 100644
--- a/emms-info-native-vorbis.el
+++ b/emms-info-native-vorbis.el
@@ -93,15 +93,15 @@ their comments have almost the same format as Vorbis.")
(error "Vorbis framing mismatch: expected `%s', got `%s'"
emms-info-native-vorbis--header-magic-pattern
vorbis)))
- (vorbis-version uint 32 'le)
+ (vorbis-version uintr 32)
(_ unit (unless (= vorbis-version 0)
(error "Vorbis version mismatch: expected 0, got %s"
vorbis-version)))
(channel-count u8)
- (sample-rate uint 32 'le)
- (bitrate-maximum uint 32 'le)
- (bitrate-nominal uint 32 'le)
- (bitrate-minimum uint 32 'le)
+ (sample-rate uintr 32)
+ (bitrate-maximum uintr 32)
+ (bitrate-nominal uintr 32)
+ (bitrate-minimum uintr 32)
(blocksize u8)
(framing-flag u8)
(_ unit (unless (= framing-flag 1)
@@ -135,7 +135,7 @@ their comments have almost the same format as Vorbis.")
(defconst emms-info-native-vorbis--comment-field-bindat-spec
(if (eval-when-compile (fboundp 'bindat-type))
(bindat-type
- (length uint 32 'le)
+ (length uintr 32)
(_ unit (when (> length emms-info-native-vorbis--max-comment-size)
(error "Vorbis comment length %s is too long"
length)))
@@ -158,12 +158,12 @@ their comments have almost the same format as Vorbis.")
(error "Vorbis framing mismatch: expected `%s', got `%s'"
emms-info-native-vorbis--header-magic-pattern
vorbis)))
- (vendor-length uint 32 'le)
+ (vendor-length uintr 32)
(_ unit (when (> vendor-length
emms-info-native-vorbis--max-vendor-length)
(error "Vorbis vendor length %s is too long"
vendor-length)))
(vendor-string str vendor-length)
- (user-comments-list-length uint 32 'le)
+ (user-comments-list-length uintr 32)
(_ unit (when (> user-comments-list-length
emms-info-native-vorbis--max-comments)
(error "Vorbis user comment list length %s is too long"
user-comments-list-length)))
- [elpa] externals/emms 6c3f1d6ab2 25/42: Use bindat-type in emms-info-opus, (continued)
- [elpa] externals/emms 6c3f1d6ab2 25/42: Use bindat-type in emms-info-opus, ELPA Syncer, 2023/11/01
- [elpa] externals/emms 59e999a259 05/42: Fix error reporting from emms-info-native--ogg-page-bindat-spec, ELPA Syncer, 2023/11/01
- [elpa] externals/emms b512ed7331 03/42: Change magic arrays to patterns, ELPA Syncer, 2023/11/01
- [elpa] externals/emms 5a52c1b129 22/42: Remove dependency on cl-lib, ELPA Syncer, 2023/11/01
- [elpa] externals/emms 399dd78230 23/42: Use bindat-type in emms-info-ogg, ELPA Syncer, 2023/11/01
- [elpa] externals/emms e18b579e31 27/42: Use bindat-type in emms-info-mp3, ELPA Syncer, 2023/11/01
- [elpa] externals/emms f6bd021bc9 29/42: Compatibility code ert-resource-file, ELPA Syncer, 2023/11/01
- [elpa] externals/emms 9db19a5abd 31/42: Remove emms--use-bindat-type, ELPA Syncer, 2023/11/01
- [elpa] externals/emms c848c18727 33/42: Change to emms-info-native- prefix, ELPA Syncer, 2023/11/01
- [elpa] externals/emms 342c44103a 35/42: Fix multi-channel mapping in Opus identification header, ELPA Syncer, 2023/11/01
- [elpa] externals/emms b3c2f9cf09 39/42: Use uintr for little-endian unsigned integer fields,
ELPA Syncer <=
- [elpa] externals/emms c96afb7687 40/42: Use eval-when-compile with subr-x, ELPA Syncer, 2023/11/01
- [elpa] externals/emms 2852a8f61b 10/42: Add tests for emms-info-native, ELPA Syncer, 2023/11/01
- [elpa] externals/emms e1f2810f39 13/42: Use string instead of vector as Ogg page payload type, ELPA Syncer, 2023/11/01
- [elpa] externals/emms dd72caba90 37/42: Doc fixes, ELPA Syncer, 2023/11/01
- [elpa] externals/emms f594f7edac 15/42: Use strings instead of vectors for passing data, ELPA Syncer, 2023/11/01
- [elpa] externals/emms 2749fdb998 30/42: Allow empty metadata blocks, ELPA Syncer, 2023/11/01
- [elpa] externals/emms 52dac8ccc4 41/42: Remove most length limits from Vorbis bindat specs, ELPA Syncer, 2023/11/01
- [elpa] externals/emms 32fd570ed7 42/42: Merge branch 'info-native', ELPA Syncer, 2023/11/01