Преглед на файлове

adapt Device for testing new features in AudioRenderer

mikymod преди 12 години
родител
ревизия
df361ccaf5
променени са 2 файла, в които са добавени 16 реда и са изтрити 3 реда
  1. 14 2
      engine/Device.cpp
  2. 2 1
      engine/Device.h

+ 14 - 2
engine/Device.cpp

@@ -184,7 +184,7 @@ void Device::shutdown()
 	{
 		m_audio_renderer->shutdown();
 
-		AudioRenderer::destroy(m_allocator, m_renderer);
+		AudioRenderer::destroy(m_allocator, m_audio_renderer);
 	}
 
 	Log::i("Releasing ConsoleServer...");
@@ -494,7 +494,7 @@ void Device::create_debug_renderer()
 void Device::create_lua_environment()
 {
 	m_lua_environment = CE_NEW(m_allocator, LuaEnvironment)();
-//-----------------------------------------------------------------------------//-----------------------------------------------------------------------------
+
 	m_lua_environment->init();
 
 	Log::d("Lua environment created.");
@@ -517,6 +517,18 @@ void Device::create_audio_renderer()
 
 	m_audio_renderer->init();
 
+	ResourceId rid = m_resource_manager->load("wav", "mono");
+
+	m_resource_manager->flush();
+
+	SoundResource* res = (SoundResource*)m_resource_manager->data(rid);
+
+	SoundBufferId bid = m_audio_renderer->create_buffer(res->data(), res->size(), res->sample_rate(), res->channels(), res->bits_per_sample());
+
+	SoundSourceId sid = m_audio_renderer->create_source();
+
+	m_audio_renderer->play_source(sid, bid);
+
 	Log::d("Audio renderer created");
 }
 

+ 2 - 1
engine/Device.h

@@ -35,6 +35,7 @@ OTHER DEALINGS IN THE SOFTWARE.
 
 #ifdef ANDROID
 #include "AndroidMountPoint.h"
+#include "SLESRenderer.h"
 #endif
 
 #define MAX_SUBSYSTEMS_HEAP 1024 * 1024
@@ -118,7 +119,7 @@ public:
 	ConsoleServer*			console_server();
 
 	AudioRenderer*			audio_renderer();
-
+	
 private:
 
 	void					create_filesystem();