Move Diskstream ownership to Track, so that Session no longer holds lists of Diskstre...

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

diff --git a/libs/ardour/ardour/audio_diskstream.h b/libs/ardour/ardour/audio_diskstream.h
index ae2176cbab700e3c72e233a06009160f4b7b62da..6cf064a61d18e713c4fbecac860b01621015db5c 100644 (file)
--- a/libs/ardour/ardour/audio_diskstream.h
+++ b/libs/ardour/ardour/audio_diskstream.h
@@ -19,7 +19,6 @@
 #ifndef __ardour_audio_diskstream_h__
 #define __ardour_audio_diskstream_h__
 
-#include <sigc++/signal.h>
 
 #include <cmath>
 #include <string>
@@ -175,7 +174,7 @@ class AudioDiskstream : public Diskstream
   protected:
        friend class AudioTrack;
 
-       int  process (nframes_t transport_frame, nframes_t nframes, bool can_record, bool rec_monitors_input);
+       int  process (nframes_t transport_frame, nframes_t nframes, bool can_record, bool rec_monitors_input, bool& need_butler);
        bool commit  (nframes_t nframes);
 
   private:
@@ -229,10 +228,10 @@ class AudioDiskstream : public Diskstream
                        ChannelInfo* channel_info, int channel, bool reversed);
 
        void finish_capture (bool rec_monitors_input, boost::shared_ptr<ChannelList>);
-       void transport_stopped (struct tm&, time_t, bool abort);
+       void transport_stopped_wallclock (struct tm&, time_t, bool abort);
        void transport_looped (nframes_t transport_frame);
 
-       void init (Diskstream::Flag);
+       void init ();
 
        void init_channel (ChannelInfo &chan);
        void destroy_channel (ChannelInfo &chan);
@@ -246,7 +245,7 @@ class AudioDiskstream : public Diskstream
        int use_pending_capture_data (XMLNode& node);
 
        void get_input_sources ();
-       void check_record_status (nframes_t transport_frame, nframes_t nframes, bool can_record);
+       void prepare_record_status(nframes_t capture_start_frame);
        void set_align_style_from_io();
        void setup_destructive_playlist ();
        void use_destructive_playlist ();