From: Tim Mayberry Date: Tue, 4 Sep 2007 09:01:22 +0000 (+0000) Subject: Use path::leaf instead of sys::basename in SessionDirectory::sound/midi_path X-Git-Tag: 3.0-alpha5~4539 X-Git-Url: https://main.carlh.net/gitweb/?a=commitdiff_plain;h=d8d24a7521853c9f3610f7a02e4197ac8fa3a3eb;hp=bb5314c3643d6f3f6fd015e598de8fd29f3148ac;p=ardour.git Use path::leaf instead of sys::basename in SessionDirectory::sound/midi_path sys::basename now matches boost::filesystem behaviour so if a session name had a dot in it the session name used in the interchange directory would be truncated. git-svn-id: svn://localhost/ardour2/trunk@2408 d708f5d6-7413-0410-9779-e7cbd77b26cf --- diff --git a/libs/ardour/session_directory.cc b/libs/ardour/session_directory.cc index ee5af0adf4..9d94b2228e 100644 --- a/libs/ardour/session_directory.cc +++ b/libs/ardour/session_directory.cc @@ -99,7 +99,7 @@ SessionDirectory::sound_path () const path l_sound_path(m_root_path); l_sound_path /= interchange_dir_name; - l_sound_path /= basename(m_root_path); + l_sound_path /= m_root_path.leaf(); l_sound_path /= sound_dir_name; return l_sound_path; @@ -112,7 +112,7 @@ SessionDirectory::midi_path () const path l_midi_path(m_root_path); l_midi_path /= interchange_dir_name; - l_midi_path /= basename(m_root_path); + l_midi_path /= m_root_path.leaf(); l_midi_path /= midi_dir_name; return l_midi_path;