Remove unused methods Session::sound_dir and Session::old_sound_dir

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

diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
index f45ae772042fba7606ef2710e095cf88cf7205b8..bba0b5a41b9fe7957c73bd81fb4daade85eac004 100644 (file)
--- a/libs/ardour/ardour/session.h
+++ b/libs/ardour/ardour/session.h
@@ -260,7 +260,6 @@ class Session : public PBD::StatefulDestructible
 
        const SessionDirectory& session_directory () const { return *(_session_dir.get()); }
 
-       std::string sound_dir (bool with_path = true) const;
        std::string peak_dir () const;
        std::string automation_dir () const;
 

diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc
index 2d4c5208cfdc0957aca2c1a8bb84e1e06f7022f2..e554b28ca284fd88c7b5c88d4543a9bb0dfff1db 100644 (file)
--- a/libs/ardour/session_state.cc
+++ b/libs/ardour/session_state.cc
@@ -1850,73 +1850,6 @@ Session::XMLNamedSelectionFactory (const XMLNode& node)
        }
 }
 
-string
-Session::old_sound_dir (bool with_path) const
-{
-       string res;
-
-       if (with_path) {
-               res = _path;
-       }
-
-       res += old_sound_dir_name;
-
-       return res;
-}
-
-string
-Session::sound_dir (bool with_path) const
-{
-       string res;
-       string full;
-
-       if (with_path) {
-               res = _path;
-       } else {
-               full = _path;
-       }
-
-       res += interchange_dir_name;
-       res += '/';
-       res += legalize_for_path (_name);
-       res += '/';
-       res += sound_dir_name;
-
-       if (with_path) {
-               full = res;
-       } else {
-               full += res;
-       }
-       
-       /* if this already exists, don't check for the old session sound directory */
-
-       if (Glib::file_test (full, Glib::FILE_TEST_IS_DIR|Glib::FILE_TEST_EXISTS)) {
-               return res;
-       }
-               
-       /* possibly support old session structure */
-
-       string old_nopath;
-       string old_withpath;
-
-       old_nopath += old_sound_dir_name;
-       old_nopath += '/';
-       
-       old_withpath = _path;
-       old_withpath += old_sound_dir_name;
-       
-       if (Glib::file_test (old_withpath.c_str(), Glib::FILE_TEST_IS_DIR|Glib::FILE_TEST_EXISTS)) {
-               if (with_path)
-                       return old_withpath;
-               
-               return old_nopath;
-       }
-       
-       /* ok, old "sounds" directory isn't there, return the new path */
-
-       return res;
-}
-
 string
 Session::peak_dir () const
 {