Modify the default volume for AYAudioWriter

Author: skoolkid

skoolkit/ay.py

@@ -190,7 +190,7 @@ def render(self, ay_log, frame_duration, ay_res, volume):
         return samples
 
 class Options:
-    def __init__(self, volume=75, ay_res=None, beeper=False):
+    def __init__(self, volume=100, ay_res=None, beeper=False):
         self.volume = volume
         self.ay_res = ay_res
         self.beeper = beeper

tests/test_ay.py

@@ -50,7 +50,7 @@ def test_default_options(self):
         samples = self._check_header(audio_bytes, options)
         self.assertEqual(len(samples), 3528)
         self.assertEqual(samples[:8], b'\x00\x80\x00\x80\x00\x80\x00\x80')
-        self.assertEqual(samples[3520:], b'\xff\x3f\xff\x3f\xff\x3f\xff\x3f')
+        self.assertEqual(samples[3520:], b'\xff\x7f\xff\x7f\xff\x7f\xff\x7f')
 
     def test_beeper_starts_before_ay(self):
         options = Options(beeper=True)
@@ -84,7 +84,7 @@ def test_beeper_starts_after_ay(self):
         samples = self._check_header(audio_bytes, options)
         self.assertEqual(len(samples), 3528)
         self.assertEqual(samples[:8], b'\x00\x80\x00\x80\x00\x80\x00\x80')
-        self.assertEqual(samples[3520:], b'\x00\xc0\x00\x80\x00\xc0\x00\x80')
+        self.assertEqual(samples[3520:], b'\x55\xd5\x00\x80\x55\xd5\x00\x80')
 
     def test_ay_res(self):
         options = Options(ay_res=2000)
@@ -101,7 +101,7 @@ def test_ay_res(self):
         samples = self._check_header(audio_bytes, options)
         self.assertEqual(len(samples), 3480)
         self.assertEqual(samples[:8], b'\x00\x80\x00\x80\x00\x80\x00\x80')
-        self.assertEqual(samples[3472:], b'\x00\x00\x00\x80\x00\x00\x00\x80')
+        self.assertEqual(samples[3472:], b'\xaa\x2a\x00\x80\xaa\x2a\x00\x80')
 
     def test_clock_speed(self):
         config = {CLOCK_SPEED: '3000000'}
@@ -127,7 +127,7 @@ def test_frame_duration(self):
         samples = self._check_header(audio_bytes, options, config)
         self.assertEqual(len(samples), 3528)
         self.assertEqual(samples[:8], b'\x00\x80\x00\x80\x00\x80\x00\x80')
-        self.assertEqual(samples[3520:], b'\x00\x00\x00\x80\x00\x00\x00\x80')
+        self.assertEqual(samples[3520:], b'\xaa\x2a\x00\x80\xaa\x2a\x00\x80')
 
     def test_sample_rate(self):
         config = {SAMPLE_RATE: 11025}

tests/test_skoolhtml.py

@@ -1499,7 +1499,7 @@ def _test_audio_macro(self, writer, macro, src, path=None, delays=None, contenti
             self.assertIsNone(ay_audio_writer.write_options)
         else:
             self.assertEqual(audio_log, ay_audio_writer.audio_log)
-            self.assertEqual(ay_audio_writer.write_options.volume, 75)
+            self.assertEqual(ay_audio_writer.write_options.volume, 100)
             self.assertIsNone(ay_audio_writer.write_options.ay_res)
             self.assertIs(ay_audio_writer.write_options.beeper, beeper)
         is128k = len(writer.snapshot) == 0x20000

tests/test_trace.py

@@ -3381,7 +3381,7 @@ def test_write_wav_128k_ay(self):
         self.assertEqual(dedent(exp_output).strip(), output.rstrip())
         self.assertEqual(ay_audio_writer.fname, outfile)
         self.assertEqual(exp_audio_log, ay_audio_writer.audio_log)
-        self.assertEqual(ay_audio_writer.options.volume, 75)
+        self.assertEqual(ay_audio_writer.options.volume, 100)
         self.assertIsNone(ay_audio_writer.options.ay_res)
         self.assertFalse(ay_audio_writer.options.beeper)
 
@@ -3448,7 +3448,7 @@ def test_write_wav_128k_ay_with_beeper(self):
         self.assertEqual(dedent(exp_output).strip(), output.rstrip())
         self.assertEqual(ay_audio_writer.fname, outfile)
         self.assertEqual(exp_audio_log, ay_audio_writer.audio_log)
-        self.assertEqual(ay_audio_writer.options.volume, 75)
+        self.assertEqual(ay_audio_writer.options.volume, 100)
         self.assertIsNone(ay_audio_writer.options.ay_res)
         self.assertTrue(ay_audio_writer.options.beeper)