Merged with trunk R846

[ardour.git] / libs / ardour / ardour / session.h

diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
index cac27168a1501bb369c4510d2cde0786dac70b80..eeb905a3018a170a4147c1f22b1cb3cf1a563993 100644 (file)
--- a/libs/ardour/ardour/session.h
+++ b/libs/ardour/ardour/session.h
@@ -285,8 +285,9 @@ class Session : public sigc::trackable, public Stateful
        BufferSet& get_scratch_buffers (ChanCount count = ChanCount::ZERO);
        BufferSet& get_send_buffers (ChanCount count = ChanCount::ZERO);
        
-       Diskstream    *diskstream_by_id (const PBD::ID& id);
-       Diskstream    *diskstream_by_name (string name);
+       void add_diskstream (boost::shared_ptr<Diskstream>);
+       boost::shared_ptr<Diskstream> diskstream_by_id (const PBD::ID& id);
+       boost::shared_ptr<Diskstream> diskstream_by_name (string name);
 
        bool have_captured() const { return _have_captured; }
 
@@ -296,9 +297,8 @@ class Session : public sigc::trackable, public Stateful
        uint32_t get_next_diskstream_id() const { return n_diskstreams(); }
        uint32_t n_diskstreams() const;
        
-       typedef list<Diskstream *> DiskstreamList;
-       
-       typedef std::list<boost::shared_ptr<Route> > RouteList; 
+       typedef std::list<boost::shared_ptr<Diskstream> > DiskstreamList;
+       typedef std::list<boost::shared_ptr<Route> >      RouteList; 
        
        boost::shared_ptr<RouteList> get_routes() const {
                return routes.reader ();
@@ -317,6 +317,7 @@ class Session : public sigc::trackable, public Stateful
        template<class T, class A> void foreach_route (T *obj, void (T::*func)(Route&, A), A arg);
 
        boost::shared_ptr<Route> route_by_name (string);
+       boost::shared_ptr<Route> route_by_id (PBD::ID);
        boost::shared_ptr<Route> route_by_remote_id (uint32_t id);
 
        bool route_name_unique (string) const;
@@ -350,7 +351,7 @@ class Session : public sigc::trackable, public Stateful
        
        /* Record status signals */
 
-        sigc::signal<void> RecordStateChanged;
+       sigc::signal<void> RecordStateChanged;
 
        /* Transport mechanism signals */
 
@@ -359,8 +360,7 @@ class Session : public sigc::trackable, public Stateful
        sigc::signal<void> DurationChanged;
        sigc::signal<void> HaltOnXrun;
 
-       sigc::signal<void,boost::shared_ptr<Route> > RouteAdded;
-       sigc::signal<void,Diskstream*> DiskstreamAdded;
+       sigc::signal<void,RouteList&> RouteAdded;
 
        void request_roll ();
        void request_bounded_roll (jack_nframes_t start, jack_nframes_t end);
@@ -493,7 +493,8 @@ class Session : public sigc::trackable, public Stateful
        int save_state (string snapshot_name, bool pending = false);
        int restore_state (string snapshot_name);
        int save_template (string template_name);
-        int save_history ();
+        int save_history (string snapshot_name = "");
+        int restore_history (string snapshot_name);
 
        static int rename_template (string old_name, string new_name);
 
@@ -551,11 +552,11 @@ class Session : public sigc::trackable, public Stateful
 
        /* fundamental operations. duh. */
 
-       boost::shared_ptr<AudioTrack> new_audio_track (int input_channels, int output_channels, TrackMode mode = Normal);
-       boost::shared_ptr<Route>      new_audio_route (int input_channels, int output_channels);
+       std::list<boost::shared_ptr<AudioTrack> > new_audio_track (int input_channels, int output_channels, TrackMode mode = Normal, uint32_t how_many = 1);
+       RouteList new_audio_route (int input_channels, int output_channels, uint32_t how_many);
        
-       boost::shared_ptr<MidiTrack> new_midi_track (TrackMode mode = Normal);
-       boost::shared_ptr<Route>      new_midi_route ();
+       std::list<boost::shared_ptr<MidiTrack> > new_midi_track (TrackMode mode = Normal, uint32_t how_many = 1);
+       //boost::shared_ptr<Route>     new_midi_route (uint32_t how_many = 1);
 
        void   remove_route (boost::shared_ptr<Route>);
        void   resort_routes ();
@@ -632,8 +633,8 @@ class Session : public sigc::trackable, public Stateful
        
        /* region info  */
 
-       sigc::signal<void,AudioRegion *> AudioRegionAdded;
-       sigc::signal<void,AudioRegion *> AudioRegionRemoved;
+       sigc::signal<void,Region *> RegionAdded;
+       sigc::signal<void,Region *> RegionRemoved;
 
        int region_name (string& result, string base = string(""), bool newlevel = false) const;
        string new_region_name (string);
@@ -642,9 +643,11 @@ class Session : public sigc::trackable, public Stateful
        Region* find_whole_file_parent (Region& child);
        void find_equivalent_playlist_regions (Region&, std::vector<Region*>& result);
 
-       AudioRegion *XMLRegionFactory (const XMLNode&, bool full);
+       Region*      XMLRegionFactory (const XMLNode&, bool full);
+       AudioRegion* XMLAudioRegionFactory (const XMLNode&, bool full);
+       MidiRegion* XMLMidiRegionFactory (const XMLNode&, bool full);
 
-       template<class T> void foreach_audio_region (T *obj, void (T::*func)(AudioRegion *));
+       template<class T> void foreach_region (T *obj, void (T::*func)(Region *));
 
        /* source management */
 
@@ -658,7 +661,7 @@ class Session : public sigc::trackable, public Stateful
            string pathname;
            
            /* result */
-           std::vector<AudioRegion*> new_regions;
+           std::vector<Region*> new_regions;
            
        };
 
@@ -672,7 +675,7 @@ class Session : public sigc::trackable, public Stateful
        int start_audio_export (ARDOUR::AudioExportSpecification&);
        int stop_audio_export (ARDOUR::AudioExportSpecification&);
        
-       void add_audio_source (AudioSource *);
+       void add_source (Source *);
        void remove_source (Source *);
        int  cleanup_audio_file_source (AudioFileSource&);
 
@@ -733,6 +736,10 @@ class Session : public sigc::trackable, public Stateful
        sigc::signal<void> NamedSelectionAdded;
        sigc::signal<void> NamedSelectionRemoved;
 
+        /* Curves and AutomationLists (TODO when they go away) */
+        void add_curve(Curve*);
+        void add_automation_list(AutomationList*);
+
        /* fade curves */
 
        float get_default_fade_length () const { return default_fade_msecs; }
@@ -859,6 +866,7 @@ class Session : public sigc::trackable, public Stateful
 
         // these commands are implemented in libs/ardour/session_command.cc
        Command *memento_command_factory(XMLNode *n);
+        void register_with_memento_command_factory(PBD::ID, Stateful *);
         class GlobalSoloStateCommand : public Command
         {
             GlobalRouteBooleanState before, after;
@@ -1518,17 +1526,16 @@ class Session : public sigc::trackable, public Stateful
 
        /* disk-streams */
 
-       DiskstreamList  diskstreams; 
-       mutable Glib::RWLock diskstream_lock;
+       SerializedRCUManager<DiskstreamList>  diskstreams; 
+
        uint32_t dstream_buffer_size;
-       void add_diskstream (Diskstream*);
        int  load_diskstreams (const XMLNode&);
 
        /* routes stuff */
 
        SerializedRCUManager<RouteList>  routes;
 
-       void   add_route (boost::shared_ptr<Route>);
+       void   add_routes (RouteList&, bool save = true);
        uint32_t destructive_index;
 
        int load_routes (const XMLNode&);
@@ -1551,8 +1558,8 @@ class Session : public sigc::trackable, public Stateful
        /* REGION MANAGEMENT */
 
        mutable Glib::Mutex region_lock;
-       typedef map<PBD::ID,AudioRegion *> AudioRegionList;
-       AudioRegionList audio_regions;
+       typedef map<PBD::ID,Region *> RegionList;
+       RegionList regions;
        
        void region_renamed (Region *);
        void region_changed (Change, Region *);
@@ -1563,10 +1570,10 @@ class Session : public sigc::trackable, public Stateful
 
        /* SOURCES */
        
-       mutable Glib::Mutex audio_source_lock;
-       typedef std::map<PBD::ID,AudioSource *> AudioSourceList;
+       mutable Glib::Mutex source_lock;
+       typedef std::map<PBD::ID,Source *> SourceList;
 
-       AudioSourceList audio_sources;
+       SourceList sources;
 
        int load_sources (const XMLNode& node);
        XMLNode& get_sources_as_xml ();
@@ -1589,7 +1596,7 @@ class Session : public sigc::trackable, public Stateful
        Playlist *XMLPlaylistFactory (const XMLNode&);
 
        void playlist_length_changed (Playlist *);
-       void diskstream_playlist_changed (Diskstream *);
+       void diskstream_playlist_changed (boost::shared_ptr<Diskstream>);
 
        /* NAMED SELECTIONS */
 
@@ -1602,6 +1609,10 @@ class Session : public sigc::trackable, public Stateful
        NamedSelection *named_selection_factory (string name);
        NamedSelection *XMLNamedSelectionFactory (const XMLNode&);
 
+        /* CURVES and AUTOMATION LISTS */
+        std::map<PBD::ID, Curve*> curves;
+        std::map<PBD::ID, AutomationList*> automation_lists;
+
        /* DEFAULT FADE CURVES */
 
        float default_fade_steepness;