diff options
| author | Andrew Wiggin <ender79bl@gmail.com> | 2011-10-14 11:41:45 +0400 |
|---|---|---|
| committer | Andrew Wiggin <ender79bl@gmail.com> | 2011-10-14 11:41:45 +0400 |
| commit | eaff9a1c1b420dde7f291c8fb8715f18dd512f64 (patch) | |
| tree | 98b2174b93a076e685e9daadf4c4ca66276e64c4 /source/blender/blenkernel | |
| parent | 13490b1ac3ee1a98a4e968555df53a4699f23f27 (diff) | |
Reverting my windows build fix because it breaks the bug fix committed in r40995
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/BKE_sound.h | 1 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/sound.c | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/blenkernel/BKE_sound.h b/source/blender/blenkernel/BKE_sound.h index 081fb8dc132..3728dd41089 100644 --- a/source/blender/blenkernel/BKE_sound.h +++ b/source/blender/blenkernel/BKE_sound.h @@ -35,7 +35,6 @@ * \author nzc */ -#define SOUND_ERR_FLT FLT_MIN #define SOUND_WAVE_SAMPLES_PER_SECOND 250 struct PackedFile; diff --git a/source/blender/blenkernel/intern/sound.c b/source/blender/blenkernel/intern/sound.c index b9a02df423e..649b4f0b724 100644 --- a/source/blender/blenkernel/intern/sound.c +++ b/source/blender/blenkernel/intern/sound.c @@ -630,7 +630,7 @@ float sound_sync_scene(struct Scene *scene) 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 @@ static void sound_start_play_scene(struct Scene *UNUSED(scene)) {} 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; } |