- unified snd_pcm_hw_params_* functions

- added backward compatibility for older non-compatible functions
- added --with-compat-rc3 to configure script to build library
  backwards compatible with 0.9.0rc3
- added symbol versioning like libc.so.6
  - ALSA_0.9      - alsa base
  - ALSA_0.9.0rc4 - first set of new functions (snd_pcm_hw_params_*)
This commit is contained in:
Jaroslav Kysela 2002-09-17 12:33:05 +00:00
parent cabf841f4e
commit b9343e0834
23 changed files with 1271 additions and 483 deletions

View file

@ -58,6 +58,7 @@ int setparams_stream(snd_pcm_t *handle,
const char *id)
{
int err;
unsigned int rrate;
err = snd_pcm_hw_params_any(handle, params);
if (err < 0) {
@ -79,12 +80,13 @@ int setparams_stream(snd_pcm_t *handle,
printf("Channels count (%i) not available for %s: %s\n", channels, id, snd_strerror(err));
return err;
}
err = snd_pcm_hw_params_set_rate_near(handle, params, rate, 0);
rrate = rate;
err = snd_pcm_hw_params_set_rate_near(handle, params, &rrate, 0);
if (err < 0) {
printf("Rate %iHz not available for %s: %s\n", rate, id, snd_strerror(err));
return err;
}
if (err != rate) {
if (rrate != rate) {
printf("Rate doesn't match (requested %iHz, get %iHz)\n", rate, err);
return -EINVAL;
}
@ -98,16 +100,17 @@ int setparams_bufsize(snd_pcm_t *handle,
const char *id)
{
int err;
snd_pcm_uframes_t periodsize;
snd_pcm_uframes_t rbufsize, periodsize;
snd_pcm_hw_params_copy(params, tparams);
err = snd_pcm_hw_params_set_buffer_size_near(handle, params, bufsize * 2);
rbufsize = bufsize * 2;
err = snd_pcm_hw_params_set_buffer_size_near(handle, params, &rbufsize);
if (err < 0) {
printf("Unable to set buffer size %li for %s: %s\n", bufsize * 2, id, snd_strerror(err));
return err;
}
periodsize = snd_pcm_hw_params_get_buffer_size(params) / 2;
err = snd_pcm_hw_params_set_period_size_near(handle, params, periodsize, 0);
err = snd_pcm_hw_params_set_period_size_near(handle, params, &periodsize, 0);
if (err < 0) {
printf("Unable to set period size %li for %s: %s\n", periodsize, id, snd_strerror(err));
return err;

View file

@ -12,13 +12,13 @@
#include <sys/time.h>
#include <math.h>
char *device = "plughw:0,0"; /* playback device */
snd_pcm_format_t format = SND_PCM_FORMAT_S16; /* sample format */
int rate = 44100; /* stream rate */
int channels = 1; /* count of channels */
int buffer_time = 500000; /* ring buffer length in us */
int period_time = 100000; /* period time in us */
double freq = 440; /* sinusoidal wave frequency in Hz */
char *device = "plughw:0,0"; /* playback device */
snd_pcm_format_t format = SND_PCM_FORMAT_S16; /* sample format */
unsigned int rate = 44100; /* stream rate */
unsigned int channels = 1; /* count of channels */
unsigned int buffer_time = 500000; /* ring buffer length in us */
unsigned int period_time = 100000; /* period time in us */
double freq = 440; /* sinusoidal wave frequency in Hz */
snd_pcm_sframes_t buffer_size;
snd_pcm_sframes_t period_size;
@ -69,6 +69,7 @@ static int set_hwparams(snd_pcm_t *handle,
snd_pcm_hw_params_t *params,
snd_pcm_access_t access)
{
unsigned int rrate;
int err, dir;
/* choose all parameters */
@ -96,29 +97,38 @@ static int set_hwparams(snd_pcm_t *handle,
return err;
}
/* set the stream rate */
err = snd_pcm_hw_params_set_rate_near(handle, params, rate, 0);
rrate = rate;
err = snd_pcm_hw_params_set_rate_near(handle, params, &rrate, 0);
if (err < 0) {
printf("Rate %iHz not available for playback: %s\n", rate, snd_strerror(err));
return err;
}
if (err != rate) {
if (rrate != rate) {
printf("Rate doesn't match (requested %iHz, get %iHz)\n", rate, err);
return -EINVAL;
}
/* set the buffer time */
err = snd_pcm_hw_params_set_buffer_time_near(handle, params, buffer_time, &dir);
err = snd_pcm_hw_params_set_buffer_time_near(handle, params, &buffer_time, &dir);
if (err < 0) {
printf("Unable to set buffer time %i for playback: %s\n", buffer_time, snd_strerror(err));
return err;
}
buffer_size = snd_pcm_hw_params_get_buffer_size(params);
err = snd_pcm_hw_params_get_buffer_size(params, &buffer_size);
if (err < 0) {
printf("Unable to get buffer size for playback: %s\n", snd_strerror(err));
return err;
}
/* set the period time */
err = snd_pcm_hw_params_set_period_time_near(handle, params, period_time, &dir);
err = snd_pcm_hw_params_set_period_time_near(handle, params, &period_time, &dir);
if (err < 0) {
printf("Unable to set period time %i for playback: %s\n", period_time, snd_strerror(err));
return err;
}
period_size = snd_pcm_hw_params_get_period_size(params, &dir);
err = snd_pcm_hw_params_get_period_size(params, &period_size, &dir);
if (err > 0) {
printf("Unable to get period size for playback: %s\n", snd_strerror(err));
return err;
}
/* write the parameters to device */
err = snd_pcm_hw_params(handle, params);
if (err < 0) {