Use Session::session_directory to access the export path for a session instead of...

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

diff --git a/gtk2_ardour/export_dialog.cc b/gtk2_ardour/export_dialog.cc
index 0707dd8230d21a0f4086f5ebf001a7696576d291..3a66099b6c48c404b0620ab6b6c6381080e29880 100644 (file)
--- a/gtk2_ardour/export_dialog.cc
+++ b/gtk2_ardour/export_dialog.cc
@@ -32,6 +32,7 @@
 #include <gtkmm2ext/window_title.h>
 
 #include <ardour/export.h>
+#include <ardour/session_directory.h>
 #include <ardour/sndfile_helpers.h>
 #include <ardour/audio_track.h>
 #include <ardour/audioregion.h>
@@ -957,18 +958,14 @@ ExportDialog::start_export ()
        */
        
        if (file_entry.get_text().length() == 0) {
-               string dir = session->export_dir();
-               string::size_type last_slash;
-               
-               if ((last_slash = dir.find_last_of ('/')) != string::npos && last_slash != 0) {
-                       dir = dir.substr (0, last_slash+1);
-               }
+
+               sys::path export_file_path = session->session_directory().export_path();
 
                if (!wants_dir()) {
-                       dir = dir + "export.wav";
+                       export_file_path /= "export.wav";
                }
                
-               file_entry.set_text (dir);
+               file_entry.set_text (export_file_path.to_string());
        }
        
        progress_bar.set_fraction (0);