diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2016-07-28 03:30:00 +0200 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2016-07-28 03:30:00 +0200 |
commit | 2010311b76299bb3f0803a52510ab41d64d8e41a (patch) | |
tree | bc6dd00aa99c38a7dcffcc381e50af6394aa4896 /music_sampler/mixer.py | |
parent | 023d9381fb532d09f1e08df65ee545da64222caa (diff) | |
download | MusicSampler-2010311b76299bb3f0803a52510ab41d64d8e41a.tar.gz MusicSampler-2010311b76299bb3f0803a52510ab41d64d8e41a.tar.zst MusicSampler-2010311b76299bb3f0803a52510ab41d64d8e41a.zip |
Improve error message and handling
Diffstat (limited to 'music_sampler/mixer.py')
-rw-r--r-- | music_sampler/mixer.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/music_sampler/mixer.py b/music_sampler/mixer.py index c8ec907..b290162 100644 --- a/music_sampler/mixer.py +++ b/music_sampler/mixer.py | |||
@@ -2,15 +2,17 @@ import sounddevice as sd | |||
2 | import audioop | 2 | import audioop |
3 | import time | 3 | import time |
4 | 4 | ||
5 | from .helpers import Config | 5 | from .helpers import Config, error_print |
6 | 6 | ||
7 | sample_width = Config.sample_width | 7 | sample_width = Config.sample_width |
8 | 8 | ||
9 | def sample_width_to_dtype(sample_width): | 9 | def sample_width_to_dtype(): |
10 | if sample_width == 1 or sample_width == 2 or sample_width == 4: | 10 | if sample_width == 1 or sample_width == 2 or sample_width == 4: |
11 | return 'int' + str(8*sample_width) | 11 | return 'int' + str(8*sample_width) |
12 | else: | 12 | else: |
13 | raise "Unknown sample width" | 13 | error_print("Unknown sample width, setting default value 2.") |
14 | Config.sample_width = 2 | ||
15 | return 'int16' | ||
14 | 16 | ||
15 | def _latency(latency): | 17 | def _latency(latency): |
16 | if latency == "high" or latency == "low": | 18 | if latency == "high" or latency == "low": |
@@ -23,7 +25,7 @@ class Mixer: | |||
23 | self.stream = sd.RawOutputStream( | 25 | self.stream = sd.RawOutputStream( |
24 | samplerate=Config.frame_rate, | 26 | samplerate=Config.frame_rate, |
25 | channels=Config.channels, | 27 | channels=Config.channels, |
26 | dtype=sample_width_to_dtype(Config.sample_width), | 28 | dtype=sample_width_to_dtype(), |
27 | latency=_latency(Config.latency), | 29 | latency=_latency(Config.latency), |
28 | blocksize=Config.blocksize, | 30 | blocksize=Config.blocksize, |
29 | callback=self.play_callback) | 31 | callback=self.play_callback) |