tts output now goes through main, added volume controls

zss/device/api.ts

@@ -125,10 +125,6 @@ export function register_share(sender: string, player: string) {
   hub.emit('register:share', sender, undefined, player)
 }
 
-export function register_refresh(sender: string, player: string) {
-  hub.emit('register:refresh', sender, undefined, player)
-}
-
 export function register_select(sender: string, book: string, player: string) {
   hub.emit('register:select', sender, book, player)
 }
@@ -161,6 +157,14 @@ export function synth_drumvolume(
   hub.emit('synth:drumvolume', sender, volume, player)
 }
 
+export function synth_ttsvolume(
+  sender: string,
+  volume: number,
+  player: string,
+) {
+  hub.emit('synth:ttsvolume', sender, volume, player)
+}
+
 export function synth_voice(
   sender: string,
   idx: number,

zss/device/register.ts

@@ -14,7 +14,6 @@ import {
   peer_create,
   platform_init,
   register_ready,
-  register_refresh,
   tape_crash,
   tape_info,
   tape_terminal_close,
@@ -78,7 +77,11 @@ function readurlhash(): string {
 let shouldreload = true
 window.addEventListener('hashchange', () => {
   if (shouldreload) {
-    location.reload()
+    // location.reload()
+    // how do we clear the state here ??
+    // do we tear down platform and re-make it ??
+    // question, should we then just shove another vm_init ??
+    // ie: here is your starting point again ??
   } else {
     // reset after a single pass
     shouldreload = true
@@ -211,15 +214,6 @@ const register = createdevice(
           })
         }
         break
-      case 'refresh':
-        if (message.player === sessionid) {
-          doasync('register:refresh', async function () {
-            writeheader(register.name(), 'BYE')
-            await waitfor(100)
-            location.reload()
-          })
-        }
-        break
       case 'nuke':
         if (message.player === sessionid) {
           doasync('register:nuke', async function () {
@@ -232,6 +226,7 @@ const register = createdevice(
             await waitfor(1000)
             writeheader(register.name(), 'BYE')
             await waitfor(100)
+            // nuke is the only valid case for reload
             location.hash = ''
             location.reload()
           })
@@ -251,7 +246,8 @@ const register = createdevice(
           doasync('register:select', async () => {
             if (isstring(message.data)) {
               await writeselectedid(message.data)
-              register_refresh(register.name(), sessionid)
+              // use same solution as a hash change here ...
+              // re-run the vm_init flow
             }
           })
         }

zss/device/synth.ts

@@ -77,7 +77,7 @@ function createsynth() {
   const destination = getDestination()
   const broadcastdestination = getContext().createMediaStreamDestination()
 
-  const mainvolume = new Volume(4)
+  const mainvolume = new Volume(0)
   mainvolume.connect(destination)
   mainvolume.connect(broadcastdestination)
 
@@ -90,24 +90,27 @@ function createsynth() {
   })
   maincompressor.connect(mainvolume)
 
-  const maingain = new Gain()
-  maingain.connect(maincompressor)
+  const playvolume = new Volume(0)
+  playvolume.connect(maincompressor)
 
-  const drumvolume = new Volume(2)
+  const drumvolume = new Volume(1)
   drumvolume.connect(maincompressor)
 
+  const ttsvolume = new Volume(3)
+  ttsvolume.connect(maincompressor)
+
   const SOURCE = [
     // for sfx
-    createsource(maingain),
+    createsource(playvolume),
     // + 8track synths
-    createsource(maingain),
-    createsource(maingain),
-    createsource(maingain),
-    createsource(maingain),
-    createsource(maingain),
-    createsource(maingain),
-    createsource(maingain),
-    createsource(maingain),
+    createsource(playvolume),
+    createsource(playvolume),
+    createsource(playvolume),
+    createsource(playvolume),
+    createsource(playvolume),
+    createsource(playvolume),
+    createsource(playvolume),
+    createsource(playvolume),
   ]
 
   // config drums
@@ -614,12 +617,24 @@ function createsynth() {
     drumvolume.volume.value = volume
   }
 
+  // tts output
+  function addttsaudiobuffer(audiobuffer: AudioBuffer) {
+    const player = new Player(audiobuffer).connect(ttsvolume)
+    player.start(0)
+  }
+
+  function setttsvolume(volume: number) {
+    ttsvolume.volume.value = volume
+  }
+
   return {
     broadcastdestination,
     addplay,
     stopplay,
+    addttsaudiobuffer,
     setmainvolume,
     setdrumvolume,
+    setttsvolume,
     SOURCE,
   }
 }
@@ -696,22 +711,7 @@ function validatesynthtype(
 }
 
 // get MicrosoftSpeechTTS instance
-const tts = new EdgeSpeechTTS({ locale: 'en-US' })
-
-function playaudiobuffer(audiobuffer: AudioBuffer) {
-  const player = new Player(audiobuffer).toDestination()
-  player.start(0)
-  console.info('playing audio buffer', player)
-}
-
-async function handletts(voice: string, phrase: string) {
-  const audiobuffer = await tts.createAudio({
-    input: phrase,
-    options: { voice: voice || 'en-US-GuyNeural' },
-  })
-  // play the audio
-  playaudiobuffer(audiobuffer)
-}
+let tts: MAYBE<EdgeSpeechTTS>
 
 let synth: MAYBE<ReturnType<typeof createsynth>>
 
@@ -737,6 +737,11 @@ const synthdevice = createdevice('synth', [], (message) => {
         synth.setdrumvolume(message.data)
       }
       break
+    case 'ttsvolume':
+      if (isnumber(message.data)) {
+        synth.setttsvolume(message.data)
+      }
+      break
     case 'play':
       if (isarray(message.data)) {
         const [mode, buffer] = message.data as [number, string]
@@ -1180,9 +1185,17 @@ const synthdevice = createdevice('synth', [], (message) => {
       break
     case 'tts':
       doasync('tts', async () => {
-        if (isarray(message.data)) {
+        if (!ispresent(tts)) {
+          tts = new EdgeSpeechTTS({ locale: 'en-US' })
+        }
+        if (ispresent(synth) && isarray(message.data)) {
           const [voice, phrase] = message.data as [string, string]
-          await handletts(voice, phrase)
+          const audiobuffer = await tts.createAudio({
+            input: phrase,
+            options: { voice: voice || 'en-US-GuyNeural' },
+          })
+          // play the audio
+          synth.addttsaudiobuffer(audiobuffer)
         }
       })
       break

zss/device/vm.ts

@@ -1,6 +1,7 @@
 import { createdevice } from 'zss/device'
 import { INPUT, UNOBSERVE_FUNC } from 'zss/gadget/data/types'
 import { doasync } from 'zss/mapping/func'
+import { waitfor } from 'zss/mapping/tick'
 import { MAYBE, isarray, ispresent, isstring } from 'zss/mapping/types'
 import { isjoin } from 'zss/mapping/url'
 import {
@@ -30,11 +31,11 @@ import {
   gadgetserver_clearplayer,
   platform_started,
   register_flush,
-  register_refresh,
   tape_debug,
   tape_info,
   vm_codeaddress,
   vm_flush,
+  vm_login,
 } from './api'
 import { modemobservevaluestring, modemwriteplayer } from './modem'
 
@@ -117,8 +118,9 @@ const vm = createdevice('vm', ['init', 'tick', 'second'], (message) => {
           gadgetserver_clearplayer('vm', message.player)
           // save state
           await savestate()
-          // reload page
-          register_refresh('vm', message.player)
+          // attempt re-login
+          await waitfor(1000)
+          vm_login(vm.name(), message.player)
         })
       }
       break

zss/firmware/audio.ts

@@ -4,6 +4,7 @@ import {
   synth_mainvolume,
   synth_play,
   synth_tts,
+  synth_ttsvolume,
   synth_voice,
   synth_voicefx,
 } from 'zss/device/api'
@@ -63,6 +64,11 @@ export const AUDIO_FIRMWARE = createfirmware()
     synth_drumvolume('audio', volume, READ_CONTEXT.player)
     return 0
   })
+  .command('ttsvolume', (_, words) => {
+    const [volume] = readargs(words, 0, [ARG_TYPE.NUMBER])
+    synth_ttsvolume('audio', volume, READ_CONTEXT.player)
+    return 0
+  })
   .command('play', (chip, words) => {
     handlesynthplay(1, chip, words)
     return 0

zss/gadget/audio/source.ts

@@ -1,8 +1,8 @@
-import { Gain, Synth } from 'tone'
+import { Synth, Volume } from 'tone'
 
 import { createfx } from './fx'
 
-export function createsource(maingain: Gain) {
+export function createsource(playvolume: Volume) {
   const source = new Synth()
   source.set({
     envelope: {
@@ -24,7 +24,7 @@ export function createsource(maingain: Gain) {
     fx.distortion,
     fx.echo,
     fx.reverb,
-    maingain,
+    playvolume,
   )
 
   return { source, fx }