diff options
| author | Joerg Mueller <nexyon@gmail.com> | 2009-08-22 20:54:18 +0400 |
|---|---|---|
| committer | Joerg Mueller <nexyon@gmail.com> | 2009-08-22 20:54:18 +0400 |
| commit | 98e9ddbf5b2b9dcf8a6a2440126f928d4394a5f4 (patch) | |
| tree | 505ad5cb362f1fea6f5c0cb5cbab1f8e8ddca259 /source | |
| parent | fa8e44556d83c2fdfd6d1e10e8611465eaf2ad59 (diff) | |
Bugfixing.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenkernel/intern/blender.c | 3 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/sound.c | 8 | ||||
| -rw-r--r-- | source/creator/creator.c | 1 |
3 files changed, 3 insertions, 9 deletions
diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c index 746dc6c59cc..f261b020717 100644 --- a/source/blender/blenkernel/intern/blender.c +++ b/source/blender/blenkernel/intern/blender.c @@ -626,8 +626,7 @@ void BKE_write_undo(bContext *C, char *name) } } -/* 1= an undo, -1 is a redo. we have to make sure 'curundo' remains at current situation - * Note, ALWAYS call sound_initialize_sounds after BKE_undo_step() */ +/* 1= an undo, -1 is a redo. we have to make sure 'curundo' remains at current situation */ void BKE_undo_step(bContext *C, int step) { diff --git a/source/blender/blenkernel/intern/sound.c b/source/blender/blenkernel/intern/sound.c index a3275792a85..74ab41ff577 100644 --- a/source/blender/blenkernel/intern/sound.c +++ b/source/blender/blenkernel/intern/sound.c @@ -319,8 +319,6 @@ void sound_stop_all(struct bContext *C) } } -#define SOUND_PLAYBACK_LAMBDA 1.0 - void sound_update_playing(struct bContext *C) { SoundHandle *handle; @@ -366,12 +364,10 @@ void sound_update_playing(struct bContext *C) action = 3; else { - float diff = AUD_getPosition(handle->handle) - (cfra - handle->startframe) / fps; -// AUD_XXX float diff = AUD_getPosition(handle->handle) * fps - cfra + handle->startframe + float diff = AUD_getPosition(handle->handle) * fps - cfra + handle->startframe; if(diff < 0.0) diff = -diff; - if(diff > SOUND_PLAYBACK_LAMBDA) -// AUD_XXX if(diff > 5.0f) + if(diff > 1.0f) { action = 2; } diff --git a/source/creator/creator.c b/source/creator/creator.c index 5ecd95ecc21..41b27b1c915 100644 --- a/source/creator/creator.c +++ b/source/creator/creator.c @@ -821,7 +821,6 @@ int main(int argc, char **argv) if (G.background) { int retval = BKE_read_file(C, argv[a], NULL, NULL); -// XXX sound_initialize_sounds(); /*we successfully loaded a blend file, get sure that pointcache works */ |