From 78a2cf90365becc1a91949eff5e8c74e2391a76f Mon Sep 17 00:00:00 2001
From: chai <chaifix@163.com>
Date: Tue, 22 May 2018 08:18:18 +0800
Subject: =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=9F=B3=E9=A2=91=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/libjin/audio/audio.h      |  2 +-
 src/libjin/audio/sdl/source.h |  5 +++++
 src/libjin/common/data.h      | 15 +++++++++++++++
 src/libjin/common/subsystem.h |  5 +----
 src/libjin/render/window.h    |  2 +-
 src/libjin/utils/utils.h      |  2 +-
 6 files changed, 24 insertions(+), 7 deletions(-)
 create mode 100644 src/libjin/common/data.h

(limited to 'src/libjin')

diff --git a/src/libjin/audio/audio.h b/src/libjin/audio/audio.h
index 6d57cd2..c0b0e1e 100644
--- a/src/libjin/audio/audio.h
+++ b/src/libjin/audio/audio.h
@@ -29,7 +29,7 @@ namespace audio
 
     };
 
-    class Audio : public common::Subsystem, IAudio
+    class Audio : public Subsystem, IAudio
     {
 
     public:
diff --git a/src/libjin/audio/sdl/source.h b/src/libjin/audio/sdl/source.h
index 5ea2cf2..0c8e938 100644
--- a/src/libjin/audio/sdl/source.h
+++ b/src/libjin/audio/sdl/source.h
@@ -1,6 +1,11 @@
 #ifndef __JIN_SOURCE_SDL_H
 #define __JIN_SOURCE_SDL_H
 
+#include "3rdparty/wav/wav.h"
+#define STB_VORBIS_HEADER_ONLY
+#include "3rdparty/stb/stb_vorbis.c"
+#undef STB_VORBIS_HEADER_ONLY
+
 #include "../source.h"
 
 namespace jin
diff --git a/src/libjin/common/data.h b/src/libjin/common/data.h
new file mode 100644
index 0000000..51a3252
--- /dev/null
+++ b/src/libjin/common/data.h
@@ -0,0 +1,15 @@
+#ifndef __JIN_COMMON_DATA_H
+#define __JIN_COMMON_DATA_H
+
+namespace jin
+{
+
+    struct Data
+    {
+        void* data;
+        int len;
+    };
+
+}
+
+#endif
\ No newline at end of file
diff --git a/src/libjin/common/subsystem.h b/src/libjin/common/subsystem.h
index ca4b33d..8c1b59b 100644
--- a/src/libjin/common/subsystem.h
+++ b/src/libjin/common/subsystem.h
@@ -5,9 +5,7 @@
 
 namespace jin
 {
-namespace common
-{
-    
+
     class Subsystem 
     {
 
@@ -32,6 +30,5 @@ namespace common
     };
 
 }
-}
 
 #endif
\ No newline at end of file
diff --git a/src/libjin/render/window.h b/src/libjin/render/window.h
index 1aabfa0..54fff47 100644
--- a/src/libjin/render/window.h
+++ b/src/libjin/render/window.h
@@ -9,7 +9,7 @@ namespace jin
 namespace render
 {
 
-    class Window : public common::Subsystem
+    class Window : public Subsystem
     {
     public: 
 
diff --git a/src/libjin/utils/utils.h b/src/libjin/utils/utils.h
index d597c83..3b8e9dd 100644
--- a/src/libjin/utils/utils.h
+++ b/src/libjin/utils/utils.h
@@ -5,6 +5,6 @@
 #include "macros.h"
 #include "endian.h"
 
-#define UNITTEST 1
+#define UNITTEST 0
 
 #endif
\ No newline at end of file
-- 
cgit v1.1-26-g67d0