Blender Git Loki

Git Commits -> Revision 4f27386

Revision 4f27386 by Wouter van Heyst (master)
July 13, 2003, 20:16 (GMT)

Commit message and the brunt of the code courtesy of intrr, apologies for the
size of this;


Finally, the Sequencer audio support and global audio/animation sync stuff!
(See http://intrr.org/blender/audiosequencer.html)

Stuff that has been done:

./source/blender/blenloader/intern/writefile.c
./source/blender/blenloader/intern/readfile.c

Added code to make it handle sounds used by audio strips, and to convert
Scene data from older (<2.28) versions to init Scene global audio settings
(Scene->audio) to defaults.

./source/blender/include/BSE_seqaudio.h
./source/blender/src/seqaudio.c

The main audio routines that start/stop/scrub the audio stream at
a certain frame position, provide the frame reference for the current
stream position, mix the audio, convert the audio, mixdown the audio
into a file.

./source/blender/makesdna/DNA_sound_types.h

Introduced new variables in the bSound struct to accomodate the sample
data after converted to the scene's global mixing format (stream, streamlen).
Also added a new flag SOUND_FLAGS_SEQUENCE that gets set if the Sound
belongs to a sequence strip.

./source/blender/makesdna/DNA_scene_types.h

Added AudioData struct, which holds scene-global audio settings.

./source/blender/makesdna/DNA_sequence_types.h

Added support for audio strips. Some variables to hold Panning/Attenuation
information, position information, reference to the sample, and some flags.

./source/blender/makesdna/DNA_userdef_types.h
./source/blender/src/usiblender.c

Added a "Mixing buffer size" userpref. Made the versions stuff initialize
it to a default for versions <2.28.

./source/blender/makesdna/DNA_space_types.h
./source/blender/src/filesel.c

Added a Cyan dot to .WAV files. Any other suggestions on a better color? :)

./source/blender/src/editsound.c

Changes (fixes) to the WAV file loader, re-enabled some gameengine code that
is needed for dealing with bSounds and bSamples.

./source/blender/src/editipo.c
./source/blender/src/drawseq.c
./source/blender/src/editnla.c
./source/blender/src/space.c
./source/blender/src/drawview.c
./source/blender/src/renderwin.c
./source/blender/src/headerbuttons.c

- Created two different wrappers for update_for_newframe(), one which scrubs
the audio, one which doesn't.
- Replaced some of the occurences of update_for_newframe() with
update_for_newframe_muted(), which doesn't scrub the audio.
- In drawview.c: Changed the synchronization scheme to get the current audio
position from the audio engine, and use that as a reference for setting
CFRA. Implements a/v sync and framedrop.
- In editipo.c: Changed handling of Fac IPOs to be usable for audio strips as
volume envelopes.
- In space.c: Added the mixing buffer size Userpref, enabled audio scrubbing
(update_for_newframe()) for moving the sequence editor framebar.

./source/blender/src/editseq.c

Added support for audio strips and a default directory for WAV files which
gets saved from the last Shift-A operation.

./source/blender/src/buttons.c

Added Scene-global audio sequencer settings in Sound buttons.

./source/blender/src/sequence.c

Various stuff that deals with handling audio strips differently than
usual strips.

Commit Details:

Full Hash: 4f273867403672b3970ff8879afe8459827f172a
SVN Revision: 1034
Parent Commit: 9cb79c6
Lines Changed: +956, -123

2 Added Paths:

/source/blender/include/BSE_seqaudio.h (+52, -0) (View)
/source/blender/src/seqaudio.c (+392, -0) (View)

23 Modified Paths:

/source/blender/blenloader/intern/readfile.c (+34, -1) (Diff)
/source/blender/blenloader/intern/writefile.c (+1, -1) (Diff)
/source/blender/makesdna/DNA_scene_types.h (+12, -0) (Diff)
/source/blender/makesdna/DNA_sequence_types.h (+10, -2) (Diff)
/source/blender/makesdna/DNA_sound_types.h (+6, -3) (Diff)
/source/blender/makesdna/DNA_space_types.h (+1, -0) (Diff)
/source/blender/makesdna/DNA_userdef_types.h (+1, -0) (Diff)
/source/blender/src/buttons.c (+83, -11) (Diff)
/source/blender/src/drawseq.c (+66, -21) (Diff)
/source/blender/src/drawview.c (+16, -4) (Diff)
/source/blender/src/editipo.c (+2, -2) (Diff)
/source/blender/src/editnla.c (+5, -5) (Diff)
/source/blender/src/editseq.c (+204, -20) (Diff)
/source/blender/src/editsound.c (+22, -45) (Diff)
/source/blender/src/filesel.c (+7, -0) (Diff)
/source/blender/src/headerbuttons.c (+14, -2) (Diff)
/source/blender/src/Makefile (+1, -0) (Diff)
/source/blender/src/renderwin.c (+1, -1) (Diff)
/source/blender/src/sequence.c (+10, -3) (Diff)
/source/blender/src/space.c (+10, -1) (Diff)
/source/blender/src/usiblender.c (+3, -1) (Diff)
/source/nan_definitions.mk (+2, -0) (Diff)
/source/nan_link.mk (+1, -0) (Diff)
Tehnyt: Miika HämäläinenViimeksi päivitetty: 07.11.2014 14:18MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021