diff options
author | Robin Gareus <robin@gareus.org> | 2019-12-17 00:34:26 +0100 |
---|---|---|
committer | Robin Gareus <robin@gareus.org> | 2019-12-17 00:42:28 +0100 |
commit | 848831d844b8cdfe71bff611d7c0096361963f0c (patch) | |
tree | 72bbeaa2148ea9043571e2ea6e6caa1dd39a31d4 /libs/ardour/ardour | |
parent | c144e807effef3eef855fb4e24495f1d3801ae71 (diff) |
Convert Disksteam & Playlists from old 2.x sessions
Diffstat (limited to 'libs/ardour/ardour')
-rw-r--r-- | libs/ardour/ardour/session.h | 3 | ||||
-rw-r--r-- | libs/ardour/ardour/session_playlists.h | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h index b4ecb87f59..14eecbae6a 100644 --- a/libs/ardour/ardour/session.h +++ b/libs/ardour/ardour/session.h @@ -1817,6 +1817,9 @@ private: /* CURVES and AUTOMATION LISTS */ std::map<PBD::ID, AutomationList*> automation_lists; + /** load 2.X Sessions. Diskstream-ID to playlist-name mapping */ + std::map<PBD::ID, std::string> _diskstreams_2X; + /* DEFAULT FADE CURVES */ float default_fade_steepness; diff --git a/libs/ardour/ardour/session_playlists.h b/libs/ardour/ardour/session_playlists.h index 0cd9a61938..cd9c919e31 100644 --- a/libs/ardour/ardour/session_playlists.h +++ b/libs/ardour/ardour/session_playlists.h @@ -75,6 +75,8 @@ private: void track (bool, boost::weak_ptr<Playlist>); void update_tracking (); + void update_orig_2X (PBD::ID, PBD::ID); + void find_equivalent_playlist_regions (boost::shared_ptr<Region>, std::vector<boost::shared_ptr<Region> >& result); void update_after_tempo_map_change (); void add_state (XMLNode*, bool save_template, bool include_unused); |