forward port 2.X changes up to and including rev 6767

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

libs/ardour/ardour/ardour.h

@@ -62,6 +62,9 @@ namespace ARDOUR {
 
 	void find_bindings_files (std::map<std::string,std::string>&);
 
+        std::string translation_kill_path ();
+        bool translations_are_disabled ();
+
 	const layer_t max_layer = UCHAR_MAX;
 
 	static inline microseconds_t get_microseconds () {

libs/ardour/globals.cc

@@ -526,3 +526,15 @@ ARDOUR::coverage (framepos_t sa, framepos_t ea,
 	return OverlapNone;
 }
 
+string
+ARDOUR::translation_kill_path ()
+{
+        return Glib::build_filename (user_config_directory().to_string(), ".love_is_the_language_of_audio");
+}
+
+bool
+ARDOUR::translations_are_disabled ()
+{
+        /* if file does not exist, we don't translate (bundled ardour only) */
+        return Glib::file_test (translation_kill_path(), Glib::FILE_TEST_EXISTS) == false;
+}

libs/ardour/session.cc

@@ -2107,6 +2107,8 @@ Session::remove_route (shared_ptr<Route> route)
                 return;
         }
 
+        route->set_solo (false, this);
+
 	{
 		RCUWriter<RouteList> writer (routes);
 		shared_ptr<RouteList> rs = writer.get_copy ();