Update of /cvsroot/audacity/audacity-src/src/effects
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv3369
Modified Files:
ChangePitch.cpp ChangeTempo.cpp SoundTouchEffect.h
Log Message:
Get rid of several warnings under OSX
Index: ChangeTempo.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/effects/ChangeTempo.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- ChangeTempo.cpp 3 Jul 2006 19:15:47 -0000 1.30
+++ ChangeTempo.cpp 28 Mar 2007 02:52:52 -0000 1.31
@@ -24,8 +24,6 @@
#if USE_SOUNDTOUCH
-#include "SoundTouch.h"
-
#include "ChangeTempo.h"
#include <math.h>
Index: ChangePitch.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/effects/ChangePitch.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- ChangePitch.cpp 24 Jan 2007 01:13:33 -0000 1.34
+++ ChangePitch.cpp 28 Mar 2007 02:52:51 -0000 1.35
@@ -15,8 +15,6 @@
#if USE_SOUNDTOUCH
-#include "SoundTouch.h"
-
#include "ChangePitch.h"
#include "../PitchName.h"
Index: SoundTouchEffect.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/effects/SoundTouchEffect.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- SoundTouchEffect.h 9 Jan 2005 23:07:34 -0000 1.5
+++ SoundTouchEffect.h 28 Mar 2007 02:52:52 -0000 1.6
@@ -18,6 +18,13 @@
#define __AUDACITY_EFFECT_SOUNDTOUCH__
#include "Effect.h"
+
+// Soundtouch defines these as well, so get rid of them before including
+#undef PACKAGE_NAME
+#undef PACKAGE_STRING
+#undef PACKAGE_TARNAME
+#undef PACKAGE_VERSION
+#undef PACKAGE_BUGREPORT
#include "SoundTouch.h"
using namespace soundtouch;
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
