Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-04-17 09:50:46 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-04-17 09:52:59 +0300
commita54bdd76cb34005d07a65c2c3a8198b7b8e8c95a (patch)
treec30e2477cc3c12b1dd046f4fd12c728114c94563 /source/blender/blenkernel/intern/sound.c
parent223f9310955f6b0d6f1089c16802a57e20fcadb3 (diff)
ClangFormat: format '#if 0' code
Previous cleanups didn't account for space after '#'.
Diffstat (limited to 'source/blender/blenkernel/intern/sound.c')
-rw-r--r--source/blender/blenkernel/intern/sound.c65
1 files changed, 32 insertions, 33 deletions
diff --git a/source/blender/blenkernel/intern/sound.c b/source/blender/blenkernel/intern/sound.c
index 383542fa335..b521aa2f954 100644
--- a/source/blender/blenkernel/intern/sound.c
+++ b/source/blender/blenkernel/intern/sound.c
@@ -391,27 +391,26 @@ void BKE_sound_load(struct Main *bmain, bSound *sound)
/* XXX unused currently */
# if 0
- switch (sound->type)
- {
+ switch (sound->type) {
case SOUND_TYPE_FILE:
# endif
- {
- char fullpath[FILE_MAX];
-
- /* load sound */
- PackedFile *pf = sound->packedfile;
-
- /* don't modify soundact->sound->name, only change a copy */
- BLI_strncpy(fullpath, sound->name, sizeof(fullpath));
- BLI_path_abs(fullpath, ID_BLEND_PATH(bmain, &sound->id));
-
- /* but we need a packed file then */
- if (pf)
- sound->handle = AUD_Sound_bufferFile((unsigned char *)pf->data, pf->size);
- /* or else load it from disk */
- else
- sound->handle = AUD_Sound_file(fullpath);
- }
+ {
+ char fullpath[FILE_MAX];
+
+ /* load sound */
+ PackedFile *pf = sound->packedfile;
+
+ /* don't modify soundact->sound->name, only change a copy */
+ BLI_strncpy(fullpath, sound->name, sizeof(fullpath));
+ BLI_path_abs(fullpath, ID_BLEND_PATH(bmain, &sound->id));
+
+ /* but we need a packed file then */
+ if (pf)
+ sound->handle = AUD_Sound_bufferFile((unsigned char *)pf->data, pf->size);
+ /* or else load it from disk */
+ else
+ sound->handle = AUD_Sound_file(fullpath);
+ }
/* XXX unused currently */
# if 0
break;
@@ -426,23 +425,23 @@ void BKE_sound_load(struct Main *bmain, bSound *sound)
break;
}
# endif
- if (sound->flags & SOUND_FLAGS_MONO) {
- void *handle = AUD_Sound_rechannel(sound->handle, AUD_CHANNELS_MONO);
- AUD_Sound_free(sound->handle);
- sound->handle = handle;
- }
+ if (sound->flags & SOUND_FLAGS_MONO) {
+ void *handle = AUD_Sound_rechannel(sound->handle, AUD_CHANNELS_MONO);
+ AUD_Sound_free(sound->handle);
+ sound->handle = handle;
+ }
- if (sound->flags & SOUND_FLAGS_CACHING) {
- sound->cache = AUD_Sound_cache(sound->handle);
- }
+ if (sound->flags & SOUND_FLAGS_CACHING) {
+ sound->cache = AUD_Sound_cache(sound->handle);
+ }
- if (sound->cache)
- sound->playback_handle = sound->cache;
- else
- sound->playback_handle = sound->handle;
+ if (sound->cache)
+ sound->playback_handle = sound->cache;
+ else
+ sound->playback_handle = sound->handle;
- BKE_sound_update_sequencer(bmain, sound);
- }
+ BKE_sound_update_sequencer(bmain, sound);
+}
}
AUD_Device *BKE_sound_mixdown(struct Scene *scene, AUD_DeviceSpecs specs, int start, float volume)