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:
authorTon Roosendaal <ton@blender.org>2005-05-20 14:27:11 +0400
committerTon Roosendaal <ton@blender.org>2005-05-20 14:27:11 +0400
commit32fd7ad4c9747577045aed0660e56cd8dc25a5c2 (patch)
treed5ca69fbaf57685a8f887202e6b310bc151bdb41 /source/blender/src/editscreen.c
parent5862e1a88340a0c8ea8671ea878e8ff8f426b14c (diff)
Fix for TimeLine "Play" with sound-sync set.
Added check for audiostream_pos() - which should return current frame corrected for audio playback - to be at least 1 frame larger than current frame. It caused in some situations even a backwards playback!
Diffstat (limited to 'source/blender/src/editscreen.c')
-rw-r--r--source/blender/src/editscreen.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/src/editscreen.c b/source/blender/src/editscreen.c
index 9383fc6cc98..020cd608b5e 100644
--- a/source/blender/src/editscreen.c
+++ b/source/blender/src/editscreen.c
@@ -1016,7 +1016,11 @@ static void animated_screen(bScreen *sc, short val)
audiostream_stop();
audiostream_start( CFRA );
}
- else CFRA = audiostream_pos();
+ else {
+ int cfra = audiostream_pos();
+ if(cfra <= CFRA) CFRA++;
+ else CFRA= cfra;
+ }
}
else {
CFRA++;