comparison libao2/ao_alsa1x.c @ 1146:a84610bb5476

hacked aocontrol_set_device working, and cleaned up a bit

1145:065583b867fd

static int control(int cmd, int arg)
{
    switch(cmd)
    {
	case AOCONTROL_GET_DEVICE:
	    return(char *)alsa_device; /* egy kicsit brutalis, dehat :) */
	case AOCONTROL_SET_DEVICE:
	    strncpy(alsa_device, (char *)arg, ALSA_DEVICE_SIZE);
	    break;
    }
    return(CONTROL_UNKNOWN);
}

#undef start

    {
	printf("alsa-init: memory allocation error: %s\n", snd_strerror(err));
	return(0);
    }

    if ((alsa_device = malloc(ALSA_DEVICE_SIZE)) == NULL)
    {
	printf("alsa-init: memory allocation error: %s\n", strerror(errno));
	return(0);
    }

    snprintf(alsa_device, ALSA_DEVICE_SIZE, "hw:%d,%d",
	snd_pcm_info_get_device(alsa_info),
	snd_pcm_info_get_subdevice(alsa_info));

    snd_pcm_info_free(alsa_info);

    printf("alsa-init: %d soundcard%s found, using: %s\n", cards+1,
	(cards >= 0) ? "" : "s", alsa_device);

    if ((err = snd_pcm_open(&alsa_handler, alsa_device, SND_PCM_STREAM_PLAYBACK,

	printf("alsa-init: unable to get buffer size: %s\n",
	    snd_strerror(err));
	return(0);
    } else
    {
        printf("alsa-init: got buffersize %i\n", err);
	ao_buffersize = err;
    }
#endif

#ifdef buffertime
    {

1146:a84610bb5476

static int control(int cmd, int arg)
{
    switch(cmd)
    {
	case AOCONTROL_GET_DEVICE:
	    return((char *)alsa_device); /* egy kicsit brutalis, dehat :) */
	case AOCONTROL_SET_DEVICE:
	{
	    int ret;

	    strncpy(alsa_device, (char *)arg, ALSA_DEVICE_SIZE);
	    uninit();
	    ret = init(ao_samplerate, ao_channels, ao_format, 0);
	    if (ret == 0)
		return(CONTROL_ERROR);
	    else
		return(CONTROL_OK);
	}
    }
    return(CONTROL_UNKNOWN);
}

#undef start

    {
	printf("alsa-init: memory allocation error: %s\n", snd_strerror(err));
	return(0);
    }

    if (alsa_device == NULL)
    {
	if ((alsa_device = malloc(ALSA_DEVICE_SIZE)) == NULL)
	{
	    printf("alsa-init: memory allocation error: %s\n", strerror(errno));
	    return(0);
	}

	snprintf(alsa_device, ALSA_DEVICE_SIZE, "hw:%d,%d",
	    snd_pcm_info_get_device(alsa_info),
	    snd_pcm_info_get_subdevice(alsa_info));

	snd_pcm_info_free(alsa_info);
    }

    printf("alsa-init: %d soundcard%s found, using: %s\n", cards+1,
	(cards >= 0) ? "" : "s", alsa_device);

    if ((err = snd_pcm_open(&alsa_handler, alsa_device, SND_PCM_STREAM_PLAYBACK,

	printf("alsa-init: unable to get buffer size: %s\n",
	    snd_strerror(err));
	return(0);
    } else
    {
	ao_buffersize = err;
        if (verbose)
	    printf("alsa-init: got buffersize %i\n", ao_buffersize);
    }
#endif

#ifdef buffertime
    {