remove soundtouch, fixes for Snow Leopard build, use libintl explicitly on non-glibc systems, fix for new glib include rules

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@12031 d708f5d6-7413-0410-9779-e7cbd77b26cf

7 files changed, 8 insertions, 10 deletions

diff --git a/libs/appleutility/CAComponent.cpp b/libs/appleutility/CAComponent.cpp
index 700d9e2b3e..137e46b595 100644
--- a/libs/appleutility/CAComponent.cpp
+++ b/libs/appleutility/CAComponent.cpp
@@ -91,7 +91,7 @@ CAComponent::~CAComponent ()
 OSStatus		CAComponent::GetResourceVersion (UInt32 &outVersion) const
 {
 	bool versionFound = false;
-	short componentResFileID = kResFileNotOpened;
+	ResFileRefNum componentResFileID = kResFileNotOpened;
 	OSStatus result;
 	short thngResourceCount;
 	
@@ -247,7 +247,7 @@ void	_ShowCF (FILE* file, CFStringRef str)
 
 void	CAComponent::Print(FILE* file) const
 {
-	fprintf (file, "CAComponent: 0x%X", int(Comp()));
+        fprintf (file, "CAComponent: %p", (void*) (Comp()));
 	if (mManuName) {
 		fprintf (file, ", Manu:"); _ShowCF (file, mManuName);
 		if (mAUName) fprintf (file, ", Name:"); _ShowCF (file, mAUName);
diff --git a/libs/ardour/SConscript b/libs/ardour/SConscript
index ec1cd65ee3..7a0ccc710d 100644
--- a/libs/ardour/SConscript
+++ b/libs/ardour/SConscript
@@ -339,9 +339,6 @@ ardour.Merge ([
 if ardour['RUBBERBAND']:
 	ardour.Merge ([ libraries['rubberband']])
 	timefx_sources += [ 'rb_effect.cc' ]
-else:
-	ardour.Merge ([ libraries['soundtouch'] ])
-	timefx_sources += [ 'st_stretch.cc', 'st_pitch.cc' ]
 	
 if ardour['LV2']:
 	ardour.Merge ([ libraries['lilv'] ])
diff --git a/libs/ardour/audio_unit.cc b/libs/ardour/audio_unit.cc
index 5a47edbfc5..8b910341a0 100644
--- a/libs/ardour/audio_unit.cc
+++ b/libs/ardour/audio_unit.cc
@@ -46,6 +46,7 @@
 #include <appleutility/CAAUParameter.h>
 
 #include <CoreFoundation/CoreFoundation.h>
+#include <CoreFoundation/CFRunLoop.h>
 #include <CoreServices/CoreServices.h>
 
 #include "i18n.h"
@@ -2495,7 +2496,7 @@ AUPluginInfo::stringify_descriptor (const CAComponentDescription& desc)
 int
 AUPlugin::create_parameter_listener (AUEventListenerProc cb, void* arg, float interval_secs)
 {
-	CFRunLoopRef run_loop = (CFRunLoopRef) GetCFRunLoopFromEventLoop(GetCurrentEventLoop()); 
+        CFRunLoopRef run_loop =  CFRunLoopGetCurrent ();
 	CFStringRef  loop_mode = kCFRunLoopDefaultMode;
 
 	if (AUEventListenerCreate (cb, arg, run_loop, loop_mode, interval_secs, interval_secs, &_parameter_listener) != noErr) {
diff --git a/libs/ardour/coreaudiosource.cc b/libs/ardour/coreaudiosource.cc
index 5a3c542521..d595873c86 100644
--- a/libs/ardour/coreaudiosource.cc
+++ b/libs/ardour/coreaudiosource.cc
@@ -225,7 +225,7 @@ CoreAudioSource::get_soundfile_info (string path, SoundFileInfo& _info, string&
 {
 	FSRef ref; 
 	ExtAudioFileRef af = 0;
-	size_t size;
+	UInt32 size;
 	CFStringRef name;
 	int ret = -1;
 
diff --git a/libs/ardour/globals.cc b/libs/ardour/globals.cc
index 3c4120c1c2..0c1dec7e12 100644
--- a/libs/ardour/globals.cc
+++ b/libs/ardour/globals.cc
@@ -232,7 +232,7 @@ setup_hardware_optimization (bool try_optimization)
                 }
 
 #elif defined (__APPLE__) && defined (BUILD_VECLIB_OPTIMIZATIONS)
-                long sysVersion = 0;
+                SInt32 sysVersion = 0;
 
                 if (noErr != Gestalt(gestaltSystemVersion, &sysVersion))
                         sysVersion = 0;
diff --git a/libs/clearlooks-newer/animation.c b/libs/clearlooks-newer/animation.c
index 82af498949..8b0bded3a1 100644
--- a/libs/clearlooks-newer/animation.c
+++ b/libs/clearlooks-newer/animation.c
@@ -27,7 +27,7 @@
 #include "animation.h"
 
 #ifdef HAVE_ANIMATION
-#include <glib/gtimer.h>
+#include <glib.h>
 
 struct _AnimationInfo {
 	GTimer *timer;
diff --git a/libs/gtkmm2ext/gtkmm2ext/application.h b/libs/gtkmm2ext/gtkmm2ext/application.h
index d3de5e1c7f..ccf89caf8e 100644
--- a/libs/gtkmm2ext/gtkmm2ext/application.h
+++ b/libs/gtkmm2ext/gtkmm2ext/application.h
@@ -23,8 +23,8 @@
 #define __GTK_APPLICATION_MM_H__
 
 #include <string>
-#include <gtkmm2ext/gtkapplication.h> // for GtkApplicationGroup typedef
 #include <sigc++/signal.h>
+#include <gtkmm2ext/gtkapplication.h> // for GtkApplicationGroup typedef
 
 namespace Gtk {
 	class MenuItem;