- build fixes for OS X.

-- casts for vDSP in mix.cc
-- fix for PluginInsert::PluginControl usage
-- disable POWERMATE if POWERMATE=0



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

4 files changed, 24 insertions, 19 deletions

diff --git a/libs/ardour/ardour/plugin.h b/libs/ardour/ardour/plugin.h
index 0cdcc9bb26..451774be6c 100644
--- a/libs/ardour/ardour/plugin.h
+++ b/libs/ardour/ardour/plugin.h
@@ -33,6 +33,7 @@
 #include <ardour/cycles.h>
 #include <ardour/latent.h>
 #include <ardour/parameter.h>
+#include <ardour/plugin_insert.h>
 
 #include <vector>
 #include <set>
@@ -150,6 +151,7 @@ class Plugin : public PBD::StatefulDestructible, public Latent
 
   protected:
 	friend class PluginInsert;
+	friend struct PluginInsert::PluginControl;
 	virtual void set_parameter (uint32_t which, float val) = 0;
 
 	ARDOUR::AudioEngine& _engine;
diff --git a/libs/ardour/ardour/plugin_insert.h b/libs/ardour/ardour/plugin_insert.h
index 0694fa2a68..2038153d86 100644
--- a/libs/ardour/ardour/plugin_insert.h
+++ b/libs/ardour/ardour/plugin_insert.h
@@ -81,13 +81,14 @@ class PluginInsert : public Processor
 
 	float default_parameter_value (Parameter param);
 	
-	struct PluginControl : public AutomationControl {
+	struct PluginControl : public AutomationControl 
+	{
 	    PluginControl (PluginInsert& p, boost::shared_ptr<AutomationList> list);
 	    
 		void set_value (float val);
 	    float get_value (void) const;
 	
-	private:
+	  private:
 		PluginInsert& _plugin;
 		boost::shared_ptr<AutomationList> _list;
 		bool _logarithmic;
diff --git a/libs/ardour/mix.cc b/libs/ardour/mix.cc
index 1c5d258661..726d375453 100644
--- a/libs/ardour/mix.cc
+++ b/libs/ardour/mix.cc
@@ -140,35 +140,35 @@ float
 veclib_compute_peak (const ARDOUR::Sample * buf, nframes_t nsamples, float current)
 {
 	float tmpmax = 0.0f;
-        vDSP_maxmgv(buf, 1, &tmpmax, nsamples);
-        return f_max(current, tmpmax);
+	vDSP_maxmgv(buf, 1, &tmpmax, nsamples);
+	return f_max(current, tmpmax);
 }
 
 void
 veclib_find_peaks (const ARDOUR::Sample * buf, nframes_t nframes, float *min, float *max)
 {
-	vDSP_maxv (buf, 1, max, nframes);
-	vDSP_minv (buf, 1, min, nframes);
+	vDSP_maxv (const_cast<ARDOUR::Sample*>(buf), 1, max, nframes);
+	vDSP_minv (const_cast<ARDOUR::Sample*>(buf), 1, min, nframes);
 }
 
 void
 veclib_apply_gain_to_buffer (ARDOUR::Sample * buf, nframes_t nframes, float gain)
 {
-        vDSP_vsmul(buf, 1, &gain, buf, 1, nframes);
+	vDSP_vsmul(buf, 1, &gain, buf, 1, nframes);
 }
 
 void
 veclib_mix_buffers_with_gain (ARDOUR::Sample * dst, const ARDOUR::Sample * src, nframes_t nframes, float gain)
 {
-        vDSP_vsma(src, 1, &gain, dst, 1, dst, 1, nframes);
+	vDSP_vsma(src, 1, &gain, dst, 1, dst, 1, nframes);
 }
 
 void
 veclib_mix_buffers_no_gain (ARDOUR::Sample * dst, const ARDOUR::Sample * src, nframes_t nframes)
 {
-        // It seems that a vector mult only operation does not exist...
-        float gain = 1.0f;
-        vDSP_vsma(src, 1, &gain, dst, 1, dst, 1, nframes);
+	// It seems that a vector mult only operation does not exist...
+	float gain = 1.0f;
+	vDSP_vsma(src, 1, &gain, dst, 1, dst, 1, nframes);
 }
 
 #endif
diff --git a/libs/surfaces/powermate/SConscript b/libs/surfaces/powermate/SConscript
index e6f7e251df..cb144e37d3 100644
--- a/libs/surfaces/powermate/SConscript
+++ b/libs/surfaces/powermate/SConscript
@@ -44,14 +44,16 @@ powermate.Merge ([
 
 libardour_powermate = powermate.SharedLibrary('ardour_powermate', powermate_files)
 
-Default(libardour_powermate)
+if env['POWERMATE']:
+	Default(libardour_powermate)
 
-if env['NLS']:
-	i18n (powermate, powermate_files, env)
+	if env['NLS']:
+		i18n (powermate, powermate_files, env)
 	      
-env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2/surfaces'), libardour_powermate))
+	env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2/surfaces'), libardour_powermate))
+
+	env.Alias('tarball', env.Distribute (env['DISTTREE'],
+					     [ 'SConscript' ] +
+					     powermate_files + 
+					     glob.glob('po/*.po') + glob.glob('*.h')))
 
-env.Alias('tarball', env.Distribute (env['DISTTREE'],
-				     [ 'SConscript' ] +
-				     powermate_files + 
-				     glob.glob('po/*.po') + glob.glob('*.h')))