diff options
Diffstat (limited to 'libs/ardour/ardour')
36 files changed, 95 insertions, 93 deletions
diff --git a/libs/ardour/ardour/analyser.h b/libs/ardour/ardour/analyser.h index 15e4220ad6..aae16e443f 100644 --- a/libs/ardour/ardour/analyser.h +++ b/libs/ardour/ardour/analyser.h @@ -1,7 +1,7 @@ #ifndef __ardour_analyser_h__ #define __ardour_analyser_h__ -#include <glibmm/thread.h> +#include <glibmm/threads.h> #include <boost/shared_ptr.hpp> namespace ARDOUR { @@ -22,8 +22,8 @@ class Analyser { private: static Analyser* the_analyser; - static Glib::StaticMutex analysis_queue_lock; - static Glib::Cond* SourcesToAnalyse; + static Glib::Threads::Mutex analysis_queue_lock; + static Glib::Threads::Cond SourcesToAnalyse; static std::list<boost::weak_ptr<Source> > analysis_queue; static void analyse_audio_file_source (boost::shared_ptr<AudioFileSource>); diff --git a/libs/ardour/ardour/audioengine.h b/libs/ardour/ardour/audioengine.h index 73e40e8ab4..1c0d0f1a55 100644 --- a/libs/ardour/ardour/audioengine.h +++ b/libs/ardour/ardour/audioengine.h @@ -31,7 +31,7 @@ #include <exception> #include <string> -#include <glibmm/thread.h> +#include <glibmm/threads.h> #include "pbd/rcu.h" #include "pbd/signals.h" @@ -85,7 +85,7 @@ public: int start (); bool running() const { return _running; } - Glib::Mutex& process_lock() { return _process_lock; } + Glib::Threads::Mutex& process_lock() { return _process_lock; } framecnt_t frame_rate () const; pframes_t frames_per_cycle () const; @@ -265,8 +265,8 @@ private: jack_client_t* volatile _jack; /* could be reset to null by SIGPIPE or another thread */ std::string jack_client_name; - Glib::Mutex _process_lock; - Glib::Cond session_removed; + Glib::Threads::Mutex _process_lock; + Glib::Threads::Cond session_removed; bool session_remove_pending; frameoffset_t session_removal_countdown; gain_t session_removal_gain; @@ -286,7 +286,7 @@ private: bool _pre_freewheel_mmc_enabled; int _usecs_per_cycle; bool port_remove_in_progress; - Glib::Thread* m_meter_thread; + Glib::Threads::Thread* m_meter_thread; ProcessThread* _main_thread; SerializedRCUManager<Ports> ports; diff --git a/libs/ardour/ardour/audiosource.h b/libs/ardour/ardour/audiosource.h index c6ec2a56ad..cbdcd296af 100644 --- a/libs/ardour/ardour/audiosource.h +++ b/libs/ardour/ardour/audiosource.h @@ -25,7 +25,7 @@ #include <time.h> -#include <glibmm/thread.h> +#include <glibmm/threads.h> #include <boost/function.hpp> #include "ardour/source.h" @@ -118,7 +118,7 @@ class AudioSource : virtual public Source, static std::vector<boost::shared_ptr<Sample> > _mixdown_buffers; static std::vector<boost::shared_ptr<gain_t> > _gain_buffers; - static Glib::StaticMutex _level_buffer_lock; + static Glib::Threads::Mutex _level_buffer_lock; static void ensure_buffers_for_level (uint32_t, framecnt_t); static void ensure_buffers_for_level_locked (uint32_t, framecnt_t); @@ -157,7 +157,7 @@ class AudioSource : virtual public Source, * PeaksReady means that _peaks_built cannot be changed * during the handling of the signal. */ - mutable Glib::Mutex _peaks_ready_lock; + mutable Glib::Threads::Mutex _peaks_ready_lock; PBD::FdFileDescriptor* _peakfile_descriptor; int _peakfile_fd; diff --git a/libs/ardour/ardour/auditioner.h b/libs/ardour/ardour/auditioner.h index 3650f0c92c..bdd04fcc66 100644 --- a/libs/ardour/ardour/auditioner.h +++ b/libs/ardour/ardour/auditioner.h @@ -22,7 +22,7 @@ #include <string> -#include <glibmm/thread.h> +#include <glibmm/threads.h> #include "ardour/ardour.h" #include "ardour/audio_track.h" @@ -62,7 +62,7 @@ class Auditioner : public AudioTrack boost::shared_ptr<AudioRegion> the_region; framepos_t current_frame; mutable gint _auditioning; - Glib::Mutex lock; + Glib::Threads::Mutex lock; framecnt_t length; bool via_monitor; diff --git a/libs/ardour/ardour/auto_bundle.h b/libs/ardour/ardour/auto_bundle.h index b41a5d344f..d97080c089 100644 --- a/libs/ardour/ardour/auto_bundle.h +++ b/libs/ardour/ardour/auto_bundle.h @@ -21,7 +21,7 @@ #define __ardour_auto_bundle_h__ #include <vector> -#include <glibmm/thread.h> +#include <glibmm/threads.h> #include "ardour/bundle.h" namespace ARDOUR { diff --git a/libs/ardour/ardour/automation_list.h b/libs/ardour/ardour/automation_list.h index 01c9d0641a..e7377d6b02 100644 --- a/libs/ardour/ardour/automation_list.h +++ b/libs/ardour/ardour/automation_list.h @@ -24,7 +24,7 @@ #include <list> #include <cmath> -#include <glibmm/thread.h> +#include <glibmm/threads.h> #include "pbd/undo.h" #include "pbd/xml++.h" diff --git a/libs/ardour/ardour/automation_watch.h b/libs/ardour/ardour/automation_watch.h index bb5ef69385..6fd5a0eb65 100644 --- a/libs/ardour/ardour/automation_watch.h +++ b/libs/ardour/ardour/automation_watch.h @@ -19,7 +19,7 @@ #include <list> #include <boost/shared_ptr.hpp> -#include <glibmm/thread.h> +#include <glibmm/threads.h> #include <sigc++/signal.h> #include "pbd/signals.h" @@ -47,10 +47,10 @@ class AutomationWatch : public sigc::trackable, public ARDOUR::SessionHandlePtr, ~AutomationWatch(); static AutomationWatch* _instance; - Glib::Thread* _thread; + Glib::Threads::Thread* _thread; bool _run_thread; AutomationWatches automation_watches; - Glib::Mutex automation_watch_lock; + Glib::Threads::Mutex automation_watch_lock; PBD::ScopedConnection transport_connection; void transport_state_change (); diff --git a/libs/ardour/ardour/buffer_manager.h b/libs/ardour/ardour/buffer_manager.h index e3ac981e63..2a8e7be6da 100644 --- a/libs/ardour/ardour/buffer_manager.h +++ b/libs/ardour/ardour/buffer_manager.h @@ -7,7 +7,7 @@ #include "ardour/chan_count.h" #include <list> -#include <glibmm/thread.h> +#include <glibmm/threads.h> namespace ARDOUR { @@ -24,7 +24,7 @@ public: static void ensure_buffers (ChanCount howmany = ChanCount::ZERO); private: - static Glib::StaticMutex rb_mutex; + static Glib::Threads::Mutex rb_mutex; typedef PBD::RingBufferNPT<ThreadBuffers*> ThreadBufferFIFO; typedef std::list<ThreadBuffers*> ThreadBufferList; diff --git a/libs/ardour/ardour/bundle.h b/libs/ardour/ardour/bundle.h index e84349c647..02845481b6 100644 --- a/libs/ardour/ardour/bundle.h +++ b/libs/ardour/ardour/bundle.h @@ -22,7 +22,7 @@ #include <string> #include <vector> -#include <glibmm/thread.h> +#include <glibmm/threads.h> #include <boost/shared_ptr.hpp> #include "pbd/signals.h" @@ -134,7 +134,7 @@ class Bundle : public PBD::ScopedConnectionList /// mutex for _channel_ports and _channel_names /// XXX: is this necessary? - mutable Glib::Mutex _channel_mutex; + mutable Glib::Threads::Mutex _channel_mutex; std::vector<Channel> _channel; private: diff --git a/libs/ardour/ardour/butler.h b/libs/ardour/ardour/butler.h index 061c94d910..cdd48c3e3a 100644 --- a/libs/ardour/ardour/butler.h +++ b/libs/ardour/ardour/butler.h @@ -20,7 +20,7 @@ #ifndef __ardour_butler_h__ #define __ardour_butler_h__ -#include <glibmm/thread.h> +#include <glibmm/threads.h> #include "pbd/ringbuffer.h" #include "pbd/pool.h" @@ -67,8 +67,8 @@ class Butler : public SessionHandleRef }; pthread_t thread; - Glib::Mutex request_lock; - Glib::Cond paused; + Glib::Threads::Mutex request_lock; + Glib::Threads::Cond paused; bool should_run; mutable gint should_do_transport_work; int request_pipe[2]; diff --git a/libs/ardour/ardour/control_protocol_manager.h b/libs/ardour/ardour/control_protocol_manager.h index 20358025f1..80c9668763 100644 --- a/libs/ardour/ardour/control_protocol_manager.h +++ b/libs/ardour/ardour/control_protocol_manager.h @@ -24,7 +24,7 @@ #include <list> -#include <glibmm/thread.h> +#include <glibmm/threads.h> #include "pbd/stateful.h" #include "ardour/session_handle.h" @@ -81,7 +81,7 @@ class ControlProtocolManager : public PBD::Stateful, public ARDOUR::SessionHandl ControlProtocolManager (); static ControlProtocolManager* _instance; - Glib::Mutex protocols_lock; + Glib::Threads::Mutex protocols_lock; std::list<ControlProtocol*> control_protocols; void session_going_away (); diff --git a/libs/ardour/ardour/diskstream.h b/libs/ardour/ardour/diskstream.h index bbc3a85dbe..5d3693052d 100644 --- a/libs/ardour/ardour/diskstream.h +++ b/libs/ardour/ardour/diskstream.h @@ -250,7 +250,7 @@ class Diskstream : public SessionObject, public PublicDiskstream static framecnt_t disk_io_chunk_frames; std::vector<CaptureInfo*> capture_info; - mutable Glib::Mutex capture_info_lock; + mutable Glib::Threads::Mutex capture_info_lock; uint32_t i_am_the_modifier; @@ -301,7 +301,7 @@ class Diskstream : public SessionObject, public PublicDiskstream bool in_set_state; - Glib::Mutex state_lock; + Glib::Threads::Mutex state_lock; PBD::ScopedConnectionList playlist_connections; diff --git a/libs/ardour/ardour/graph.h b/libs/ardour/ardour/graph.h index e5c03ad134..cac09d34af 100644 --- a/libs/ardour/ardour/graph.h +++ b/libs/ardour/ardour/graph.h @@ -122,8 +122,8 @@ private: bool _graph_empty; // chain swapping - Glib::Mutex _swap_mutex; - Glib::Cond _cleanup_cond; + Glib::Threads::Mutex _swap_mutex; + Glib::Threads::Cond _cleanup_cond; volatile int _current_chain; volatile int _pending_chain; volatile int _setup_chain; diff --git a/libs/ardour/ardour/internal_return.h b/libs/ardour/ardour/internal_return.h index 291b51896c..c7fe04cc42 100644 --- a/libs/ardour/ardour/internal_return.h +++ b/libs/ardour/ardour/internal_return.h @@ -48,7 +48,7 @@ class InternalReturn : public Return /** sends that we are receiving data from */ std::list<InternalSend*> _sends; /** mutex to protect _sends */ - Glib::Mutex _sends_mutex; + Glib::Threads::Mutex _sends_mutex; }; } // namespace ARDOUR diff --git a/libs/ardour/ardour/io.h b/libs/ardour/ardour/io.h index d38aa88576..69297fff04 100644 --- a/libs/ardour/ardour/io.h +++ b/libs/ardour/ardour/io.h @@ -25,7 +25,7 @@ #include <cmath> #include <jack/jack.h> -#include <glibmm/thread.h> +#include <glibmm/threads.h> #include "pbd/fastlog.h" #include "pbd/undo.h" @@ -200,7 +200,7 @@ class IO : public SessionObject, public Latent int set_ports (const std::string& str); private: - mutable Glib::Mutex io_lock; + mutable Glib::Threads::Mutex io_lock; protected: PortSet _ports; diff --git a/libs/ardour/ardour/io_processor.h b/libs/ardour/ardour/io_processor.h index 3d59230b26..7adfab2225 100644 --- a/libs/ardour/ardour/io_processor.h +++ b/libs/ardour/ardour/io_processor.h @@ -23,7 +23,7 @@ #include <string> #include <boost/shared_ptr.hpp> -#include <glibmm/thread.h> +#include <glibmm/threads.h> #include "pbd/undo.h" diff --git a/libs/ardour/ardour/location.h b/libs/ardour/ardour/location.h index 069230438e..414f332b5e 100644 --- a/libs/ardour/ardour/location.h +++ b/libs/ardour/ardour/location.h @@ -27,7 +27,7 @@ #include <sys/types.h> -#include <glibmm/thread.h> +#include <glibmm/threads.h> #include "pbd/undo.h" #include "pbd/stateful.h" @@ -181,12 +181,12 @@ class Locations : public SessionHandleRef, public PBD::StatefulDestructible PBD::Signal1<void,const PBD::PropertyChange&> StateChanged; template<class T> void apply (T& obj, void (T::*method)(LocationList&)) { - Glib::Mutex::Lock lm (lock); + Glib::Threads::Mutex::Lock lm (lock); (obj.*method)(locations); } template<class T1, class T2> void apply (T1& obj, void (T1::*method)(LocationList&, T2& arg), T2& arg) { - Glib::Mutex::Lock lm (lock); + Glib::Threads::Mutex::Lock lm (lock); (obj.*method)(locations, arg); } @@ -194,7 +194,7 @@ class Locations : public SessionHandleRef, public PBD::StatefulDestructible LocationList locations; Location *current_location; - mutable Glib::Mutex lock; + mutable Glib::Threads::Mutex lock; int set_current_unlocked (Location *); void location_changed (Location*); diff --git a/libs/ardour/ardour/logcurve.h b/libs/ardour/ardour/logcurve.h index a5f0ce4734..4c91ad9a79 100644 --- a/libs/ardour/ardour/logcurve.h +++ b/libs/ardour/ardour/logcurve.h @@ -21,7 +21,7 @@ #define __ardour_logcurve_h__ #include "pbd/fastlog.h" -#include <glibmm/thread.h> +#include <glibmm/threads.h> namespace ARDOUR { @@ -93,7 +93,7 @@ class LogCurve { } void set_length (uint32_t len) { l = len; } - mutable Glib::Mutex lock; + mutable Glib::Threads::Mutex lock; protected: float a; diff --git a/libs/ardour/ardour/midi_diskstream.h b/libs/ardour/ardour/midi_diskstream.h index 99513734da..0823a5f8ac 100644 --- a/libs/ardour/ardour/midi_diskstream.h +++ b/libs/ardour/ardour/midi_diskstream.h @@ -199,7 +199,7 @@ class MidiDiskstream : public Diskstream the GUI to read (so that it can update itself). */ MidiBuffer _gui_feed_buffer; - mutable Glib::Mutex _gui_feed_buffer_mutex; + mutable Glib::Threads::Mutex _gui_feed_buffer_mutex; }; }; /* namespace ARDOUR */ diff --git a/libs/ardour/ardour/midi_model.h b/libs/ardour/ardour/midi_model.h index d0a05e131d..38bd3ab982 100644 --- a/libs/ardour/ardour/midi_model.h +++ b/libs/ardour/ardour/midi_model.h @@ -25,7 +25,7 @@ #include <deque> #include <utility> #include <boost/utility.hpp> -#include <glibmm/thread.h> +#include <glibmm/threads.h> #include "pbd/command.h" #include "ardour/types.h" #include "ardour/midi_buffer.h" @@ -267,14 +267,14 @@ protected: private: struct WriteLockImpl : public AutomatableSequence<TimeType>::WriteLockImpl { - WriteLockImpl(Glib::Mutex::Lock* source_lock, Glib::RWLock& s, Glib::Mutex& c) + WriteLockImpl(Glib::Threads::Mutex::Lock* slock, Glib::Threads::RWLock& s, Glib::Threads::Mutex& c) : AutomatableSequence<TimeType>::WriteLockImpl(s, c) - , source_lock(source_lock) + , source_lock (slock) {} ~WriteLockImpl() { delete source_lock; } - Glib::Mutex::Lock* source_lock; + Glib::Threads::Mutex::Lock* source_lock; }; public: diff --git a/libs/ardour/ardour/midi_source.h b/libs/ardour/ardour/midi_source.h index 1d4ba56ba3..1a7f3b07c5 100644 --- a/libs/ardour/ardour/midi_source.h +++ b/libs/ardour/ardour/midi_source.h @@ -22,7 +22,7 @@ #include <string> #include <time.h> -#include <glibmm/thread.h> +#include <glibmm/threads.h> #include <boost/enable_shared_from_this.hpp> #include "pbd/stateful.h" #include "pbd/xml++.h" diff --git a/libs/ardour/ardour/playlist.h b/libs/ardour/ardour/playlist.h index a64ebdd727..6de772390e 100644 --- a/libs/ardour/ardour/playlist.h +++ b/libs/ardour/ardour/playlist.h @@ -230,16 +230,16 @@ public: friend class Session; protected: - class RegionReadLock : public Glib::RWLock::ReaderLock { + class RegionReadLock : public Glib::Threads::RWLock::ReaderLock { public: - RegionReadLock (Playlist *pl) : Glib::RWLock::ReaderLock (pl->region_lock) {} + RegionReadLock (Playlist *pl) : Glib::Threads::RWLock::ReaderLock (pl->region_lock) {} ~RegionReadLock() {} }; - class RegionWriteLock : public Glib::RWLock::WriterLock { + class RegionWriteLock : public Glib::Threads::RWLock::WriterLock { public: RegionWriteLock (Playlist *pl, bool do_block_notify = true) - : Glib::RWLock::WriterLock (pl->region_lock) + : Glib::Threads::RWLock::WriterLock (pl->region_lock) , playlist (pl) , block_notify (do_block_notify) { if (block_notify) { @@ -248,7 +248,7 @@ public: } ~RegionWriteLock() { - Glib::RWLock::WriterLock::release (); + Glib::Threads::RWLock::WriterLock::release (); if (block_notify) { playlist->release_notifications (); } @@ -375,7 +375,7 @@ public: private: friend class RegionReadLock; friend class RegionWriteLock; - mutable Glib::RWLock region_lock; + mutable Glib::Threads::RWLock region_lock; private: void setup_layering_indices (RegionList const &); diff --git a/libs/ardour/ardour/process_thread.h b/libs/ardour/ardour/process_thread.h index 6dd91aa305..871a2584d5 100644 --- a/libs/ardour/ardour/process_thread.h +++ b/libs/ardour/ardour/process_thread.h @@ -1,7 +1,7 @@ #ifndef __libardour_process_thread__ #define __libardour_process_thread__ -#include <glibmm/thread.h> +#include <glibmm/threads.h> #include "ardour/chan_count.h" #include "ardour/types.h" @@ -36,7 +36,7 @@ protected: void session_going_away (); private: - static Glib::Private<ThreadBuffers>* _private_thread_buffers; + static Glib::Threads::Private<ThreadBuffers> _private_thread_buffers; }; } // namespace diff --git a/libs/ardour/ardour/region_factory.h b/libs/ardour/ardour/region_factory.h index 471f172440..ed0c962d87 100644 --- a/libs/ardour/ardour/region_factory.h +++ b/libs/ardour/ardour/region_factory.h @@ -22,7 +22,7 @@ #include <map> #include <set> -#include <glibmm/thread.h> +#include <glibmm/threads.h> #include "pbd/id.h" #include "pbd/property_list.h" @@ -124,11 +124,11 @@ public: static void region_changed (PBD::PropertyChange const &, boost::weak_ptr<Region>); - static Glib::StaticMutex region_map_lock; + static Glib::Threads::Mutex region_map_lock; static RegionMap region_map; - static Glib::StaticMutex region_name_maps_mutex; + static Glib::Threads::Mutex region_name_maps_mutex; /** map of partial region names and suffix numbers */ static std::map<std::string, uint32_t> region_name_number_map; /** map of complete region names with their region ID */ diff --git a/libs/ardour/ardour/route.h b/libs/ardour/ardour/route.h index 62a694071f..b2e3d1236e 100644 --- a/libs/ardour/ardour/route.h +++ b/libs/ardour/ardour/route.h @@ -32,7 +32,7 @@ #include <boost/dynamic_bitset.hpp> #include <boost/enable_shared_from_this.hpp> -#include <glibmm/thread.h> +#include <glibmm/threads.h> #include "pbd/fastlog.h" #include "pbd/xml++.h" #include "pbd/undo.h" @@ -191,7 +191,7 @@ class Route : public SessionObject, public Automatable, public RouteGroupMember, void flush_processors (); void foreach_processor (boost::function<void(boost::weak_ptr<Processor>)> method) { - Glib::RWLock::ReaderLock lm (_processor_lock); + Glib::Threads::RWLock::ReaderLock lm (_processor_lock); for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) { if (boost::dynamic_pointer_cast<UnknownProcessor> (*i)) { break; @@ -201,7 +201,7 @@ class Route : public SessionObject, public Automatable, public RouteGroupMember, } boost::shared_ptr<Processor> nth_processor (uint32_t n) { - Glib::RWLock::ReaderLock lm (_processor_lock); + Glib::Threads::RWLock::ReaderLock lm (_processor_lock); ProcessorList::iterator i; for (i = _processors.begin(); i != _processors.end() && n; ++i, --n) {} if (i == _processors.end()) { @@ -468,7 +468,7 @@ class Route : public SessionObject, public Automatable, public RouteGroupMember, framecnt_t _roll_delay; ProcessorList _processors; - mutable Glib::RWLock _processor_lock; + mutable Glib::Threads::RWLock _processor_lock; boost::shared_ptr<Delivery> _main_outs; boost::shared_ptr<InternalSend> _monitor_send; boost::shared_ptr<InternalReturn> _intreturn; diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h index 780c68f2b0..5f20df029c 100644 --- a/libs/ardour/ardour/session.h +++ b/libs/ardour/ardour/session.h @@ -34,7 +34,7 @@ #include <boost/weak_ptr.hpp> #include <boost/utility.hpp> -#include <glibmm/thread.h> +#include <glibmm/threads.h> #include "pbd/error.h" #include "pbd/event_loop.h" @@ -1258,7 +1258,7 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi /* REGION MANAGEMENT */ - mutable Glib::Mutex region_lock; + mutable Glib::Threads::Mutex region_lock; int load_regions (const XMLNode& node); int load_compounds (const XMLNode& node); @@ -1269,7 +1269,7 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi /* SOURCES */ - mutable Glib::Mutex source_lock; + mutable Glib::Threads::Mutex source_lock; public: typedef std::map<PBD::ID,boost::shared_ptr<Source> > SourceMap; @@ -1354,7 +1354,7 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi could not report free space. */ bool _total_free_4k_blocks_uncertain; - Glib::Mutex space_lock; + Glib::Threads::Mutex space_lock; bool no_questions_about_missing_files; @@ -1397,7 +1397,7 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi Sample* click_emphasis_data; framecnt_t click_length; framecnt_t click_emphasis_length; - mutable Glib::RWLock click_lock; + mutable Glib::Threads::RWLock click_lock; static const Sample default_click[]; static const framecnt_t default_click_length; @@ -1450,7 +1450,7 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi int find_all_sources_across_snapshots (std::set<std::string>& result, bool exclude_this_snapshot); typedef std::set<boost::shared_ptr<PBD::Controllable> > Controllables; - Glib::Mutex controllables_lock; + Glib::Threads::Mutex controllables_lock; Controllables controllables; boost::shared_ptr<PBD::Controllable> _solo_cut_control; diff --git a/libs/ardour/ardour/session_playlist.h b/libs/ardour/ardour/session_playlist.h index 7f5d1e89ce..fa1acc5828 100644 --- a/libs/ardour/ardour/session_playlist.h +++ b/libs/ardour/ardour/session_playlist.h @@ -29,7 +29,7 @@ namespace ARDOUR { template<class T> void SessionPlaylists::foreach (T *obj, void (T::*func)(boost::shared_ptr<Playlist>)) { - Glib::Mutex::Lock lm (lock); + Glib::Threads::Mutex::Lock lm (lock); for (List::iterator i = playlists.begin(); i != playlists.end(); i++) { if (!(*i)->hidden()) { (obj->*func) (*i); diff --git a/libs/ardour/ardour/session_playlists.h b/libs/ardour/ardour/session_playlists.h index 5f69ba8001..83dc8ee58c 100644 --- a/libs/ardour/ardour/session_playlists.h +++ b/libs/ardour/ardour/session_playlists.h @@ -23,7 +23,7 @@ #include <set> #include <vector> #include <string> -#include <glibmm/thread.h> +#include <glibmm/threads.h> #include <boost/shared_ptr.hpp> #include <boost/function.hpp> @@ -78,7 +78,7 @@ private: int load_unused (Session &, const XMLNode&); boost::shared_ptr<Playlist> XMLPlaylistFactory (Session &, const XMLNode&); - mutable Glib::Mutex lock; + mutable Glib::Threads::Mutex lock; typedef std::set<boost::shared_ptr<Playlist> > List; List playlists; List unused_playlists; diff --git a/libs/ardour/ardour/session_route.h b/libs/ardour/ardour/session_route.h index cfaa13cdc8..19d8614d1b 100644 --- a/libs/ardour/ardour/session_route.h +++ b/libs/ardour/ardour/session_route.h @@ -22,7 +22,7 @@ #include <iostream> -#include <glibmm/thread.h> +#include <glibmm/threads.h> #include "ardour/session.h" #include "ardour/route.h" diff --git a/libs/ardour/ardour/slave.h b/libs/ardour/ardour/slave.h index a487824e51..1602b8bc8e 100644 --- a/libs/ardour/ardour/slave.h +++ b/libs/ardour/ardour/slave.h @@ -22,7 +22,7 @@ #include <vector> -#include <glibmm/thread.h> +#include <glibmm/threads.h> #include <jack/jack.h> @@ -262,7 +262,7 @@ class MTC_Slave : public Slave { size_t speed_accumulator_cnt; bool have_first_speed_accumulator; double average_speed; - Glib::Mutex reset_lock; + Glib::Threads::Mutex reset_lock; uint32_t reset_pending; bool reset_position; diff --git a/libs/ardour/ardour/source.h b/libs/ardour/ardour/source.h index e65b4cb093..a3b5fd817a 100644 --- a/libs/ardour/ardour/source.h +++ b/libs/ardour/ardour/source.h @@ -23,7 +23,7 @@ #include <string> #include <set> -#include <glib.h> +#include <glibmm/threads.h> #include <boost/utility.hpp> #include "pbd/statefuldestructible.h" @@ -99,7 +99,7 @@ class Source : public SessionObject void set_allow_remove_if_empty (bool yn); - Glib::Mutex& mutex() { return _lock; } + Glib::Threads::Mutex& mutex() { return _lock; } Flag flags() const { return _flags; } virtual void inc_use_count (); @@ -114,8 +114,8 @@ class Source : public SessionObject time_t _timestamp; framepos_t _timeline_position; bool _analysed; - mutable Glib::Mutex _lock; - mutable Glib::Mutex _analysis_lock; + mutable Glib::Threads::Mutex _lock; + mutable Glib::Threads::Mutex _analysis_lock; gint _use_count; /* atomic */ uint32_t _level; /* how deeply nested is this source w.r.t a disk file */ diff --git a/libs/ardour/ardour/source_factory.h b/libs/ardour/ardour/source_factory.h index 5ddf1f8735..387a40aff3 100644 --- a/libs/ardour/ardour/source_factory.h +++ b/libs/ardour/ardour/source_factory.h @@ -24,6 +24,8 @@ #include <stdint.h> #include <boost/shared_ptr.hpp> +#include <glibmm/threads.h> + #include "ardour/source.h" class XMLNode; @@ -59,8 +61,8 @@ class SourceFactory { (DataType type, Session& s, boost::shared_ptr<Playlist> p, const PBD::ID& orig, const std::string& name, uint32_t chn, frameoffset_t start, framecnt_t len, bool copy, bool defer_peaks); - static Glib::Cond* PeaksToBuild; - static Glib::StaticMutex peak_building_lock; + static Glib::Threads::Cond PeaksToBuild; + static Glib::Threads::Mutex peak_building_lock; static std::list< boost::weak_ptr<AudioSource> > files_with_peaks; static int setup_peakfile (boost::shared_ptr<Source>, bool async); diff --git a/libs/ardour/ardour/tempo.h b/libs/ardour/ardour/tempo.h index 15032b8741..8e4f1bc420 100644 --- a/libs/ardour/ardour/tempo.h +++ b/libs/ardour/ardour/tempo.h @@ -24,7 +24,7 @@ #include <string> #include <vector> #include <cmath> -#include <glibmm/thread.h> +#include <glibmm/threads.h> #include "pbd/undo.h" #include "pbd/stateful.h" @@ -218,7 +218,7 @@ class TempoMap : public PBD::StatefulDestructible typedef std::vector<BBTPoint> BBTPointList; template<class T> void apply_with_metrics (T& obj, void (T::*method)(const Metrics&)) { - Glib::RWLock::ReaderLock lm (lock); + Glib::Threads::RWLock::ReaderLock lm (lock); (obj.*method)(metrics); } @@ -314,7 +314,7 @@ class TempoMap : public PBD::StatefulDestructible Metrics metrics; framecnt_t _frame_rate; - mutable Glib::RWLock lock; + mutable Glib::Threads::RWLock lock; BBTPointList _map; void recompute_map (bool reassign_tempo_bbt, framepos_t end = -1); diff --git a/libs/ardour/ardour/thread_buffers.h b/libs/ardour/ardour/thread_buffers.h index be8cb42282..9011e98e43 100644 --- a/libs/ardour/ardour/thread_buffers.h +++ b/libs/ardour/ardour/thread_buffers.h @@ -1,7 +1,7 @@ #ifndef __libardour_thread_buffers__ #define __libardour_thread_buffers__ -#include <glibmm/thread.h> +#include <glibmm/threads.h> #include "ardour/chan_count.h" #include "ardour/types.h" diff --git a/libs/ardour/ardour/user_bundle.h b/libs/ardour/ardour/user_bundle.h index c124e2e722..5ecfe521f5 100644 --- a/libs/ardour/ardour/user_bundle.h +++ b/libs/ardour/ardour/user_bundle.h @@ -21,7 +21,7 @@ #define __ardour_user_bundle_h__ #include <vector> -#include <glibmm/thread.h> +#include <glibmm/threads.h> #include "pbd/stateful.h" #include "ardour/bundle.h" diff --git a/libs/ardour/ardour/worker.h b/libs/ardour/ardour/worker.h index 984e375c80..fe278b9618 100644 --- a/libs/ardour/ardour/worker.h +++ b/libs/ardour/ardour/worker.h @@ -22,7 +22,7 @@ #include <stdint.h> -#include <glibmm/thread.h> +#include <glibmm/threads.h> #include "pbd/ringbuffer.h" #include "pbd/semaphore.h" @@ -76,13 +76,13 @@ public: private: void run(); - Workee* _workee; - Glib::Thread* _thread; - RingBuffer<uint8_t>* _requests; - RingBuffer<uint8_t>* _responses; - uint8_t* _response; - PBD::Semaphore _sem; - bool _exit; + Workee* _workee; + Glib::Threads::Thread* _thread; + RingBuffer<uint8_t>* _requests; + RingBuffer<uint8_t>* _responses; + uint8_t* _response; + PBD::Semaphore _sem; + bool _exit; }; } // namespace ARDOUR |