From af0c42ec4f9d46907299f704d0c70e25e0af6b96 Mon Sep 17 00:00:00 2001
From: Robin Gareus <robin@gareus.org>
Date: Sun, 23 Mar 2014 18:59:24 +0100
Subject: midi-controller, support log parameters - fixes #5890

---
 libs/ardour/plugin_insert.cc                   |  4 ++++
 libs/surfaces/generic_midi/midicontrollable.cc | 23 ++++++++++++++++++++---
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/libs/ardour/plugin_insert.cc b/libs/ardour/plugin_insert.cc
index 2f90017498..ae018fb2a3 100644
--- a/libs/ardour/plugin_insert.cc
+++ b/libs/ardour/plugin_insert.cc
@@ -1184,6 +1184,10 @@ PluginInsert::PluginControl::PluginControl (PluginInsert* p, const Evoral::Param
 	_logarithmic = desc.logarithmic;
 	_sr_dependent = desc.sr_dependent;
 	_toggled = desc.toggled;
+
+	if (desc.toggled) {
+		set_flags(Controllable::Toggle);
+	}
 }
 
 /** @param val `user' value */
diff --git a/libs/surfaces/generic_midi/midicontrollable.cc b/libs/surfaces/generic_midi/midicontrollable.cc
index d78dd5e644..a12b20b1a8 100644
--- a/libs/surfaces/generic_midi/midicontrollable.cc
+++ b/libs/surfaces/generic_midi/midicontrollable.cc
@@ -167,7 +167,7 @@ MIDIControllable::control_to_midi (float val)
 
 	float control_min = controllable->lower ();
 	float control_max = controllable->upper ();
-	const float control_range = control_max - control_min;
+	float control_range = control_max - control_min;
 
 	if (controllable->is_toggle()) {
 		if (val >= (control_min + (control_range/2.0f))) {
@@ -175,6 +175,14 @@ MIDIControllable::control_to_midi (float val)
 		} else {
 			return 0;
 		}
+	} else {
+		AutomationControl *actl = dynamic_cast<AutomationControl*> (controllable);
+		if (actl) {
+			control_min = actl->internal_to_interface(control_min);
+			control_max = actl->internal_to_interface(control_max);
+			control_range = control_max - control_min;
+			val = actl->internal_to_interface(val);
+		}
 	}
 
 	return (val - control_min) / control_range * max_value_for_type ();
@@ -196,8 +204,17 @@ MIDIControllable::midi_to_control (int val)
 
 	float control_min = controllable->lower ();
 	float control_max = controllable->upper ();
-	const float control_range = control_max - control_min;
-
+	float control_range = control_max - control_min;
+
+	AutomationControl *actl = dynamic_cast<AutomationControl*> (controllable);
+	if (actl) {
+		if (fv == 0.f) return control_min;
+		if (fv == 1.f) return control_max;
+		control_min = actl->internal_to_interface(control_min);
+		control_max = actl->internal_to_interface(control_max);
+		control_range = control_max - control_min;
+		return actl->interface_to_internal((fv * control_range) + control_min);
+	}
 	return (fv * control_range) + control_min;
 }
 
-- 
cgit v1.2.3


From 65f5f17c18d224ce72b25789e9d00a300389d070 Mon Sep 17 00:00:00 2001
From: Robin Gareus <robin@gareus.org>
Date: Wed, 2 Apr 2014 18:48:28 +0200
Subject: fix typo

---
 gtk2_ardour/editor_regions.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gtk2_ardour/editor_regions.cc b/gtk2_ardour/editor_regions.cc
index bf13bd5a65..69620d489f 100644
--- a/gtk2_ardour/editor_regions.cc
+++ b/gtk2_ardour/editor_regions.cc
@@ -114,7 +114,7 @@ EditorRegions::EditorRegions (Editor* e)
 		{ 3, _("Length"),  _("Length of the region") },
 		{ 4, _("Sync"),  _("Position of region sync point, relative to start of the region") },
 		{ 5, _("Fade In"),  _("Length of region fade-in (units: secondary clock), () if disabled") },
-		{ 6, _("Fade Out"),  _("Length of region fade-out (units: secondary clock), () if dsisabled") },
+		{ 6, _("Fade Out"),  _("Length of region fade-out (units: secondary clock), () if disabled") },
 		{ 7, _("L"),  _("Region position locked?") },
 		{ 8, _("G"),  _("Region position glued to Bars|Beats time?") },
 		{ 9, _("M"),  _("Region muted?") },
-- 
cgit v1.2.3


From 2482361d8887915bcadc03a5e226753597c924cf Mon Sep 17 00:00:00 2001
From: Sakari Bergen <sakari.bergen@beatwaves.net>
Date: Mon, 7 Apr 2014 21:27:56 +0300
Subject: Fix buffer size mismatch in evoral tests

---
 libs/evoral/test/SequenceTest.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/evoral/test/SequenceTest.cpp b/libs/evoral/test/SequenceTest.cpp
index 69931b8e0d..6e07776fdb 100644
--- a/libs/evoral/test/SequenceTest.cpp
+++ b/libs/evoral/test/SequenceTest.cpp
@@ -23,7 +23,7 @@ SequenceTest::preserveEventOrderingTest ()
 	seq->start_write();
 
 	for (Notes::const_iterator i = test_notes.begin(); i != test_notes.end(); ++i) {
-		uint8_t buffer[2];
+		uint8_t buffer[3];
 		Event<Time>* event = new Event<Time>(
 				DummyTypeMap::CONTROL, (*i)->on_event().time(), 3, buffer, true
 		);
-- 
cgit v1.2.3


From 8bd6de3f4e450451b6e75e64660141bb997d51d0 Mon Sep 17 00:00:00 2001
From: Sakari Bergen <sakari.bergen@beatwaves.net>
Date: Mon, 7 Apr 2014 21:36:58 +0300
Subject: export ARDOUR_TEST_PATH for artest

We should probably remove the old test running stuff from libs/ardour.
Does someone still need it?
---
 gtk2_ardour/ardev_common.sh.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gtk2_ardour/ardev_common.sh.in b/gtk2_ardour/ardev_common.sh.in
index 8724ff2c7d..def4d4a456 100644
--- a/gtk2_ardour/ardev_common.sh.in
+++ b/gtk2_ardour/ardev_common.sh.in
@@ -18,6 +18,7 @@ export ARDOUR_MIDIMAPS_PATH=$TOP/midi_maps:.
 export ARDOUR_MCP_PATH=$TOP/mcp:.
 export ARDOUR_EXPORT_FORMATS_PATH=$TOP/export:.
 export ARDOUR_BACKEND_PATH=$libs/backends/jack
+export ARDOUR_TEST_PATH=$libs/ardour/test/data
 
 #
 # even though we set the above variables, ardour requires that these 
-- 
cgit v1.2.3


From 670c066793bb6608070923277fca2fc9dc43d4d2 Mon Sep 17 00:00:00 2001
From: Robin Gareus <robin@gareus.org>
Date: Fri, 11 Apr 2014 17:01:26 +0200
Subject: add manual reference to missing video-tools warnings

---
 gtk2_ardour/transcode_ffmpeg.cc    | 24 +++++++++++++-----------
 gtk2_ardour/video_server_dialog.cc |  9 +++++++--
 gtk2_ardour/video_timeline.cc      |  4 +++-
 3 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/gtk2_ardour/transcode_ffmpeg.cc b/gtk2_ardour/transcode_ffmpeg.cc
index ce9a01e4f5..3cc45d217d 100644
--- a/gtk2_ardour/transcode_ffmpeg.cc
+++ b/gtk2_ardour/transcode_ffmpeg.cc
@@ -71,17 +71,19 @@ TranscodeFfmpeg::TranscodeFfmpeg (std::string f)
 	if (ffmpeg_exe.empty() || ffprobe_exe.empty()) {
 		warning << string_compose(
 				_(
-				"No ffprobe or ffmpeg executables could be found on this system.\n"
-				"Video import and export is not possible until you install those tools.\n"
-				"%1 requires ffmpeg and ffprobe from ffmpeg.org - version 1.1 or newer.\n"
-				"\n"
-				"The tools are included with the %1 releases from ardour.org "
-				"and also available with the video-server at http://x42.github.com/harvid/\n"
-				"\n"
-				"Important: the files need to be installed in $PATH and named ffmpeg_harvid and ffprobe_harvid.\n"
-				"If you already have a suitable ffmpeg installation on your system, we recommend creating "
-				"symbolic links from ffmpeg to ffmpeg_harvid and from ffprobe to ffprobe_harvid.\n"
-				), PROGRAM_NAME) << endmsg;
+					"No ffprobe or ffmpeg executables could be found on this system.\n"
+					"Video import and export is not possible until you install those tools.\n"
+					"%1 requires ffmpeg and ffprobe from ffmpeg.org - version 1.1 or newer.\n"
+					"\n"
+					"The tools are included with the %1 releases from ardour.org "
+					"and also available with the video-server at http://x42.github.com/harvid/\n"
+					"\n"
+					"Important: the files need to be installed in $PATH and named ffmpeg_harvid and ffprobe_harvid.\n"
+					"If you already have a suitable ffmpeg installation on your system, we recommend creating "
+					"symbolic links from ffmpeg to ffmpeg_harvid and from ffprobe to ffprobe_harvid.\n"
+					"\n"
+					"see also http://manual.ardour.org/video-timeline/setup/"
+				 ), PROGRAM_NAME) << endmsg;
 		return;
 	}
 	ffexecok = true;
diff --git a/gtk2_ardour/video_server_dialog.cc b/gtk2_ardour/video_server_dialog.cc
index 18a4d21dc9..2f22065a10 100644
--- a/gtk2_ardour/video_server_dialog.cc
+++ b/gtk2_ardour/video_server_dialog.cc
@@ -89,8 +89,13 @@ VideoServerDialog::VideoServerDialog (Session* s)
 	else {
 		PBD::warning <<
 			string_compose(
-			_("The external video server 'harvid' can not be found. The tool is included with the %1 releases from ardour.org, "
-			  "alternatively you can download it from http://x42.github.com/harvid/ or acquire it from your distribution."), PROGRAM_NAME)
+					_("The external video server 'harvid' can not be found.\n"
+						"The tool is included with the %1 releases from ardour.org, "
+						"alternatively you can download it from http://x42.github.com/harvid/ "
+						"or acquire it from your distribution.\n"
+						"\n"
+						"see also http://manual.ardour.org/video-timeline/setup/"
+					 ), PROGRAM_NAME)
 			<< endmsg;
 	}
 
diff --git a/gtk2_ardour/video_timeline.cc b/gtk2_ardour/video_timeline.cc
index 75f6150691..33331dbc8a 100644
--- a/gtk2_ardour/video_timeline.cc
+++ b/gtk2_ardour/video_timeline.cc
@@ -736,7 +736,9 @@ VideoTimeLine::find_xjadeo () {
 		_xjadeo_bin = X_("");
 		warning << _("Video-monitor 'xjadeo' was not found. Please install http://xjadeo.sf.net/ "
 				"(a custom path to xjadeo can be specified by setting the XJREMOTE environment variable. "
-				"It should point to an application compatible with xjadeo's remote-control interface 'xjremote').")
+				"It should point to an application compatible with xjadeo's remote-control interface 'xjremote').\n"
+				"\n"
+				"see also http://manual.ardour.org/video-timeline/setup/")
 			<< endmsg;
 	}
 }
-- 
cgit v1.2.3


From eef4e1efee2ae76fac181c078b46ca3bc6d33d2e Mon Sep 17 00:00:00 2001
From: Robin Gareus <robin@gareus.org>
Date: Mon, 14 Apr 2014 12:26:10 +0200
Subject: -d (disable plugin) option takes no arguments

---
 gtk2_ardour/opts.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gtk2_ardour/opts.cc b/gtk2_ardour/opts.cc
index 90d753af4c..4596b5c62c 100644
--- a/gtk2_ardour/opts.cc
+++ b/gtk2_ardour/opts.cc
@@ -102,7 +102,7 @@ ARDOUR_COMMAND_LINE::parse_opts (int argc, char *argv[])
 		{ "help", 0, 0, 'h' },
 		{ "no-announcements", 0, 0, 'a' },
 		{ "bindings", 0, 0, 'b' },
-		{ "disable-plugins", 1, 0, 'd' },
+		{ "disable-plugins", 0, 0, 'd' },
 		{ "debug", 1, 0, 'D' },
 		{ "no-splash", 0, 0, 'n' },
 		{ "menus", 1, 0, 'm' },
-- 
cgit v1.2.3


From 99bf5d9eeda1e5e1811d660c0c22bb5a2d4984c0 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Mon, 14 Apr 2014 12:53:30 -0400
Subject: backport  1d85ab27a7e and ba128eea from cairocanvas branch to remove
 GIO (possible hotfix release)

---
 libs/ardour/lv2_plugin.cc | 24 ++------------
 libs/pbd/clear_dir.cc     | 37 ++++++++++++++++++++++
 libs/pbd/file_utils.cc    | 79 ++++++++++++++++++++++++++++++++++++++---------
 libs/pbd/pbd/clear_dir.h  |  1 +
 4 files changed, 104 insertions(+), 37 deletions(-)

diff --git a/libs/ardour/lv2_plugin.cc b/libs/ardour/lv2_plugin.cc
index a0720044d4..204ae2c694 100644
--- a/libs/ardour/lv2_plugin.cc
+++ b/libs/ardour/lv2_plugin.cc
@@ -31,6 +31,7 @@
 
 #include <boost/utility.hpp>
 
+#include "pbd/clear_dir.h"
 #include "pbd/pathscanner.h"
 #include "pbd/compose.h"
 #include "pbd/error.h"
@@ -880,27 +881,6 @@ LV2Plugin::lv2_state_make_path(LV2_State_Make_Path_Handle handle,
 	return g_strndup(abs_path.c_str(), abs_path.length());
 }
 
-static void
-remove_directory(const std::string& path)
-{
-	if (!Glib::file_test(path, Glib::FILE_TEST_IS_DIR)) {
-		warning << string_compose("\"%1\" is not a directory", path) << endmsg;
-		return;
-	}
-
-	Glib::RefPtr<Gio::File>           dir = Gio::File::create_for_path(path);
-	Glib::RefPtr<Gio::FileEnumerator> e   = dir->enumerate_children();
-	Glib::RefPtr<Gio::FileInfo>       fi;
-	while ((fi = e->next_file())) {
-		if (fi->get_type() == Gio::FILE_TYPE_DIRECTORY) {
-			remove_directory(fi->get_name());
-		} else {
-			dir->get_child(fi->get_name())->remove();
-		}
-	}
-	dir->remove();
-}
-
 void
 LV2Plugin::add_state(XMLNode* root) const
 {
@@ -952,7 +932,7 @@ LV2Plugin::add_state(XMLNode* root) const
 		} else {
 			// State is identical, decrement version and nuke directory
 			lilv_state_free(state);
-			remove_directory(new_dir);
+			PBD::remove_directory(new_dir);
 			--_state_version;
 		}
 
diff --git a/libs/pbd/clear_dir.cc b/libs/pbd/clear_dir.cc
index 29410d41e5..a7564447ab 100644
--- a/libs/pbd/clear_dir.cc
+++ b/libs/pbd/clear_dir.cc
@@ -24,6 +24,8 @@
 #include <errno.h>
 #include <string.h>
 
+#include <glib.h>
+#include <glib/gstdio.h>
 #include <glibmm/miscutils.h>
 
 #include "pbd/error.h"
@@ -85,3 +87,38 @@ PBD::clear_directory (const string& dir, size_t* size, vector<string>* paths)
 
         return ret;
 }
+
+// rm -rf <dir> -- used to remove saved plugin state
+void
+PBD::remove_directory (const std::string& dir) {
+	DIR* dead;
+	struct dirent* dentry;
+	struct stat statbuf;
+
+	if ((dead = ::opendir (dir.c_str())) == 0) {
+		return;
+	}
+
+	while ((dentry = ::readdir (dead)) != 0) {
+		if(!strcmp(dentry->d_name, ".") || !strcmp(dentry->d_name, "..")) {
+			continue;
+		}
+
+		string fullpath = Glib::build_filename (dir, dentry->d_name);
+		if (::stat (fullpath.c_str(), &statbuf)) {
+			continue;
+		}
+
+		if (S_ISDIR (statbuf.st_mode)) {
+			remove_directory(fullpath);
+			continue;
+		}
+
+		if (::g_unlink (fullpath.c_str())) {
+			error << string_compose (_("cannot remove file %1 (%2)"), fullpath, strerror (errno)) << endmsg;
+		}
+	}
+	if (::g_rmdir(dir.c_str())) {
+		error << string_compose (_("cannot remove directory %1 (%2)"), dir, strerror (errno)) << endmsg;
+	}
+}
diff --git a/libs/pbd/file_utils.cc b/libs/pbd/file_utils.cc
index bb290fa6aa..2b03a64058 100644
--- a/libs/pbd/file_utils.cc
+++ b/libs/pbd/file_utils.cc
@@ -27,7 +27,20 @@
 #include <glibmm/miscutils.h>
 #include <glibmm/pattern.h>
 
-#include <giomm/file.h>
+#include <errno.h>
+#include <string.h> /* strerror */
+
+/* open() */
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
+/* close(), read(), write() */
+#ifdef COMPILER_MSVC
+#include <io.h> // Microsoft's nearest equivalent to <unistd.h>
+#else
+#include <unistd.h>
+#endif
 
 #include "pbd/compose.h"
 #include "pbd/file_utils.h"
@@ -139,21 +152,57 @@ copy_file(const std::string & from_path, const std::string & to_path)
 {
 	if (!Glib::file_test (from_path, Glib::FILE_TEST_EXISTS)) return false;
 
-	Glib::RefPtr<Gio::File> from_file = Gio::File::create_for_path(from_path);
-	Glib::RefPtr<Gio::File> to_file = Gio::File::create_for_path(to_path);
+	int fd_from = -1;
+	int fd_to = -1;
+	char buf[4096]; // BUFSIZ  ??
+	ssize_t nread;
 
-	try
-	{
-		from_file->copy (to_file, Gio::FILE_COPY_OVERWRITE);
+	fd_from = ::open(from_path.c_str(), O_RDONLY);
+	if (fd_from < 0) {
+		goto copy_error;
 	}
-	catch(const Glib::Exception& ex)
-	{
-		error << string_compose (_("Unable to Copy file %1 to %2 (%3)"),
-				from_path, to_path, ex.what())
-			<< endmsg;
-		return false;
+
+	fd_to = ::open(to_path.c_str(), O_WRONLY | O_CREAT, 0666);
+	if (fd_to < 0) {
+		goto copy_error;
 	}
-	return true;
+
+	while (nread = ::read(fd_from, buf, sizeof(buf)), nread > 0) {
+		char *out_ptr = buf;
+		do {
+			ssize_t nwritten = ::write(fd_to, out_ptr, nread);
+			if (nwritten >= 0) {
+				nread -= nwritten;
+				out_ptr += nwritten;
+			} else if (errno != EINTR) {
+				goto copy_error;
+			}
+		} while (nread > 0);
+	}
+
+	if (nread == 0) {
+		if (::close(fd_to)) {
+			fd_to = -1;
+			goto copy_error;
+		}
+		::close(fd_from);
+		return true;
+	}
+
+copy_error:
+	int saved_errno = errno;
+
+	if (fd_from >= 0) {
+		::close(fd_from);
+	}
+	if (fd_to >= 0) {
+		::close(fd_to);
+	}
+
+	error << string_compose (_("Unable to Copy file %1 to %2 (%3)"),
+			from_path, to_path, strerror(saved_errno))
+		<< endmsg;
+	return false;
 }
 
 static
@@ -181,8 +230,8 @@ copy_files(const std::string & from_path, const std::string & to_dir)
 std::string
 get_absolute_path (const std::string & p)
 {
-	Glib::RefPtr<Gio::File> f = Gio::File::create_for_path (p);
-	return f->get_path ();
+	if (Glib::path_is_absolute(p)) return p;
+	return Glib::build_filename (Glib::get_current_dir(), p);
 }
 
 bool
diff --git a/libs/pbd/pbd/clear_dir.h b/libs/pbd/pbd/clear_dir.h
index 9c128d994d..5f57483b63 100644
--- a/libs/pbd/pbd/clear_dir.h
+++ b/libs/pbd/pbd/clear_dir.h
@@ -26,6 +26,7 @@
 
 namespace PBD {
         int clear_directory (const std::string&, size_t* = 0, std::vector<std::string>* = 0);
+        void remove_directory (const std::string& dir);
 }
 
 #endif /* __pbd_clear_dir_h__ */
-- 
cgit v1.2.3


From e1bf151ab0a5dd1d467ea2f43b0cd9c70caecfae Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Fri, 4 Apr 2014 15:26:44 -0400
Subject: after cloning a MIDI region, mark the source file as non-removable.
 Fixes reports about missing MIDI files on the forums and IRC

---
 libs/ardour/ardour/file_source.h |  3 ++-
 libs/ardour/ardour/smf_source.h  |  2 ++
 libs/ardour/midi_source.cc       |  5 +++++
 libs/ardour/smf_source.cc        | 12 +++++++++++-
 4 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/libs/ardour/ardour/file_source.h b/libs/ardour/ardour/file_source.h
index 3d9c8c623f..6991840beb 100644
--- a/libs/ardour/ardour/file_source.h
+++ b/libs/ardour/ardour/file_source.h
@@ -82,6 +82,8 @@ public:
 	
 	static PBD::Signal3<int,std::string,std::string,std::vector<std::string> > AmbiguousFileName;
 
+	virtual void prevent_deletion ();
+
 protected:
 	FileSource (Session& session, DataType type,
 	            const std::string& path,
@@ -103,7 +105,6 @@ protected:
 	std::string _origin;
 	bool        _open;
 
-	void prevent_deletion ();
 };
 
 } // namespace ARDOUR
diff --git a/libs/ardour/ardour/smf_source.h b/libs/ardour/ardour/smf_source.h
index ca337a62c2..e422d37f62 100644
--- a/libs/ardour/ardour/smf_source.h
+++ b/libs/ardour/ardour/smf_source.h
@@ -69,6 +69,8 @@ public:
 
 	static bool safe_midi_file_extension (const std::string& path);
 
+	void prevent_deletion ();
+
   protected:
 	void set_path (const std::string& newpath);
 
diff --git a/libs/ardour/midi_source.cc b/libs/ardour/midi_source.cc
index 124d3f7c9b..79922571c1 100644
--- a/libs/ardour/midi_source.cc
+++ b/libs/ardour/midi_source.cc
@@ -39,6 +39,7 @@
 #include "ardour/midi_model.h"
 #include "ardour/midi_state_tracker.h"
 #include "ardour/midi_source.h"
+#include "ardour/file_source.h"
 #include "ardour/session.h"
 #include "ardour/session_directory.h"
 #include "ardour/source_factory.h"
@@ -381,6 +382,10 @@ MidiSource::clone (const string& path, Evoral::MusicalTime begin, Evoral::Musica
 	} else {
 		newsrc->set_model (_model);
 	}
+	
+	/* this file is not removable (but since it is MIDI, it is mutable) */
+
+	boost::dynamic_pointer_cast<FileSource> (newsrc)->prevent_deletion ();
 
 	return newsrc;
 }
diff --git a/libs/ardour/smf_source.cc b/libs/ardour/smf_source.cc
index 52c950e76f..4167bea877 100644
--- a/libs/ardour/smf_source.cc
+++ b/libs/ardour/smf_source.cc
@@ -72,9 +72,10 @@ SMFSource::SMFSource (Session& s, const string& path, Source::Flag flags)
 		return;
 	}
 
-	if (open(_path)) {
+	if (open (_path)) {
 		throw failed_constructor ();
 	}
+
 	_open = true;
 }
 
@@ -657,3 +658,12 @@ SMFSource::ensure_disk_file ()
 	}
 }
 
+void
+SMFSource::prevent_deletion ()
+{
+	/* Unlike the audio case, the MIDI file remains mutable (because we can
+	   edit MIDI data)
+	*/
+  
+	_flags = Flag (_flags & ~(Removable|RemovableIfEmpty|RemoveAtDestroy));
+}
-- 
cgit v1.2.3


From 2b3cb052caa3426866b67ab14afac84a3dc764a9 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Fri, 4 Apr 2014 15:26:44 -0400
Subject: after cloning a MIDI region, mark the source file as non-removable.
 Fixes reports about missing MIDI files on the forums and IRC

---
 libs/ardour/ardour/file_source.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libs/ardour/ardour/file_source.h b/libs/ardour/ardour/file_source.h
index 6991840beb..8fe3ab21da 100644
--- a/libs/ardour/ardour/file_source.h
+++ b/libs/ardour/ardour/file_source.h
@@ -84,6 +84,8 @@ public:
 
 	virtual void prevent_deletion ();
 
+	virtual void prevent_deletion ();
+
 protected:
 	FileSource (Session& session, DataType type,
 	            const std::string& path,
-- 
cgit v1.2.3


From 384c0a9facf1bfecc783ac048dbb0bae4ad901fd Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Thu, 10 Apr 2014 08:58:04 -0400
Subject: redesign technique for naming/creating regions for MIDI clone (or
 other non-capture driven MIDI region creation operations).

See comments in Session::new_midi_source_name() for details.
---
 libs/ardour/ardour/audio_diskstream.h  |  1 -
 libs/ardour/ardour/diskstream.h        |  2 ++
 libs/ardour/ardour/file_source.h       |  2 +-
 libs/ardour/ardour/midi_diskstream.h   |  2 +-
 libs/ardour/ardour/public_diskstream.h |  2 +-
 libs/ardour/ardour/track.h             |  2 +-
 libs/ardour/audio_diskstream.cc        |  8 --------
 libs/ardour/file_source.cc             | 17 ++++++++++++----
 libs/ardour/midi_diskstream.cc         | 33 +++++++++++++++----------------
 libs/ardour/midi_source.cc             | 18 ++++++++---------
 libs/ardour/session.cc                 | 36 ++++++++++++++++++++++++----------
 libs/ardour/track.cc                   |  6 +++---
 12 files changed, 72 insertions(+), 57 deletions(-)

diff --git a/libs/ardour/ardour/audio_diskstream.h b/libs/ardour/ardour/audio_diskstream.h
index 3a5dc2ad91..65d7db67ba 100644
--- a/libs/ardour/ardour/audio_diskstream.h
+++ b/libs/ardour/ardour/audio_diskstream.h
@@ -139,7 +139,6 @@ class AudioDiskstream : public Diskstream
 	void set_block_size (pframes_t);
 	int  internal_playback_seek (framecnt_t distance);
 	int  can_internal_playback_seek (framecnt_t distance);
-	std::list<boost::shared_ptr<Source> > steal_write_sources();
 	void reset_write_sources (bool, bool force = false);
 	void non_realtime_input_change ();
 	void non_realtime_locate (framepos_t location);
diff --git a/libs/ardour/ardour/diskstream.h b/libs/ardour/ardour/diskstream.h
index 7a4bccbb46..91efb0d517 100644
--- a/libs/ardour/ardour/diskstream.h
+++ b/libs/ardour/ardour/diskstream.h
@@ -70,6 +70,8 @@ class Diskstream : public SessionObject, public PublicDiskstream
 
 	virtual bool set_name (const std::string& str);
 
+	virtual std::string steal_write_source_name () { return std::string(); }
+
 	boost::shared_ptr<ARDOUR::IO> io() const { return _io; }
 	void set_track (ARDOUR::Track *);
 
diff --git a/libs/ardour/ardour/file_source.h b/libs/ardour/ardour/file_source.h
index 8fe3ab21da..f1b42aa2ae 100644
--- a/libs/ardour/ardour/file_source.h
+++ b/libs/ardour/ardour/file_source.h
@@ -44,7 +44,7 @@ class MissingSource : public std::exception
 /** A source associated with a file on disk somewhere */
 class FileSource : virtual public Source {
 public:
-	virtual ~FileSource () {}
+	virtual ~FileSource ();
 
 	virtual const std::string& path() const { return _path; }
 
diff --git a/libs/ardour/ardour/midi_diskstream.h b/libs/ardour/ardour/midi_diskstream.h
index c2c3f5801f..6401554711 100644
--- a/libs/ardour/ardour/midi_diskstream.h
+++ b/libs/ardour/ardour/midi_diskstream.h
@@ -111,7 +111,7 @@ class MidiDiskstream : public Diskstream
 	void set_block_size (pframes_t);
 	int  internal_playback_seek (framecnt_t distance);
 	int  can_internal_playback_seek (framecnt_t distance);
-	std::list<boost::shared_ptr<Source> > steal_write_sources();
+	std::string steal_write_source_name();
 	void reset_write_sources (bool, bool force = false);
 	void non_realtime_input_change ();
 	void non_realtime_locate (framepos_t location);
diff --git a/libs/ardour/ardour/public_diskstream.h b/libs/ardour/ardour/public_diskstream.h
index 125e1a21ce..c150ca93b0 100644
--- a/libs/ardour/ardour/public_diskstream.h
+++ b/libs/ardour/ardour/public_diskstream.h
@@ -38,7 +38,7 @@ public:
 	virtual bool destructive () const = 0;
 	virtual std::list<boost::shared_ptr<Source> > & last_capture_sources () = 0;
 	virtual void set_capture_offset () = 0;
-	virtual std::list<boost::shared_ptr<Source> > steal_write_sources () = 0;
+	virtual std::string steal_write_source_name () = 0;
 	virtual void reset_write_sources (bool, bool force = false) = 0;
 	virtual float playback_buffer_load () const = 0;
 	virtual float capture_buffer_load () const = 0;
diff --git a/libs/ardour/ardour/track.h b/libs/ardour/ardour/track.h
index bdf420763b..c763b440af 100644
--- a/libs/ardour/ardour/track.h
+++ b/libs/ardour/ardour/track.h
@@ -120,7 +120,7 @@ class Track : public Route, public PublicDiskstream
 	bool destructive () const;
 	std::list<boost::shared_ptr<Source> > & last_capture_sources ();
 	void set_capture_offset ();
-	std::list<boost::shared_ptr<Source> > steal_write_sources();
+	std::string steal_write_source_name ();
 	void reset_write_sources (bool, bool force = false);
 	float playback_buffer_load () const;
 	float capture_buffer_load () const;
diff --git a/libs/ardour/audio_diskstream.cc b/libs/ardour/audio_diskstream.cc
index a9f9f40d64..010e1da21f 100644
--- a/libs/ardour/audio_diskstream.cc
+++ b/libs/ardour/audio_diskstream.cc
@@ -1928,14 +1928,6 @@ AudioDiskstream::use_new_write_source (uint32_t n)
 	return 0;
 }
 
-list<boost::shared_ptr<Source> >
-AudioDiskstream::steal_write_sources()
-{
-	/* not possible to steal audio write sources */
-	list<boost::shared_ptr<Source> > ret;
-	return ret;
-}
-
 void
 AudioDiskstream::reset_write_sources (bool mark_write_complete, bool /*force*/)
 {
diff --git a/libs/ardour/file_source.cc b/libs/ardour/file_source.cc
index c6f3a9cd5d..de7365962f 100644
--- a/libs/ardour/file_source.cc
+++ b/libs/ardour/file_source.cc
@@ -81,6 +81,10 @@ FileSource::FileSource (Session& session, const XMLNode& node, bool /*must_exist
         prevent_deletion ();
 }
 
+FileSource::~FileSource()
+{
+}
+
 void
 FileSource::prevent_deletion ()
 {
@@ -88,6 +92,8 @@ FileSource::prevent_deletion ()
          */
 
         if (Glib::file_test (_path, Glib::FILE_TEST_EXISTS)) {
+		cerr << " ... " << _path << " already  exists, marking immutable\n";
+
                 if (!(_flags & Destructive)) {
                         mark_immutable ();
                 } else {
@@ -536,10 +542,13 @@ FileSource::set_source_name (const string& newname, bool destructive)
 		return -1;
 	}
 
-        if (::rename (oldpath.c_str(), newpath.c_str()) != 0) {
-                error << string_compose (_("cannot rename file %1 to %2 (%3)"), oldpath, newpath, strerror(errno)) << endmsg;
-                return -1;
-        }
+	if (Glib::file_test (oldpath.c_str(), Glib::FILE_TEST_EXISTS)) { 
+		/* rename only needed if file exists on disk */
+		if (::rename (oldpath.c_str(), newpath.c_str()) != 0) {
+			error << string_compose (_("cannot rename file %1 to %2 (%3)"), oldpath, newpath, strerror(errno)) << endmsg;
+			return -1;
+		}
+	}
 
 	_name = Glib::path_get_basename (newpath);
 	_path = newpath;
diff --git a/libs/ardour/midi_diskstream.cc b/libs/ardour/midi_diskstream.cc
index 66a3754e2d..eeabdcb728 100644
--- a/libs/ardour/midi_diskstream.cc
+++ b/libs/ardour/midi_diskstream.cc
@@ -1214,25 +1214,24 @@ MidiDiskstream::use_new_write_source (uint32_t n)
 
 	return 0;
 }
-
-list<boost::shared_ptr<Source> >
-MidiDiskstream::steal_write_sources()
+/**
+ * We want to use the name of the existing write source (the one that will be
+ * used by the next capture) for another purpose. So change the name of the
+ * current source, and return its current name.
+ *
+ * Return an empty string if the change cannot be accomplished.
+ */
+std::string
+MidiDiskstream::steal_write_source_name ()
 {
-	list<boost::shared_ptr<Source> > ret;
-
-	/* put some data on the disk, even if its just a header for an empty file */
-	boost::dynamic_pointer_cast<SMFSource> (_write_source)->ensure_disk_file ();
-
-	/* never let it go away */
-	_write_source->mark_nonremovable ();
-
-	ret.push_back (_write_source);
-
-	/* get a new one */
-
-	use_new_write_source (0);
+	std::string our_new_name = _session.new_midi_source_name (_write_source->name());
+	std::string our_old_name = _write_source->name();
+	
+	if (_write_source->set_source_name (our_new_name, false)) {
+		return string();
+	}
 
-	return ret;
+	return our_old_name;
 }
 
 void
diff --git a/libs/ardour/midi_source.cc b/libs/ardour/midi_source.cc
index 79922571c1..ed9aa9ddba 100644
--- a/libs/ardour/midi_source.cc
+++ b/libs/ardour/midi_source.cc
@@ -336,21 +336,19 @@ MidiSource::mark_streaming_write_completed ()
 boost::shared_ptr<MidiSource>
 MidiSource::clone (const string& path, Evoral::MusicalTime begin, Evoral::MusicalTime end)
 {
-	string newname = PBD::basename_nosuffix(_name.val());
 	string newpath;
 
+	/* get a new name for the MIDI file we're going to write to
+	 */
+	
 	if (path.empty()) {
-
-		/* get a new name for the MIDI file we're going to write to
-		 */
-		
-		do {
-			newname = bump_name_once (newname, '-');
-			newpath = Glib::build_filename (_session.session_directory().midi_path(), newname + ".mid");
-			
-		} while (Glib::file_test (newpath, Glib::FILE_TEST_EXISTS));
+		string newname = PBD::basename_nosuffix(_name.val());
+		newname = bump_name_once (newname, '-');
+		newname += ".mid";
+		newpath = _session.new_source_path_from_name (DataType::MIDI, newname);
 	} else {
 		/* caller must check for pre-existing file */
+		assert (!Glib::file_test (path, Glib::FILE_TEST_EXISTS));
 		newpath = path;
 	}
 
diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
index 0f93db7128..0bb2242b6c 100644
--- a/libs/ardour/session.cc
+++ b/libs/ardour/session.cc
@@ -88,6 +88,7 @@
 #include "ardour/smf_source.h"
 #include "ardour/source_factory.h"
 #include "ardour/speakers.h"
+#include "ardour/track.h"
 #include "ardour/utils.h"
 
 #include "midi++/port.h"
@@ -3587,6 +3588,7 @@ Session::new_midi_source_name (const string& base)
 	legalized = legalize_for_path (base);
 
 	// Find a "version" of the file name that doesn't exist in any of the possible directories.
+
 	for (cnt = 1; cnt <= limit; ++cnt) {
 
 		vector<space_and_path>::iterator i;
@@ -3626,23 +3628,37 @@ Session::new_midi_source_name (const string& base)
 boost::shared_ptr<MidiSource>
 Session::create_midi_source_for_session (Track* track, string const & n)
 {
-	/* try to use the existing write source for the track, to keep numbering sane
-	 */
+	std::string name;
 
 	if (track) {
-		/*MidiTrack* mt = dynamic_cast<Track*> (track);
-		  assert (mt);
+		/* the caller passes in the track the source will be used in,
+		   so that we can keep the numbering sane. 
+		   
+		   Rationale: a track with the name "Foo" that has had N
+		   captures carried out so far will already have a write source
+		   named "Foo-N+1.mid" waiting to be used for the next capture.
+
+		   If we call new_midi_source_name() we will get "Foo-N+2". But
+		   there is no region corresponding to "Foo-N+1", so when
+		   "Foo-N+2" appears in the track, the gap presents the user
+		   with odd behaviour - why did it skip past Foo-N+1?
+
+		   We could explain this to the user in some odd way, but
+		   instead we rename "Foo-N+1.mid" as "Foo-N+2.mid", and then
+		   use "Foo-N+1" here.
+
+		   If that attempted rename fails, we get "Foo-N+2.mid" anyway.
 		*/
 
-		list<boost::shared_ptr<Source> > l = track->steal_write_sources ();
+		MidiTrack* mt = dynamic_cast<MidiTrack*> (track);
+		assert (mt);
+		name = track->steal_write_source_name ();
+	}
 
-		if (!l.empty()) {
-			assert (boost::dynamic_pointer_cast<MidiSource> (l.front()));
-			return boost::dynamic_pointer_cast<MidiSource> (l.front());
-		}
+	if (name.empty()) {
+		name = new_midi_source_name (n);
 	}
 
-	const string name = new_midi_source_name (n);
 	const string path = new_source_path_from_name (DataType::MIDI, name);
 
 	return boost::dynamic_pointer_cast<SMFSource> (
diff --git a/libs/ardour/track.cc b/libs/ardour/track.cc
index 57239cb841..5c95de0c41 100644
--- a/libs/ardour/track.cc
+++ b/libs/ardour/track.cc
@@ -579,10 +579,10 @@ Track::set_capture_offset ()
 	_diskstream->set_capture_offset ();
 }
 
-list<boost::shared_ptr<Source> >
-Track::steal_write_sources()
+std::string
+Track::steal_write_source_name()
 {
-        return _diskstream->steal_write_sources ();
+        return _diskstream->steal_write_source_name ();
 }
 
 void
-- 
cgit v1.2.3


From 0d5f4c553a7365612a44e1e0997a6d0e14d8b7ff Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Sun, 13 Apr 2014 10:29:07 -0400
Subject: dramatic change in logic and naming for operations related to adding
 a MIDI region on demand and cloning/unlinking

Existing code would cause data loss due to creation of two Source objects referring the same path, one with removable flags and one without. Careful code review suggested a variety of thinkos, function naming problems and other confusion that caused this. I have tried ot extensively comment what is going on with these operations, because it is one key area in which MIDI differs from audio: with audio, capture is the only way to add a new audio region, but for MIDI there are GUI input events that can add a new region.
---
 gtk2_ardour/editor_ops.cc            |  17 +++--
 gtk2_ardour/midi_time_axis.cc        |   3 +-
 libs/ardour/ardour/audiofilesource.h |   4 --
 libs/ardour/ardour/midi_region.h     |   1 +
 libs/ardour/ardour/midi_source.h     |  18 ++++-
 libs/ardour/ardour/session.h         |   9 +--
 libs/ardour/ardour/smf_source.h      |   2 -
 libs/ardour/file_source.cc           |   2 +-
 libs/ardour/midi_diskstream.cc       |  18 +++--
 libs/ardour/midi_region.cc           |  24 ++++++-
 libs/ardour/midi_source.cc           |  28 ++------
 libs/ardour/session.cc               | 126 ++++++++++++++++++++++++-----------
 12 files changed, 158 insertions(+), 94 deletions(-)

diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index 1a818f1c71..a2eae60052 100644
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -4772,12 +4772,17 @@ Editor::fork_region ()
 		MidiRegionView* const mrv = dynamic_cast<MidiRegionView*>(*r);
 
 		if (mrv) {
-			boost::shared_ptr<Playlist> playlist = mrv->region()->playlist();
-			boost::shared_ptr<MidiRegion> newregion = mrv->midi_region()->clone ();
-
-			playlist->clear_changes ();
-			playlist->replace_region (mrv->region(), newregion, mrv->region()->position());
-			_session->add_command(new StatefulDiffCommand (playlist));
+			try {
+				boost::shared_ptr<Playlist> playlist = mrv->region()->playlist();
+				boost::shared_ptr<MidiSource> new_source = _session->create_midi_source_by_stealing_name (mrv->midi_view()->track());
+				boost::shared_ptr<MidiRegion> newregion = mrv->midi_region()->clone (new_source);
+				
+				playlist->clear_changes ();
+				playlist->replace_region (mrv->region(), newregion, mrv->region()->position());
+				_session->add_command(new StatefulDiffCommand (playlist));
+			} catch (...) {
+				error << string_compose (_("Could not unlink %1"), mrv->region()->name()) << endmsg;
+			}
 		}
 
 		r = tmp;
diff --git a/gtk2_ardour/midi_time_axis.cc b/gtk2_ardour/midi_time_axis.cc
index 54793d9904..aa057d98c6 100644
--- a/gtk2_ardour/midi_time_axis.cc
+++ b/gtk2_ardour/midi_time_axis.cc
@@ -1524,8 +1524,7 @@ MidiTimeAxisView::add_region (framepos_t pos, framecnt_t length, bool commit)
 
 	real_editor->snap_to (pos, 0);
 
-	boost::shared_ptr<Source> src = _session->create_midi_source_for_session (
-		view()->trackview().track().get(), view()->trackview().track()->name());
+	boost::shared_ptr<Source> src = _session->create_midi_source_by_stealing_name (view()->trackview().track());
 	PropertyList plist;
 
 	plist.add (ARDOUR::Properties::start, 0);
diff --git a/libs/ardour/ardour/audiofilesource.h b/libs/ardour/ardour/audiofilesource.h
index c5fd7b3af2..9be8d6ce45 100644
--- a/libs/ardour/ardour/audiofilesource.h
+++ b/libs/ardour/ardour/audiofilesource.h
@@ -39,10 +39,6 @@ class AudioFileSource : public AudioSource, public FileSource {
 public:
 	virtual ~AudioFileSource ();
 
-	bool set_name (const std::string& newname) {
-		return (set_source_name(newname, destructive()) == 0);
-	}
-
 	std::string peak_path (std::string audio_path);
 	std::string find_broken_peakfile (std::string missing_peak_path,
 	                                  std::string audio_path);
diff --git a/libs/ardour/ardour/midi_region.h b/libs/ardour/ardour/midi_region.h
index daca7a243d..91e048c03e 100644
--- a/libs/ardour/ardour/midi_region.h
+++ b/libs/ardour/ardour/midi_region.h
@@ -63,6 +63,7 @@ class MidiRegion : public Region
 	~MidiRegion();
 
 	boost::shared_ptr<MidiRegion> clone (std::string path = std::string()) const;
+	boost::shared_ptr<MidiRegion> clone (boost::shared_ptr<MidiSource>) const;
 
 	boost::shared_ptr<MidiSource> midi_source (uint32_t n=0) const;
 
diff --git a/libs/ardour/ardour/midi_source.h b/libs/ardour/ardour/midi_source.h
index a5aac8859b..6a21c03856 100644
--- a/libs/ardour/ardour/midi_source.h
+++ b/libs/ardour/ardour/midi_source.h
@@ -48,9 +48,21 @@ class MidiSource : virtual public Source, public boost::enable_shared_from_this<
 	MidiSource (Session& session, const XMLNode&);
 	virtual ~MidiSource ();
 
-	boost::shared_ptr<MidiSource> clone (const std::string& path,
-					     Evoral::MusicalTime begin = Evoral::MinMusicalTime,
-	                                     Evoral::MusicalTime end = Evoral::MaxMusicalTime);
+	/** Write the data in the given time range to another MidiSource
+	 * \param newsrc MidiSource to which data will be written. Should be a
+	 *        new, empty source. If it already has contents, the results are
+	 *        undefined. Source must be writable.
+	 *
+	 * \param begin time of earliest event that can be written.
+	 * \param end time of latest event that can be written.
+	 *
+	 * Returns zero on success, non-zero if the write failed for any
+	 * reason.
+	 *
+	 */
+	int write_to (boost::shared_ptr<MidiSource> newsrc,
+		      Evoral::MusicalTime begin = Evoral::MinMusicalTime,
+		      Evoral::MusicalTime end = Evoral::MaxMusicalTime);
 
 	/** Read the data in a given time range from the MIDI source.
 	 * All time stamps in parameters are in audio frames (even if the source has tempo time).
diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
index 09421a580b..07c6210833 100644
--- a/libs/ardour/ardour/session.h
+++ b/libs/ardour/ardour/session.h
@@ -194,7 +194,7 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
 
 	std::string peak_path (std::string) const;
 
-	std::string change_source_path_by_name (std::string oldpath, std::string oldname, std::string newname, bool destructive);
+	std::string generate_new_source_path_from_name (std::string oldpath, std::string oldname, std::string newname, bool destructive);
 
 	std::string peak_path_from_audio_path (std::string) const;
 	std::string new_audio_source_name (const std::string&, uint32_t nchans, uint32_t chan, bool destructive);
@@ -582,11 +582,12 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
 	boost::shared_ptr<AudioFileSource> create_audio_source_for_session (
 		size_t, std::string const &, uint32_t, bool destructive);
 
-	boost::shared_ptr<MidiSource> create_midi_source_for_session (
-		Track*, std::string const &);
+	boost::shared_ptr<MidiSource> create_midi_source_for_session (std::string const &);
+	boost::shared_ptr<MidiSource> create_midi_source_by_stealing_name (boost::shared_ptr<Track>);
 
 	boost::shared_ptr<Source> source_by_id (const PBD::ID&);
-	boost::shared_ptr<Source> source_by_path_and_channel (const std::string&, uint16_t);
+	boost::shared_ptr<AudioFileSource> source_by_path_and_channel (const std::string&, uint16_t) const;
+	boost::shared_ptr<MidiSource> source_by_path (const std::string&) const;
 	uint32_t count_sources_by_origin (const std::string&);
 
 	void add_playlist (boost::shared_ptr<Playlist>, bool unused = false);
diff --git a/libs/ardour/ardour/smf_source.h b/libs/ardour/ardour/smf_source.h
index e422d37f62..e0c5a9c6e8 100644
--- a/libs/ardour/ardour/smf_source.h
+++ b/libs/ardour/ardour/smf_source.h
@@ -49,8 +49,6 @@ public:
 		return safe_midi_file_extension(path);
 	}
 
-	bool set_name (const std::string& newname) { return (set_source_name(newname, false) == 0); }
-
 	void append_event_unlocked_beats (const Evoral::Event<Evoral::MusicalTime>& ev);
 	void append_event_unlocked_frames (const Evoral::Event<framepos_t>& ev, framepos_t source_start);
 
diff --git a/libs/ardour/file_source.cc b/libs/ardour/file_source.cc
index de7365962f..df9fa13e3c 100644
--- a/libs/ardour/file_source.cc
+++ b/libs/ardour/file_source.cc
@@ -529,7 +529,7 @@ FileSource::set_source_name (const string& newname, bool destructive)
 {
 	Glib::Threads::Mutex::Lock lm (_lock);
 	string oldpath = _path;
-	string newpath = _session.change_source_path_by_name (oldpath, _name, newname, destructive);
+	string newpath = _session.generate_new_source_path_from_name (oldpath, _name, newname, destructive);
 
 	if (newpath.empty()) {
 		error << string_compose (_("programming error: %1"), "cannot generate a changed file path") << endmsg;
diff --git a/libs/ardour/midi_diskstream.cc b/libs/ardour/midi_diskstream.cc
index eeabdcb728..21b5aa0a34 100644
--- a/libs/ardour/midi_diskstream.cc
+++ b/libs/ardour/midi_diskstream.cc
@@ -1199,7 +1199,7 @@ MidiDiskstream::use_new_write_source (uint32_t n)
 
 	try {
 		_write_source = boost::dynamic_pointer_cast<SMFSource>(
-			_session.create_midi_source_for_session (0, name ()));
+			_session.create_midi_source_for_session (name ()));
 
 		if (!_write_source) {
 			throw failed_constructor();
@@ -1224,13 +1224,19 @@ MidiDiskstream::use_new_write_source (uint32_t n)
 std::string
 MidiDiskstream::steal_write_source_name ()
 {
-	std::string our_new_name = _session.new_midi_source_name (_write_source->name());
-	std::string our_old_name = _write_source->name();
-	
-	if (_write_source->set_source_name (our_new_name, false)) {
+	string our_old_name = _write_source->name();
+
+	/* this will bump the name of the current write source to the next one
+	 * (e.g. "MIDI 1-1" gets renamed to "MIDI 1-2"), thus leaving the
+	 * current write source name (e.g. "MIDI 1-1" available). See the
+	 * comments in Session::create_midi_source_for_track() about why we do
+	 * this.
+	 */
+
+	if (_write_source->set_source_name (name(), false)) {
 		return string();
 	}
-
+	
 	return our_old_name;
 }
 
diff --git a/libs/ardour/midi_region.cc b/libs/ardour/midi_region.cc
index 8509e55f97..e7298e7526 100644
--- a/libs/ardour/midi_region.cc
+++ b/libs/ardour/midi_region.cc
@@ -25,6 +25,8 @@
 #include <set>
 
 #include <glibmm/threads.h>
+#include <glibmm/fileutils.h>
+#include <glibmm/miscutils.h>
 
 #include "pbd/xml++.h"
 #include "pbd/basename.h"
@@ -36,6 +38,7 @@
 #include "ardour/midi_source.h"
 #include "ardour/region_factory.h"
 #include "ardour/session.h"
+#include "ardour/source_factory.h"
 #include "ardour/tempo.h"
 #include "ardour/types.h"
 
@@ -126,16 +129,31 @@ MidiRegion::~MidiRegion ()
  */
 boost::shared_ptr<MidiRegion>
 MidiRegion::clone (string path) const
+{
+	boost::shared_ptr<MidiSource> newsrc;
+
+	/* caller must check for pre-existing file */
+	assert (!Glib::file_test (path, Glib::FILE_TEST_EXISTS));
+	newsrc = boost::dynamic_pointer_cast<MidiSource>(
+		SourceFactory::createWritable(DataType::MIDI, _session,
+					      path, false, _session.frame_rate()));
+	return clone (newsrc);
+}
+
+boost::shared_ptr<MidiRegion>
+MidiRegion::clone (boost::shared_ptr<MidiSource> newsrc) const
 {
 	BeatsFramesConverter bfc (_session.tempo_map(), _position);
 	Evoral::MusicalTime const bbegin = bfc.from (_start);
 	Evoral::MusicalTime const bend = bfc.from (_start + _length);
 
-	boost::shared_ptr<MidiSource> ms = midi_source(0)->clone (path, bbegin, bend);
+	if (midi_source(0)->write_to (newsrc, bbegin, bend)) {
+		return boost::shared_ptr<MidiRegion> ();
+	}
 
 	PropertyList plist;
 
-	plist.add (Properties::name, PBD::basename_nosuffix (ms->name()));
+	plist.add (Properties::name, PBD::basename_nosuffix (newsrc->name()));
 	plist.add (Properties::whole_file, true);
 	plist.add (Properties::start, _start);
 	plist.add (Properties::start_beats, _start_beats);
@@ -143,7 +161,7 @@ MidiRegion::clone (string path) const
 	plist.add (Properties::length_beats, _length_beats);
 	plist.add (Properties::layer, 0);
 
-	return boost::dynamic_pointer_cast<MidiRegion> (RegionFactory::create (ms, plist, true));
+	return boost::dynamic_pointer_cast<MidiRegion> (RegionFactory::create (newsrc, plist, true));
 }
 
 void
diff --git a/libs/ardour/midi_source.cc b/libs/ardour/midi_source.cc
index ed9aa9ddba..880bad1c24 100644
--- a/libs/ardour/midi_source.cc
+++ b/libs/ardour/midi_source.cc
@@ -333,29 +333,9 @@ MidiSource::mark_streaming_write_completed ()
 	mark_midi_streaming_write_completed (Evoral::Sequence<Evoral::MusicalTime>::DeleteStuckNotes);
 }
 
-boost::shared_ptr<MidiSource>
-MidiSource::clone (const string& path, Evoral::MusicalTime begin, Evoral::MusicalTime end)
+int
+MidiSource::write_to (boost::shared_ptr<MidiSource> newsrc, Evoral::MusicalTime begin, Evoral::MusicalTime end)
 {
-	string newpath;
-
-	/* get a new name for the MIDI file we're going to write to
-	 */
-	
-	if (path.empty()) {
-		string newname = PBD::basename_nosuffix(_name.val());
-		newname = bump_name_once (newname, '-');
-		newname += ".mid";
-		newpath = _session.new_source_path_from_name (DataType::MIDI, newname);
-	} else {
-		/* caller must check for pre-existing file */
-		assert (!Glib::file_test (path, Glib::FILE_TEST_EXISTS));
-		newpath = path;
-	}
-
-	boost::shared_ptr<MidiSource> newsrc = boost::dynamic_pointer_cast<MidiSource>(
-		SourceFactory::createWritable(DataType::MIDI, _session,
-		                              newpath, false, _session.frame_rate()));
-
 	newsrc->set_timeline_position(_timeline_position);
 	newsrc->copy_interpolation_from (this);
 	newsrc->copy_automation_state_from (this);
@@ -368,7 +348,7 @@ MidiSource::clone (const string& path, Evoral::MusicalTime begin, Evoral::Musica
 		}
 	} else {
 		error << string_compose (_("programming error: %1"), X_("no model for MidiSource during ::clone()"));
-		return boost::shared_ptr<MidiSource>();
+		return -1;
 	}
 
 	newsrc->flush_midi();
@@ -385,7 +365,7 @@ MidiSource::clone (const string& path, Evoral::MusicalTime begin, Evoral::Musica
 
 	boost::dynamic_pointer_cast<FileSource> (newsrc)->prevent_deletion ();
 
-	return newsrc;
+	return 0;
 }
 
 void
diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
index 0bb2242b6c..cf1487c28c 100644
--- a/libs/ardour/session.cc
+++ b/libs/ardour/session.cc
@@ -3304,12 +3304,16 @@ Session::source_by_id (const PBD::ID& id)
 	return source;
 }
 
-boost::shared_ptr<Source>
-Session::source_by_path_and_channel (const string& path, uint16_t chn)
+boost::shared_ptr<AudioFileSource>
+Session::source_by_path_and_channel (const string& path, uint16_t chn) const
 {
+	/* Restricted to audio files because only audio sources have channel
+	   as a property.
+	*/
+
 	Glib::Threads::Mutex::Lock lm (source_lock);
 
-	for (SourceMap::iterator i = sources.begin(); i != sources.end(); ++i) {
+	for (SourceMap::const_iterator i = sources.begin(); i != sources.end(); ++i) {
 		boost::shared_ptr<AudioFileSource> afs
 			= boost::dynamic_pointer_cast<AudioFileSource>(i->second);
 
@@ -3317,7 +3321,31 @@ Session::source_by_path_and_channel (const string& path, uint16_t chn)
 			return afs;
 		}
 	}
-	return boost::shared_ptr<Source>();
+
+	return boost::shared_ptr<AudioFileSource>();
+}
+
+boost::shared_ptr<MidiSource>
+Session::source_by_path (const std::string& path) const
+{
+	/* Restricted to MIDI files because audio sources require a channel
+	   for unique identification, in addition to a path.
+	*/
+
+	Glib::Threads::Mutex::Lock lm (source_lock);
+
+	for (SourceMap::const_iterator s = sources.begin(); s != sources.end(); ++s) {
+		boost::shared_ptr<MidiSource> ms
+			= boost::dynamic_pointer_cast<MidiSource>(s->second);
+		boost::shared_ptr<FileSource> fs
+			= boost::dynamic_pointer_cast<FileSource>(s->second);
+		
+		if (ms && fs && fs->path() == path) {
+			return ms;
+		}
+	}
+
+	return boost::shared_ptr<MidiSource>();
 }
 
 uint32_t
@@ -3338,9 +3366,8 @@ Session::count_sources_by_origin (const string& path)
 	return cnt;
 }
 
-
 string
-Session::change_source_path_by_name (string path, string oldname, string newname, bool destructive)
+Session::generate_new_source_path_from_name (string path, string oldname, string newname, bool destructive)
 {
 	string look_for;
 	string old_basename = PBD::basename_nosuffix (oldname);
@@ -3427,7 +3454,9 @@ Session::change_source_path_by_name (string path, string oldname, string newname
 
 			if (!matching_unsuffixed_filename_exists_in (dir, buf)) {
 				path = Glib::build_filename (dir, buf);
-				break;
+				if (!source_by_path (path)) {
+					break;
+				}
 			}
 
 			path = "";
@@ -3575,17 +3604,18 @@ Session::create_audio_source_for_session (size_t n_chans, string const & n, uint
 		SourceFactory::createWritable (DataType::AUDIO, *this, path, destructive, frame_rate()));
 }
 
-/** Return a unique name based on \a base for a new internal MIDI source */
+/** Return a unique name based on \a owner_name for a new internal MIDI source */
 string
-Session::new_midi_source_name (const string& base)
+Session::new_midi_source_name (const string& owner_name)
 {
 	uint32_t cnt;
 	char buf[PATH_MAX+1];
 	const uint32_t limit = 10000;
 	string legalized;
+	string possible_name;
 
 	buf[0] = '\0';
-	legalized = legalize_for_path (base);
+	legalized = legalize_for_path (owner_name);
 
 	// Find a "version" of the file name that doesn't exist in any of the possible directories.
 
@@ -3597,12 +3627,17 @@ Session::new_midi_source_name (const string& base)
 		for (i = session_dirs.begin(); i != session_dirs.end(); ++i) {
 
 			SessionDirectory sdir((*i).path);
+			
+			snprintf (buf, sizeof(buf), "%s-%u.mid", legalized.c_str(), cnt);
+			possible_name = buf;
 
-			std::string p = Glib::build_filename (sdir.midi_path(), legalized);
-
-			snprintf (buf, sizeof(buf), "%s-%u.mid", p.c_str(), cnt);
+			std::string possible_path = Glib::build_filename (sdir.midi_path(), possible_name);
+			
+			if (Glib::file_test (possible_path, Glib::FILE_TEST_EXISTS)) {
+				existing++;
+			}
 
-			if (Glib::file_test (buf, Glib::FILE_TEST_EXISTS)) {
+			if (source_by_path (possible_path)) {
 				existing++;
 			}
 		}
@@ -3614,49 +3649,62 @@ Session::new_midi_source_name (const string& base)
 		if (cnt > limit) {
 			error << string_compose(
 					_("There are already %1 recordings for %2, which I consider too many."),
-					limit, base) << endmsg;
+					limit, owner_name) << endmsg;
 			destroy ();
 			throw failed_constructor();
 		}
 	}
 
-	return Glib::path_get_basename(buf);
+	return possible_name;
 }
 
 
 /** Create a new within-session MIDI source */
 boost::shared_ptr<MidiSource>
-Session::create_midi_source_for_session (Track* track, string const & n)
+Session::create_midi_source_for_session (string const & basic_name)
 {
 	std::string name;
 
-	if (track) {
-		/* the caller passes in the track the source will be used in,
-		   so that we can keep the numbering sane. 
-		   
-		   Rationale: a track with the name "Foo" that has had N
-		   captures carried out so far will already have a write source
-		   named "Foo-N+1.mid" waiting to be used for the next capture.
-
-		   If we call new_midi_source_name() we will get "Foo-N+2". But
-		   there is no region corresponding to "Foo-N+1", so when
-		   "Foo-N+2" appears in the track, the gap presents the user
-		   with odd behaviour - why did it skip past Foo-N+1?
+	if (name.empty()) {
+		name = new_midi_source_name (basic_name);
+	}
 
-		   We could explain this to the user in some odd way, but
-		   instead we rename "Foo-N+1.mid" as "Foo-N+2.mid", and then
-		   use "Foo-N+1" here.
+	const string path = new_source_path_from_name (DataType::MIDI, name);
 
-		   If that attempted rename fails, we get "Foo-N+2.mid" anyway.
-		*/
+	return boost::dynamic_pointer_cast<SMFSource> (
+		SourceFactory::createWritable (
+			DataType::MIDI, *this, path, false, frame_rate()));
+}
 
-		MidiTrack* mt = dynamic_cast<MidiTrack*> (track);
-		assert (mt);
-		name = track->steal_write_source_name ();
-	}
+/** Create a new within-session MIDI source */
+boost::shared_ptr<MidiSource>
+Session::create_midi_source_by_stealing_name (boost::shared_ptr<Track> track)
+{
+	/* the caller passes in the track the source will be used in,
+	   so that we can keep the numbering sane. 
+	   
+	   Rationale: a track with the name "Foo" that has had N
+	   captures carried out so far will ALREADY have a write source
+	   named "Foo-N+1.mid" waiting to be used for the next capture.
+	   
+	   If we call new_midi_source_name() we will get "Foo-N+2". But
+	   there is no region corresponding to "Foo-N+1", so when
+	   "Foo-N+2" appears in the track, the gap presents the user
+	   with odd behaviour - why did it skip past Foo-N+1?
+	   
+	   We could explain this to the user in some odd way, but
+	   instead we rename "Foo-N+1.mid" as "Foo-N+2.mid", and then
+	   use "Foo-N+1" here.
+	   
+	   If that attempted rename fails, we get "Foo-N+2.mid" anyway.
+	*/
+	
+	boost::shared_ptr<MidiTrack> mt = boost::dynamic_pointer_cast<MidiTrack> (track);
+	assert (mt);
+	std::string name = track->steal_write_source_name ();
 
 	if (name.empty()) {
-		name = new_midi_source_name (n);
+		return boost::shared_ptr<MidiSource>();
 	}
 
 	const string path = new_source_path_from_name (DataType::MIDI, name);
-- 
cgit v1.2.3


From b49bb451d25ec11535282ca80a6f0be127fb6107 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Sun, 13 Apr 2014 11:12:22 -0400
Subject: further code simplification and rationalization related to MIDI
 source/file renaming

---
 libs/ardour/ardour/session.h    |   2 -
 libs/ardour/ardour/smf_source.h |   9 ++++
 libs/ardour/file_source.cc      |  32 ------------
 libs/ardour/midi_diskstream.cc  |  14 ++++--
 libs/ardour/session.cc          | 106 ----------------------------------------
 libs/ardour/smf_source.cc       |  32 ++++++++++++
 6 files changed, 51 insertions(+), 144 deletions(-)

diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
index 07c6210833..38185a71d6 100644
--- a/libs/ardour/ardour/session.h
+++ b/libs/ardour/ardour/session.h
@@ -194,8 +194,6 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
 
 	std::string peak_path (std::string) const;
 
-	std::string generate_new_source_path_from_name (std::string oldpath, std::string oldname, std::string newname, bool destructive);
-
 	std::string peak_path_from_audio_path (std::string) const;
 	std::string new_audio_source_name (const std::string&, uint32_t nchans, uint32_t chan, bool destructive);
 	std::string new_midi_source_name (const std::string&);
diff --git a/libs/ardour/ardour/smf_source.h b/libs/ardour/ardour/smf_source.h
index e0c5a9c6e8..2e6ebc0650 100644
--- a/libs/ardour/ardour/smf_source.h
+++ b/libs/ardour/ardour/smf_source.h
@@ -45,6 +45,15 @@ public:
 
 	virtual ~SMFSource ();
 
+	/** Rename the file on disk referenced by this source to \param newname
+	 *
+	 * This method exists only for MIDI file sources, not for audio, which 
+	 * can never be renamed. It exists for MIDI so that we can get
+	 * consistent and sane region/source numbering when regions are added
+	 * manually (which never happens with audio).
+	 */
+	int rename (const std::string& name);
+
         bool safe_file_extension (const std::string& path) const {
 		return safe_midi_file_extension(path);
 	}
diff --git a/libs/ardour/file_source.cc b/libs/ardour/file_source.cc
index df9fa13e3c..f9abda0ab3 100644
--- a/libs/ardour/file_source.cc
+++ b/libs/ardour/file_source.cc
@@ -524,38 +524,6 @@ out:
 	return ret;
 }
 
-int
-FileSource::set_source_name (const string& newname, bool destructive)
-{
-	Glib::Threads::Mutex::Lock lm (_lock);
-	string oldpath = _path;
-	string newpath = _session.generate_new_source_path_from_name (oldpath, _name, newname, destructive);
-
-	if (newpath.empty()) {
-		error << string_compose (_("programming error: %1"), "cannot generate a changed file path") << endmsg;
-		return -1;
-	}
-
-	// Test whether newpath exists, if yes notify the user but continue.
-	if (Glib::file_test (newpath, Glib::FILE_TEST_EXISTS)) {
-		error << string_compose (_("Programming error! %1 tried to rename a file over another file! It's safe to continue working, but please report this to the developers."), PROGRAM_NAME) << endmsg;
-		return -1;
-	}
-
-	if (Glib::file_test (oldpath.c_str(), Glib::FILE_TEST_EXISTS)) { 
-		/* rename only needed if file exists on disk */
-		if (::rename (oldpath.c_str(), newpath.c_str()) != 0) {
-			error << string_compose (_("cannot rename file %1 to %2 (%3)"), oldpath, newpath, strerror(errno)) << endmsg;
-			return -1;
-		}
-	}
-
-	_name = Glib::path_get_basename (newpath);
-	_path = newpath;
-
-	return 0;
-}
-
 void
 FileSource::mark_immutable ()
 {
diff --git a/libs/ardour/midi_diskstream.cc b/libs/ardour/midi_diskstream.cc
index 21b5aa0a34..c38c08d72e 100644
--- a/libs/ardour/midi_diskstream.cc
+++ b/libs/ardour/midi_diskstream.cc
@@ -1229,12 +1229,18 @@ MidiDiskstream::steal_write_source_name ()
 	/* this will bump the name of the current write source to the next one
 	 * (e.g. "MIDI 1-1" gets renamed to "MIDI 1-2"), thus leaving the
 	 * current write source name (e.g. "MIDI 1-1" available). See the
-	 * comments in Session::create_midi_source_for_track() about why we do
-	 * this.
+	 * comments in Session::create_midi_source_by_stealing_name() about why
+	 * we do this.
 	 */
 
-	if (_write_source->set_source_name (name(), false)) {
-		return string();
+	try {
+		string new_name = _session.new_midi_source_name (name());
+		
+		if (_write_source->rename (new_name)) {
+			return string();
+		}
+	} catch (...) {
+		return string ();
 	}
 	
 	return our_old_name;
diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
index cf1487c28c..bf911c3253 100644
--- a/libs/ardour/session.cc
+++ b/libs/ardour/session.cc
@@ -3366,112 +3366,6 @@ Session::count_sources_by_origin (const string& path)
 	return cnt;
 }
 
-string
-Session::generate_new_source_path_from_name (string path, string oldname, string newname, bool destructive)
-{
-	string look_for;
-	string old_basename = PBD::basename_nosuffix (oldname);
-	string new_legalized = legalize_for_path (newname);
-
-	/* note: we know (or assume) the old path is already valid */
-
-	if (destructive) {
-
-		/* destructive file sources have a name of the form:
-
-		    /path/to/Tnnnn-NAME(%[LR])?.wav
-
-		    the task here is to replace NAME with the new name.
-		*/
-
-		string dir;
-		string prefix;
-		string::size_type dash;
-
-		dir = Glib::path_get_dirname (path);
-		path = Glib::path_get_basename (path);
-
-		/* '-' is not a legal character for the NAME part of the path */
-
-		if ((dash = path.find_last_of ('-')) == string::npos) {
-			return "";
-		}
-
-		prefix = path.substr (0, dash);
-
-		path += prefix;
-		path += '-';
-		path += new_legalized;
-		path += native_header_format_extension (config.get_native_file_header_format(), DataType::AUDIO);
-		path = Glib::build_filename (dir, path);
-
-	} else {
-
-		/* non-destructive file sources have a name of the form:
-
-		    /path/to/NAME-nnnnn(%[LR])?.ext
-
-		    the task here is to replace NAME with the new name.
-		*/
-
-		string dir;
-		string suffix;
-		string::size_type dash;
-		string::size_type postfix;
-
-		dir = Glib::path_get_dirname (path);
-		path = Glib::path_get_basename (path);
-
-		/* '-' is not a legal character for the NAME part of the path */
-
-		if ((dash = path.find_last_of ('-')) == string::npos) {
-			return "";
-		}
-
-		suffix = path.substr (dash+1);
-
-		// Suffix is now everything after the dash. Now we need to eliminate
-		// the nnnnn part, which is done by either finding a '%' or a '.'
-
-		postfix = suffix.find_last_of ("%");
-		if (postfix == string::npos) {
-			postfix = suffix.find_last_of ('.');
-		}
-
-		if (postfix != string::npos) {
-			suffix = suffix.substr (postfix);
-		} else {
-			error << "Logic error in Session::change_source_path_by_name(), please report" << endl;
-			return "";
-		}
-
-		const uint32_t limit = 10000;
-		char buf[PATH_MAX+1];
-
-		for (uint32_t cnt = 1; cnt <= limit; ++cnt) {
-
-			snprintf (buf, sizeof(buf), "%s-%u%s", newname.c_str(), cnt, suffix.c_str());
-
-			if (!matching_unsuffixed_filename_exists_in (dir, buf)) {
-				path = Glib::build_filename (dir, buf);
-				if (!source_by_path (path)) {
-					break;
-				}
-			}
-
-			path = "";
-		}
-
-		if (path.empty()) {
-			fatal << string_compose (_("FATAL ERROR! Could not find a suitable version of %1 for a rename"),
-			                         newname) << endl;
-			/*NOTREACHED*/
-		}
-	}
-
-	return path;
-}
-
 /** Return the full path (in some session directory) for a new within-session source.
  * \a name must be a session-unique name that does not contain slashes
  *         (e.g. as returned by new_*_source_name)
diff --git a/libs/ardour/smf_source.cc b/libs/ardour/smf_source.cc
index 4167bea877..ad238e27e1 100644
--- a/libs/ardour/smf_source.cc
+++ b/libs/ardour/smf_source.cc
@@ -667,3 +667,35 @@ SMFSource::prevent_deletion ()
   
 	_flags = Flag (_flags & ~(Removable|RemovableIfEmpty|RemoveAtDestroy));
 }
+
+int
+SMFSource::rename (const string& newname)
+{
+	Glib::Threads::Mutex::Lock lm (_lock);
+	string oldpath = _path;
+	string newpath = _session.new_source_path_from_name (DataType::MIDI, newname);
+
+	if (newpath.empty()) {
+		error << string_compose (_("programming error: %1"), "cannot generate a changed file path") << endmsg;
+		return -1;
+	}
+
+	// Test whether newpath exists, if yes notify the user but continue.
+	if (Glib::file_test (newpath, Glib::FILE_TEST_EXISTS)) {
+		error << string_compose (_("Programming error! %1 tried to rename a file over another file! It's safe to continue working, but please report this to the developers."), PROGRAM_NAME) << endmsg;
+		return -1;
+	}
+
+	if (Glib::file_test (oldpath.c_str(), Glib::FILE_TEST_EXISTS)) { 
+		/* rename only needed if file exists on disk */
+		if (::rename (oldpath.c_str(), newpath.c_str()) != 0) {
+			error << string_compose (_("cannot rename file %1 to %2 (%3)"), oldpath, newpath, strerror(errno)) << endmsg;
+			return -1;
+		}
+	}
+
+	_name = Glib::path_get_basename (newpath);
+	_path = newpath;
+
+	return 0;
+}
-- 
cgit v1.2.3


From 2e3a84b15afb749fbbfd05d765badb53434188b0 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Sun, 13 Apr 2014 11:35:49 -0400
Subject: check whether a source with the same path exists in session list not
 just on disk.

This is intended to catch a potential wierd condition where a source exists as a stub, but has not yet been written to disk,
and then a new source is created with the same path. Currently it is not understood how/when this might happen
---
 libs/ardour/session.cc | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
index bf911c3253..c9e0068431 100644
--- a/libs/ardour/session.cc
+++ b/libs/ardour/session.cc
@@ -3469,6 +3469,13 @@ Session::new_audio_source_name (const string& base, uint32_t nchan, uint32_t cha
 				existing++;
 				break;
 			}
+
+			string possible_path = Glib::build_filename (spath, buf);
+
+			if (source_by_path (possible_path)) {
+				existing++;
+				break;
+			}
 		}
 
 		if (existing == 0) {
-- 
cgit v1.2.3


From be0da8ff5c1a3bfbdf0a2934a79aeeed26ade3bc Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Mon, 14 Apr 2014 03:03:35 -0400
Subject: merge 5764970709f15e85ec30c9cea89c318eb8114c58 from cairocanvas as
 final(?) change related to data loss

---
 libs/ardour/ardour/file_source.h |  1 +
 libs/ardour/coreaudiosource.cc   | 15 +++++++++++++-
 libs/ardour/file_source.cc       | 27 +++++++++++--------------
 libs/ardour/session.cc           |  9 +++++++++
 libs/ardour/smf_source.cc        | 10 ++++++++--
 libs/ardour/sndfilesource.cc     | 43 +++++++++++++++++++++++++++++-----------
 6 files changed, 75 insertions(+), 30 deletions(-)

diff --git a/libs/ardour/ardour/file_source.h b/libs/ardour/ardour/file_source.h
index f1b42aa2ae..3acc62ed20 100644
--- a/libs/ardour/ardour/file_source.h
+++ b/libs/ardour/ardour/file_source.h
@@ -84,6 +84,7 @@ public:
 
 	virtual void prevent_deletion ();
 
+	void existence_check ();
 	virtual void prevent_deletion ();
 
 protected:
diff --git a/libs/ardour/coreaudiosource.cc b/libs/ardour/coreaudiosource.cc
index 947c66e756..010905d120 100644
--- a/libs/ardour/coreaudiosource.cc
+++ b/libs/ardour/coreaudiosource.cc
@@ -28,6 +28,8 @@
 #include <appleutility/CAAudioFile.h>
 #include <appleutility/CAStreamBasicDescription.h>
 
+#include <glibmm/fileutils.h>
+
 #include "i18n.h"
 
 #include <AudioToolbox/AudioFormat.h>
@@ -36,21 +38,32 @@ using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 
+/** Create a new CoreAudioSource using session state, which implies that the
+ *  file must already exist.
+ */
 CoreAudioSource::CoreAudioSource (Session& s, const XMLNode& node)
 	: Source (s, node)
 	, AudioFileSource (s, node)
 {
 	init_cafile ();
+
+        assert (Glib::file_test (_path, Glib::FILE_TEST_EXISTS));
+	existence_check ();
 }
 
+/** Create a new CoreAudioSource from an existing file. Sources created with this
+ *  method are never writable or removable.
+ */
 CoreAudioSource::CoreAudioSource (Session& s, const string& path, int chn, Flag flags)
-	/* files created this way are never writable or removable */
 	: Source (s, DataType::AUDIO, path, Source::Flag (flags & ~(Writable|Removable|RemovableIfEmpty|RemoveAtDestroy))),
 		AudioFileSource (s, path,
 			Source::Flag (flags & ~(Writable|Removable|RemovableIfEmpty|RemoveAtDestroy)))
 {
 	_channel = chn;
 	init_cafile ();
+
+        assert (Glib::file_test (_path, Glib::FILE_TEST_EXISTS));
+	existence_check ();
 }
 
 void
diff --git a/libs/ardour/file_source.cc b/libs/ardour/file_source.cc
index f9abda0ab3..de2783a1ac 100644
--- a/libs/ardour/file_source.cc
+++ b/libs/ardour/file_source.cc
@@ -62,8 +62,6 @@ FileSource::FileSource (Session& session, DataType type, const string& path, con
         , _open (false)
 {
 	set_within_session_from_path (path);
-
-        prevent_deletion ();
 }
 
 FileSource::FileSource (Session& session, const XMLNode& node, bool /*must_exist*/)
@@ -77,8 +75,6 @@ FileSource::FileSource (Session& session, const XMLNode& node, bool /*must_exist
 
 	_path = _name;
 	_within_session = true;
-
-        prevent_deletion ();
 }
 
 FileSource::~FileSource()
@@ -86,20 +82,21 @@ FileSource::~FileSource()
 }
 
 void
-FileSource::prevent_deletion ()
+FileSource::existence_check ()
 {
-        /* if this file already exists, it cannot be removed, ever
-         */
-
         if (Glib::file_test (_path, Glib::FILE_TEST_EXISTS)) {
-		cerr << " ... " << _path << " already  exists, marking immutable\n";
+		prevent_deletion ();
+	}
+}
 
-                if (!(_flags & Destructive)) {
-                        mark_immutable ();
-                } else {
-                        _flags = Flag (_flags & ~(Removable|RemovableIfEmpty|RemoveAtDestroy));
-                }
-        }
+void
+FileSource::prevent_deletion ()
+{
+	if (!(_flags & Destructive)) {
+		mark_immutable ();
+	} else {
+		_flags = Flag (_flags & ~(Removable|RemovableIfEmpty|RemoveAtDestroy));
+	}
 }
 
 bool
diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
index c9e0068431..1de5730a95 100644
--- a/libs/ardour/session.cc
+++ b/libs/ardour/session.cc
@@ -3470,6 +3470,15 @@ Session::new_audio_source_name (const string& base, uint32_t nchan, uint32_t cha
 				break;
 			}
 
+			/* it is possible that we have the path already
+			 * assigned to a source that has not yet been written
+			 * (ie. the write source for a diskstream). we have to
+			 * check this in order to make sure that our candidate
+			 * path isn't used again, because that can lead to
+			 * two Sources point to the same file with different
+			 * notions of their removability.
+			 */
+
 			string possible_path = Glib::build_filename (spath, buf);
 
 			if (source_by_path (possible_path)) {
diff --git a/libs/ardour/smf_source.cc b/libs/ardour/smf_source.cc
index ad238e27e1..90e50e6f44 100644
--- a/libs/ardour/smf_source.cc
+++ b/libs/ardour/smf_source.cc
@@ -62,9 +62,12 @@ SMFSource::SMFSource (Session& s, const string& path, Source::Flag flags)
 {
 	/* note that origin remains empty */
 
-	if (init(_path, false)) {
+	if (init (_path, false)) {
 		throw failed_constructor ();
 	}
+ 
+        assert (!Glib::file_test (_path, Glib::FILE_TEST_EXISTS));
+	existence_check ();
 
 	/* file is not opened until write */
 
@@ -93,10 +96,13 @@ SMFSource::SMFSource (Session& s, const XMLNode& node, bool must_exist)
 		throw failed_constructor ();
 	}
 
-	if (init(_path, true)) {
+	if (init (_path, true)) {
 		throw failed_constructor ();
 	}
 
+        assert (Glib::file_test (_path, Glib::FILE_TEST_EXISTS));
+	existence_check ();
+
 	if (open(_path)) {
 		throw failed_constructor ();
 	}
diff --git a/libs/ardour/sndfilesource.cc b/libs/ardour/sndfilesource.cc
index cf75cffba3..6b019f6fd0 100644
--- a/libs/ardour/sndfilesource.cc
+++ b/libs/ardour/sndfilesource.cc
@@ -30,6 +30,10 @@
 #include <sys/utsname.h>
 #include <sys/stat.h>
 
+#ifdef PLATFORM_WINDOWS
+#include <glibmm/convert.h>
+#endif
+#include <glibmm/fileutils.h>
 #include <glibmm/miscutils.h>
 
 #include "ardour/sndfilesource.h"
@@ -56,9 +60,18 @@ const Source::Flag SndFileSource::default_writable_flags = Source::Flag (
 SndFileSource::SndFileSource (Session& s, const XMLNode& node)
 	: Source(s, node)
 	, AudioFileSource (s, node)
+	, _descriptor (0)
+	, _broadcast_info (0)
+	, _capture_start (false)
+	, _capture_end (false)
+	, file_pos (0)
+	, xfade_buf (0)
 {
 	init_sndfile ();
 
+        assert (Glib::file_test (_path, Glib::FILE_TEST_EXISTS));
+	existence_check ();
+
 	if (open()) {
 		throw failed_constructor ();
 	}
@@ -69,11 +82,20 @@ SndFileSource::SndFileSource (Session& s, const string& path, int chn, Flag flag
 	: Source(s, DataType::AUDIO, path, flags)
           /* note that the origin of an external file is itself */
 	, AudioFileSource (s, path, Flag (flags & ~(Writable|Removable|RemovableIfEmpty|RemoveAtDestroy)))
+	, _descriptor (0)
+	, _broadcast_info (0)
+	, _capture_start (false)
+	, _capture_end (false)
+	, file_pos (0)
+	, xfade_buf (0)
 {
 	_channel = chn;
 
 	init_sndfile ();
 
+        assert (Glib::file_test (_path, Glib::FILE_TEST_EXISTS));
+	existence_check ();
+
 	if (open()) {
 		throw failed_constructor ();
 	}
@@ -84,11 +106,20 @@ SndFileSource::SndFileSource (Session& s, const string& path, const string& orig
                               SampleFormat sfmt, HeaderFormat hf, framecnt_t rate, Flag flags)
 	: Source(s, DataType::AUDIO, path, flags)
 	, AudioFileSource (s, path, origin, flags, sfmt, hf)
+	, _descriptor (0)
+	, _broadcast_info (0)
+	, _capture_start (false)
+	, _capture_end (false)
+	, file_pos (0)
+	, xfade_buf (0)
 {
 	int fmt = 0;
 
         init_sndfile ();
 
+        assert (!Glib::file_test (_path, Glib::FILE_TEST_EXISTS));
+	existence_check ();
+
 	_file_is_new = true;
 
 	switch (hf) {
@@ -155,24 +186,12 @@ SndFileSource::SndFileSource (Session& s, const string& path, const string& orig
 void
 SndFileSource::init_sndfile ()
 {
-	string file;
-
-        _descriptor = 0;
-
-	// lets try to keep the object initalizations here at the top
-	xfade_buf = 0;
-	_broadcast_info = 0;
-
 	/* although libsndfile says we don't need to set this,
 	   valgrind and source code shows us that we do.
 	*/
 
 	memset (&_info, 0, sizeof(_info));
 
-	_capture_start = false;
-	_capture_end = false;
-	file_pos = 0;
-
 	if (destructive()) {
 		xfade_buf = new Sample[xfade_frames];
 		_timeline_position = header_position_offset;
-- 
cgit v1.2.3


From 16a8762dd494adb68756b8d549f349ed7bdccd9b Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Mon, 14 Apr 2014 14:14:30 -0400
Subject: fix minor problem with recent cherry-picking from cairocanvas

---
 libs/ardour/ardour/file_source.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/libs/ardour/ardour/file_source.h b/libs/ardour/ardour/file_source.h
index 3acc62ed20..531cdf4d4c 100644
--- a/libs/ardour/ardour/file_source.h
+++ b/libs/ardour/ardour/file_source.h
@@ -82,8 +82,6 @@ public:
 	
 	static PBD::Signal3<int,std::string,std::string,std::vector<std::string> > AmbiguousFileName;
 
-	virtual void prevent_deletion ();
-
 	void existence_check ();
 	virtual void prevent_deletion ();
 
-- 
cgit v1.2.3


From f5276a104c2d544cf537db9e9b8de9022de7ad56 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Mon, 28 Apr 2014 10:37:17 -0400
Subject: add new SMFSource constructor to be used for existing-external files.
 Fixes #5919. Needs merging with CC

---
 libs/ardour/ardour/smf_source.h |  6 ++++--
 libs/ardour/smf_source.cc       | 33 +++++++++++++++++++++++++++++++++
 libs/ardour/source_factory.cc   |  2 +-
 3 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/libs/ardour/ardour/smf_source.h b/libs/ardour/ardour/smf_source.h
index 2e6ebc0650..9c0a78f282 100644
--- a/libs/ardour/ardour/smf_source.h
+++ b/libs/ardour/ardour/smf_source.h
@@ -36,9 +36,11 @@ template<typename T> class MidiRingBuffer;
 /** Standard Midi File (Type 0) Source */
 class SMFSource : public MidiSource, public FileSource, public Evoral::SMF {
 public:
+	/** Constructor for new internal-to-session files */
+	SMFSource (Session& session, const std::string& path, Source::Flag flags);
+
 	/** Constructor for existing external-to-session files */
-	SMFSource (Session& session, const std::string& path,
-			Source::Flag flags = Source::Flag(0));
+	SMFSource (Session& session, const std::string& path);
 
 	/** Constructor for existing in-session files */
 	SMFSource (Session& session, const XMLNode&, bool must_exist = false);
diff --git a/libs/ardour/smf_source.cc b/libs/ardour/smf_source.cc
index 90e50e6f44..d52923c302 100644
--- a/libs/ardour/smf_source.cc
+++ b/libs/ardour/smf_source.cc
@@ -82,6 +82,39 @@ SMFSource::SMFSource (Session& s, const string& path, Source::Flag flags)
 	_open = true;
 }
 
+/** Constructor used for external-to-session files.  File must exist. */
+SMFSource::SMFSource (Session& s, const string& path)
+	: Source(s, DataType::MIDI, path, Source::Flag (0))
+	, MidiSource(s, path, Source::Flag (0))
+	, FileSource(s, DataType::MIDI, path, string(), Source::Flag (0))
+	, Evoral::SMF()
+	, _last_ev_time_beats(0.0)
+	, _last_ev_time_frames(0)
+	, _smf_last_read_end (0)
+	, _smf_last_read_time (0)
+{
+	/* note that origin remains empty */
+
+	if (init (_path, false)) {
+		throw failed_constructor ();
+	}
+ 
+        assert (Glib::file_test (_path, Glib::FILE_TEST_EXISTS));
+	existence_check ();
+
+	/* file is not opened until write */
+
+	if (_flags & Writable) {
+		return;
+	}
+
+	if (open (_path)) {
+		throw failed_constructor ();
+	}
+
+	_open = true;
+}
+
 /** Constructor used for existing internal-to-session files. */
 SMFSource::SMFSource (Session& s, const XMLNode& node, bool must_exist)
 	: Source(s, node)
diff --git a/libs/ardour/source_factory.cc b/libs/ardour/source_factory.cc
index 0729f21592..391b205a94 100644
--- a/libs/ardour/source_factory.cc
+++ b/libs/ardour/source_factory.cc
@@ -272,7 +272,7 @@ SourceFactory::createExternal (DataType type, Session& s, const string& path,
 
 	} else if (type == DataType::MIDI) {
 
-		boost::shared_ptr<SMFSource> src (new SMFSource (s, path, SMFSource::Flag(0)));
+		boost::shared_ptr<SMFSource> src (new SMFSource (s, path));
 		src->load_model (true, true);
 #ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
 		// boost_debug_shared_ptr_mark_interesting (src, "Source");
-- 
cgit v1.2.3


From 2f6065b32c26dba0f7ea5da5c980d0406c36cc55 Mon Sep 17 00:00:00 2001
From: Damien Zammit <damien@zamaudio.com>
Date: Tue, 29 Apr 2014 06:44:40 +1000
Subject: Fixed problem where importing invalid midi files caused crash.

---
 gtk2_ardour/sfdb_ui.cc          |  8 ++++----
 libs/ardour/ardour/smf_source.h |  1 +
 libs/ardour/smf_source.cc       | 11 +++++++++++
 libs/evoral/evoral/SMF.hpp      |  1 +
 libs/evoral/src/SMF.cpp         | 22 ++++++++++++++++++++++
 5 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/gtk2_ardour/sfdb_ui.cc b/gtk2_ardour/sfdb_ui.cc
index 4b89cd51fe..6e08617af2 100644
--- a/gtk2_ardour/sfdb_ui.cc
+++ b/gtk2_ardour/sfdb_ui.cc
@@ -279,7 +279,7 @@ SoundFileBox::setup_labels (const string& filename)
 
 	string error_msg;
 
-	if (SMFSource::safe_midi_file_extension (path)) {
+	if (SMFSource::valid_midi_file (path)) {
 
 		boost::shared_ptr<SMFSource> ms =
 			boost::dynamic_pointer_cast<SMFSource> (
@@ -404,7 +404,7 @@ SoundFileBox::audition ()
 
 	boost::shared_ptr<Region> r;
 
-	if (SMFSource::safe_midi_file_extension (path)) {
+	if (SMFSource::valid_midi_file (path)) {
 
 		boost::shared_ptr<SMFSource> ms =
 			boost::dynamic_pointer_cast<SMFSource> (
@@ -1307,7 +1307,7 @@ SoundFileOmega::reset_options ()
 
 	/* See if we are thinking about importing any MIDI files */
 	vector<string>::iterator i = paths.begin ();
-	while (i != paths.end() && SMFSource::safe_midi_file_extension (*i) == false) {
+	while (i != paths.end() && SMFSource::valid_midi_file (*i) == false) {
 		++i;
 	}
 	bool const have_a_midi_file = (i != paths.end ());
@@ -1535,7 +1535,7 @@ SoundFileOmega::check_info (const vector<string>& paths, bool& same_size, bool&
 				src_needed = true;
 			}
 
-		} else if (SMFSource::safe_midi_file_extension (*i)) {
+		} else if (SMFSource::valid_midi_file (*i)) {
 
 			Evoral::SMF reader;
 			reader.open(*i);
diff --git a/libs/ardour/ardour/smf_source.h b/libs/ardour/ardour/smf_source.h
index 9c0a78f282..a068a3e385 100644
--- a/libs/ardour/ardour/smf_source.h
+++ b/libs/ardour/ardour/smf_source.h
@@ -77,6 +77,7 @@ public:
 	void ensure_disk_file ();
 
 	static bool safe_midi_file_extension (const std::string& path);
+	static bool valid_midi_file (const std::string& path);
 
 	void prevent_deletion ();
 
diff --git a/libs/ardour/smf_source.cc b/libs/ardour/smf_source.cc
index d52923c302..c3bc78c83d 100644
--- a/libs/ardour/smf_source.cc
+++ b/libs/ardour/smf_source.cc
@@ -34,6 +34,7 @@
 #include <glibmm/fileutils.h>
 
 #include "evoral/Control.hpp"
+#include "evoral/evoral/SMF.hpp"
 
 #include "ardour/event_type_map.h"
 #include "ardour/midi_model.h"
@@ -48,6 +49,7 @@
 using namespace ARDOUR;
 using namespace Glib;
 using namespace PBD;
+using namespace Evoral;
 
 /** Constructor used for new internal-to-session files.  File cannot exist. */
 SMFSource::SMFSource (Session& s, const string& path, Source::Flag flags)
@@ -496,6 +498,15 @@ SMFSource::mark_midi_streaming_write_completed (Evoral::Sequence<Evoral::Musical
 	mark_nonremovable ();
 }
 
+bool
+SMFSource::valid_midi_file (const string& file)
+{
+	if (safe_midi_file_extension (file) ) {
+		return (SMF::test (file) );
+	}
+	return false;
+}
+
 bool
 SMFSource::safe_midi_file_extension (const string& file)
 {
diff --git a/libs/evoral/evoral/SMF.hpp b/libs/evoral/evoral/SMF.hpp
index 8bd05444c4..02d0710409 100644
--- a/libs/evoral/evoral/SMF.hpp
+++ b/libs/evoral/evoral/SMF.hpp
@@ -50,6 +50,7 @@ public:
 	SMF() : _smf(0), _smf_track(0), _empty(true) {};
 	virtual ~SMF();
 
+	static bool test(const std::string& path);
 	int  open(const std::string& path, int track=1) THROW_FILE_ERROR;
 	int  create(const std::string& path, int track=1, uint16_t ppqn=19200) THROW_FILE_ERROR;
 	void close() THROW_FILE_ERROR;
diff --git a/libs/evoral/src/SMF.cpp b/libs/evoral/src/SMF.cpp
index b84507818c..6557a01b80 100644
--- a/libs/evoral/src/SMF.cpp
+++ b/libs/evoral/src/SMF.cpp
@@ -67,6 +67,28 @@ SMF::seek_to_track(int track)
 	}
 }
 
+/** Attempt to open the SMF file just to see if it is valid.
+ *
+ * \return  true on success
+ *          false on failure
+ */
+bool
+SMF::test(const std::string& path)
+{
+	PBD::StdioFileDescriptor d (path, "r");
+	FILE* f = d.allocate ();
+	if (f == 0) {
+		return false;
+	}
+
+	smf_t* test_smf;
+	if ((test_smf = smf_load (f)) == NULL) {
+		return false;
+	}
+	smf_delete (test_smf);
+	return true;
+}
+
 /** Attempt to open the SMF file for reading and/or writing.
  *
  * \return  0 on success
-- 
cgit v1.2.3


From d067e27762e6ee69dabc9d48a80828b6287511c1 Mon Sep 17 00:00:00 2001
From: "Devin J. Pohly" <djpohly@gmail.com>
Date: Wed, 14 May 2014 02:47:32 -0400
Subject: fix accumulated rounding error in BBT grid

Though current_frame is an integral type (framepos_t), it was being
added to as if it were floating-point, leading to an ever-increasing
rounding error when creating the grid for bars/beats/ticks.
---
 libs/ardour/tempo.cc | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/libs/ardour/tempo.cc b/libs/ardour/tempo.cc
index 0bb2fea0cf..a2a400ad32 100644
--- a/libs/ardour/tempo.cc
+++ b/libs/ardour/tempo.cc
@@ -884,6 +884,7 @@ TempoMap::_extend_map (TempoSection* tempo, MeterSection* meter,
 	TempoSection* ts;
 	MeterSection* ms;
 	double beat_frames;
+	double current_frame_exact;
 	framepos_t bar_start_frame;
 
 	DEBUG_TRACE (DEBUG::TempoMath, string_compose ("Extend map to %1 from %2 = %3\n", end, current, current_frame));
@@ -895,11 +896,13 @@ TempoMap::_extend_map (TempoSection* tempo, MeterSection* meter,
 	}
 
 	beat_frames = meter->frames_per_grid (*tempo,_frame_rate);
+	current_frame_exact = current_frame;
 
 	while (current_frame < end) {
 
 		current.beats++;
-		current_frame += beat_frames;
+		current_frame_exact += beat_frames;
+		current_frame = llrint(current_frame_exact);
 
 		if (current.beats > meter->divisions_per_bar()) {
 			current.bars++;
@@ -942,7 +945,8 @@ TempoMap::_extend_map (TempoSection* tempo, MeterSection* meter,
 						                                               tempo->start(), current_frame, tempo->bar_offset()));
 						
 						/* back up to previous beat */
-						current_frame -= beat_frames;
+						current_frame_exact -= beat_frames;
+						current_frame = llrint(current_frame_exact);
 
 						/* set tempo section location
 						 * based on offset from last
@@ -963,7 +967,8 @@ TempoMap::_extend_map (TempoSection* tempo, MeterSection* meter,
 
 						double offset_within_old_beat = (tempo->frame() - current_frame) / beat_frames;
 
-						current_frame += (offset_within_old_beat * beat_frames) + ((1.0 - offset_within_old_beat) * next_beat_frames);
+						current_frame_exact += (offset_within_old_beat * beat_frames) + ((1.0 - offset_within_old_beat) * next_beat_frames);
+						current_frame = llrint(current_frame_exact);
 
 						/* next metric doesn't have to
 						 * match this precisely to
-- 
cgit v1.2.3


From cd0ac04080132464b3e7f19804405ed036ff0cc1 Mon Sep 17 00:00:00 2001
From: "Devin J. Pohly" <djpohly@gmail.com>
Date: Wed, 14 May 2014 02:59:25 -0400
Subject: don't use llrint on already-integral variables

This could trick people into thinking that there is a floating-point
type hiding behind the typedef instead of an integer.
---
 libs/ardour/tempo.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libs/ardour/tempo.cc b/libs/ardour/tempo.cc
index a2a400ad32..621d1e2c74 100644
--- a/libs/ardour/tempo.cc
+++ b/libs/ardour/tempo.cc
@@ -1017,11 +1017,11 @@ TempoMap::_extend_map (TempoSection* tempo, MeterSection* meter,
 
 		if (current.beats == 1) {
 			DEBUG_TRACE (DEBUG::TempoMath, string_compose ("Add Bar at %1|1 @ %2\n", current.bars, current_frame));
-			_map.push_back (BBTPoint (*meter, *tempo,(framepos_t) llrint(current_frame), current.bars, 1));
+			_map.push_back (BBTPoint (*meter, *tempo, current_frame, current.bars, 1));
 			bar_start_frame = current_frame;
 		} else {
 			DEBUG_TRACE (DEBUG::TempoMath, string_compose ("Add Beat at %1|%2 @ %3\n", current.bars, current.beats, current_frame));
-			_map.push_back (BBTPoint (*meter, *tempo, (framepos_t) llrint(current_frame), current.bars, current.beats));
+			_map.push_back (BBTPoint (*meter, *tempo, current_frame, current.bars, current.beats));
 		}
 
 		if (next_metric == metrics.end()) {
-- 
cgit v1.2.3


From 3b4b848d5afd798e059b4f0ccb94991fa3b28332 Mon Sep 17 00:00:00 2001
From: "Devin J. Pohly" <djpohly@gmail.com>
Date: Wed, 14 May 2014 01:40:30 -0400
Subject: fix rounding error in the min:sec ruler

When zoomed in to the millisecond level, the framerate was being divided
by 1000 as an integer to generate a ruler tick interval, which doesn't
work so well at things like 44100 or 88200.  Instead, just count this
value in milliseconds, dividing by 1000 when we are done.

This was purely a display issue - the grid was in the correct place.
---
 gtk2_ardour/editor_rulers.cc | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/gtk2_ardour/editor_rulers.cc b/gtk2_ardour/editor_rulers.cc
index 2752f96553..cd5df3e761 100644
--- a/gtk2_ardour/editor_rulers.cc
+++ b/gtk2_ardour/editor_rulers.cc
@@ -1862,13 +1862,13 @@ sample_to_clock_parts ( framepos_t sample,
 	long millisecs;
 
 	left = sample;
-	hrs = left / (sample_rate * 60 * 60);
-	left -= hrs * sample_rate * 60 * 60;
-	mins = left / (sample_rate * 60);
-	left -= mins * sample_rate * 60;
-	secs = left / sample_rate;
-	left -= secs * sample_rate;
-	millisecs = left * 1000 / sample_rate;
+	hrs = left / (sample_rate * 60 * 60 * 1000);
+	left -= hrs * sample_rate * 60 * 60 * 1000;
+	mins = left / (sample_rate * 60 * 1000);
+	left -= mins * sample_rate * 60 * 1000;
+	secs = left / (sample_rate * 1000);
+	left -= secs * sample_rate * 1000;
+	millisecs = left / sample_rate;
 
 	*millisecs_p = millisecs;
 	*secs_p = secs;
@@ -1888,7 +1888,7 @@ Editor::set_minsec_ruler_scale (framepos_t lower, framepos_t upper)
 		return;
 	}
 
-	fr = _session->frame_rate();
+	fr = _session->frame_rate() * 1000;
 
 	/* to prevent 'flashing' */
 	if (lower > (spacer = (framepos_t)(128 * Editor::get_current_zoom ()))) {
@@ -1897,7 +1897,7 @@ Editor::set_minsec_ruler_scale (framepos_t lower, framepos_t upper)
 		lower = 0;
 	}
 	upper += spacer;
-	framecnt_t const range = upper - lower;
+	framecnt_t const range = (upper - lower) * 1000;
 
 	if (range <  (fr / 50)) {
 		minsec_mark_interval =  fr / 1000; /* show 1/1000 seconds */
@@ -1997,7 +1997,7 @@ Editor::metric_get_minsec (GtkCustomRulerMark **marks, gdouble lower, gdouble /*
 	}
 
 	*marks = (GtkCustomRulerMark *) g_malloc (sizeof(GtkCustomRulerMark) * minsec_nmarks);
-	pos = ((((framepos_t) floor(lower)) + (minsec_mark_interval/2))/minsec_mark_interval) * minsec_mark_interval;
+	pos = (((1000 * (framepos_t) floor(lower)) + (minsec_mark_interval/2))/minsec_mark_interval) * minsec_mark_interval;
 	switch (minsec_ruler_scale) {
 	case minsec_show_seconds:
 		for (n = 0; n < minsec_nmarks; pos += minsec_mark_interval, ++n) {
@@ -2014,7 +2014,7 @@ Editor::metric_get_minsec (GtkCustomRulerMark **marks, gdouble lower, gdouble /*
 	                        (*marks)[n].style = GtkCustomRulerMarkMicro;
         	        }
                 	(*marks)[n].label = g_strdup (buf);
-              		(*marks)[n].position = pos;
+			(*marks)[n].position = pos/1000.0;
 		}
 	  break;
 	case minsec_show_minutes:
@@ -2032,7 +2032,7 @@ Editor::metric_get_minsec (GtkCustomRulerMark **marks, gdouble lower, gdouble /*
                                 (*marks)[n].style = GtkCustomRulerMarkMicro;
                         }
                         (*marks)[n].label = g_strdup (buf);
-                        (*marks)[n].position = pos;
+                        (*marks)[n].position = pos/1000.0;
                 }
 	  break;
 	case minsec_show_hours:
@@ -2046,7 +2046,7 @@ Editor::metric_get_minsec (GtkCustomRulerMark **marks, gdouble lower, gdouble /*
                                 (*marks)[n].style = GtkCustomRulerMarkMicro;
                         }
                         (*marks)[n].label = g_strdup (buf);
-                        (*marks)[n].position = pos;
+                        (*marks)[n].position = pos/1000.0;
                 }
 	      break;
 	case minsec_show_frames:
@@ -2064,7 +2064,7 @@ Editor::metric_get_minsec (GtkCustomRulerMark **marks, gdouble lower, gdouble /*
 				(*marks)[n].style = GtkCustomRulerMarkMicro;
 			}
 			(*marks)[n].label = g_strdup (buf);
-			(*marks)[n].position = pos;
+			(*marks)[n].position = pos/1000.0;
 		}
 	  break;
 	}
-- 
cgit v1.2.3


From 32f62beb9039587917eb96a1f1b12469f4d97c36 Mon Sep 17 00:00:00 2001
From: "Devin J. Pohly" <djpohly@gmail.com>
Date: Wed, 14 May 2014 08:36:03 -0400
Subject: fix major/minor ticks on min:sec ruler

All ticks from 0:00.000 to 0:00.999... were major, and everything after
was minor, instead of the correct distribution.
---
 gtk2_ardour/editor_rulers.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gtk2_ardour/editor_rulers.cc b/gtk2_ardour/editor_rulers.cc
index cd5df3e761..ee83d18647 100644
--- a/gtk2_ardour/editor_rulers.cc
+++ b/gtk2_ardour/editor_rulers.cc
@@ -2053,7 +2053,7 @@ Editor::metric_get_minsec (GtkCustomRulerMark **marks, gdouble lower, gdouble /*
 		for (n = 0; n < minsec_nmarks; pos += minsec_mark_interval, ++n) {
 			sample_to_clock_parts (pos, _session->frame_rate(), &hrs, &mins, &secs, &millisecs);
 			if (millisecs % minsec_mark_modulo == 0) {
-				if (secs == 0) {
+				if (millisecs == 0) {
 					(*marks)[n].style = GtkCustomRulerMarkMajor;
 				} else {
 					(*marks)[n].style = GtkCustomRulerMarkMinor;
-- 
cgit v1.2.3


From b0842d29de44932b6478bae84867c87474325139 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Thu, 22 May 2014 14:11:02 -0400
Subject: fix binding name for set-tempo-from-region

---
 gtk2_ardour/mnemonic-us.bindings.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gtk2_ardour/mnemonic-us.bindings.in b/gtk2_ardour/mnemonic-us.bindings.in
index d0bc802b0e..9b4479a4f7 100644
--- a/gtk2_ardour/mnemonic-us.bindings.in
+++ b/gtk2_ardour/mnemonic-us.bindings.in
@@ -339,7 +339,7 @@ This mode provides many different operations on both regions and control points,
 @trans|Transport/ToggleAutoPlay|5|toggle auto play
 @trans|Transport/ToggleAutoReturn|6|toggle auto return
 @trans|Transport/ToggleClick|7|toggle click (metronome)
-@ranges|Editor/set-tempo-from-region|9|set tempo (1 bar) from region(s)
+@ranges|Region/set-tempo-from-region|9|set tempo (1 bar) from region(s)
 @ranges|Editor/set-tempo-from-edit-range|0|set tempo (1 bar) from edit range
 
 ; mouse stuff
-- 
cgit v1.2.3


From 08a1409b1f5b5558d2eccc28a3ae4cbd44391812 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Thu, 29 May 2014 16:28:57 -0400
Subject: back port 6576105 from cairocanvas as fix for data loss/file deletion

---
 gtk2_ardour/editor_audio_import.cc | 2 +-
 libs/ardour/ardour/session.h       | 4 ++--
 libs/ardour/import.cc              | 2 +-
 libs/ardour/session.cc             | 8 ++++----
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/gtk2_ardour/editor_audio_import.cc b/gtk2_ardour/editor_audio_import.cc
index a19a62b337..9364437b78 100644
--- a/gtk2_ardour/editor_audio_import.cc
+++ b/gtk2_ardour/editor_audio_import.cc
@@ -611,7 +611,7 @@ Editor::embed_sndfiles (vector<string> paths, bool multifile,
 
 				boost::shared_ptr<Source> s;
 
-				if ((s = _session->source_by_path_and_channel (path, n)) == 0) {
+				if ((s = _session->audio_source_by_path_and_channel (path, n)) == 0) {
 
 					source = boost::dynamic_pointer_cast<AudioFileSource> (
 						SourceFactory::createExternal (DataType::AUDIO, *_session,
diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
index 38185a71d6..168137ffc3 100644
--- a/libs/ardour/ardour/session.h
+++ b/libs/ardour/ardour/session.h
@@ -584,8 +584,8 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
 	boost::shared_ptr<MidiSource> create_midi_source_by_stealing_name (boost::shared_ptr<Track>);
 
 	boost::shared_ptr<Source> source_by_id (const PBD::ID&);
-	boost::shared_ptr<AudioFileSource> source_by_path_and_channel (const std::string&, uint16_t) const;
-	boost::shared_ptr<MidiSource> source_by_path (const std::string&) const;
+	boost::shared_ptr<AudioFileSource> audio_source_by_path_and_channel (const std::string&, uint16_t) const;
+	boost::shared_ptr<MidiSource> midi_source_by_path (const std::string&) const;
 	uint32_t count_sources_by_origin (const std::string&);
 
 	void add_playlist (boost::shared_ptr<Playlist>, bool unused = false);
diff --git a/libs/ardour/import.cc b/libs/ardour/import.cc
index 047b46f553..e63143e695 100644
--- a/libs/ardour/import.cc
+++ b/libs/ardour/import.cc
@@ -201,7 +201,7 @@ map_existing_mono_sources (const vector<string>& new_paths, Session& /*sess*/,
 	for (vector<string>::const_iterator i = new_paths.begin();
 	     i != new_paths.end(); ++i)
 	{
-		boost::shared_ptr<Source> source = session->source_by_path_and_channel(*i, 0);
+		boost::shared_ptr<Source> source = session->audio_source_by_path_and_channel(*i, 0);
 
 		if (source == 0) {
 			error << string_compose(_("Could not find a source for %1 even though we are updating this file!"), (*i)) << endl;
diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
index 1de5730a95..1006c0f90b 100644
--- a/libs/ardour/session.cc
+++ b/libs/ardour/session.cc
@@ -3305,7 +3305,7 @@ Session::source_by_id (const PBD::ID& id)
 }
 
 boost::shared_ptr<AudioFileSource>
-Session::source_by_path_and_channel (const string& path, uint16_t chn) const
+Session::audio_source_by_path_and_channel (const string& path, uint16_t chn) const
 {
 	/* Restricted to audio files because only audio sources have channel
 	   as a property.
@@ -3326,7 +3326,7 @@ Session::source_by_path_and_channel (const string& path, uint16_t chn) const
 }
 
 boost::shared_ptr<MidiSource>
-Session::source_by_path (const std::string& path) const
+Session::midi_source_by_path (const std::string& path) const
 {
 	/* Restricted to MIDI files because audio sources require a channel
 	   for unique identification, in addition to a path.
@@ -3481,7 +3481,7 @@ Session::new_audio_source_name (const string& base, uint32_t nchan, uint32_t cha
 
 			string possible_path = Glib::build_filename (spath, buf);
 
-			if (source_by_path (possible_path)) {
+			if (audio_source_by_path_and_channel (possible_path, chan)) {
 				existing++;
 				break;
 			}
@@ -3547,7 +3547,7 @@ Session::new_midi_source_name (const string& owner_name)
 				existing++;
 			}
 
-			if (source_by_path (possible_path)) {
+			if (midi_source_by_path (possible_path)) {
 				existing++;
 			}
 		}
-- 
cgit v1.2.3