Merge remote-tracking branch 'origin/master' into version/4.1

src/sound/midi.c

@@ -10,12 +10,10 @@
  *
  *
  *
- * Authors:  Sarah Walker, <https://pcem-emulator.co.uk/>
- *           Miran Grca, <mgrca8@gmail.com>
+ * Authors:  Miran Grca, <mgrca8@gmail.com>
  *           Bit,
  *           DOSBox Team,
  *
- *           Copyright 2008-2020 Sarah Walker.
  *           Copyright 2016-2020 Miran Grca.
  *           Copyright 2016-2020 Bit.
  *           Copyright 2008-2020 DOSBox Team.

src/sound/munt/CMakeLists.txt

@@ -22,5 +22,5 @@ add_library(mt32emu STATIC Analog.cpp BReverbModel.cpp Display.cpp File.cpp File
     srchelper/srctools/src/LinearResampler.cpp
     srchelper/srctools/src/ResamplerModel.cpp
     srchelper/srctools/src/SincResampler.cpp
-    srchelper/InternalResampler.cpp	Synth.cpp Tables.cpp TVA.cpp TVF.cpp
+    srchelper/InternalResampler.cpp Synth.cpp Tables.cpp TVA.cpp TVF.cpp
     TVP.cpp sha1/sha1.cpp c_interface/c_interface.cpp)

src/sound/snd_adlibgold.c

@@ -692,7 +692,7 @@ adgold_timer_poll(void *priv)
 {
     adgold_t *adgold = (adgold_t *) priv;
 
-	/*A small timer period will result in hangs.*/
+    /*A small timer period will result in hangs.*/
     timer_on_auto(&adgold->adgold_mma_timer_count, 4.88964);
 
     if (adgold->adgold_midi_ctrl & 0x3f) {

src/sound/snd_mpu401.c

@@ -10,14 +10,13 @@
  *
  *
  *
- * Authors:  Sarah Walker, <https://pcem-emulator.co.uk/>
- *           DOSBox Team,
+ * Authors:  DOSBox Team,
  *           Miran Grca, <mgrca8@gmail.com>
  *           TheCollector1995, <mariogplayer@gmail.com>
  *
- *           Copyright 2008-2020 Sarah Walker.
  *           Copyright 2008-2020 DOSBox Team.
  *           Copyright 2016-2020 Miran Grca.
+ *           Copyright 2016-2020 TheCollector1995.
  */
 #include <stdarg.h>
 #include <stdint.h>