[Bf-blender-cvs] [2f79286453e] master: Cleanup: unused vars

Campbell Barton noreply at git.blender.org
Sat May 4 02:57:11 CEST 2019


Commit: 2f79286453edc8c28e994e8a2ccf5f3dcfa9b054
Author: Campbell Barton
Date:   Sat May 4 10:56:33 2019 +1000
Branches: master
https://developer.blender.org/rB2f79286453edc8c28e994e8a2ccf5f3dcfa9b054

Cleanup: unused vars

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

M	source/blender/blenkernel/intern/sound.c

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

diff --git a/source/blender/blenkernel/intern/sound.c b/source/blender/blenkernel/intern/sound.c
index 978b287ba22..6ea384abdd6 100644
--- a/source/blender/blenkernel/intern/sound.c
+++ b/source/blender/blenkernel/intern/sound.c
@@ -175,7 +175,8 @@ void BKE_sound_free_audio(bSound *sound)
   }
 
   BKE_sound_free_waveform(sound);
-
+#else
+  UNUSED_VARS(sound);
 #endif /* WITH_AUDASPACE */
 }
 
@@ -313,7 +314,7 @@ void BKE_sound_init_main(Main *bmain)
     AUD_setSynchronizerCallback(sound_sync_callback, bmain);
   }
 #  else
-  (void)bmain; /* unused */
+  UNUSED_VARS(bmain);
 #  endif
 }
 
@@ -1263,7 +1264,7 @@ void BKE_sound_jack_sync_callback_set(SoundJackSyncCallback callback)
 #if defined(WITH_AUDASPACE) && defined(WITH_JACK)
   sound_jack_sync_callback = callback;
 #else
-  (void)callback;
+  UNUSED_VARS(callback);
 #endif
 }
 
@@ -1286,6 +1287,8 @@ void BKE_sound_jack_scene_update(Scene *scene, int mode, float time)
   if (scene->playback_handle != NULL) {
     AUD_Handle_setPosition(scene->playback_handle, time);
   }
+#else
+  UNUSED_VARS(time);
 #endif
 }



More information about the Bf-blender-cvs mailing list