Merge branch 'master' into next

[paraslash.git] / error.h

diff --git a/error.h b/error.h
index ec1ec7b060e5d8180b4671dd96cec7ebb5359157..555ca15f0c6e79307f7dafe397c8222630592764 100644 (file)
--- a/error.h
+++ b/error.h
@@ -394,7 +394,7 @@ extern const char **para_errlist[];
        PARA_ERROR(BAD_PERIOD, "can not use period equal to buffer size"), \
        PARA_ERROR(ALSA_WRITE, "alsa write error"), \
        PARA_ERROR(PCM_OPEN, "unable to open pcm"), \
        PARA_ERROR(BAD_PERIOD, "can not use period equal to buffer size"), \
        PARA_ERROR(ALSA_WRITE, "alsa write error"), \
        PARA_ERROR(PCM_OPEN, "unable to open pcm"), \

-       PARA_ERROR(SND_PCM_INFO, "pcm info error"), \
+       PARA_ERROR(PHYSICAL_WIDTH, "unable to determine bytes per frame"), \

        PARA_ERROR(GET_BUFFER_TIME, "snd_pcm_hw_params_get_buffer_time_max() failed"), \
        PARA_ERROR(SET_BUFFER_TIME, "snd_pcm_hw_params_set_buffer_time_near() failed"), \
        PARA_ERROR(SET_RATE, "snd_pcm_hw_params_set_rate_near failed"), \
        PARA_ERROR(GET_BUFFER_TIME, "snd_pcm_hw_params_get_buffer_time_max() failed"), \
        PARA_ERROR(SET_BUFFER_TIME, "snd_pcm_hw_params_set_buffer_time_near() failed"), \
        PARA_ERROR(SET_RATE, "snd_pcm_hw_params_set_rate_near failed"), \