[Bf-blender-cvs] [5d42ab2] gooseberry: Warnings

[Campbell Barton]

Commit: 5d42ab2ad0c34132262508e14e9efd2ddb7af356
Author: Campbell Barton
Date:   Tue Nov 4 17:58:50 2014 +0100
Branches: gooseberry
https://developer.blender.org/rB5d42ab2ad0c34132262508e14e9efd2ddb7af356

Warnings

===================================================================

M	source/blender/blenkernel/intern/sound.c
M	source/blender/editors/space_sequencer/sequencer_draw.c
M	source/blender/editors/space_sequencer/sequencer_preview.c
M	source/blender/gpu/intern/gpu_buffers.c
M	source/blender/gpu/intern/gpu_renderer.c

===================================================================

diff --git a/source/blender/blenkernel/intern/sound.c b/source/blender/blenkernel/intern/sound.c
index dab4e23..7fda3dc 100644
--- a/source/blender/blenkernel/intern/sound.c
+++ b/source/blender/blenkernel/intern/sound.c
@@ -849,7 +849,7 @@ void sound_stop_scene(struct Scene *UNUSED(scene)) {}
 void sound_seek_scene(struct Main *UNUSED(bmain), struct Scene *UNUSED(scene)) {}
 float sound_sync_scene(struct Scene *UNUSED(scene)) { return NAN_FLT; }
 int sound_scene_playing(struct Scene *UNUSED(scene)) { return -1; }
-void sound_read_waveform(struct bSound *UNUSED(sound), bool locked) {}
+void sound_read_waveform(struct bSound *UNUSED(sound), bool UNUSED(locked), short *UNUSED(stop)) {}
 void sound_init_main(struct Main *UNUSED(bmain)) {}
 void sound_set_cfra(int UNUSED(cfra)) {}
 void sound_update_sequencer(struct Main *UNUSED(main), struct bSound *UNUSED(sound)) {}
diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c
index 1fff132..8e1b9f2 100644
--- a/source/blender/editors/space_sequencer/sequencer_draw.c
+++ b/source/blender/editors/space_sequencer/sequencer_draw.c
@@ -534,8 +534,9 @@ static void draw_seq_text(View2D *v2d, Sequence *seq, float x1, float x2, float
 /* draw code vertex array storage */
 static float strip_vertex_storage[36][2];
 static char strip_color_storage[36][3];
-const static unsigned short strip_element_buffer[] = {9, 10, 8, 11, 7, 12, 6, 13, 5, 14, 4, 15, 3, 16, 2, 17, 1, 18, 0, 19, 35, 20,
-                                       34, 21, 33, 22, 32, 23, 31, 24, 30, 25, 29, 26, 28, 27};
+static const unsigned short strip_element_buffer[] = {
+    9, 10, 8, 11, 7, 12, 6, 13, 5, 14, 4, 15, 3, 16, 2, 17, 1, 18, 0, 19, 35, 20,
+    34, 21, 33, 22, 32, 23, 31, 24, 30, 25, 29, 26, 28, 27};
 
 static float calculate_cuddly_radius_x(float x1, float x2, float aspect)
 {
diff --git a/source/blender/editors/space_sequencer/sequencer_preview.c b/source/blender/editors/space_sequencer/sequencer_preview.c
index 4d76901..10189be 100644
--- a/source/blender/editors/space_sequencer/sequencer_preview.c
+++ b/source/blender/editors/space_sequencer/sequencer_preview.c
@@ -44,7 +44,9 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "AUD_C-API.h"
+#ifdef WITH_AUDASPACE
+#  include "AUD_C-API.h"
+#endif
 
 #include "sequencer_intern.h"
 
diff --git a/source/blender/gpu/intern/gpu_buffers.c b/source/blender/gpu/intern/gpu_buffers.c
index 23a6d95..1550cbb 100644
--- a/source/blender/gpu/intern/gpu_buffers.c
+++ b/source/blender/gpu/intern/gpu_buffers.c
@@ -502,7 +502,7 @@ static void gpu_drawobject_init_vert_points(GPUDrawObject *gdo, MFace *f, int to
 
 /* see GPUDrawObject's structure definition for a description of the
  * data being initialized here */
-GPUDrawObject *GPU_drawobject_new(DerivedMesh *dm, GPUSortType type)
+GPUDrawObject *GPU_drawobject_new(DerivedMesh *dm, GPUSortType UNUSED(type))
 {
 	GPUDrawObject *gdo;
 	MFace *mface;
diff --git a/source/blender/gpu/intern/gpu_renderer.c b/source/blender/gpu/intern/gpu_renderer.c
index f4c0b8d..6ca0c8b 100644
--- a/source/blender/gpu/intern/gpu_renderer.c
+++ b/source/blender/gpu/intern/gpu_renderer.c
@@ -32,5 +32,5 @@
 /* iterates through all added materials, prepares data if needed and draws their meshes */
 void GPU_renderer_material_draw(struct ListBase *materials)
 {
-	
+	(void)materials;
 }