From 4c27661f7abe837d132655a2901aea4e6bc841fc Mon Sep 17 00:00:00 2001
From: jules <jules@juce.com>
Date: Mon, 2 Nov 2015 17:23:24 +0000
Subject: [PATCH] Fixed a merge problem

---
 .../audio_io/juce_AudioDeviceManager.cpp                  | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/modules/juce_audio_devices/audio_io/juce_AudioDeviceManager.cpp b/modules/juce_audio_devices/audio_io/juce_AudioDeviceManager.cpp
index bd5237d5f4..197cfb670d 100644
--- a/modules/juce_audio_devices/audio_io/juce_AudioDeviceManager.cpp
+++ b/modules/juce_audio_devices/audio_io/juce_AudioDeviceManager.cpp
@@ -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);
     }
 }