- got rid of silly #define ..._BIT, #define ... (1<<..._BIT) stuff

 - switched almost all uiDefBut(..., TOG|BIT|..) to use UiDefButBit and the
   name of the actual bit define instead of just a magic constant, this makes
   searching the code much nicer. most of the credit here goes to LetterRip
   who did almost all of the conversions, I mostly just checked them over.

1 files changed, 9 insertions, 23 deletions

diff --git a/source/blender/makesdna/DNA_sound_types.h b/source/blender/makesdna/DNA_sound_types.h
index 82b457ac003..1ec788976df 100644
--- a/source/blender/makesdna/DNA_sound_types.h
+++ b/source/blender/makesdna/DNA_sound_types.h
@@ -169,29 +169,15 @@ enum SAMPLE_FileTypes {
 #define SOUND_CHANNELS_LEFT		1
 #define SOUND_CHANNELS_RIGHT	2
 
-enum SOUND_FLAGS_BITS {
-	SOUND_FLAGS_LOOP_BIT = 0,
-	SOUND_FLAGS_FIXED_VOLUME_BIT,
-	SOUND_FLAGS_FIXED_PANNING_BIT,
-	SOUND_FLAGS_3D_BIT,
-	SOUND_FLAGS_BIDIRECTIONAL_LOOP_BIT,
-	SOUND_FLAGS_PRIORITY_BIT,
-	SOUND_FLAGS_SEQUENCE_BIT
-};
-
-#define SOUND_FLAGS_LOOP 			(1 << SOUND_FLAGS_LOOP_BIT)
-#define SOUND_FLAGS_FIXED_VOLUME 	(1 << SOUND_FLAGS_FIXED_VOLUME_BIT)
-#define SOUND_FLAGS_FIXED_PANNING 	(1 << SOUND_FLAGS_FIXED_PANNING_BIT)
-#define SOUND_FLAGS_3D				(1 << SOUND_FLAGS_3D_BIT)
-#define SOUND_FLAGS_BIDIRECTIONAL_LOOP (1 << SOUND_FLAGS_BIDIRECTIONAL_LOOP_BIT)
-#define SOUND_FLAGS_PRIORITY		(1 << SOUND_FLAGS_PRIORITY_BIT)
-#define SOUND_FLAGS_SEQUENCE		(1 << SOUND_FLAGS_SEQUENCE_BIT)
-
-enum SAMPLE_FLAGS_BITS {
-	SAMPLE_NEEDS_SAVE_BIT = 0
-};
-
-#define SAMPLE_NEEDS_SAVE		(1 << SAMPLE_NEEDS_SAVE_BIT)
+#define SOUND_FLAGS_LOOP 				(1 << 0)
+#define SOUND_FLAGS_FIXED_VOLUME 		(1 << 1)
+#define SOUND_FLAGS_FIXED_PANNING 		(1 << 2)
+#define SOUND_FLAGS_3D					(1 << 3)
+#define SOUND_FLAGS_BIDIRECTIONAL_LOOP	(1 << 4)
+#define SOUND_FLAGS_PRIORITY			(1 << 5)
+#define SOUND_FLAGS_SEQUENCE			(1 << 6)
+
+#define SAMPLE_NEEDS_SAVE		(1 << 0)
 
 /* to DNA_sound_types.h*/