Merged timbyr's win32 branch. -r 547:566.

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

18 files changed, 36 insertions, 32 deletions

diff --git a/gtk2_ardour/analysis_window.cc b/gtk2_ardour/analysis_window.cc
index 014aeaaabc..f044ca7388 100644
--- a/gtk2_ardour/analysis_window.cc
+++ b/gtk2_ardour/analysis_window.cc
@@ -211,7 +211,7 @@ AnalysisWindow::analyze_data (Gtk::Button *button)
 {
 	track_list_ready = false;
 	{
-		LockMonitor lm (track_list_lock, __LINE__, __FILE__);
+		Glib::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 a5ca5b3c26..cd1243bb6a 100644
--- a/gtk2_ardour/analysis_window.h
+++ b/gtk2_ardour/analysis_window.h
@@ -34,7 +34,7 @@
 
 #include <gtkmm2ext/dndtreeview.h>
 
-#include <pbd/lockmonitor.h>
+#include <glibmm/thread.h>
 
 
 #include "ardour_dialog.h"
@@ -106,7 +106,7 @@ class AnalysisWindow : public ArdourDialog
 	  FFTGraph fft_graph;
 
 	  bool track_list_ready;
-	  PBD::Lock track_list_lock;
+	  Glib::Mutex track_list_lock;
 
 	  friend class FFTGraph;
 };
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 146d4d2ffe..a802aaebba 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -33,7 +33,6 @@
 
 #include <pbd/error.h>
 #include <pbd/compose.h>
-#include <pbd/basename.h>
 #include <pbd/pathscanner.h>
 #include <pbd/failed_constructor.h>
 #include <gtkmm2ext/gtk_ui.h>
@@ -717,7 +716,7 @@ ARDOUR_UI::redisplay_recent_sessions ()
 
 		TreeModel::Row row = *(recent_session_model->append());
 
-		row[recent_session_columns.visible_name] = PBD::basename (fullpath);
+		row[recent_session_columns.visible_name] = Glib::path_get_basename (fullpath);
 		row[recent_session_columns.fullpath] = fullpath;
 
 		if (states->size() > 1) {
@@ -824,9 +823,11 @@ ARDOUR_UI::filter_ardour_session_dirs (const FileFilter::Info& info)
 		return false;
 	}
 
+        // XXX Portability
+        
 	string session_file = info.filename;
 	session_file += '/';
-	session_file += PBD::basename (info.filename);
+	session_file += Glib::path_get_basename (info.filename);
 	session_file += ".ardour";
 	
 	if (stat (session_file.c_str(), &statbuf) != 0) {
diff --git a/gtk2_ardour/audio_clock.cc b/gtk2_ardour/audio_clock.cc
index 506b082b53..a5e7aa7193 100644
--- a/gtk2_ardour/audio_clock.cc
+++ b/gtk2_ardour/audio_clock.cc
@@ -41,6 +41,7 @@ using namespace sigc;
 using namespace Gtk;
 
 using PBD::atoi;
+using PBD::atof;
 
 const uint32_t AudioClock::field_length[(int) AudioClock::AudioFrames+1] = {
 	2,   /* SMPTE_Hours */
diff --git a/gtk2_ardour/connection_editor.cc b/gtk2_ardour/connection_editor.cc
index 596029eeb3..f411f945c8 100644
--- a/gtk2_ardour/connection_editor.cc
+++ b/gtk2_ardour/connection_editor.cc
@@ -490,7 +490,7 @@ ConnectionEditor::display_ports ()
 void
 ConnectionEditor::display_connection_state (bool for_input)
 {
-	LockMonitor lm (port_display_lock, __LINE__, __FILE__);
+	Glib::Mutex::Lock lm  (port_display_lock);
 	uint32_t limit;
 
 	if (session == 0 || current_connection == 0) {
@@ -601,7 +601,7 @@ ConnectionEditor::add_port ()
 void
 ConnectionEditor::connection_port_button_press_event (GdkEventButton* ev, TreeView* tview)
 {
-	LockMonitor lm (port_display_lock, __LINE__, __FILE__);
+	Glib::Mutex::Lock lm  (port_display_lock);
 
 	int which_port = reinterpret_cast<intptr_t> (treeview->get_data ("port"));
 
diff --git a/gtk2_ardour/connection_editor.h b/gtk2_ardour/connection_editor.h
index 1d6dd7d7fc..71d201cd8d 100644
--- a/gtk2_ardour/connection_editor.h
+++ b/gtk2_ardour/connection_editor.h
@@ -39,7 +39,7 @@ using __gnu_cxx::slist;
 
 #include "ardour_dialog.h"
 
-#include <pbd/lockmonitor.h>
+#include <glibmm/thread.h>
 
 namespace ARDOUR {
 	class Session;
@@ -116,7 +116,7 @@ class ConnectionEditor : public ArdourDialog {
 	Gtk::Button clear_button;
 	Gtk::Button add_port_button;
 
-	PBD::Lock port_display_lock;
+	Glib::Mutex port_display_lock;
 	slist<Gtk::ScrolledWindow *> port_displays;
 
 	Gtk::Button ok_button;
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 6dc3b955f1..c7956386ce 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -90,6 +90,7 @@ using namespace Gtkmm2ext;
 using namespace Editing;
 
 using PBD::internationalize;
+using PBD::atoi;
 
 const double Editor::timebar_height = 15.0;
 
@@ -2191,7 +2192,7 @@ Editor::set_state (const XMLNode& node)
 	}
 
 	if ((prop = node.property ("zoom"))) {
-		set_frames_per_unit (atof (prop->value()));
+		set_frames_per_unit (PBD::atof (prop->value()));
 	}
 
 	if ((prop = node.property ("snap-to"))) {
@@ -2899,7 +2900,7 @@ Editor::convert_drop_to_paths (vector<ustring>& paths,
 	for (vector<ustring>::iterator i = uris.begin(); i != uris.end(); ++i) {
 		if ((*i).substr (0,7) == "file://") {
 			string p = *i;
-			url_decode (p);
+                        PBD::url_decode (p);
 			paths.push_back (p.substr (7));
 		}
 	}
diff --git a/gtk2_ardour/editor_audio_import.cc b/gtk2_ardour/editor_audio_import.cc
index 184c1757f2..ee73c46b24 100644
--- a/gtk2_ardour/editor_audio_import.cc
+++ b/gtk2_ardour/editor_audio_import.cc
@@ -203,7 +203,7 @@ Editor::embed_sndfile (Glib::ustring path, bool split, bool multiple_files, bool
 	/* lets see if we can link it into the session */
 	
 	linked_path = session->sound_dir();
-	linked_path += PBD::basename (path);
+	linked_path += Glib::path_get_basename (path);
 
 	if (link (path.c_str(), linked_path.c_str()) == 0) {
 
diff --git a/gtk2_ardour/export_dialog.cc b/gtk2_ardour/export_dialog.cc
index 1293fca34b..834127e042 100644
--- a/gtk2_ardour/export_dialog.cc
+++ b/gtk2_ardour/export_dialog.cc
@@ -27,7 +27,6 @@
 #include <samplerate.h>
 
 #include <pbd/convert.h>
-#include <pbd/dirname.h>
 #include <pbd/xml++.h>
 
 #include <gtkmm2ext/utils.h>
@@ -1154,7 +1153,7 @@ ExportDialog::is_filepath_valid(string &filepath)
  	
  	// directory needs to exist and be writable
 
- 	string dirpath = PBD::dirname (filepath);
+ 	string dirpath = Glib::path_get_dirname (filepath);
  	if (::access (dirpath.c_str(), W_OK) != 0) {
  		string txt = _("Cannot write file in: ") + dirpath;
 		MessageDialog msg (*this, txt, false, MESSAGE_ERROR, BUTTONS_OK, true);
diff --git a/gtk2_ardour/export_range_markers_dialog.cc b/gtk2_ardour/export_range_markers_dialog.cc
index 07ce651e62..3ff6ae783d 100644
--- a/gtk2_ardour/export_range_markers_dialog.cc
+++ b/gtk2_ardour/export_range_markers_dialog.cc
@@ -25,8 +25,6 @@
 #include <ardour/audioengine.h>
 #include <ardour/sndfile_helpers.h>
 
-#include <pbd/dirname.h>
-
 #include "ardour_ui.h"
 #include "export_range_markers_dialog.h"
 
@@ -149,7 +147,7 @@ ExportRangeMarkersDialog::is_filepath_valid(string &filepath)
 	}
  	
  	// directory needs to exist and be writable
- 	string dirpath = PBD::dirname (filepath);
+ 	string dirpath = Glib::path_get_dirname (filepath);
  	if (::access (dirpath.c_str(), W_OK) != 0) {
  		string txt = _("Cannot write file in: ") + dirpath;
 		MessageDialog msg (*this, txt, false, MESSAGE_ERROR, BUTTONS_OK, true);
diff --git a/gtk2_ardour/fft_graph.cc b/gtk2_ardour/fft_graph.cc
index df13614ecf..c2d81abf3c 100644
--- a/gtk2_ardour/fft_graph.cc
+++ b/gtk2_ardour/fft_graph.cc
@@ -58,7 +58,7 @@ void
 FFTGraph::setWindowSize(int windowSize)
 {
 	if (_a_window) {
-		LockMonitor lm (_a_window->track_list_lock, __LINE__, __FILE__);
+		Glib::Mutex::Lock lm  (_a_window->track_list_lock);
 		setWindowSize_internal(windowSize);
 	} else {
 		setWindowSize_internal(windowSize);
@@ -261,7 +261,7 @@ FFTGraph::draw_scales(Glib::RefPtr<Gdk::Window> window)
 void
 FFTGraph::redraw()
 {	
-	LockMonitor lm (_a_window->track_list_lock, __LINE__, __FILE__ );
+	Glib::Mutex::Lock lm  (_a_window->track_list_lock);
 
 	draw_scales(get_window());
 	
diff --git a/gtk2_ardour/io_selector.cc b/gtk2_ardour/io_selector.cc
index 247ad602bd..b45966c5e3 100644
--- a/gtk2_ardour/io_selector.cc
+++ b/gtk2_ardour/io_selector.cc
@@ -23,7 +23,7 @@
 
 #include <gtkmm/messagedialog.h>
 
-#include <pbd/lockmonitor.h>
+#include <glibmm/thread.h>
 
 #include <ardour/io.h>
 #include <ardour/route.h>
@@ -368,7 +368,7 @@ IOSelector::display_ports ()
 	TreeView *selected_port_tview = 0;
 
 	{
-		LockMonitor lm (port_display_lock, __LINE__, __FILE__);
+		Glib::Mutex::Lock lm  (port_display_lock);
 		Port *port;
 		uint32_t limit;
 
@@ -670,7 +670,7 @@ IOSelector::port_column_button_release (GdkEventButton* event, TreeView* treevie
 	if (Keyboard::is_delete_event (event)) {
 		Port* port;
 		{
-			LockMonitor lm (port_display_lock, __LINE__, __FILE__);
+			Glib::Mutex::Lock lm  (port_display_lock);
 			
 			port = static_cast<Port *> (treeview->get_data (_("port")));
 			
@@ -724,7 +724,7 @@ IOSelector::select_treeview (TreeView* tview)
 	   switch.
 	*/
 
-	LockMonitor lm (port_display_lock, __LINE__, __FILE__);
+	Glib::Mutex::Lock lm  (port_display_lock);
  	Port* port = reinterpret_cast<Port *> (tview->get_data (_("port")));
 	
 	if (port != selected_port) {
diff --git a/gtk2_ardour/io_selector.h b/gtk2_ardour/io_selector.h
index 1dd77dd5a1..44518e6759 100644
--- a/gtk2_ardour/io_selector.h
+++ b/gtk2_ardour/io_selector.h
@@ -29,6 +29,9 @@ using __gnu_cxx::slist;
 #endif
 
 #include <string>
+
+#include <glibmm/thread.h>
+
 #include <gtkmm/box.h>
 #include <gtkmm/frame.h>
 #include <gtkmm/button.h>
@@ -39,6 +42,7 @@ using __gnu_cxx::slist;
 
 #include <ardour_dialog.h>
 
+
 namespace ARDOUR {
 	class IO;
 	class Session;
@@ -105,7 +109,7 @@ class IOSelector : public Gtk::VBox {
 	Gtk::Button clear_connections_button;
 	Gtk::ScrolledWindow port_display_scroller;
 
-	PBD::Lock port_display_lock;
+	Glib::Mutex port_display_lock;
 	slist<Gtk::TreeView *> port_displays;
 	void display_ports ();
 
diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc
index 20630e4f1c..e9ac25a8f8 100644
--- a/gtk2_ardour/main.cc
+++ b/gtk2_ardour/main.cc
@@ -367,6 +367,9 @@ main (int argc, char *argv[])
 	ARDOUR::AudioEngine *engine;
 	vector<Glib::ustring> null_file_list;
 
+        // needs a better home.
+        Glib::thread_init();
+        
 	gtk_set_locale ();
 
 	(void)   bindtextdomain (PACKAGE, LOCALEDIR);
diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc
index 2d0a37cd47..1ded8625c6 100644
--- a/gtk2_ardour/mixer_ui.cc
+++ b/gtk2_ardour/mixer_ui.cc
@@ -24,7 +24,7 @@
 #include <gtkmm/accelmap.h>
 
 #include <pbd/convert.h>
-#include <pbd/lockmonitor.h>
+#include <glibmm/thread.h>
 
 #include <gtkmm2ext/gtk_ui.h>
 #include <gtkmm2ext/utils.h>
diff --git a/gtk2_ardour/new_session_dialog.cc b/gtk2_ardour/new_session_dialog.cc
index b7b448b677..88944aacb7 100644
--- a/gtk2_ardour/new_session_dialog.cc
+++ b/gtk2_ardour/new_session_dialog.cc
@@ -24,8 +24,6 @@
 #include <ardour/recent_sessions.h>
 #include <ardour/session.h>
 
-#include <pbd/basename.h>
-
 #include <gtkmm/entry.h>
 #include <gtkmm/filechooserbutton.h>
 #include <gtkmm/spinbutton.h>
@@ -659,7 +657,7 @@ NewSessionDialog::reset_recent()
 	    
 		Gtk::TreeModel::Row row = *(recent_model->append());
 		
-		row[recent_columns.visible_name] = PBD::basename (fullpath);
+		row[recent_columns.visible_name] = Glib::path_get_basename (fullpath);
 		row[recent_columns.fullpath] = fullpath;
 		
 		if (states->size() > 1) {
diff --git a/gtk2_ardour/route_params_ui.cc b/gtk2_ardour/route_params_ui.cc
index a52cf79f3f..aee247df02 100644
--- a/gtk2_ardour/route_params_ui.cc
+++ b/gtk2_ardour/route_params_ui.cc
@@ -20,7 +20,7 @@
 
 #include <algorithm>
 
-#include <pbd/lockmonitor.h>
+#include <glibmm/thread.h>
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/stop_signal.h>
 
diff --git a/gtk2_ardour/sfdb_ui.cc b/gtk2_ardour/sfdb_ui.cc
index a8b2510cf5..947f470ac8 100644
--- a/gtk2_ardour/sfdb_ui.cc
+++ b/gtk2_ardour/sfdb_ui.cc
@@ -25,7 +25,6 @@
 #include <gtkmm/box.h>
 #include <gtkmm/stock.h>
 
-#include <pbd/basename.h>
 #include <pbd/convert.h>
 
 #include <gtkmm2ext/utils.h>
@@ -206,7 +205,7 @@ SoundFileBox::play_btn_clicked ()
 		}
 
 		string result;
-		_session->region_name (result, PBD::basename(srclist[0]->name()), false);
+		_session->region_name (result, Glib::path_get_basename(srclist[0]->name()), false);
 		AudioRegion* a_region = new AudioRegion(srclist, 0, srclist[0]->length(), result, 0, Region::DefaultFlags, false);
 		region_cache[path] = a_region;
 	}