Error message for sample note matching made consistent

Author: gamblor21

locale/circuitpython.pot

@@ -1956,36 +1956,20 @@ msgstr ""
 msgid "The length of rgb_pins must be 6, 12, 18, 24, or 30"
 msgstr ""
 
-#: shared-module/audioeffects/Echo.c
-msgid "The sample's bits_per_sample does not match the effect's"
+#: shared-module/audiodelays/Echo.c shared-module/audiomixer/MixerVoice.c
+msgid "The sample's bits_per_sample does not match"
 msgstr ""
 
-#: shared-module/audiomixer/MixerVoice.c
-msgid "The sample's bits_per_sample does not match the mixer's"
+#: shared-module/audiodelays/Echo.c shared-module/audiomixer/MixerVoice.c
+msgid "The sample's channel count does not match"
 msgstr ""
 
-#: shared-module/audioeffects/Echo.c
-msgid "The sample's channel count does not match the effect's"
+#: shared-module/audiodelays/Echo.c shared-module/audiomixer/MixerVoice.c
+msgid "The sample's sample rate does not match"
 msgstr ""
 
-#: shared-module/audiomixer/MixerVoice.c
-msgid "The sample's channel count does not match the mixer's"
-msgstr ""
-
-#: shared-module/audioeffects/Echo.c
-msgid "The sample's sample rate does not match the effect's"
-msgstr ""
-
-#: shared-module/audiomixer/MixerVoice.c
-msgid "The sample's sample rate does not match the mixer's"
-msgstr ""
-
-#: shared-module/audioeffects/Echo.c
-msgid "The sample's signedness does not match the effect's"
-msgstr ""
-
-#: shared-module/audiomixer/MixerVoice.c
-msgid "The sample's signedness does not match the mixer's"
+#: shared-module/audiodelays/Echo.c shared-module/audiomixer/MixerVoice.c
+msgid "The sample's signedness does not match"
 msgstr ""
 
 #: supervisor/shared/safe_mode.c
@@ -2516,7 +2500,7 @@ msgstr ""
 msgid "bits must be 32 or less"
 msgstr ""
 
-#: shared-bindings/audioeffects/Echo.c shared-bindings/audiomixer/Mixer.c
+#: shared-bindings/audiodelays/Echo.c shared-bindings/audiomixer/Mixer.c
 msgid "bits_per_sample must be 8 or 16"
 msgstr ""
 
@@ -2863,10 +2847,6 @@ msgstr ""
 msgid "data type not understood"
 msgstr ""
 
-#: shared-bindings/audioeffects/Echo.c
-msgid "decay must be between 0 and 1"
-msgstr ""
-
 #: py/parsenum.c
 msgid "decimal numbers not supported"
 msgstr ""

shared-module/audiodelays/Echo.c

@@ -154,21 +154,21 @@ bool common_hal_audiodelays_echo_get_playing(audiodelays_echo_obj_t *self) {
 
 void common_hal_audiodelays_echo_play(audiodelays_echo_obj_t *self, mp_obj_t sample, bool loop) {
     if (audiosample_sample_rate(sample) != self->sample_rate) {
-        mp_raise_ValueError(MP_ERROR_TEXT("The sample's sample rate does not match the effect's"));
+        mp_raise_ValueError(MP_ERROR_TEXT("The sample's sample rate does not match"));
     }
     if (audiosample_channel_count(sample) != self->channel_count) {
-        mp_raise_ValueError(MP_ERROR_TEXT("The sample's channel count does not match the effect's"));
+        mp_raise_ValueError(MP_ERROR_TEXT("The sample's channel count does not match"));
     }
     if (audiosample_bits_per_sample(sample) != self->bits_per_sample) {
-        mp_raise_ValueError(MP_ERROR_TEXT("The sample's bits_per_sample does not match the effect's"));
+        mp_raise_ValueError(MP_ERROR_TEXT("The sample's bits_per_sample does not match"));
     }
     bool single_buffer;
     bool samples_signed;
     uint32_t max_buffer_length;
     uint8_t spacing;
     audiosample_get_buffer_structure(sample, false, &single_buffer, &samples_signed, &max_buffer_length, &spacing);
     if (samples_signed != self->samples_signed) {
-        mp_raise_ValueError(MP_ERROR_TEXT("The sample's signedness does not match the effect's"));
+        mp_raise_ValueError(MP_ERROR_TEXT("The sample's signedness does not match"));
     }
     self->sample = sample;
     self->loop = loop;
@@ -190,7 +190,7 @@ void common_hal_audiodelays_echo_stop(audiodelays_echo_obj_t *self) {
 #define RANGE_LOW (-28000)
 #define RANGE_HIGH (28000)
 #define RANGE_SHIFT (16)
-#define RANGE_SCALE (0xfffffff / (32768 * 2 - RANGE_HIGH))
+#define RANGE_SCALE (0xfffffff / (32768 * 4 - RANGE_HIGH))
 
 // dynamic range compression via a downward compressor with hard knee
 //

shared-module/audiomixer/MixerVoice.c

@@ -32,13 +32,13 @@ void common_hal_audiomixer_mixervoice_set_level(audiomixer_mixervoice_obj_t *sel
 
 void common_hal_audiomixer_mixervoice_play(audiomixer_mixervoice_obj_t *self, mp_obj_t sample, bool loop) {
     if (audiosample_sample_rate(sample) != self->parent->sample_rate) {
-        mp_raise_ValueError(MP_ERROR_TEXT("The sample's sample rate does not match the mixer's"));
+        mp_raise_ValueError(MP_ERROR_TEXT("The sample's sample rate does not match"));
     }
     if (audiosample_channel_count(sample) != self->parent->channel_count) {
-        mp_raise_ValueError(MP_ERROR_TEXT("The sample's channel count does not match the mixer's"));
+        mp_raise_ValueError(MP_ERROR_TEXT("The sample's channel count does not match"));
     }
     if (audiosample_bits_per_sample(sample) != self->parent->bits_per_sample) {
-        mp_raise_ValueError(MP_ERROR_TEXT("The sample's bits_per_sample does not match the mixer's"));
+        mp_raise_ValueError(MP_ERROR_TEXT("The sample's bits_per_sample does not match"));
     }
     bool single_buffer;
     bool samples_signed;
@@ -47,7 +47,7 @@ void common_hal_audiomixer_mixervoice_play(audiomixer_mixervoice_obj_t *self, mp
     audiosample_get_buffer_structure(sample, false, &single_buffer, &samples_signed,
         &max_buffer_length, &spacing);
     if (samples_signed != self->parent->samples_signed) {
-        mp_raise_ValueError(MP_ERROR_TEXT("The sample's signedness does not match the mixer's"));
+        mp_raise_ValueError(MP_ERROR_TEXT("The sample's signedness does not match"));
     }
     self->sample = sample;
     self->loop = loop;