Bugfixing.
authorJoerg Mueller <nexyon@gmail.com>
Sat, 22 Aug 2009 16:54:18 +0000 (16:54 +0000)
committerJoerg Mueller <nexyon@gmail.com>
Sat, 22 Aug 2009 16:54:18 +0000 (16:54 +0000)
intern/audaspace/jack/AUD_JackDevice.cpp
intern/audaspace/jack/AUD_JackDevice.h
source/blender/blenkernel/intern/blender.c
source/blender/blenkernel/intern/sound.c
source/creator/creator.c

index 1f2c6faa51165c86f56eab93d662842e5184a4f5..445e68e1a9ae90f7bbc25df9148c98c0fb744190 100644 (file)
@@ -31,8 +31,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#ifdef WITH_JACK
-
 // AUD_XXX this is not realtime suitable!
 int AUD_JackDevice::jack_mix(jack_nframes_t length, void *data)
 {
@@ -149,5 +147,3 @@ void AUD_JackDevice::playing(bool playing)
 {
        // Do nothing.
 }
-
-#endif
index e6d332e1160d36cea825592cef03fd48312bd2d9..f0c887a2f43f96639e76948d91aab2b112f4f53c 100644 (file)
@@ -26,7 +26,6 @@
 #ifndef AUD_JACKDEVICE
 #define AUD_JACKDEVICE
 
-#ifdef WITH_JACK
 
 #include "AUD_SoftwareDevice.h"
 class AUD_Buffer;
@@ -90,6 +89,4 @@ public:
        virtual ~AUD_JackDevice();
 };
 
-#endif //WITH_JACK
-
 #endif //AUD_JACKDEVICE
index 746dc6c59ccfc4ed9853960fde6586bcd5b45d42..f261b020717a1b78a5bf7fe36c2863fec4174824 100644 (file)
@@ -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)
 {
        
index a3275792a85b2e940d5e95fbf971e0d4701d09ad..74ab41ff5775e1d8f8f42866240c7c141974569f 100644 (file)
@@ -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;
                                                }
index 5ecd95ecc21390670b8b6c7e1b521257c88d4175..41b27b1c9159609ffe7d8a19cb7ccfb0dfe0dee7 100644 (file)
@@ -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 */