Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: Move 'WAVEFORM_LOADING' of sounds from flags to tags.

Browse Source 
This is purely runtime data, so move it to new tags. ;)
This commit is contained in:
Bastien Montagne
2018-07-20 12:11:34 +02:00
parent f48e81e720
commit 710a059549
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenkernel/intern/sound.c
View File

@@ -798,7 +798,7 @@ void BKE_sound_read_waveform(bSound *sound, short *stop)
} }
MEM_freeN(waveform); MEM_freeN(waveform);
BLI_spin_lock(sound->spinlock); BLI_spin_lock(sound->spinlock);
sound->flags &= ~SOUND_FLAGS_WAVEFORM_LOADING; sound->tags &= ~SOUND_TAGS_WAVEFORM_LOADING;
BLI_spin_unlock(sound->spinlock); BLI_spin_unlock(sound->spinlock);
return; return;
} }
@@ -807,7 +807,7 @@ void BKE_sound_read_waveform(bSound *sound, short *stop)
BLI_spin_lock(sound->spinlock); BLI_spin_lock(sound->spinlock);
sound->waveform = waveform; sound->waveform = waveform;
sound->flags &= ~SOUND_FLAGS_WAVEFORM_LOADING; sound->tags &= ~SOUND_TAGS_WAVEFORM_LOADING;
BLI_spin_unlock(sound->spinlock); BLI_spin_unlock(sound->spinlock);
} }

2
source/blender/blenloader/intern/readfile.c
View File

@@ -7565,7 +7565,7 @@ static void direct_link_sound(FileData *fd, bSound *sound)
BLI_spin_init(sound->spinlock); BLI_spin_init(sound->spinlock);
} }
/* clear waveform loading flag */ /* clear waveform loading flag */
sound->flags &= ~SOUND_FLAGS_WAVEFORM_LOADING; sound->tags &= ~SOUND_TAGS_WAVEFORM_LOADING;
sound->packedfile = direct_link_packedfile(fd, sound->packedfile); sound->packedfile = direct_link_packedfile(fd, sound->packedfile);
sound->newpackedfile = direct_link_packedfile(fd, sound->newpackedfile); sound->newpackedfile = direct_link_packedfile(fd, sound->newpackedfile);

4
source/blender/editors/space_sequencer/sequencer_draw.c
View File

@@ -220,9 +220,9 @@ static void drawseqwave(const bContext *C, SpaceSeq *sseq, Scene *scene, Sequenc
BLI_spin_lock(sound->spinlock); BLI_spin_lock(sound->spinlock);
if (!sound->waveform) { if (!sound->waveform) {
if (!(sound->flags & SOUND_FLAGS_WAVEFORM_LOADING)) { if (!(sound->tags & SOUND_TAGS_WAVEFORM_LOADING)) {
/* prevent sounds from reloading */ /* prevent sounds from reloading */
sound->flags |= SOUND_FLAGS_WAVEFORM_LOADING; sound->tags |= SOUND_TAGS_WAVEFORM_LOADING;
BLI_spin_unlock(sound->spinlock); BLI_spin_unlock(sound->spinlock);
sequencer_preview_add_sound(C, seq); sequencer_preview_add_sound(C, seq);
} }

2
source/blender/editors/space_sequencer/sequencer_preview.c
View File

@@ -96,7 +96,7 @@ static void preview_startjob(void *data, short *stop, short *do_update, float *p
/* make sure we cleanup the loading flag! */ /* make sure we cleanup the loading flag! */
BLI_spin_lock(sound->spinlock); BLI_spin_lock(sound->spinlock);
sound->flags &= ~SOUND_FLAGS_WAVEFORM_LOADING; sound->tags &= ~SOUND_TAGS_WAVEFORM_LOADING;
BLI_spin_unlock(sound->spinlock); BLI_spin_unlock(sound->spinlock);
BLI_mutex_lock(pj->mutex); BLI_mutex_lock(pj->mutex);

2
source/blender/makesdna/DNA_sound_types.h
View File

@@ -125,12 +125,12 @@ enum {
#endif #endif
SOUND_FLAGS_CACHING = (1 << 4), SOUND_FLAGS_CACHING = (1 << 4),
SOUND_FLAGS_MONO = (1 << 5), SOUND_FLAGS_MONO = (1 << 5),
SOUND_FLAGS_WAVEFORM_LOADING = (1 << 6),
}; };
/* bSound->tags */ /* bSound->tags */
enum { enum {
SOUND_TAGS_WAVEFORM_NO_RELOAD = 1 << 0, /* Do not free/reset waveform on sound load, only used by undo code. */ SOUND_TAGS_WAVEFORM_NO_RELOAD = 1 << 0, /* Do not free/reset waveform on sound load, only used by undo code. */
SOUND_TAGS_WAVEFORM_LOADING = (1 << 6),
}; };
/* to DNA_sound_types.h*/ /* to DNA_sound_types.h*/