All included libraries now link dynamically instead of statically.

Moved items from gtk2_ardour/utils to pbd3/convert.
Various cleanups.


git-svn-id: svn://localhost/trunk/ardour2@475 d708f5d6-7413-0410-9779-e7cbd77b26cf

7 files changed, 29 insertions, 35 deletions

diff --git a/libs/ardour/.cvsignore b/libs/ardour/.cvsignore
index 74244ff78c..15d7926473 100644
--- a/libs/ardour/.cvsignore
+++ b/libs/ardour/.cvsignore
@@ -5,3 +5,4 @@ version.cc
 *.os
 *.mo
 *.pot
+*.dylib
diff --git a/libs/ardour/SConscript b/libs/ardour/SConscript
index 3d83b3e276..d5cb439202 100644
--- a/libs/ardour/SConscript
+++ b/libs/ardour/SConscript
@@ -168,6 +168,7 @@ if conf.CheckCHeader('/System/Library/Frameworks/CoreMIDI.framework/Headers/Core
 
 if conf.CheckCHeader('/System/Library/Frameworks/AudioToolbox.framework/Headers/ExtendedAudioFile.h'):
     ardour.Append(CXXFLAGS="-DHAVE_COREAUDIO")    
+    ardour.Append(LINKFLAGS="-framework AudioToolbox")
     extra_sources += coreaudio_files
 
 ardour = conf.Finish ()
@@ -199,26 +200,15 @@ env['BUILDERS']['SharedAsmObject'] = Builder (action = '$CXX -c -fPIC $SOURCE -o
 					      src_suffix = '.s',
 					      single_source = 1)
 
-if env['DEVBUILD'] == 1:
-	if env['FPU_OPTIMIZATION']:
-		if env['DIST_TARGET'] == "i386":
-			arch_specific_objects = env.SharedAsmObject('sse_functions.os', 'sse_functions.s')
-		if env['DIST_TARGET'] == "i686":
-			arch_specific_objects = env.SharedAsmObject('sse_functions.os', 'sse_functions.s')
-		if env['DIST_TARGET'] == "x86_64":
-			arch_specific_objects = env.SharedAsmObject('sse_functions_64bit.os', 'sse_functions_64bit.s')
+if env['FPU_OPTIMIZATION']:
+	if env['DIST_TARGET'] == "i386":
+		arch_specific_objects = env.SharedAsmObject('sse_functions.os', 'sse_functions.s')
+	if env['DIST_TARGET'] == "i686":
+		arch_specific_objects = env.SharedAsmObject('sse_functions.os', 'sse_functions.s')
+	if env['DIST_TARGET'] == "x86_64":
+		arch_specific_objects = env.SharedAsmObject('sse_functions_64bit.os', 'sse_functions_64bit.s')
 			
-	libardour = ardour.SharedLibrary('ardour', ardour_files + extra_sources + arch_specific_objects)
-else:
-	if env['FPU_OPTIMIZATION']:
-		if env['DIST_TARGET'] == "i386":
-			arch_specific_objects = env.StaticObject(target='sse_functions',source='sse_functions.s')
-		if env['DIST_TARGET'] == "i686":
-			arch_specific_objects = env.StaticObject(target='sse_functions',source='sse_functions.s')
-		if env['DIST_TARGET'] == "x86_64":
-			arch_specific_objects = env.StaticObject(target='sse_functions_64bit',source='sse_functions_64bit.s')
-
-	libardour = ardour.StaticLibrary('ardour', ardour_files + extra_sources + arch_specific_objects)
+libardour = ardour.SharedLibrary('ardour', ardour_files + extra_sources + arch_specific_objects)
 
 Default(libardour)
 
diff --git a/libs/ardour/ardour/plugin.h b/libs/ardour/ardour/plugin.h
index 272506f11e..211b00d0bb 100644
--- a/libs/ardour/ardour/plugin.h
+++ b/libs/ardour/ardour/plugin.h
@@ -47,6 +47,7 @@ class Session;
 class PluginInfo {
   public:
 	enum Type {
+		AudioUnit,
 		LADSPA,
 		VST
 	};
diff --git a/libs/ardour/control_protocol_manager.cc b/libs/ardour/control_protocol_manager.cc
index ed33d0b6ee..6f3cb4e457 100644
--- a/libs/ardour/control_protocol_manager.cc
+++ b/libs/ardour/control_protocol_manager.cc
@@ -231,22 +231,22 @@ ControlProtocolManager::set_state (const XMLNode& node)
 
 	for (citer = clist.begin(); citer != clist.end(); ++citer) {
 		if ((*citer)->name() == X_("Protocol")) {
-			if ((prop = (*citer)->property (X_("active"))) != 0) {
-				if (prop->value() == X_("yes")) {
-					if ((prop = (*citer)->property (X_("name"))) != 0) {
-						ControlProtocolInfo* cpi = cpi_by_name (prop->value());
-						if (cpi) {
-							if (_session) {
-								instantiate (*cpi);
-							} else {
-								cpi->requested = true;
-							}
+			prop = (*citer)->property (X_("active"));
+			if (prop && prop->value() == X_("yes")) {
+				if ((prop = (*citer)->property (X_("name"))) != 0) {
+					ControlProtocolInfo* cpi = cpi_by_name (prop->value());
+					if (cpi) {
+						if (_session) {
+							instantiate (*cpi);
+						} else {
+							cpi->requested = true;
 						}
 					}
 				}
-			}    
-		}
+			}
+		}    
 	}
+	return 0;
 }
 
 XMLNode&
diff --git a/libs/ardour/i18n.h b/libs/ardour/i18n.h
index 3ace250419..71a3dccab8 100644
--- a/libs/ardour/i18n.h
+++ b/libs/ardour/i18n.h
@@ -7,8 +7,6 @@
 #include <vector>
 #include <string>
 
-std::vector<std::string> internationalize (const char **);
-
 #define _(Text)  dgettext (PACKAGE,Text)
 #define N_(Text) gettext_noop (Text)
 #define X_(Text) Text
diff --git a/libs/ardour/plugin_manager.cc b/libs/ardour/plugin_manager.cc
index 36cc80a660..e1f34199d6 100644
--- a/libs/ardour/plugin_manager.cc
+++ b/libs/ardour/plugin_manager.cc
@@ -198,7 +198,6 @@ PluginManager::add_presets(string domain)
 	vector_delete (presets);
 }
 
-
 void
 PluginManager::add_lrdf_data (const string &path)
 {
@@ -341,6 +340,9 @@ ARDOUR::find_plugin(Session& session, string name, long unique_id, PluginInfo::T
 		plugs = &mgr->vst_plugin_info();
 		unique_id = 0; // VST plugins don't have a unique id.
 		break;
+	case PluginInfo::AudioUnit:
+	default:
+		return 0;
 	}
 
 	for (i = plugs->begin(); i != plugs->end(); ++i) {
diff --git a/libs/ardour/sndfile_helpers.cc b/libs/ardour/sndfile_helpers.cc
index 7566107167..b308a74c36 100644
--- a/libs/ardour/sndfile_helpers.cc
+++ b/libs/ardour/sndfile_helpers.cc
@@ -1,6 +1,8 @@
 #include <map>
 #include <vector>
 
+#include <pbd/convert.h>
+
 #include <sndfile.h>
 #include <ardour/sndfile_helpers.h>
 
@@ -108,7 +110,7 @@ sndfile_file_ending_from_string (string str)
 	static vector<string> file_endings;
 
 	if (file_endings.empty()) {
-		file_endings = internationalize((const char **) sndfile_file_endings_strings);
+		file_endings = PBD::internationalize((const char **) sndfile_file_endings_strings);
 	}
 
 	for (int n = 0; sndfile_header_formats_strings[n]; ++n) {