Changed type of audio_channel_counts; fixes type conversion warnings on MSVC.

This commit is contained in:
James Touton 2015-08-06 01:34:55 -07:00
parent 1d875960db
commit f35cb736c7
2 changed files with 4 additions and 4 deletions

View File

@ -39,7 +39,7 @@
// Supported sample rates, sizes and channels
vector<uint32> audio_sample_rates;
vector<uint16> audio_sample_sizes;
vector<uint16> audio_channel_counts;
vector<uint8> audio_channel_counts;
// Global variables
struct audio_status AudioStatus; // Current audio status (sample rate etc.)
@ -233,7 +233,7 @@ static int32 AudioSetInfo(uint32 infoPtr, uint32 selector, uint32 sourceID)
return badChannel;
case siSpeakerMute:
audio_set_speaker_mute((uint16)infoPtr);
audio_set_speaker_mute(uint16(infoPtr) != 0);
break;
case siSpeakerVolume:
@ -242,7 +242,7 @@ static int32 AudioSetInfo(uint32 infoPtr, uint32 selector, uint32 sourceID)
break;
case siHardwareMute:
audio_set_main_mute((uint16)infoPtr);
audio_set_main_mute(uint16(infoPtr) != 0);
break;
case siHardwareVolume:

View File

@ -76,7 +76,7 @@ extern uint32 audio_component_flags; // Component feature flags
extern vector<uint32> audio_sample_rates; // Vector of supported sample rates (16.16 fixed point)
extern vector<uint16> audio_sample_sizes; // Vector of supported sample sizes
extern vector<uint16> audio_channel_counts; // Array of supported channels counts
extern vector<uint8> audio_channel_counts; // Array of supported channels counts
// Audio component global data and 68k routines
enum {