rename OsEventBuffer in EventBuffer

engine/Android.mk

@@ -62,7 +62,7 @@ LOCAL_SRC_FILES :=\
 \
 	network/BitMessage.cpp\
 \
-	os/OsEventBuffer.cpp\
+	os/EventBuffer.cpp\
 	os/android/AndroidOS.cpp\
 	os/android/AndroidDevice.cpp\
 	os/android/OsWindow.cpp\

engine/CMakeLists.txt

@@ -302,13 +302,13 @@ set (RESOURCE_HEADERS
 )
 
 set (OS_SRC
-	os/OsEventBuffer.cpp
+	os/EventBuffer.cpp
 )
 
 set (OS_HEADERS
 	os/OS.h
 	os/NetAddress.h
-	os/OsEventBuffer.h
+	os/EventBuffer.h
 	os/OsEvents.h
 )
 

engine/Device.cpp

@@ -54,7 +54,7 @@ OTHER DEALINGS IN THE SOFTWARE.
 #include "Bundle.h"
 #include "TempAllocator.h"
 #include "ResourcePackage.h"
-#include "OsEventBuffer.h"
+#include "EventBuffer.h"
 
 #if defined(LINUX) || defined(WINDOWS)
 	#include "BundleCompiler.h"

engine/input/InputManager.cpp

@@ -27,7 +27,7 @@ OTHER DEALINGS IN THE SOFTWARE.
 #include "InputManager.h"
 #include "OS.h"
 #include "Log.h"
-#include "OsEventBuffer.h"
+#include "EventBuffer.h"
 
 namespace crown
 {

engine/os/OsEventBuffer.cpp → engine/os/EventBuffer.cpp

@@ -1,16 +1,16 @@
-#include "OsEventBuffer.h"
+#include "EventBuffer.h"
 #include "Log.h"
 
 namespace crown
 {
 
 //-----------------------------------------------------------------------------
-OsEventBuffer::OsEventBuffer() : m_size(0)
+EventBuffer::EventBuffer() : m_size(0)
 {
 }
 
 //-----------------------------------------------------------------------------
-void OsEventBuffer::push_event(OsEventType event_type, void* event_data, size_t event_size)
+void EventBuffer::push_event(uint32_t event_type, void* event_data, size_t event_size)
 {
 	if (m_size + sizeof(event_type) + sizeof(event_size) + event_size > MAX_OS_EVENT_BUFFER_SIZE)
 	{
@@ -29,7 +29,7 @@ void OsEventBuffer::push_event(OsEventType event_type, void* event_data, size_t
 }
 
 //-----------------------------------------------------------------------------
-void OsEventBuffer::push_event_buffer(char* event_buffer, size_t buffer_size)
+void EventBuffer::push_event_buffer(char* event_buffer, size_t buffer_size)
 {
 	if (m_size + buffer_size > MAX_OS_EVENT_BUFFER_SIZE)
 	{
@@ -45,7 +45,7 @@ void OsEventBuffer::push_event_buffer(char* event_buffer, size_t buffer_size)
 
 
 //-----------------------------------------------------------------------------
-void* OsEventBuffer::get_next_event(uint32_t& event_type, size_t& event_size)
+void* EventBuffer::get_next_event(uint32_t& event_type, size_t& event_size)
 {
 	static size_t read = 0;
 
@@ -70,33 +70,33 @@ void* OsEventBuffer::get_next_event(uint32_t& event_type, size_t& event_size)
 }
 
 //-----------------------------------------------------------------------------
-void OsEventBuffer::clear()
+void EventBuffer::clear()
 {
 	m_size = 0;
 }
 
 //-----------------------------------------------------------------------------
-void OsEventBuffer::flush()
+void EventBuffer::flush()
 {
 	m_size = 0;
 }
 
 //-----------------------------------------------------------------------------
-size_t OsEventBuffer::size() const
+size_t EventBuffer::size() const
 {
 	return m_size;
 }
 
 //-----------------------------------------------------------------------------
-char* OsEventBuffer::buffer()
+char* EventBuffer::buffer()
 {
 	return m_buffer;
 }
 
 //-----------------------------------------------------------------------------
-OsEventBuffer g_os_event_buffer;
+EventBuffer g_os_event_buffer;
 
-OsEventBuffer* os_event_buffer()
+EventBuffer* os_event_buffer()
 {
 	return &g_os_event_buffer;
 }

engine/os/OsEventBuffer.h → engine/os/EventBuffer.h

@@ -39,19 +39,19 @@ namespace crown
 {
 
 
-///	__OsEventBuffer__ is a global buffer used for storing events.
+///	__EventBuffer__ is a global buffer used for storing events.
 ///	Each subsystem can read its relative events and modifies its behaviour consequently.
 ///
 /// [type #0][size #0][data #0] ... [type #n][size #n][data #n]
-class OsEventBuffer
+class EventBuffer
 {
 
 public:
 	/// Constructor
-				OsEventBuffer();
+				EventBuffer();
 
 	/// Pushes an @a event_data of size @a event_size with type @a event_type 
-	void		push_event(OsEventType event_type, void* event_data, size_t event_size);
+	void		push_event(uint32_t event_type, void* event_data, size_t event_size);
 	/// Pushes an entire @a event_buffer of size @a buffer_size
 	void		push_event_buffer(char* event_buffer, size_t buffer_size);
 	/// Retrieves the @a event_type and @a event_size of next os event
@@ -73,6 +73,6 @@ public:
 	char		m_buffer[MAX_OS_EVENT_BUFFER_SIZE];
 };
 
-OsEventBuffer* os_event_buffer();
+EventBuffer* os_event_buffer();
 
 } // namespace crown

engine/os/android/AndroidOS.cpp

@@ -41,7 +41,7 @@ OTHER DEALINGS IN THE SOFTWARE.
 #include "OS.h"
 #include "Assert.h"
 #include "StringUtils.h"
-#include "OsEventBuffer.h"
+#include "EventBuffer.h"
 
 namespace crown
 {

engine/os/linux/OsWindow.cpp

@@ -29,7 +29,7 @@ OTHER DEALINGS IN THE SOFTWARE.
 #include "OS.h"
 #include "GLContext.h"
 #include "StringUtils.h"
-#include "OsEventBuffer.h"
+#include "EventBuffer.h"
 
 namespace crown
 {