basic: move sound code to basic_sound.cpp

Author: Ulrich Hecht

ttbasic/basic.cpp

@@ -2063,9 +2063,6 @@ void itroff() {
   trace_enabled = false;
 }
 
-bool event_play_enabled;
-uint8_t event_play_proc_idx[SOUND_CHANNELS];
-
 #define MAX_PADS 3
 bool event_pad_enabled;
 uint8_t event_pad_proc_idx[MAX_PADS];
@@ -2929,16 +2926,6 @@ void BASIC_FP do_call(uint8_t proc_idx)
   return;
 }
 
-void BASIC_INT event_handle_play(int ch)
-{
-  if (event_play_proc_idx[ch] == NO_PROC)
-    return;
-  init_stack_frame();
-  push_num_arg(ch);
-  do_call(event_play_proc_idx[ch]);
-  event_play_enabled = false;
-}
-
 #define EVENT_PROFILE_SAMPLES 7
 uint32_t event_profile[EVENT_PROFILE_SAMPLES];
 
@@ -3692,141 +3679,6 @@ void SMALL ismode() {
     flags);
 }
 
-/***bc snd BEEP
-Produces a sound using the "beeper" sound engine.
-\usage BEEP period[, volume]
-\args
-@period	- tone cycle period in samples [`0` (off) to `320`/`160`]
-@volume	- tone volume +
-          [`0` to `15`, default: as set in system configuration]
-\note
-The maximum value for `period` depends on the flavor of Engine BASIC;
-it's 320 for the gaming build, and 160 for the network build.
-\ref CONFIG
-***/
-void ibeep() {
-  int32_t period;
-  int32_t vol = CONFIG.beep_volume;
-
-  if ( getParam(period, 0, SOUND_BUFLEN, I_NONE) ) return;
-  if(*cip == I_COMMA) {
-    cip++;
-    if ( getParam(vol, 0, 15, I_NONE) ) return;
-  }
-  if (period == 0)
-    sound.noBeep();
-  else
-    sound.beep(period, vol);
-}
-
-/***bc snd SOUND FONT
-Sets the sound font to be used by the wavetable synthesizer.
-\usage SOUND FONT file$
-\args
-@file$	name of the SF2 sound font file
-\note
-If a relative path is specified, Engine BASIC will first attempt
-to load the sound font from `/sd`, then from `/flash`.
-
-The default sound font name is `1mgm.sf2`.
-\bugs
-No sanity checks are performed before setting the sound font.
-\ref INST$()
-***/
-
-/***bc snd SOUND
-Generates a sound using the wavetable synthesizer.
-\usage SOUND ch, inst, note[, len[, vel]]
-\args
-@ch	sound channel [`0` to `{SOUND_CHANNELS_m1}`]
-@inst	instrument number
-@note	note pitch
-@len	note duration, milliseconds [default: 1000]
-@vel	note velocity [`0` to `1` (default)]
-\ref INST$() SOUND_FONT
-***/
-void isound() {
-#ifdef HAVE_TSF
-  if (*cip == I_FONT) {
-    ++cip;
-    BString font = getParamFname();
-    sound.setFontName(font);
-  } else {
-    int32_t ch, inst, note, len = 1000;
-    num_t vel = 1;
-    if (getParam(ch, 0, SOUND_CHANNELS - 1, I_COMMA)) return;
-    int instcnt = sound.instCount();
-    if (!instcnt) {
-      err = ERR_TSF;
-      return;
-    }
-    if (getParam(inst, 0, instcnt - 1, I_COMMA)) return;
-    if (getParam(note, 0, INT32_MAX, I_NONE)) return;
-    if (*cip == I_COMMA) {
-      ++cip;
-      if (getParam(len, 0, INT32_MAX, I_NONE)) return;
-      if (*cip == I_COMMA) {
-        ++cip;
-        if (getParam(vel, 0, 1.0, I_NONE)) return;
-      }
-    }
-    sound.noteOn(ch, inst, note, vel, len);
-  }
-#else
-  err = ERR_NOT_SUPPORTED;
-#endif
-}
-
-#ifdef HAVE_MML
-BString mml_text;
-#endif
-/***bc snd PLAY
-Plays a piece of music in Music Macro Language (MML) using the
-wavetable synthesizer.
-\usage PLAY mml$
-\args
-@mml$	score in MML format
-\bugs
-* Only supports one sound channel.
-* MML syntax undocumented.
-* Fails silently if the synthesizer could not be initialized.
-***/
-void iplay() {
-#ifdef HAVE_MML
-  sound.stopMml(0);
-  mml_text = istrexp();
-  sound.playMml(0, mml_text.c_str());
-#else
-  err = ERR_NOT_SUPPORTED;
-#endif
-}
-
-/***bc snd SAY
-Speaks the given text.
-\usage SAY text$
-\args
-@text$	text to be spoken
-\note
-`text$` is assumed to be in English.
-
-`SAY` cannot be used concurrently with the wavetable synthesizer
-because they use different sample rates.
-\bugs
-* Does not support phonetic input.
-* No possibility to change synthesizer parameters.
-***/
-void isay() {
-  BString text = istrexp();
-  if (err)
-    return;
-  ESP8266SAM *sam = sound.sam();
-  if (!sam) {
-    err = ERR_OOM;
-    return;
-  }
-  sam->Say(text.c_str());
-}
-
 /***bf bas MAP
 Re-maps a value from one range to another
 \usage mval = MAP(val, l1, h1, l2, h2)
@@ -4738,27 +4590,6 @@ static BString BASIC_INT sinkey() {
     return BString();
 }
 
-/***bf snd INST$
-Returns the name of the specified wavetable synthesizer instrument.
-\usage name$ = INST$(num)
-\args
-@num	instrument number
-\ret
-Instrument name.
-
-If an instrument is not defined in the current sound font, an empty
-string is returned.
-\ref SOUND_FONT
-***/
-static BString sinst() {
-#ifdef HAVE_TSF
-  return sound.instName(getparam());
-#else
-  err = ERR_NOT_SUPPORTED;
-  return BString();
-#endif
-}
-
 /***bf bas RET$
 Returns one of the string return values returned by the last function
 call.
@@ -5139,34 +4970,6 @@ num_t BASIC_FP nleft() {
   return psxLeft;
 }
 
-/***bf snd PLAY
-Checks if a sound is playing a on wavetable synthesizer channel.
-\usage p = PLAY(channel)
-\args
-@channel	sound channel +
-                [`0` to `{SOUND_CHANNELS_m1}`, or `-1` to check all channels]
-\ret `1` if sound is playing, `0` otherwise.
-\ref PLAY SOUND
-***/
-num_t BASIC_FP nplay() {
-#ifdef HAVE_MML
-  int32_t a, b;
-  if (checkOpen()) return 0;
-  if (getParam(a, -1, SOUND_CHANNELS - 1, I_CLOSE)) return 0;
-  if (a == -1) {
-    b = 0;
-    for (int i = 0; i < SOUND_CHANNELS; ++i) {
-      b |= sound.isPlaying(i);
-    }
-    return b;
-  } else
-    return sound.isPlaying(a);
-#else
-  err = ERR_NOT_SUPPORTED;
-  return 0;
-#endif
-}
-
 #ifndef ESP8266
 int try_malloc() {
   uint32_t total = 0;

ttbasic/basic.h

@@ -12,6 +12,7 @@
 #include "video.h"
 #include "variable.h"
 #include "proc.h"
+#include "sound.h"
 
 #define SIZE_LINE 256    // コマンドライン入力バッファサイズ + NULL
 #define SIZE_IBUF 256    // 中間コード変換バッファサイズ
@@ -372,6 +373,7 @@ void iloadbg();
 
 int32_t ncharfun();
 num_t nvreg();
+num_t nplay();
 
 #define COL_BG		0
 #define COL_FG		1
@@ -405,9 +407,12 @@ extern SystemConfig CONFIG;
 #define COL(n)	(csp.colorFromRgb(CONFIG.color_scheme[COL_ ## n]))
 
 void BASIC_INT event_handle_play(int ch);
+extern bool event_play_enabled;
+extern uint8_t event_play_proc_idx[SOUND_CHANNELS];
+
 void event_handle_pad();
-void event_handle_sprite();
 
+void event_handle_sprite();
 extern uint8_t event_sprite_proc_idx;
 
 #ifdef USE_BG_ENGINE