mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-28 02:30:05 +00:00
Code Activity

Fixed a merge problem

Browse source
This commit is contained in:
jules 2015-11-02 17:23:24 +00:00
parent 2286856b7b
commit 4c27661f7a
1 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
modules/juce_audio_devices/audio_io/juce_AudioDeviceManager.cpp
View file

@ -1152,17 +1152,13 @@ void AudioDeviceManager::playSound (const File& file)
}
}
void AudioDeviceManager::playSound (const char* resourceData, int resourceSize)
void AudioDeviceManager::playSound (const void* resourceData, size_t resourceSize)
{
if (resourceData != nullptr && resourceSize > 0)
{
AudioFormatManager formatManager;
formatManager.registerBasicFormats();
MemoryInputStream* mem = new MemoryInputStream (resourceData,
static_cast<size_t> (resourceSize),
false);
MemoryInputStream* mem = new MemoryInputStream (resourceData, resourceSize, false);
playSound (formatManager.createReaderFor (mem), true);
}
}