[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27016] trunk/blender/source/blender: revert 27010, sorry but this makes playback of animation unusable & jerky, we can provide some sample files for testing.

[Campbell Barton]

Revision: 27016
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27016
Author:   campbellbarton
Date:     2010-02-18 18:00:24 +0100 (Thu, 18 Feb 2010)

Log Message:
-----------
revert 27010, sorry but this makes playback of animation unusable & jerky, we can provide some sample files for testing.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/BKE_sound.h
    trunk/blender/source/blender/blenkernel/intern/sound.c
    trunk/blender/source/blender/editors/screen/screen_ops.c

Modified: trunk/blender/source/blender/blenkernel/BKE_sound.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_sound.h	2010-02-18 16:59:09 UTC (rev 27015)
+++ trunk/blender/source/blender/blenkernel/BKE_sound.h	2010-02-18 17:00:24 UTC (rev 27016)
@@ -86,8 +86,6 @@
 
 void sound_seek_scene(struct bContext *C);
 
-float sound_sync_scene(struct Scene *scene);
-
 int sound_read_sound_buffer(struct bSound* sound, float* buffer, int length);
 
 #endif

Modified: trunk/blender/source/blender/blenkernel/intern/sound.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/sound.c	2010-02-18 16:59:09 UTC (rev 27015)
+++ trunk/blender/source/blender/blenkernel/intern/sound.c	2010-02-18 17:00:24 UTC (rev 27016)
@@ -394,11 +394,6 @@
 	AUD_unlock();
 }
 
-float sound_sync_scene(struct Scene *scene)
-{
-	return AUD_getPosition(scene->sound_scene_handle);
-}
-
 int sound_read_sound_buffer(bSound* sound, float* buffer, int length)
 {
 	return AUD_readSound(sound->cache, buffer, length);

Modified: trunk/blender/source/blender/editors/screen/screen_ops.c
===================================================================
--- trunk/blender/source/blender/editors/screen/screen_ops.c	2010-02-18 16:59:09 UTC (rev 27015)
+++ trunk/blender/source/blender/editors/screen/screen_ops.c	2010-02-18 17:00:24 UTC (rev 27016)
@@ -2429,17 +2429,13 @@
 		else sync= (scene->audio.flag & AUDIO_SYNC);
 		
 		if(sync) {
+			/* skip frames */
+			int step = floor(wt->duration * FPS);
 			if(sad->flag & ANIMPLAY_FLAG_REVERSE) // XXX does this option work with audio?
-			{                                     // XXX - no
-				/* skip frames */
-				int step = floor(wt->duration * FPS);
 				scene->r.cfra -= step;
-				wt->duration -= ((float)step)/FPS;
-			}
 			else
-			{
-				scene->r.cfra = floor(sound_sync_scene(scene) * FPS);
-			}
+				scene->r.cfra += step;
+			wt->duration -= ((float)step)/FPS;
 		}
 		else {
 			/* one frame +/- */