Apple-2-Tools/prez
1
0
Fork 0
mirror of https://github.com/ksherlock/prez.git synced 2025-02-20 08:29:03 +00:00
Code Issues Projects Releases Wiki Activity

rSoundSample fixes

Browse Source
This commit is contained in:
Kelvin Sherlock 2020-08-02 17:28:59 -04:00
parent b5f27c5478
commit a9ac738a44
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
examples/sound.prez Normal file
View File

@ -0,0 +1,5 @@
#
# load from a file, downsample to 26320 hz
#
rSoundSample("tambourine.wav", name="Tambourine", rate=26320)

BIN
examples/tambourine.wav Executable file
View File

Binary file not shown.

11
sound.py
View File

@ -4,6 +4,7 @@ import audioop
import struct
import re
import sys
import os
from math import log2
__all__ = ["rSoundSample"]
@ -34,7 +35,7 @@ def pitch_to_hz(p):
if p == None: return 261.63
if type(p) in (int, float): return float(p)
if type(p) == str:
m = re.match("^([A-Ga-g])([#b])?([0-8])$", x)
m = re.match("^([A-Ga-g])([#b])?([0-8])$", p)
if not m: return None
note = m1[1].upper(); accidental = m[2]; octave = int(m[3])
@ -84,13 +85,13 @@ class rSoundSample(rObject):
rName = "rSoundSample"
rType = 0x8024
def __init__(filename, pitch=None, rate=None, channel=0, **kwargs):
def __init__(self, filename, pitch=None, rate=None, channel=0, **kwargs):
super().__init__(**kwargs)
new_rate = rate
freq = pitch_to_hz(pitch)
if not freq: raise ValueException("Invalid pitch: {}".format(pitch))
if not freq: raise ValueError("Invalid pitch: {}".format(pitch))
# audio conversion
@ -163,7 +164,7 @@ class rSoundSample(rObject):
hz # hz
)
self.data = rv
self.data = bytes(rv)
self.pages = pages
self.channel = channel
self.relative_pitch = rp
@ -186,7 +187,7 @@ class rSoundSample(rObject):
"\t{}, /* size (pages) */\n"
"\t0x{:04x}, /* relative pitch */\n"
"\t0x{:04x}, /* stereo channel */\n"
"\t0x{:u}, /* sample rate */\n"
"\t{:d}, /* sample rate */\n"
"\t..."
).format(
self.pages,