diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2014-11-24 20:18:35 +0300 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2014-11-24 20:23:44 +0300 |
| commit | 649a2bcc3d51cfc6f9fc237695015c87bcca7deb (patch) | |
| tree | 4bea67033363027c40c3e78b2782d7df00e39558 /source/blender/makesdna/DNA_sound_types.h | |
| parent | aa0b268acbf352bdf69644bb11ee3b893008cc40 (diff) | |
Politically correct terrible consequencer changes
This patch includes the work done in the terrible consequencer branch
that hasn't been merged to master minus a few controversial and WIP
stuff, like strip parenting, new sequence data structs and cuddly
widgets.
What is included:
* Strip extensions only when slipping. It can very easily be made an
option but with a few strips with overlapping durations it makes view
too crowded and difficult to make out.
* Threaded waveform loading + code that restores waveforms on undo (not
used though, since sound_load recreates everything. There's a patch for
review D876)
* Toggle to enable backdrop in the strip sequence editor
* Toggle to easily turn on/off waveform display
* Snapping during transform on sequence boundaries. Snapping to start or
end of selection depends on position of mouse when invoking the operator
* Snapping of timeline indicator in sequencer to strip boundaries. To
use just press and hold ctrl while dragging.
Reviewers: campbellbarton
Differential Revision: https://developer.blender.org/D904
Diffstat (limited to 'source/blender/makesdna/DNA_sound_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_sound_types.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/source/blender/makesdna/DNA_sound_types.h b/source/blender/makesdna/DNA_sound_types.h index d7a51359777..4ab22e4f7b7 100644 --- a/source/blender/makesdna/DNA_sound_types.h +++ b/source/blender/makesdna/DNA_sound_types.h @@ -95,6 +95,8 @@ typedef struct bSound { */ void *playback_handle; + /* mutex for asynchronous loading of sounds */ + void *mutex; /* XXX unused currently (SOUND_TYPE_LIMITER) */ /* float start, end; */ } bSound; @@ -116,9 +118,10 @@ enum { }; enum { - SOUND_FLAGS_3D = (1 << 3), /* deprecated! used for sound actuator loading */ - SOUND_FLAGS_CACHING = (1 << 4), - SOUND_FLAGS_MONO = (1 << 5), + SOUND_FLAGS_3D = (1 << 3), /* deprecated! used for sound actuator loading */ + SOUND_FLAGS_CACHING = (1 << 4), + SOUND_FLAGS_MONO = (1 << 5), + SOUND_FLAGS_WAVEFORM_LOADING = (1 << 6), }; #if (DNA_DEPRECATED_GCC_POISON == 1) |