comparison libao2/ao_oss.c @ 3319:66134af21278

fixed to check that SNDCTL_DSP_CHANNELS actually grants the requested number of channels

3318:a3739b590cf2

  
  if(format != AFMT_AC3) {
    // We only use SNDCTL_DSP_CHANNELS for >2 channels, in case some drivers don't have it
    ao_data.channels = channels;
    if (ao_data.channels > 2) {
      if (ioctl (audio_fd, SNDCTL_DSP_CHANNELS, &ao_data.channels) == -1) {
	printf("audio_setup: Failed to set audio device to %d channels\n", ao_data.channels);
	return 0;
      }
    }
    else {
      int c = ao_data.channels-1;
      if (ioctl (audio_fd, SNDCTL_DSP_STEREO, &c) == -1) {
	printf("audio_setup: Failed to set audio device to %d channels\n", ao_data.channels);
	return 0;
      }
    }
    printf("audio_setup: using %d channels (requested: %d)\n", ao_data.channels, ao_data.channels);
    // set rate
    ao_data.samplerate=rate;
    ioctl (audio_fd, SNDCTL_DSP_SPEED, &ao_data.samplerate);
    printf("audio_setup: using %d Hz samplerate (requested: %d)\n",ao_data.samplerate,rate);
  }

3319:66134af21278

  
  if(format != AFMT_AC3) {
    // We only use SNDCTL_DSP_CHANNELS for >2 channels, in case some drivers don't have it
    ao_data.channels = channels;
    if (ao_data.channels > 2) {
      if ( ioctl(audio_fd, SNDCTL_DSP_CHANNELS, &ao_data.channels) == -1 ||
	   ao_data.channels != channels ) {
	printf("audio_setup: Failed to set audio device to %d channels\n", channels);
	return 0;
      }
    }
    else {
      int c = ao_data.channels-1;
      if (ioctl (audio_fd, SNDCTL_DSP_STEREO, &c) == -1) {
	printf("audio_setup: Failed to set audio device to %d channels\n", ao_data.channels);
	return 0;
      }
    }
    printf("audio_setup: using %d channels (requested: %d)\n", ao_data.channels, channels);
    // set rate
    ao_data.samplerate=rate;
    ioctl (audio_fd, SNDCTL_DSP_SPEED, &ao_data.samplerate);
    printf("audio_setup: using %d Hz samplerate (requested: %d)\n",ao_data.samplerate,rate);
  }