[Summary] Adding informative message to failed file copy exception in Session::save_as.

[ardour.git] / libs / ardour / session_state.cc

diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc
index a217db5c45a13173f98288c3cefb4d343a0971c5..669517bdfb3fa24b95d26de8d139209584811ad4 100644 (file)
--- a/libs/ardour/session_state.cc
+++ b/libs/ardour/session_state.cc
@@ -100,6 +100,7 @@
 #include "ardour/playlist_source.h"
 #include "ardour/port.h"
 #include "ardour/processor.h"
+#include "ardour/profile.h"
 #include "ardour/proxy_controllable.h"
 #include "ardour/recent_sessions.h"
 #include "ardour/region_factory.h"
@@ -490,7 +491,7 @@ Session::create (const string& session_template, BusProfile* bus_profile)
        _writable = exists_and_writable (_path);
 
        if (!session_template.empty()) {
-               std::string in_path = session_template_dir_to_file (session_template);
+               std::string in_path = (ARDOUR::Profile->get_trx () ? session_template : session_template_dir_to_file (session_template));
 
                ifstream in(in_path.c_str());
 
@@ -2022,24 +2023,31 @@ Session::save_template (string template_name)
                template_dir_path = template_name;
        }
 
-       if (Glib::file_test (template_dir_path, Glib::FILE_TEST_EXISTS)) {
-               warning << string_compose(_("Template \"%1\" already exists - new version not created"),
-                               template_dir_path) << endmsg;
-               return -1;
-       }
-       
-       if (g_mkdir_with_parents (template_dir_path.c_str(), 0755) != 0) {
-               error << string_compose(_("Could not create directory for Session template\"%1\" (%2)"),
-                               template_dir_path, g_strerror (errno)) << endmsg;
-               return -1;
+       if (!ARDOUR::Profile->get_trx()) {
+               if (Glib::file_test (template_dir_path, Glib::FILE_TEST_EXISTS)) {
+                       warning << string_compose(_("Template \"%1\" already exists - new version not created"),
+                                                                         template_dir_path) << endmsg;
+                       return -1;
+               }
+               
+               if (g_mkdir_with_parents (template_dir_path.c_str(), 0755) != 0) {
+                       error << string_compose(_("Could not create directory for Session template\"%1\" (%2)"),
+                                                                       template_dir_path, g_strerror (errno)) << endmsg;
+                       return -1;
+               }
        }
 
        /* file to write */
        std::string template_file_path;
-       if (absolute_path) {
-               template_file_path = Glib::build_filename (template_dir_path, Glib::path_get_basename (template_dir_path) + template_suffix);
+       
+       if (ARDOUR::Profile->get_trx()) {
+               template_file_path = template_name;
        } else {
-               template_file_path = Glib::build_filename (template_dir_path, template_name + template_suffix);
+               if (absolute_path) {
+                       template_file_path = Glib::build_filename (template_dir_path, Glib::path_get_basename (template_dir_path) + template_suffix);
+               } else {
+                       template_file_path = Glib::build_filename (template_dir_path, template_name + template_suffix);
+               }
        }
 
        SessionSaveUnderway (); /* EMIT SIGNAL */
@@ -2065,6 +2073,8 @@ Session::save_template (string template_name)
                copy_files (plugins_dir(), template_plugin_state_path);
        }
 
+       store_recent_templates (template_file_path);
+
        return 0;
 }
 
@@ -4196,7 +4206,8 @@ Session::save_as (SaveAs& saveas)
                                                info << "media file copying from " << from << " to " << to << endmsg;
                                                
                                                if (!copy_file (from, to)) {
-                                                       throw Glib::FileError (Glib::FileError::IO_ERROR, "copy failed");
+                                                       throw Glib::FileError (Glib::FileError::IO_ERROR,
+                                                                                                  string_compose(_("\ncopying \"%1\" failed !"), from));
                                                }
                                        }
                                        
@@ -4270,7 +4281,8 @@ Session::save_as (SaveAs& saveas)
                                                info << "attempting to copy " << from << " to " << to << endmsg;
                                                
                                                if (!copy_file (from, to)) {
-                                                       throw Glib::FileError (Glib::FileError::IO_ERROR, "copy failed");
+                                                       throw Glib::FileError (Glib::FileError::IO_ERROR,
+                                                                                                  string_compose(_("\ncopying \"%1\" failed !"), from));
                                                }
                                        }
                                }