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:
authorSergey Sharybin <sergey.vfx@gmail.com>2019-05-04 20:15:15 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2019-05-04 20:15:15 +0300
commit9f681bea68fc1aebc41d43d5bd3b5e73c91f6f45 (patch)
tree4637b37b77685da00aa98ee029410f03033c22b2 /source/blender/editors/space_sequencer/sequencer_preview.c
parent773691310f9479a7de9b01f13fbbdc5d45c1c47e (diff)
Fix T64144: Crash when displaying audio waveforms in VSE
Diffstat (limited to 'source/blender/editors/space_sequencer/sequencer_preview.c')
-rw-r--r--source/blender/editors/space_sequencer/sequencer_preview.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_preview.c b/source/blender/editors/space_sequencer/sequencer_preview.c
index 546c2a8a9f0..8a4e8c007f7 100644
--- a/source/blender/editors/space_sequencer/sequencer_preview.c
+++ b/source/blender/editors/space_sequencer/sequencer_preview.c
@@ -50,6 +50,7 @@ typedef struct PreviewJob {
typedef struct PreviewJobAudio {
struct PreviewJobAudio *next, *prev;
+ struct Main *bmain;
bSound *sound;
int lr; /* sample left or right */
int startframe;
@@ -79,7 +80,9 @@ static void preview_startjob(void *data, short *stop, short *do_update, float *p
PreviewJobAudio *preview_next;
bSound *sound = previewjb->sound;
+ BKE_sound_load_audio(previewjb->bmain, sound);
BKE_sound_read_waveform(sound, stop);
+ BKE_sound_free_audio(sound);
if (*stop || G.is_break) {
BLI_mutex_lock(pj->mutex);
@@ -153,6 +156,7 @@ void sequencer_preview_add_sound(const bContext *C, Sequence *seq)
/* attempt to lock mutex of job here */
+ audiojob->bmain = CTX_data_main(C);
audiojob->sound = seq->sound;
BLI_mutex_lock(pj->mutex);