Revision: 41003
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41003
Author: ender79
Date: 2011-10-14 07:41:45 +0000 (Fri, 14 Oct 2011)
Log Message:
-----------
Reverting my windows build fix because it breaks the bug fix committed in r40995
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40995
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
trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
Modified: trunk/blender/source/blender/blenkernel/BKE_sound.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_sound.h 2011-10-14 05:07:53 UTC
(rev 41002)
+++ trunk/blender/source/blender/blenkernel/BKE_sound.h 2011-10-14 07:41:45 UTC
(rev 41003)
@@ -35,7 +35,6 @@
* \author nzc
*/
-#define SOUND_ERR_FLT FLT_MIN
#define SOUND_WAVE_SAMPLES_PER_SECOND 250
struct PackedFile;
Modified: trunk/blender/source/blender/blenkernel/intern/sound.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/sound.c 2011-10-14
05:07:53 UTC (rev 41002)
+++ trunk/blender/source/blender/blenkernel/intern/sound.c 2011-10-14
07:41:45 UTC (rev 41003)
@@ -630,7 +630,7 @@
else
return AUD_getPosition(scene->sound_scene_handle);
}
- return SOUND_ERR_FLT;
+ return .0f/.0f;
}
int sound_scene_playing(struct Scene *scene)
@@ -787,7 +787,7 @@
void sound_play_scene(struct Scene *UNUSED(scene)) {}
void sound_stop_scene(struct Scene *UNUSED(scene)) {}
void sound_seek_scene(struct Main *UNUSED(bmain), struct Scene *UNUSED(scene))
{}
-float sound_sync_scene(struct Scene *UNUSED(scene)) { return SOUND_ERR_FLT; }
+float sound_sync_scene(struct Scene *UNUSED(scene)) { return .0f/.0f; }
int sound_scene_playing(struct Scene *UNUSED(scene)) { return -1; }
int sound_read_sound_buffer(struct bSound* UNUSED(sound), float*
UNUSED(buffer), int UNUSED(length), float UNUSED(start), float UNUSED(end)) {
return 0; }
void sound_read_waveform(struct bSound* sound) { (void)sound; }
Modified: trunk/blender/source/blender/editors/screen/screen_ops.c
===================================================================
--- trunk/blender/source/blender/editors/screen/screen_ops.c 2011-10-14
05:07:53 UTC (rev 41002)
+++ trunk/blender/source/blender/editors/screen/screen_ops.c 2011-10-14
07:41:45 UTC (rev 41003)
@@ -2814,7 +2814,7 @@
else if (sad->flag & ANIMPLAY_FLAG_NO_SYNC) sync= 0;
else sync= (scene->flag & SCE_FRAME_DROP);
- if((scene->audio.flag & AUDIO_SYNC) && !(sad->flag &
ANIMPLAY_FLAG_REVERSE) && ((time = sound_sync_scene(scene)) != SOUND_ERR_FLT))
+ if((scene->audio.flag & AUDIO_SYNC) && !(sad->flag &
ANIMPLAY_FLAG_REVERSE) && finite(time = sound_sync_scene(scene)))
scene->r.cfra = (double)time * FPS + 0.5;
else
{
Modified: trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
2011-10-14 05:07:53 UTC (rev 41002)
+++ trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
2011-10-14 07:41:45 UTC (rev 41003)
@@ -33,6 +33,7 @@
#include <stdlib.h>
#include <string.h>
+#include <math.h>
#include "DNA_listBase.h"
#include "DNA_screen_types.h"
@@ -46,7 +47,6 @@
#include "BLI_blenlib.h"
#include "BLI_utildefines.h"
-#include "BLI_math.h"
#include "BKE_blender.h"
#include "BKE_context.h"
@@ -1791,7 +1791,7 @@
if(playing == 0) {
float time =
sound_sync_scene(scene);
- if(time != SOUND_ERR_FLT) {
+ if(finite(time)) {
int ncfra =
sound_sync_scene(scene) * (float)FPS + 0.5f;
if(ncfra !=
scene->r.cfra) {
scene->r.cfra =
ncfra;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
