music-metadata 7.11.1 → 7.11.5

package/lib/ogg/opus/Opus.d.ts

@@ -1,48 +1,48 @@
-import { IGetToken } from 'strtok3/lib/core';
-/**
- * Opus ID Header interface
- * Ref: https://wiki.xiph.org/OggOpus#ID_Header
- */
-export interface IIdHeader {
-    /**
-     * Magic signature: "OpusHead" (64 bits)
-     */
-    magicSignature: string;
-    /**
-     * Version number (8 bits unsigned): 0x01 for this spec
-     */
-    version: number;
-    /**
-     * Channel count 'c' (8 bits unsigned): MUST be > 0
-     */
-    channelCount: number;
-    /**
-     * Pre-skip (16 bits unsigned, little endian)
-     */
-    preSkip: number;
-    /**
-     * Input sample rate (32 bits unsigned, little endian): informational only
-     */
-    inputSampleRate: number;
-    /**
-     * Output gain (16 bits, little endian, signed Q7.8 in dB) to apply when decoding
-     */
-    outputGain: number;
-    /**
-     * Channel mapping family (8 bits unsigned)
-     * -  0 = one stream: mono or L,R stereo
-     * -  1 = channels in vorbis spec order: mono or L,R stereo or ... or FL,C,FR,RL,RR,LFE, ...
-     * -  2..254 = reserved (treat as 255)
-     * -  255 = no defined channel meaning
-     */
-    channelMapping: number;
-}
-/**
- * Opus ID Header parser
- * Ref: https://wiki.xiph.org/OggOpus#ID_Header
- */
-export declare class IdHeader implements IGetToken<IIdHeader> {
-    len: number;
-    constructor(len: number);
-    get(buf: any, off: any): IIdHeader;
-}
+import { IGetToken } from 'strtok3/lib/core';
+/**
+ * Opus ID Header interface
+ * Ref: https://wiki.xiph.org/OggOpus#ID_Header
+ */
+export interface IIdHeader {
+    /**
+     * Magic signature: "OpusHead" (64 bits)
+     */
+    magicSignature: string;
+    /**
+     * Version number (8 bits unsigned): 0x01 for this spec
+     */
+    version: number;
+    /**
+     * Channel count 'c' (8 bits unsigned): MUST be > 0
+     */
+    channelCount: number;
+    /**
+     * Pre-skip (16 bits unsigned, little endian)
+     */
+    preSkip: number;
+    /**
+     * Input sample rate (32 bits unsigned, little endian): informational only
+     */
+    inputSampleRate: number;
+    /**
+     * Output gain (16 bits, little endian, signed Q7.8 in dB) to apply when decoding
+     */
+    outputGain: number;
+    /**
+     * Channel mapping family (8 bits unsigned)
+     * -  0 = one stream: mono or L,R stereo
+     * -  1 = channels in vorbis spec order: mono or L,R stereo or ... or FL,C,FR,RL,RR,LFE, ...
+     * -  2..254 = reserved (treat as 255)
+     * -  255 = no defined channel meaning
+     */
+    channelMapping: number;
+}
+/**
+ * Opus ID Header parser
+ * Ref: https://wiki.xiph.org/OggOpus#ID_Header
+ */
+export declare class IdHeader implements IGetToken<IIdHeader> {
+    len: number;
+    constructor(len: number);
+    get(buf: any, off: any): IIdHeader;
+}

package/lib/ogg/opus/Opus.js

@@ -1,28 +1,28 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.IdHeader = void 0;
-const Token = require("token-types");
-/**
- * Opus ID Header parser
- * Ref: https://wiki.xiph.org/OggOpus#ID_Header
- */
-class IdHeader {
-    constructor(len) {
-        this.len = len;
-        if (len < 19) {
-            throw new Error("ID-header-page 0 should be at least 19 bytes long");
-        }
-    }
-    get(buf, off) {
-        return {
-            magicSignature: new Token.StringType(8, 'ascii').get(buf, off + 0),
-            version: buf.readUInt8(off + 8),
-            channelCount: buf.readUInt8(off + 9),
-            preSkip: buf.readInt16LE(off + 10),
-            inputSampleRate: buf.readInt32LE(off + 12),
-            outputGain: buf.readInt16LE(off + 16),
-            channelMapping: buf.readUInt8(off + 18)
-        };
-    }
-}
-exports.IdHeader = IdHeader;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.IdHeader = void 0;
+const Token = require("token-types");
+/**
+ * Opus ID Header parser
+ * Ref: https://wiki.xiph.org/OggOpus#ID_Header
+ */
+class IdHeader {
+    constructor(len) {
+        this.len = len;
+        if (len < 19) {
+            throw new Error("ID-header-page 0 should be at least 19 bytes long");
+        }
+    }
+    get(buf, off) {
+        return {
+            magicSignature: new Token.StringType(8, 'ascii').get(buf, off + 0),
+            version: buf.readUInt8(off + 8),
+            channelCount: buf.readUInt8(off + 9),
+            preSkip: buf.readInt16LE(off + 10),
+            inputSampleRate: buf.readInt32LE(off + 12),
+            outputGain: buf.readInt16LE(off + 16),
+            channelMapping: buf.readUInt8(off + 18)
+        };
+    }
+}
+exports.IdHeader = IdHeader;

package/lib/ogg/opus/OpusParser.d.ts

@@ -1,25 +1,25 @@
-/// <reference types="node" />
-import { ITokenizer } from 'strtok3/lib/core';
-import { IPageHeader } from '../Ogg';
-import { VorbisParser } from '../vorbis/VorbisParser';
-import { IOptions } from '../../type';
-import { INativeMetadataCollector } from '../../common/MetadataCollector';
-/**
- * Opus parser
- * Internet Engineering Task Force (IETF) - RFC 6716
- * Used by OggParser
- */
-export declare class OpusParser extends VorbisParser {
-    private tokenizer;
-    private idHeader;
-    private lastPos;
-    constructor(metadata: INativeMetadataCollector, options: IOptions, tokenizer: ITokenizer);
-    /**
-     * Parse first Opus Ogg page
-     * @param {IPageHeader} header
-     * @param {Buffer} pageData
-     */
-    protected parseFirstPage(header: IPageHeader, pageData: Buffer): void;
-    protected parseFullPage(pageData: Buffer): void;
-    calculateDuration(header: IPageHeader): void;
-}
+/// <reference types="node" />
+import { ITokenizer } from 'strtok3/lib/core';
+import { IPageHeader } from '../Ogg';
+import { VorbisParser } from '../vorbis/VorbisParser';
+import { IOptions } from '../../type';
+import { INativeMetadataCollector } from '../../common/MetadataCollector';
+/**
+ * Opus parser
+ * Internet Engineering Task Force (IETF) - RFC 6716
+ * Used by OggParser
+ */
+export declare class OpusParser extends VorbisParser {
+    private tokenizer;
+    private idHeader;
+    private lastPos;
+    constructor(metadata: INativeMetadataCollector, options: IOptions, tokenizer: ITokenizer);
+    /**
+     * Parse first Opus Ogg page
+     * @param {IPageHeader} header
+     * @param {Buffer} pageData
+     */
+    protected parseFirstPage(header: IPageHeader, pageData: Buffer): void;
+    protected parseFullPage(pageData: Buffer): void;
+    calculateDuration(header: IPageHeader): void;
+}

package/lib/ogg/opus/OpusParser.js

@@ -1,56 +1,56 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.OpusParser = void 0;
-const Token = require("token-types");
-const Opus = require("./Opus");
-const VorbisParser_1 = require("../vorbis/VorbisParser");
-/**
- * Opus parser
- * Internet Engineering Task Force (IETF) - RFC 6716
- * Used by OggParser
- */
-class OpusParser extends VorbisParser_1.VorbisParser {
-    constructor(metadata, options, tokenizer) {
-        super(metadata, options);
-        this.tokenizer = tokenizer;
-        this.lastPos = -1;
-    }
-    /**
-     * Parse first Opus Ogg page
-     * @param {IPageHeader} header
-     * @param {Buffer} pageData
-     */
-    parseFirstPage(header, pageData) {
-        this.metadata.setFormat('codec', 'Opus');
-        // Parse Opus ID Header
-        this.idHeader = new Opus.IdHeader(pageData.length).get(pageData, 0);
-        if (this.idHeader.magicSignature !== "OpusHead")
-            throw new Error("Illegal ogg/Opus magic-signature");
-        this.metadata.setFormat('sampleRate', this.idHeader.inputSampleRate);
-        this.metadata.setFormat('numberOfChannels', this.idHeader.channelCount);
-    }
-    parseFullPage(pageData) {
-        const magicSignature = new Token.StringType(8, 'ascii').get(pageData, 0);
-        switch (magicSignature) {
-            case 'OpusTags':
-                this.parseUserCommentList(pageData, 8);
-                this.lastPos = this.tokenizer.position - pageData.length;
-                break;
-            default:
-                break;
-        }
-    }
-    calculateDuration(header) {
-        if (this.metadata.format.sampleRate && header.absoluteGranulePosition >= 0) {
-            // Calculate duration
-            const pos_48bit = header.absoluteGranulePosition - this.idHeader.preSkip;
-            this.metadata.setFormat('numberOfSamples', pos_48bit);
-            this.metadata.setFormat('duration', pos_48bit / 48000);
-            if (this.lastPos !== -1 && this.tokenizer.fileInfo.size && this.metadata.format.duration) {
-                const dataSize = this.tokenizer.fileInfo.size - this.lastPos;
-                this.metadata.setFormat('bitrate', 8 * dataSize / this.metadata.format.duration);
-            }
-        }
-    }
-}
-exports.OpusParser = OpusParser;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OpusParser = void 0;
+const Token = require("token-types");
+const VorbisParser_1 = require("../vorbis/VorbisParser");
+const Opus = require("./Opus");
+/**
+ * Opus parser
+ * Internet Engineering Task Force (IETF) - RFC 6716
+ * Used by OggParser
+ */
+class OpusParser extends VorbisParser_1.VorbisParser {
+    constructor(metadata, options, tokenizer) {
+        super(metadata, options);
+        this.tokenizer = tokenizer;
+        this.lastPos = -1;
+    }
+    /**
+     * Parse first Opus Ogg page
+     * @param {IPageHeader} header
+     * @param {Buffer} pageData
+     */
+    parseFirstPage(header, pageData) {
+        this.metadata.setFormat('codec', 'Opus');
+        // Parse Opus ID Header
+        this.idHeader = new Opus.IdHeader(pageData.length).get(pageData, 0);
+        if (this.idHeader.magicSignature !== "OpusHead")
+            throw new Error("Illegal ogg/Opus magic-signature");
+        this.metadata.setFormat('sampleRate', this.idHeader.inputSampleRate);
+        this.metadata.setFormat('numberOfChannels', this.idHeader.channelCount);
+    }
+    parseFullPage(pageData) {
+        const magicSignature = new Token.StringType(8, 'ascii').get(pageData, 0);
+        switch (magicSignature) {
+            case 'OpusTags':
+                this.parseUserCommentList(pageData, 8);
+                this.lastPos = this.tokenizer.position - pageData.length;
+                break;
+            default:
+                break;
+        }
+    }
+    calculateDuration(header) {
+        if (this.metadata.format.sampleRate && header.absoluteGranulePosition >= 0) {
+            // Calculate duration
+            const pos_48bit = header.absoluteGranulePosition - this.idHeader.preSkip;
+            this.metadata.setFormat('numberOfSamples', pos_48bit);
+            this.metadata.setFormat('duration', pos_48bit / 48000);
+            if (this.lastPos !== -1 && this.tokenizer.fileInfo.size && this.metadata.format.duration) {
+                const dataSize = this.tokenizer.fileInfo.size - this.lastPos;
+                this.metadata.setFormat('bitrate', 8 * dataSize / this.metadata.format.duration);
+            }
+        }
+    }
+}
+exports.OpusParser = OpusParser;

package/lib/ogg/speex/Speex.d.ts

@@ -1,36 +1,36 @@
-import { IGetToken } from 'strtok3/lib/core';
-/**
- * Speex Header Packet
- * Ref: https://www.speex.org/docs/manual/speex-manual/node8.html#SECTION00830000000000000000
- */
-export interface IHeader {
-    /**
-     * speex_string, char[] 8
-     */
-    speex: string;
-    /**
-     * speex_version, char[] 20
-     */
-    version: string;
-    /**
-     * Version id
-     */
-    version_id: number;
-    header_size: number;
-    rate: number;
-    mode: number;
-    mode_bitstream_version: number;
-    nb_channels: number;
-    bitrate: number;
-    frame_size: number;
-    vbr: number;
-    frames_per_packet: number;
-    extra_headers: number;
-    reserved1: number;
-    reserved2: number;
-}
-/**
- * Speex Header Packet
- * Ref: https://www.speex.org/docs/manual/speex-manual/node8.html#SECTION00830000000000000000
- */
-export declare const Header: IGetToken<IHeader>;
+import { IGetToken } from 'strtok3/lib/core';
+/**
+ * Speex Header Packet
+ * Ref: https://www.speex.org/docs/manual/speex-manual/node8.html#SECTION00830000000000000000
+ */
+export interface IHeader {
+    /**
+     * speex_string, char[] 8
+     */
+    speex: string;
+    /**
+     * speex_version, char[] 20
+     */
+    version: string;
+    /**
+     * Version id
+     */
+    version_id: number;
+    header_size: number;
+    rate: number;
+    mode: number;
+    mode_bitstream_version: number;
+    nb_channels: number;
+    bitrate: number;
+    frame_size: number;
+    vbr: number;
+    frames_per_packet: number;
+    extra_headers: number;
+    reserved1: number;
+    reserved2: number;
+}
+/**
+ * Speex Header Packet
+ * Ref: https://www.speex.org/docs/manual/speex-manual/node8.html#SECTION00830000000000000000
+ */
+export declare const Header: IGetToken<IHeader>;

package/lib/ogg/speex/Speex.js

@@ -1,31 +1,31 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Header = void 0;
-const Token = require("token-types");
-const util = require("../../common/Util");
-/**
- * Speex Header Packet
- * Ref: https://www.speex.org/docs/manual/speex-manual/node8.html#SECTION00830000000000000000
- */
-exports.Header = {
-    len: 80,
-    get: (buf, off) => {
-        return {
-            speex: new Token.StringType(8, 'ascii').get(buf, off + 0),
-            version: util.trimRightNull(new Token.StringType(20, 'ascii').get(buf, off + 8)),
-            version_id: buf.readInt32LE(off + 28),
-            header_size: buf.readInt32LE(off + 32),
-            rate: buf.readInt32LE(off + 36),
-            mode: buf.readInt32LE(off + 40),
-            mode_bitstream_version: buf.readInt32LE(off + 44),
-            nb_channels: buf.readInt32LE(off + 48),
-            bitrate: buf.readInt32LE(off + 52),
-            frame_size: buf.readInt32LE(off + 56),
-            vbr: buf.readInt32LE(off + 60),
-            frames_per_packet: buf.readInt32LE(off + 64),
-            extra_headers: buf.readInt32LE(off + 68),
-            reserved1: buf.readInt32LE(off + 72),
-            reserved2: buf.readInt32LE(off + 76)
-        };
-    }
-};
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Header = void 0;
+const Token = require("token-types");
+const util = require("../../common/Util");
+/**
+ * Speex Header Packet
+ * Ref: https://www.speex.org/docs/manual/speex-manual/node8.html#SECTION00830000000000000000
+ */
+exports.Header = {
+    len: 80,
+    get: (buf, off) => {
+        return {
+            speex: new Token.StringType(8, 'ascii').get(buf, off + 0),
+            version: util.trimRightNull(new Token.StringType(20, 'ascii').get(buf, off + 8)),
+            version_id: buf.readInt32LE(off + 28),
+            header_size: buf.readInt32LE(off + 32),
+            rate: buf.readInt32LE(off + 36),
+            mode: buf.readInt32LE(off + 40),
+            mode_bitstream_version: buf.readInt32LE(off + 44),
+            nb_channels: buf.readInt32LE(off + 48),
+            bitrate: buf.readInt32LE(off + 52),
+            frame_size: buf.readInt32LE(off + 56),
+            vbr: buf.readInt32LE(off + 60),
+            frames_per_packet: buf.readInt32LE(off + 64),
+            extra_headers: buf.readInt32LE(off + 68),
+            reserved1: buf.readInt32LE(off + 72),
+            reserved2: buf.readInt32LE(off + 76)
+        };
+    }
+};

package/lib/ogg/speex/SpeexParser.d.ts

@@ -1,22 +1,22 @@
-/// <reference types="node" />
-import { ITokenizer } from 'strtok3/lib/core';
-import { IPageHeader } from '../Ogg';
-import { VorbisParser } from '../vorbis/VorbisParser';
-import { IOptions } from '../../type';
-import { INativeMetadataCollector } from '../../common/MetadataCollector';
-/**
- * Speex, RFC 5574
- * Ref:
- *   https://www.speex.org/docs/manual/speex-manual/
- *   https://tools.ietf.org/html/rfc5574
- */
-export declare class SpeexParser extends VorbisParser {
-    private tokenizer;
-    constructor(metadata: INativeMetadataCollector, options: IOptions, tokenizer: ITokenizer);
-    /**
-     * Parse first Speex Ogg page
-     * @param {IPageHeader} header
-     * @param {Buffer} pageData
-     */
-    protected parseFirstPage(header: IPageHeader, pageData: Buffer): void;
-}
+/// <reference types="node" />
+import { ITokenizer } from 'strtok3/lib/core';
+import { IPageHeader } from '../Ogg';
+import { VorbisParser } from '../vorbis/VorbisParser';
+import { IOptions } from '../../type';
+import { INativeMetadataCollector } from '../../common/MetadataCollector';
+/**
+ * Speex, RFC 5574
+ * Ref:
+ *   https://www.speex.org/docs/manual/speex-manual/
+ *   https://tools.ietf.org/html/rfc5574
+ */
+export declare class SpeexParser extends VorbisParser {
+    private tokenizer;
+    constructor(metadata: INativeMetadataCollector, options: IOptions, tokenizer: ITokenizer);
+    /**
+     * Parse first Speex Ogg page
+     * @param {IPageHeader} header
+     * @param {Buffer} pageData
+     */
+    protected parseFirstPage(header: IPageHeader, pageData: Buffer): void;
+}

package/lib/ogg/speex/SpeexParser.js

@@ -1,35 +1,35 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SpeexParser = void 0;
-const initDebug = require("debug");
-const Speex = require("./Speex");
-const VorbisParser_1 = require("../vorbis/VorbisParser");
-const debug = initDebug('music-metadata:parser:ogg:speex');
-/**
- * Speex, RFC 5574
- * Ref:
- *   https://www.speex.org/docs/manual/speex-manual/
- *   https://tools.ietf.org/html/rfc5574
- */
-class SpeexParser extends VorbisParser_1.VorbisParser {
-    constructor(metadata, options, tokenizer) {
-        super(metadata, options);
-        this.tokenizer = tokenizer;
-    }
-    /**
-     * Parse first Speex Ogg page
-     * @param {IPageHeader} header
-     * @param {Buffer} pageData
-     */
-    parseFirstPage(header, pageData) {
-        debug('First Ogg/Speex page');
-        const speexHeader = Speex.Header.get(pageData, 0);
-        this.metadata.setFormat('codec', `Speex ${speexHeader.version}`);
-        this.metadata.setFormat('numberOfChannels', speexHeader.nb_channels);
-        this.metadata.setFormat('sampleRate', speexHeader.rate);
-        if (speexHeader.bitrate !== -1) {
-            this.metadata.setFormat('bitrate', speexHeader.bitrate);
-        }
-    }
-}
-exports.SpeexParser = SpeexParser;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SpeexParser = void 0;
+const initDebug = require("debug");
+const VorbisParser_1 = require("../vorbis/VorbisParser");
+const Speex = require("./Speex");
+const debug = initDebug('music-metadata:parser:ogg:speex');
+/**
+ * Speex, RFC 5574
+ * Ref:
+ *   https://www.speex.org/docs/manual/speex-manual/
+ *   https://tools.ietf.org/html/rfc5574
+ */
+class SpeexParser extends VorbisParser_1.VorbisParser {
+    constructor(metadata, options, tokenizer) {
+        super(metadata, options);
+        this.tokenizer = tokenizer;
+    }
+    /**
+     * Parse first Speex Ogg page
+     * @param {IPageHeader} header
+     * @param {Buffer} pageData
+     */
+    parseFirstPage(header, pageData) {
+        debug('First Ogg/Speex page');
+        const speexHeader = Speex.Header.get(pageData, 0);
+        this.metadata.setFormat('codec', `Speex ${speexHeader.version}`);
+        this.metadata.setFormat('numberOfChannels', speexHeader.nb_channels);
+        this.metadata.setFormat('sampleRate', speexHeader.rate);
+        if (speexHeader.bitrate !== -1) {
+            this.metadata.setFormat('bitrate', speexHeader.bitrate);
+        }
+    }
+}
+exports.SpeexParser = SpeexParser;

package/lib/ogg/theora/Theora.d.ts

@@ -1,20 +1,20 @@
-import { IGetToken } from 'strtok3/lib/core';
-/**
- * 6.2 Identification Header
- * Ref: https://theora.org/doc/Theora.pdf: 6.2 Identification Header Decode
- */
-export interface IIdentificationHeader {
-    id: string;
-    vmaj: number;
-    vmin: number;
-    vrev: number;
-    vmbw: number;
-    vmbh: number;
-    nombr: number;
-    nqual: number;
-}
-/**
- * 6.2 Identification Header
- * Ref: https://theora.org/doc/Theora.pdf: 6.2 Identification Header Decode
- */
-export declare const IdentificationHeader: IGetToken<IIdentificationHeader>;
+import { IGetToken } from 'strtok3/lib/core';
+/**
+ * 6.2 Identification Header
+ * Ref: https://theora.org/doc/Theora.pdf: 6.2 Identification Header Decode
+ */
+export interface IIdentificationHeader {
+    id: string;
+    vmaj: number;
+    vmin: number;
+    vrev: number;
+    vmbw: number;
+    vmbh: number;
+    nombr: number;
+    nqual: number;
+}
+/**
+ * 6.2 Identification Header
+ * Ref: https://theora.org/doc/Theora.pdf: 6.2 Identification Header Decode
+ */
+export declare const IdentificationHeader: IGetToken<IIdentificationHeader>;

package/lib/ogg/theora/Theora.js

@@ -1,23 +1,23 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.IdentificationHeader = void 0;
-const Token = require("token-types");
-/**
- * 6.2 Identification Header
- * Ref: https://theora.org/doc/Theora.pdf: 6.2 Identification Header Decode
- */
-exports.IdentificationHeader = {
-    len: 42,
-    get: (buf, off) => {
-        return {
-            id: new Token.StringType(7, 'ascii').get(buf, off),
-            vmaj: buf.readUInt8(off + 7),
-            vmin: buf.readUInt8(off + 8),
-            vrev: buf.readUInt8(off + 9),
-            vmbw: buf.readUInt16BE(off + 10),
-            vmbh: buf.readUInt16BE(off + 17),
-            nombr: Token.UINT24_BE.get(buf, off + 37),
-            nqual: buf.readUInt8(off + 40)
-        };
-    }
-};
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.IdentificationHeader = void 0;
+const Token = require("token-types");
+/**
+ * 6.2 Identification Header
+ * Ref: https://theora.org/doc/Theora.pdf: 6.2 Identification Header Decode
+ */
+exports.IdentificationHeader = {
+    len: 42,
+    get: (buf, off) => {
+        return {
+            id: new Token.StringType(7, 'ascii').get(buf, off),
+            vmaj: buf.readUInt8(off + 7),
+            vmin: buf.readUInt8(off + 8),
+            vrev: buf.readUInt8(off + 9),
+            vmbw: buf.readUInt16BE(off + 10),
+            vmbh: buf.readUInt16BE(off + 17),
+            nombr: Token.UINT24_BE.get(buf, off + 37),
+            nqual: buf.readUInt8(off + 40)
+        };
+    }
+};