Fix broken whitespace. I'd apologize for the compile times if it was my fault :D

[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 7b7cdd7e3f262b8560db50e8fe9f6ce576a9284e..e37963a07a0addffcef43586ea158c183852a918 100644 (file)
--- a/libs/ardour/ardour/audio_diskstream.h
+++ b/libs/ardour/ardour/audio_diskstream.h
@@ -66,17 +66,12 @@ class AudioDiskstream : public Diskstream
        std::string input_source (uint32_t n=0) const {
                boost::shared_ptr<ChannelList> c = channels.reader();
                if (n < c->size()) {
-                       return (*c)[n]->source ? (*c)[n]->source->name() : "";
+                       return (*c)[n]->source.name;
                } else {
                        return "";
                }
        }
 
-       Port *input_source_port (uint32_t n=0) const {
-               boost::shared_ptr<ChannelList> c = channels.reader();
-               if (n < c->size()) return (*c)[n]->source; return 0;
-       }
-
        void set_record_enabled (bool yn);
        int set_destructive (bool yn);
        int set_non_layered (bool yn);
@@ -124,6 +119,8 @@ class AudioDiskstream : public Diskstream
        int add_channel (uint32_t how_many);
        int remove_channel (uint32_t how_many);
 
+       bool set_name (std::string const &);
+
        /* stateful */
 
        XMLNode& get_state(void);
@@ -139,7 +136,7 @@ class AudioDiskstream : public Diskstream
                }
        }
 
-       static void swap_by_ptr (Sample *first, Sample *last, nframes_t n) {
+       static void swap_by_ptr (Sample *first, Sample *last, framecnt_t n) {
                while (n--) {
                        Sample tmp = *first;
                        *first++ = *last;
@@ -149,8 +146,6 @@ class AudioDiskstream : public Diskstream
 
        CubicInterpolation interpolation;
 
-       XMLNode* deprecated_io_node;
-
   protected:
        friend class Session;
 
@@ -161,33 +156,38 @@ class AudioDiskstream : public Diskstream
 
        void set_pending_overwrite(bool);
        int  overwrite_existing_buffers ();
-       void set_block_size (nframes_t);
-       int  internal_playback_seek (nframes_t distance);
-       int  can_internal_playback_seek (nframes_t distance);
-       int  rename_write_sources ();
-        std::list<boost::shared_ptr<Source> > steal_write_sources();
+       void set_block_size (pframes_t);
+       int  internal_playback_seek (framecnt_t distance);
+       int  can_internal_playback_seek (framecnt_t distance);
+       std::list<boost::shared_ptr<Source> > steal_write_sources();
        void reset_write_sources (bool, bool force = false);
        void non_realtime_input_change ();
-       void non_realtime_locate (nframes_t location);
+       void non_realtime_locate (framepos_t location);
 
   protected:
        friend class Auditioner;
-       int  seek (nframes_t which_sample, bool complete_refill = false);
+       int  seek (framepos_t which_sample, bool complete_refill = false);
 
   protected:
        friend class AudioTrack;
 
-       int  process (nframes_t transport_frame, nframes_t nframes, bool can_record, bool rec_monitors_input, bool& need_butler);
-       bool commit  (nframes_t nframes);
+       int  process (framepos_t transport_frame, pframes_t nframes, bool can_record, bool rec_monitors_input, bool& need_butler);
+       bool commit  (framecnt_t nframes);
 
   private:
+       struct ChannelSource {
+               std::string name;
+
+               bool is_physical () const;
+               void ensure_monitor_input (bool) const;
+       };
 
        struct ChannelInfo : public boost::noncopyable {
 
-               ChannelInfo (nframes_t playback_buffer_size, 
-                             nframes_t capture_buffer_size,
-                             nframes_t speed_buffer_size, 
-                             nframes_t wrap_buffer_size);
+               ChannelInfo (framecnt_t playback_buffer_size,
+                            framecnt_t capture_buffer_size,
+                            framecnt_t speed_buffer_size,
+                            framecnt_t wrap_buffer_size);
                ~ChannelInfo ();
 
                Sample     *playback_wrap_buffer;
@@ -196,35 +196,36 @@ class AudioDiskstream : public Diskstream
 
                float       peak_power;
 
-               boost::shared_ptr<AudioFileSource> fades_source;
                boost::shared_ptr<AudioFileSource> write_source;
 
-               /// the Port that our audio data comes from
-               Port         *source;
+               /// information the Port that our audio data comes from
+
+               ChannelSource source;
+
                Sample       *current_capture_buffer;
                Sample       *current_playback_buffer;
 
-               RingBufferNPT<Sample> *playback_buf;
-               RingBufferNPT<Sample> *capture_buf;
+               PBD::RingBufferNPT<Sample> *playback_buf;
+               PBD::RingBufferNPT<Sample> *capture_buf;
 
                Sample* scrub_buffer;
                Sample* scrub_forward_buffer;
                Sample* scrub_reverse_buffer;
 
-               RingBufferNPT<Sample>::rw_vector playback_vector;
-               RingBufferNPT<Sample>::rw_vector capture_vector;
+               PBD::RingBufferNPT<Sample>::rw_vector playback_vector;
+               PBD::RingBufferNPT<Sample>::rw_vector capture_vector;
 
-               RingBufferNPT<CaptureTransition> * capture_transition_buf;
+               PBD::RingBufferNPT<CaptureTransition> * capture_transition_buf;
                // the following are used in the butler thread only
-               nframes_t                     curr_capture_cnt;
+               framecnt_t                     curr_capture_cnt;
 
-                void resize_playback (nframes_t);
-                void resize_capture (nframes_t);
+               void resize_playback (framecnt_t);
+               void resize_capture (framecnt_t);
        };
 
        typedef std::vector<ChannelInfo*> ChannelList;
 
-       void process_varispeed_playback(nframes_t nframes, boost::shared_ptr<ChannelList> c);
+       void process_varispeed_playback (pframes_t nframes, boost::shared_ptr<ChannelList> c);
 
        /* The two central butler operations */
        int do_flush (RunContext context, bool force = false);
@@ -233,12 +234,12 @@ class AudioDiskstream : public Diskstream
        int do_refill_with_alloc ();
 
        int read (Sample* buf, Sample* mixdown_buffer, float* gain_buffer,
-                       nframes_t& start, nframes_t cnt,
-                       ChannelInfo* channel_info, int channel, bool reversed);
+                 framepos_t& start, framecnt_t cnt,
+                 ChannelInfo* channel_info, int channel, bool reversed);
 
        void finish_capture (bool rec_monitors_input, boost::shared_ptr<ChannelList>);
        void transport_stopped_wallclock (struct tm&, time_t, bool abort);
-       void transport_looped (nframes_t transport_frame);
+       void transport_looped (framepos_t transport_frame);
 
        void init ();
 
@@ -254,13 +255,13 @@ class AudioDiskstream : public Diskstream
        int use_pending_capture_data (XMLNode& node);
 
        void get_input_sources ();
-       void prepare_record_status(nframes_t capture_start_frame);
+       void prepare_record_status(framepos_t capture_start_frame);
        void set_align_style_from_io();
        void setup_destructive_playlist ();
        void use_destructive_playlist ();
 
-        void adjust_playback_buffering ();
-        void adjust_capture_buffering ();
+       void adjust_playback_buffering ();
+       void adjust_capture_buffering ();
 
        void engage_record_enable ();
        void disengage_record_enable ();