Fix the horrible mess that was anything related to sources and paths.

[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 0db44709f8267a2c4490ecd65f358c60a5e5f448..8f081ab58dbca91d8f26888ab674a8546b1d06e9 100644 (file)
--- a/libs/ardour/ardour/audio_diskstream.h
+++ b/libs/ardour/ardour/audio_diskstream.h
@@ -36,13 +36,10 @@
 
 #include <ardour/ardour.h>
 #include <ardour/configuration.h>
-#include <ardour/session.h>
-#include <ardour/route_group.h>
-#include <ardour/route.h>
-#include <ardour/port.h>
 #include <ardour/utils.h>
 #include <ardour/diskstream.h>
 #include <ardour/audioplaylist.h>
+#include <ardour/port.h>
 
 struct tm;
 
@@ -217,7 +214,7 @@ class AudioDiskstream : public Diskstream
   protected:
        friend class AudioTrack;
 
-       int  process (nframes_t transport_frame, nframes_t nframes, nframes_t offset, bool can_record, bool rec_monitors_input);        
+       int  process (nframes_t transport_frame, nframes_t nframes, nframes_t offset, bool can_record, bool rec_monitors_input);
        bool commit  (nframes_t nframes);
 
   private:
@@ -261,7 +258,7 @@ class AudioDiskstream : public Diskstream
        void process_varispeed_playback(nframes_t nframes, boost::shared_ptr<ChannelList> c);
        
        /* The two central butler operations */
-       int do_flush (Session::RunContext context, bool force = false);
+       int do_flush (RunContext context, bool force = false);
        int do_refill () { return _do_refill(_mixdown_buffer, _gain_buffer); }
        
        int do_refill_with_alloc ();
@@ -270,7 +267,7 @@ class AudioDiskstream : public Diskstream
                  nframes_t& start, nframes_t cnt, 
                  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_looped (nframes_t transport_frame);