Add a SessionDirectory to the Session class

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

diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
index 608ab1e731c227cacff092d626a23bb962c101e0..58919588b60c70051478d41eb506c64daca3e6b9 100644 (file)
--- a/libs/ardour/ardour/session.h
+++ b/libs/ardour/ardour/session.h
@@ -53,6 +53,7 @@
 #include <ardour/location.h>
 #include <ardour/gain.h>
 #include <ardour/io.h>
+#include <ardour/session_directory.h>
 
 #include <ardour/smpte.h>
 
@@ -1100,6 +1101,8 @@ class Session : public PBD::StatefulDestructible
        bool                     loop_changing;
        nframes_t           last_loopend;
 
+       SessionDirectory         _session_dir;
+
        RingBuffer<Event*> pending_events;
 
        void hookup_io ();

diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
index aa2df558a24d01648ace0556080062a6e4be2a27..c118f53fd4c9b8ebcd35a37dd356b4c0a87b19bb 100644 (file)
--- a/libs/ardour/session.cc
+++ b/libs/ardour/session.cc
@@ -111,6 +111,7 @@ Session::Session (AudioEngine &eng,
          _mmc_port (default_mmc_port),
          _mtc_port (default_mtc_port),
          _midi_port (default_midi_port),
+         _session_dir (fullpath),
          pending_events (2048),
          //midi_requests (128), // the size of this should match the midi request pool size
          _send_smpte_update (false),
@@ -131,13 +132,11 @@ Session::Session (AudioEngine &eng,
 
        initialize_start_and_end_locations(0, compute_initial_length ());
 
-       SessionDirectory sdir(fullpath);
-
        if(mix_template) {
                // try and create a new session directory
                try
                {
-                       if(!sdir.create()) {
+                       if(!_session_dir.create()) {
                                // an existing session.
                                // throw a_more_meaningful_exception()
                                destroy ();
@@ -164,7 +163,7 @@ Session::Session (AudioEngine &eng,
                {
                        // ensure the necessary session subdirectories exist
                        // in case the directory structure has changed etc.
-                       sdir.create();
+                       _session_dir.create();
                }
                catch(sys::filesystem_error& ex)
                {
@@ -213,6 +212,7 @@ Session::Session (AudioEngine &eng,
          _mmc_port (default_mmc_port),
          _mtc_port (default_mtc_port),
          _midi_port (default_midi_port),
+         _session_dir (fullpath),
          pending_events (2048),
          //midi_requests (16),
          _send_smpte_update (false),
@@ -242,9 +242,9 @@ Session::Session (AudioEngine &eng,
 
        initialize_start_and_end_locations(0, initial_length);
 
-       SessionDirectory sdir(fullpath);
+       SessionDirectory _session_dir(fullpath);
        
-       if (!sdir.create () || !create_session_file ()) {
+       if (!_session_dir.create () || !create_session_file ()) {
                destroy ();
                throw failed_constructor ();
        }