Remove most using declarations from header files.

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

diff --git a/libs/ardour/session_directory.cc b/libs/ardour/session_directory.cc
index e871b84244eb51c512f96b5f9b7900ad025bb64e..d56998b5509342d9ac94a1cc3e605346e3e55d0b 100644 (file)
--- a/libs/ardour/session_directory.cc
+++ b/libs/ardour/session_directory.cc
@@ -16,25 +16,22 @@
        Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include <cerrno>
+#include "pbd/error.h"
+#include "pbd/compose.h"
+#include "pbd/filesystem.h"
 
-#include <glibmm/fileutils.h>
-#include <glibmm/miscutils.h>
-
-#include <pbd/error.h>
-#include <pbd/compose.h>
-#include <pbd/filesystem.h>
-
-#include <ardour/directory_names.h>
-#include <ardour/session_directory.h>
+#include "ardour/directory_names.h"
+#include "ardour/session_directory.h"
+#include "ardour/utils.h"
 
 #include "i18n.h"
 
 namespace ARDOUR {
 
+using namespace std;
 using namespace PBD::sys;
 
-SessionDirectory::SessionDirectory (const string& session_path)
+SessionDirectory::SessionDirectory (const path& session_path)
        : m_root_path(session_path)
 {
 
@@ -43,23 +40,26 @@ SessionDirectory::SessionDirectory (const string& session_path)
 bool
 SessionDirectory::create ()
 {
-       if (is_directory (m_root_path))
-       {
-               PBD::error << string_compose(_("Cannot create Session directory at path %1 as it already exists"), m_root_path.to_string()) << endmsg;
-               return false;
-       }
+       bool is_new = false;
 
        vector<path> sub_dirs = sub_directories ();
        for (vector<path>::const_iterator i = sub_dirs.begin(); i != sub_dirs.end(); ++i)
        {
-               if (!create_directories(*i))
+               try
                {
-                       PBD::error << string_compose(_("Cannot create Session directory at path %1 Error: %2"), (*i).to_string(), g_strerror (errno)) << endmsg;
-                       return false;
+                       if(create_directories(*i)) is_new = true;
+               }
+               catch (PBD::sys::filesystem_error& ex)
+               {
+                       // log the error
+                       PBD::error << string_compose(_("Cannot create Session directory at path %1 Error: %2"), (*i).to_string(), ex.what()) << endmsg;
+
+                       // and rethrow
+                       throw ex;
                }
        }
 
-       return true;
+       return is_new;
 }
 
 bool
@@ -81,7 +81,15 @@ SessionDirectory::is_valid () const
 const path
 SessionDirectory::old_sound_path () const
 {
-       return path(m_root_path) /= old_sound_dir_name;
+       return m_root_path / old_sound_dir_name;
+}
+
+const path
+SessionDirectory::sources_root () const
+{
+       const string legalized_root(legalize_for_path(m_root_path.leaf()));
+
+       return m_root_path / interchange_dir_name / legalized_root;
 }
 
 const path
@@ -90,31 +98,43 @@ SessionDirectory::sound_path () const
        if(is_directory (old_sound_path ())) return old_sound_path();
 
        // the new style sound directory
-       path l_sound_path(m_root_path);
+       return sources_root() / sound_dir_name;
+}
 
-       l_sound_path /= interchange_dir_name;
-       l_sound_path /= basename(m_root_path);
-       l_sound_path /= sound_dir_name;
+const path
+SessionDirectory::midi_path () const
+{
+       return sources_root() / midi_dir_name;
+}
 
-       return l_sound_path;
+const path
+SessionDirectory::midi_patch_path () const
+{
+       return sources_root() / midi_patch_dir_name;
 }
 
 const path
 SessionDirectory::peak_path () const
 {
-       return path(m_root_path) /= peak_dir_name;
+       return m_root_path / peak_dir_name;
 }
 
 const path
 SessionDirectory::dead_sound_path () const
 {
-       return path(m_root_path) /= dead_sound_dir_name;
+       return m_root_path / dead_sound_dir_name;
+}
+
+const path
+SessionDirectory::dead_midi_path () const
+{
+       return m_root_path / dead_midi_dir_name;
 }
 
 const path
 SessionDirectory::export_path () const
 {
-       return path(m_root_path) /= export_dir_name;
+       return m_root_path / export_dir_name;
 }
 
 const vector<path>
@@ -123,8 +143,10 @@ SessionDirectory::sub_directories () const
        vector<path> tmp_paths; 
 
        tmp_paths.push_back ( sound_path () );
+       tmp_paths.push_back ( midi_path () );
        tmp_paths.push_back ( peak_path () );
        tmp_paths.push_back ( dead_sound_path () );
+       tmp_paths.push_back ( dead_midi_path () );
        tmp_paths.push_back ( export_path () );
 
        return tmp_paths;