diff options
| author | Tim E. Real <termtech@rogers.com> | 2010-09-21 07:35:14 +0000 |
|---|---|---|
| committer | Tim E. Real <termtech@rogers.com> | 2010-09-21 07:35:14 +0000 |
| commit | e8b5334796e137ac673e4b4772aec93e347c6627 (patch) | |
| tree | b4b611bac303ad59d66b2c5b4fc8a3673ede2bd1 | |
| parent | 6f9b006f9c7f8edf59fcdaee759b36baf6491792 (diff) | |
See ChangeLog
| -rw-r--r-- | muse/ChangeLog | 1 | ||||
| -rw-r--r-- | muse/al/dsp.cpp | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/muse/ChangeLog b/muse/ChangeLog index 8714afe1..d8987862 100644 --- a/muse/ChangeLog +++ b/muse/ChangeLog @@ -1,6 +1,7 @@ 21.09.2010 * Fixed: Mixers not restoring their size properly upon song load. (T356) - Rearranged MusE::loadProjectFile1() slightly so mixer resizing done at end. Tested OK. + * Changed: Disabled some optimized code always enabled in Dsp::cpy(), for now, in case of 64-bit issues. (T356) 16.09.2010 * Created rc2 release for 1.1 (rj) * Fixed: Delete track(s) not disconnecting track routes, causing routes to hang around and store in song file. (T356) diff --git a/muse/al/dsp.cpp b/muse/al/dsp.cpp index 9d549ed7..fa9fa18b 100644 --- a/muse/al/dsp.cpp +++ b/muse/al/dsp.cpp @@ -92,6 +92,7 @@ class DspSSE86 : public Dsp { void initDsp() { +#if 0 // Disabled for now. #if defined(__i386__) || defined(__x86_64__) if(debugMsg) printf("Muse: __i386__ or __x86_64__ defined. Using optimized float buffer copying (asm movsl).\n"); @@ -99,6 +100,7 @@ void initDsp() if(debugMsg) printf("Muse: __i386__ or __x86_64__ not defined. Using non-optimized memcpy for float buffer copying.\n"); #endif +#endif #if defined(__i386__) && defined(USE_SSE) unsigned long useSSE = 0; @@ -153,7 +155,8 @@ void Dsp::cpy(float* dst, float* src, unsigned n) { // FIXME: Changed by T356. Not defined. Where are these??? //#if defined(ARCH_X86) || defined(ARCH_X86_64) -#if defined(__i386__) || defined(__x86_64__) +///#if defined(__i386__) || defined(__x86_64__) +#if 0 // Disabled for now. //printf("Dsp: using asm cpy\n"); // Changed by T356. Get To and From not declared in scope compile errors. //register unsigned long int dummy; |