From 1961c61d2033b301ffcaf22ac3bfbe3852a6a4f4 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 17 Apr 2019 09:34:15 +0200 Subject: ClangFormat: re-run (#if 0 caused noise) --- source/blender/blenkernel/intern/sound.c | 62 ++++++++++++++++---------------- 1 file changed, 31 insertions(+), 31 deletions(-) (limited to 'source/blender/blenkernel/intern/sound.c') diff --git a/source/blender/blenkernel/intern/sound.c b/source/blender/blenkernel/intern/sound.c index b521aa2f954..118d307eb7c 100644 --- a/source/blender/blenkernel/intern/sound.c +++ b/source/blender/blenkernel/intern/sound.c @@ -394,23 +394,23 @@ void BKE_sound_load(struct Main *bmain, bSound *sound) 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; @@ -425,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) -- cgit v1.2.3