convert from Glib:: to Glib::Threads for all thread-related API

git-svn-id: svn://localhost/ardour2/branches/3.0@13084 d708f5d6-7413-0410-9779-e7cbd77b26cf

8 files changed, 12 insertions, 12 deletions

diff --git a/gtk2_ardour/analysis_window.cc b/gtk2_ardour/analysis_window.cc
index c4948f5092..e93fad887c 100644
--- a/gtk2_ardour/analysis_window.cc
+++ b/gtk2_ardour/analysis_window.cc
@@ -239,7 +239,7 @@ AnalysisWindow::analyze_data (Gtk::Button */*button*/)
 {
 	track_list_ready = false;
 	{
-		Glib::Mutex::Lock lm  (track_list_lock);
+		Glib::Threads::Mutex::Lock lm  (track_list_lock);
 
 		// Empty track list & free old graphs
 		clear_tracklist();
diff --git a/gtk2_ardour/analysis_window.h b/gtk2_ardour/analysis_window.h
index 19ef84069a..af540b9173 100644
--- a/gtk2_ardour/analysis_window.h
+++ b/gtk2_ardour/analysis_window.h
@@ -35,7 +35,7 @@
 
 #include <gtkmm2ext/dndtreeview.h>
 
-#include <glibmm/thread.h>
+#include <glibmm/threads.h>
 
 #include "ardour/session_handle.h"
 
@@ -116,7 +116,7 @@ private:
 	FFTGraph fft_graph;
 
 	bool track_list_ready;
-	Glib::Mutex track_list_lock;
+	Glib::Threads::Mutex track_list_lock;
 
 	friend class FFTGraph;
 };
diff --git a/gtk2_ardour/fft_graph.cc b/gtk2_ardour/fft_graph.cc
index c0171ce57b..2b0b32a28a 100644
--- a/gtk2_ardour/fft_graph.cc
+++ b/gtk2_ardour/fft_graph.cc
@@ -61,7 +61,7 @@ void
 FFTGraph::setWindowSize(int windowSize)
 {
 	if (_a_window) {
-		Glib::Mutex::Lock lm  (_a_window->track_list_lock);
+		Glib::Threads::Mutex::Lock lm  (_a_window->track_list_lock);
 		setWindowSize_internal(windowSize);
 	} else {
 		setWindowSize_internal(windowSize);
@@ -268,7 +268,7 @@ FFTGraph::draw_scales(Glib::RefPtr<Gdk::Window> window)
 void
 FFTGraph::redraw()
 {
-	Glib::Mutex::Lock lm  (_a_window->track_list_lock);
+	Glib::Threads::Mutex::Lock lm  (_a_window->track_list_lock);
 
 	draw_scales(get_window());
 
diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc
index 1babbca556..a141999277 100644
--- a/gtk2_ardour/mixer_ui.cc
+++ b/gtk2_ardour/mixer_ui.cc
@@ -30,7 +30,7 @@
 #include "pbd/convert.h"
 #include "pbd/unwind.h"
 
-#include <glibmm/thread.h>
+#include <glibmm/threads.h>
 
 #include <gtkmm2ext/gtk_ui.h>
 #include <gtkmm2ext/utils.h>
diff --git a/gtk2_ardour/processor_box.cc b/gtk2_ardour/processor_box.cc
index 68ca80ff05..2cb561172e 100644
--- a/gtk2_ardour/processor_box.cc
+++ b/gtk2_ardour/processor_box.cc
@@ -1236,7 +1236,7 @@ ProcessorBox::choose_send ()
 
 	/* XXX need processor lock on route */
 	try {
-		Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock());
+		Glib::Threads::Mutex::Lock lm (AudioEngine::instance()->process_lock());
 		send->output()->ensure_io (outs, false, this);
 	} catch (AudioEngine::PortRegistrationFailure& err) {
 		error << string_compose (_("Cannot set up new send: %1"), err.what()) << endmsg;
diff --git a/gtk2_ardour/route_params_ui.cc b/gtk2_ardour/route_params_ui.cc
index ca673954d4..5f06555f28 100644
--- a/gtk2_ardour/route_params_ui.cc
+++ b/gtk2_ardour/route_params_ui.cc
@@ -20,7 +20,7 @@
 #include <algorithm>
 #include <inttypes.h>
 
-#include <glibmm/thread.h>
+#include <glibmm/threads.h>
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/window_title.h>
 
diff --git a/gtk2_ardour/strip_silence_dialog.cc b/gtk2_ardour/strip_silence_dialog.cc
index 32e7bc6054..2fb4b5923f 100644
--- a/gtk2_ardour/strip_silence_dialog.cc
+++ b/gtk2_ardour/strip_silence_dialog.cc
@@ -187,7 +187,7 @@ void
 StripSilenceDialog::update_silence_rects ()
 {
 	/* Lock so that we don't contend with the detection thread for access to the silence regions */
-	Glib::Mutex::Lock lm (_lock);
+	Glib::Threads::Mutex::Lock lm (_lock);
         double const y = _threshold.get_value();
 
         for (list<ViewInterval>::iterator v = views.begin(); v != views.end(); ++v) {
diff --git a/gtk2_ardour/strip_silence_dialog.h b/gtk2_ardour/strip_silence_dialog.h
index 18313941c1..5ba88812d7 100644
--- a/gtk2_ardour/strip_silence_dialog.h
+++ b/gtk2_ardour/strip_silence_dialog.h
@@ -18,7 +18,7 @@
 */
 
 #include <gtkmm/spinbutton.h>
-#include <glibmm/thread.h>
+#include <glibmm/threads.h>
 
 #include "ardour/types.h"
 #include "ardour_dialog.h"
@@ -84,8 +84,8 @@ private:
 	pthread_t _thread; ///< thread to compute silence in the background
 	static void * _detection_thread_work (void *);
 	void * detection_thread_work ();
-	Glib::Mutex _lock; ///< lock held while the thread is doing work
-	Glib::Cond _run_cond; ///< condition to wake the thread
+	Glib::Threads::Mutex _lock; ///< lock held while the thread is doing work
+	Glib::Threads::Cond  _run_cond; ///< condition to wake the thread
 	bool _thread_should_finish; ///< true if the thread should terminate
 	PBD::Signal0<void> Completed; ///< emitted when a silence detection has completed
 	PBD::ScopedConnection _completed_connection;