medfall

commit d86d284a8c3f56b1e6ddb9b62228ea98591cae9c
parent e86f1da9508f0ebd76dac678382e4910eb032108
Author: Michael Savage <mikejsavage@gmail.com>
Date:   Sun Nov  1 19:28:49 +0000

Move Sound into assets.h

Diffstat:
assets.h
 | 
5
++++-
wave.cc
 | 
1
+
wave.h
 | 
10
++--------
3 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/assets.h b/assets.h
@@ -25,7 +25,10 @@ struct Bitmap {
 
 struct Sound {
 	u32 num_samples;
-	u8 * data;
+	u32 sample_rate;
+	u32 num_channels;
+
+	s16 * samples;
 };
 
 struct Asset {
diff --git a/wave.cc b/wave.cc
@@ -1,5 +1,6 @@
 #include "intrinsics.h"
 #include "memory_arena.h"
+#include "assets.h"
 #include "wave.h"
 
 // TODO: this only works on a little endian machine
diff --git a/wave.h b/wave.h
@@ -1,15 +1,9 @@
 #ifndef _WAVE_H_
 #define _WAVE_H_
 
+#include "intrinsics.h"
 #include "memory_arena.h"
-
-struct Sound {
-	u32 num_samples;
-	u32 sample_rate;
-	u32 num_channels;
-
-	s16 * samples;
-};
+#include "assets.h"
 
 bool wave_decode( MemoryArena * arena, u8 * data, Sound * sound );