added mutable keyword to gints used in glib atomic operations to satisfy compiler on PPC arch. Also moved the needed apple ldflags for making shared libs to a better place.

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

9 files changed, 28 insertions, 18 deletions

diff --git a/SConstruct b/SConstruct
index 1c246f9f66..91db89fcf8 100644
--- a/SConstruct
+++ b/SConstruct
@@ -737,6 +737,12 @@ if env['FPU_OPTIMIZATION']:
 # end optimization section
 
 #
+# save off guessed arch element in an env
+#
+env.Append(CONFIG_ARCH=config[config_arch])
+
+
+#
 # ARCH="..." overrides all 
 #
 
diff --git a/libs/ardour/SConscript b/libs/ardour/SConscript
index 2efaa9b6a2..0fb5cfc788 100644
--- a/libs/ardour/SConscript
+++ b/libs/ardour/SConscript
@@ -178,10 +178,13 @@ if conf.CheckCHeader('/System/Library/Frameworks/CoreMIDI.framework/Headers/Core
 if conf.CheckCHeader('/System/Library/Frameworks/AudioToolbox.framework/Headers/ExtendedAudioFile.h') and ardour['COREAUDIO'] == 1:
     ardour.Append(CXXFLAGS="-DHAVE_COREAUDIO")    
     ardour.Append(LINKFLAGS="-framework AudioToolbox")
-    #
+    
+
+if env['CONFIG_ARCH'] == 'apple':
     # this next line avoids issues with circular dependencies between libardour and libardour_cp.
     # it is based on the (entirely reasonable) assumption that a system with CoreAudio is OS X
     #
+    print 'APPLE CONFIG'
     ardour.Append(LINKFLAGS='-undefined suppress -flat_namespace') 
     extra_sources += coreaudio_files
 
@@ -191,6 +194,7 @@ ardour.Merge ([
 	     libraries['core'],
 	     libraries['xml'],
 	     libraries['sndfile'],
+	     libraries['raptor'],
 	     libraries['lrdf'],
 	     libraries['samplerate'],
 	     libraries['sigc2'],
diff --git a/libs/ardour/ardour/audioengine.h b/libs/ardour/ardour/audioengine.h
index bbd7001100..50bf7dddcc 100644
--- a/libs/ardour/ardour/audioengine.h
+++ b/libs/ardour/ardour/audioengine.h
@@ -240,7 +240,7 @@ class AudioEngine : public sigc::trackable
 	void meter_thread ();
 	void start_metering_thread ();
     Glib::Thread*    m_meter_thread;
-    gint    m_meter_exit;
+    mutable gint     m_meter_exit;
 };
 
 }; /* namespace ARDOUR */
diff --git a/libs/ardour/ardour/auditioner.h b/libs/ardour/ardour/auditioner.h
index d5d4063dda..434ec32f97 100644
--- a/libs/ardour/ardour/auditioner.h
+++ b/libs/ardour/ardour/auditioner.h
@@ -56,7 +56,7 @@ class Auditioner : public AudioTrack
   private:
 	AudioRegion *the_region;
 	jack_nframes_t current_frame;
-	gint _active;
+	mutable gint _active;
 	Glib::Mutex lock;
 	jack_nframes_t length;
 
diff --git a/libs/ardour/ardour/diskstream.h b/libs/ardour/ardour/diskstream.h
index a017b7af9b..316daba52f 100644
--- a/libs/ardour/ardour/diskstream.h
+++ b/libs/ardour/ardour/diskstream.h
@@ -320,7 +320,7 @@ class DiskStream : public Stateful, public sigc::trackable
 	uint32_t      _n_channels;
 	id_t              _id;
 
-	gint                 _record_enabled;
+	mutable gint             _record_enabled;
 	AudioPlaylist*           _playlist;
 	double                   _visible_speed;
 	double                   _actual_speed;
diff --git a/libs/ardour/ardour/playlist.h b/libs/ardour/ardour/playlist.h
index 02aaa5c5c9..d322f564ee 100644
--- a/libs/ardour/ardour/playlist.h
+++ b/libs/ardour/ardour/playlist.h
@@ -170,8 +170,8 @@ class Playlist : public Stateful, public StateManager {
 	RegionList       regions;
 	string          _name;
 	Session&        _session;
-	gint             block_notifications;
-	gint             ignore_state_changes;
+	mutable gint    block_notifications;
+	mutable gint    ignore_state_changes;
 	mutable Glib::Mutex region_lock;
 	RegionList       pending_removals;
 	RegionList       pending_adds;
diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
index c78a53135a..83acb3f82a 100644
--- a/libs/ardour/ardour/session.h
+++ b/libs/ardour/ardour/session.h
@@ -1004,12 +1004,12 @@ class Session : public sigc::trackable, public Stateful
 	typedef void (Session::*process_function_type)(jack_nframes_t);
 
 	AudioEngine            &_engine;
-	gint                 processing_prohibited;
+	mutable gint            processing_prohibited;
 	process_function_type    process_function;
 	process_function_type    last_process_function;
 	jack_nframes_t          _current_frame_rate;
 	int                      transport_sub_state;
-	gint                _record_status;
+	mutable gint           _record_status;
 	jack_nframes_t          _transport_frame;
 	Location*                end_location;
 	Location*                start_location;
@@ -1172,7 +1172,7 @@ class Session : public sigc::trackable, public Stateful
 	Glib::Mutex       butler_request_lock;
         Glib::Cond        butler_paused;
 	bool              butler_should_run;
-	gint              butler_should_do_transport_work;
+	mutable gint      butler_should_do_transport_work;
 	int               butler_request_pipe[2];
 	
 	struct ButlerRequest {
@@ -1420,7 +1420,7 @@ class Session : public sigc::trackable, public Stateful
 	Glib::Mutex       midi_lock;
 	pthread_t       midi_thread;
 	int             midi_request_pipe[2];
-	gint        butler_active;
+	mutable  gint   butler_active;
 	RingBuffer<MIDIRequest*> midi_requests;
 
 	int           start_midi_thread ();
@@ -1618,10 +1618,10 @@ class Session : public sigc::trackable, public Stateful
 	int ensure_sound_dir (string, string&);
 	void refresh_disk_space ();
 
-	gint _playback_load;
-	gint _capture_load;
-	gint _playback_load_min;
-	gint _capture_load_min;
+	mutable gint _playback_load;
+	mutable gint _capture_load;
+	mutable gint _playback_load_min;
+	mutable gint _capture_load_min;
 
 	/* I/O Connections */
 
diff --git a/libs/pbd3/pbd/ringbuffer.h b/libs/pbd3/pbd/ringbuffer.h
index 7906119ea9..1d9c9b04e3 100644
--- a/libs/pbd3/pbd/ringbuffer.h
+++ b/libs/pbd3/pbd/ringbuffer.h
@@ -117,8 +117,8 @@ class RingBuffer
   protected:
 	T *buf;
 	size_t size;
-	gint write_ptr;
-	gint read_ptr;
+	mutable gint write_ptr;
+	mutable gint read_ptr;
 	size_t size_mask;
 };
 
diff --git a/libs/pbd3/pbd/ringbufferNPT.h b/libs/pbd3/pbd/ringbufferNPT.h
index bb5df15b2e..fee2efce3d 100644
--- a/libs/pbd3/pbd/ringbufferNPT.h
+++ b/libs/pbd3/pbd/ringbufferNPT.h
@@ -113,8 +113,8 @@ class RingBufferNPT
   protected:
 	T *buf;
 	size_t size;
-	gint write_ptr;
-	gint read_ptr;
+	mutable gint write_ptr;
+	mutable gint read_ptr;
 };
 
 template<class T> size_t