Don't add standard processors twice to routes from 2.X sessions. Fixes #3434.

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

diff --git a/libs/ardour/session_directory.cc b/libs/ardour/session_directory.cc
index 299f5423161aa634c6bcbe9cbddf1909c9896122..a848ceee4b632c14aac9ba12c79c215d40615824 100644 (file)
--- a/libs/ardour/session_directory.cc
+++ b/libs/ardour/session_directory.cc
@@ -1,5 +1,5 @@
 /*
-       Copyright (C) 2007 Tim Mayberry 
+       Copyright (C) 2007 Tim Mayberry
 
        This program is free software; you can redistribute it and/or modify
        it under the terms of the GNU General Public License as published by
@@ -16,18 +16,19 @@
        Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include <pbd/error.h>
-#include <pbd/compose.h>
-#include <pbd/filesystem.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/utils.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 path& session_path)
@@ -100,12 +101,27 @@ SessionDirectory::sound_path () const
        return sources_root() / sound_dir_name;
 }
 
+const path
+SessionDirectory::sound_stub_path () const
+{
+       if(is_directory (old_sound_path ())) return old_sound_path();
+
+       // the new style sound directory
+       return sources_root() / sound_dir_name / stub_dir_name;
+}
+
 const path
 SessionDirectory::midi_path () const
 {
        return sources_root() / midi_dir_name;
 }
 
+const path
+SessionDirectory::midi_stub_path () const
+{
+       return sources_root() / midi_dir_name / stub_dir_name;
+}
+
 const path
 SessionDirectory::midi_patch_path () const
 {
@@ -139,7 +155,7 @@ SessionDirectory::export_path () const
 const vector<path>
 SessionDirectory::sub_directories () const
 {
-       vector<path> tmp_paths; 
+       vector<path> tmp_paths;
 
        tmp_paths.push_back ( sound_path () );
        tmp_paths.push_back ( midi_path () );