File diff r24217:df2f5854f1e3 → r24218:c32caa9f014d
src/sound/allegro_s.cpp
Show inline comments
 
@@ -29,49 +29,49 @@ void SoundDriver_Allegro::MainLoop()
 
	/* We haven't opened a stream yet */
 
	if (_stream == nullptr) return;
 

	
 
	void *data = get_audio_stream_buffer(_stream);
 
	/* We don't have to fill the stream yet */
 
	if (data == nullptr) return;
 

	
 
	/* Mix the samples */
 
	MxMixSamples(data, _buffer_size);
 

	
 
	/* Allegro sound is always unsigned, so we need to correct that */
 
	uint16 *snd = (uint16*)data;
 
	for (int i = 0; i < _buffer_size * 2; i++) snd[i] ^= 0x8000;
 

	
 
	/* Tell we've filled the stream */
 
	free_audio_stream_buffer(_stream);
 
}
 

	
 
/**
 
 * There are multiple modules that might be using Allegro and
 
 * Allegro can only be initiated once.
 
 */
 
extern int _allegro_instance_count;
 

	
 
const char *SoundDriver_Allegro::Start(const char * const *parm)
 
const char *SoundDriver_Allegro::Start(const StringList &parm)
 
{
 
	if (_allegro_instance_count == 0 && install_allegro(SYSTEM_AUTODETECT, &errno, nullptr)) {
 
		DEBUG(driver, 0, "allegro: install_allegro failed '%s'", allegro_error);
 
		return "Failed to set up Allegro";
 
	}
 
	_allegro_instance_count++;
 

	
 
	/* Initialise the sound */
 
	if (install_sound(DIGI_AUTODETECT, MIDI_AUTODETECT, nullptr) != 0) {
 
		DEBUG(driver, 0, "allegro: install_sound failed '%s'", allegro_error);
 
		return "Failed to set up Allegro sound";
 
	}
 

	
 
	/* Okay, there's no soundcard */
 
	if (digi_card == DIGI_NONE) {
 
		DEBUG(driver, 0, "allegro: no sound card found");
 
		return "No sound card found";
 
	}
 

	
 
	int hz = GetDriverParamInt(parm, "hz", 44100);
 
	_buffer_size = GetDriverParamInt(parm, "samples", 1024) * hz / 11025;
 
	_stream = play_audio_stream(_buffer_size, 16, true, hz, 255, 128);
 
	MxInitialize(hz);
 
	return nullptr;