[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22706] branches/blender2.5/blender: Bugfixing.

[Joerg Mueller]

Revision: 22706
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22706
Author:   nexyon
Date:     2009-08-22 18:54:18 +0200 (Sat, 22 Aug 2009)

Log Message:
-----------
Bugfixing.

Modified Paths:
--------------
    branches/blender2.5/blender/intern/audaspace/jack/AUD_JackDevice.cpp
    branches/blender2.5/blender/intern/audaspace/jack/AUD_JackDevice.h
    branches/blender2.5/blender/source/blender/blenkernel/intern/blender.c
    branches/blender2.5/blender/source/blender/blenkernel/intern/sound.c
    branches/blender2.5/blender/source/creator/creator.c

Modified: branches/blender2.5/blender/intern/audaspace/jack/AUD_JackDevice.cpp
===================================================================
--- branches/blender2.5/blender/intern/audaspace/jack/AUD_JackDevice.cpp	2009-08-22 14:23:54 UTC (rev 22705)
+++ branches/blender2.5/blender/intern/audaspace/jack/AUD_JackDevice.cpp	2009-08-22 16:54:18 UTC (rev 22706)
@@ -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 @@
 {
 	// Do nothing.
 }
-
-#endif

Modified: branches/blender2.5/blender/intern/audaspace/jack/AUD_JackDevice.h
===================================================================
--- branches/blender2.5/blender/intern/audaspace/jack/AUD_JackDevice.h	2009-08-22 14:23:54 UTC (rev 22705)
+++ branches/blender2.5/blender/intern/audaspace/jack/AUD_JackDevice.h	2009-08-22 16:54:18 UTC (rev 22706)
@@ -26,7 +26,6 @@
 #ifndef AUD_JACKDEVICE
 #define AUD_JACKDEVICE
 
-#ifdef WITH_JACK
 
 #include "AUD_SoftwareDevice.h"
 class AUD_Buffer;
@@ -90,6 +89,4 @@
 	virtual ~AUD_JackDevice();
 };
 
-#endif //WITH_JACK
-
 #endif //AUD_JACKDEVICE

Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/blender.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/blender.c	2009-08-22 14:23:54 UTC (rev 22705)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/blender.c	2009-08-22 16:54:18 UTC (rev 22706)
@@ -626,8 +626,7 @@
 	}
 }
 
-/* 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)
 {
 	

Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/sound.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/sound.c	2009-08-22 14:23:54 UTC (rev 22705)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/sound.c	2009-08-22 16:54:18 UTC (rev 22706)
@@ -319,8 +319,6 @@
 	}
 }
 
-#define SOUND_PLAYBACK_LAMBDA 1.0
-
 void sound_update_playing(struct bContext *C)
 {
 	SoundHandle *handle;
@@ -366,12 +364,10 @@
 						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;
 						}

Modified: branches/blender2.5/blender/source/creator/creator.c
===================================================================
--- branches/blender2.5/blender/source/creator/creator.c	2009-08-22 14:23:54 UTC (rev 22705)
+++ branches/blender2.5/blender/source/creator/creator.c	2009-08-22 16:54:18 UTC (rev 22706)
@@ -821,7 +821,6 @@
 			
 			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 */