wav metadata update

added wave metadata options
FIXED RMIDI FOR REAL

package.json

@@ -1,6 +1,6 @@
 {
   "name": "SpessaSynth",
-  "version": "3.12.3",
+  "version": "3.13.0",
   "type": "module",
   "scripts": {
     "start": "node src/website/server/server.js",

src/spessasynth_lib/utils/buffer_to_wav.js

@@ -1,18 +1,24 @@
 /**
  * @typedef {Object} WaveMetadata
- * @property {string} title - the song's title
- * @property {string} album - the song's album
- * @property {string} genre - the song's genre
+ * @property {string|undefined} title - the song's title
+ * @property {string|undefined} artist - the song's artist
+ * @property {string|undefined} album - the song's album
+ * @property {string|undefined} genre - the song's genre
  */
 
+import { combineArrays } from './indexed_array.js'
+import { getStringBytes } from './byte_functions/string.js'
+import { writeRIFFOddSize } from '../soundfont/read/riff_chunk.js'
+
 /**
  *
  * @param audioBuffer {AudioBuffer}
  * @param normalizeAudio {boolean} find the max sample point and set it to 1, and scale others with it
  * @param channelOffset {number} channel offset and channel offset + 1 get saved
+ * @param metadata {WaveMetadata}
  * @returns {Blob}
  */
-export function audioBufferToWav(audioBuffer, normalizeAudio = true, channelOffset = 0)
+export function audioBufferToWav(audioBuffer, normalizeAudio = true, channelOffset = 0, metadata = {})
 {
     // this code currently doesn't add any metadata
     const channel1Data = audioBuffer.getChannelData(channelOffset);
@@ -57,11 +63,52 @@ export function audioBufferToWav(audioBuffer, normalizeAudio = true, channelOffs
     // data chunk length
     header.set(new Uint8Array([dataSize & 0xff, (dataSize >> 8) & 0xff, (dataSize >> 16) & 0xff, (dataSize >> 24) & 0xff]), 40);
 
-    const wavData = new Uint8Array(headerSize + dataSize);
-    wavData.set(header, 0);
-    // Interleave audio data (combine channels)
+    let wavData;
     let offset = headerSize;
+    let infoChunk = undefined;
+    // INFO chunk
+    if(Object.keys(metadata).length > 0)
+    {
+        const encoder = new TextEncoder();
+        const infoChunks = [
+            getStringBytes("INFO"),
+            writeRIFFOddSize("ICMT", encoder.encode("Created with SpessaSynth"))
+        ];
+        if(metadata.artist)
+        {
+            infoChunks.push(
+                writeRIFFOddSize("IART", encoder.encode(metadata.artist))
+            );
+        }
+        if(metadata.album)
+        {
+            infoChunks.push(
+                writeRIFFOddSize("IPRD", encoder.encode(metadata.album))
+            );
+        }
+        if(metadata.genre)
+        {
+            infoChunks.push(
+                writeRIFFOddSize("IGNR", encoder.encode(metadata.genre))
+            );
+        }
+        if(metadata.title)
+        {
+            infoChunks.push(
+                writeRIFFOddSize("INAM", encoder.encode(metadata.title))
+            );
+        }
+        infoChunk = writeRIFFOddSize("LIST", combineArrays(infoChunks));
+        wavData = new Uint8Array(headerSize + dataSize + infoChunk.length);
+    }
+    else
+    {
+        wavData = new Uint8Array(headerSize + dataSize);
+
+    }
+    wavData.set(header, 0);
 
+    // Interleave audio data (combine channels)
     let multiplier;
     if(normalizeAudio)
     {
@@ -103,6 +150,10 @@ export function audioBufferToWav(audioBuffer, normalizeAudio = true, channelOffs
         wavData[offset++] = (sample2 >> 8) & 0xff;
     }
 
+    if(infoChunk)
+    {
+        wavData.set(infoChunk, offset);
+    }
 
     return new Blob([wavData.buffer], { type: 'audio/wav' });
 }

src/website/manager/export_audio.js

@@ -12,10 +12,11 @@ const RENDER_AUDIO_TIME_INTERVAL = 1000;
  * @param normalizeAudio {boolean}
  * @param additionalTime {number}
  * @param separateChannels {boolean}
+ * @param meta {WaveMetadata}
  * @returns {Promise<void>}
  * @private
  */
-export async function _doExportAudioData(normalizeAudio = true, additionalTime = 2, separateChannels = false)
+export async function _doExportAudioData(normalizeAudio = true, additionalTime = 2, separateChannels = false, meta = {})
 {
     this.isExporting = true;
     if(!this.seq)
@@ -115,7 +116,7 @@ export async function _doExportAudioData(normalizeAudio = true, additionalTime =
     await new Promise(r => setTimeout(r, ANIMATION_REFLOW_TIME));
     if(!separateChannels)
     {
-        this.saveBlob(audioBufferToWav(buf, normalizeAudio), `${this.seqUI.currentSongTitle || 'unnamed_song'}.wav`);
+        this.saveBlob(audioBufferToWav(buf, normalizeAudio, 0, meta), `${this.seqUI.currentSongTitle || 'unnamed_song'}.wav`,);
     }
     else
     {
@@ -182,6 +183,16 @@ export async function _exportAudioData()
         return;
     }
     const wavPath = `locale.exportAudio.formats.formats.wav.options.`;
+    const metadataPath = "locale.exportAudio.formats.metadata.";
+    const verifyDecode = (type, def, decoder) => {
+        return this.seq.midiData.RMIDInfo?.[type] === undefined ? def : decoder.decode(this.seq.midiData.RMIDInfo?.[type])
+    }
+    const encoding = verifyDecode("IENC", "ascii", new TextDecoder());
+    const decoder = new TextDecoder(encoding);
+
+    const startAlbum = verifyDecode("IPRD", "", decoder);
+    const startArtist = verifyDecode("IART", "", decoder);
+    const startGenre = verifyDecode("IGNR", "", decoder);
     /**
      * @type {NotificationContent[]}
      */
@@ -209,6 +220,42 @@ export async function _exportAudioData()
                 "separate-channels-toggle": "1"
             }
         },
+        {
+            type: "input",
+            translatePathTitle: metadataPath + "songTitle",
+            attributes: {
+                "name": "song_title",
+                "type": "text",
+                "value": this.seqUI.currentSongTitle
+            }
+        },
+        {
+            type: "input",
+            translatePathTitle: metadataPath + "album",
+            attributes: {
+                "value": startAlbum,
+                "name": "album",
+                "type": "text"
+            }
+        },
+        {
+            type: "input",
+            translatePathTitle: metadataPath + "artist",
+            attributes: {
+                "value": startArtist,
+                "name": "artist",
+                "type": "text"
+            }
+        },
+        {
+            type: "input",
+            translatePathTitle: metadataPath + "genre",
+            attributes: {
+                "value": startGenre,
+                "name": "genre",
+                "type": "text"
+            }
+        },
         {
             type: "button",
             textContent: this.localeManager.getLocaleString(wavPath + "confirm"),
@@ -217,7 +264,21 @@ export async function _exportAudioData()
                 const normalizeVolume = n.div.querySelector("input[normalize-volume-toggle]").checked;
                 const additionalTime = n.div.querySelector("input[type='number']").value;
                 const separateChannels = n.div.querySelector("input[separate-channels-toggle]").checked;
-                this._doExportAudioData(normalizeVolume, parseInt(additionalTime), separateChannels);
+                const artist = n.div.querySelector("input[name='artist']").value;
+                const album = n.div.querySelector("input[name='album']").value;
+                const title = n.div.querySelector("input[name='song_title']").value;
+                const genre = n.div.querySelector("input[name='genre']").value;
+                /**
+                 * @type {WaveMetadata}
+                 */
+                const metadata = {
+                    artist: artist.length > 0 ? artist : undefined,
+                    album: album.length > 0 ? album : undefined,
+                    title: title.length > 0 ? title : undefined,
+                    genre: genre.length > 0 ? genre : undefined,
+                }
+
+                this._doExportAudioData(normalizeVolume, parseInt(additionalTime), separateChannels, metadata);
             }
         }
     ];