fixes for 98% of all the warnings/errors reported by OS X gcc on tiger

[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 70691f7e3fa96d948ddab94474042475d7a54b30..f233e2111208586ddc357533f1f88e742bebe018 100644 (file)
--- a/libs/ardour/ardour/audio_diskstream.h
+++ b/libs/ardour/ardour/audio_diskstream.h
@@ -119,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);
@@ -157,7 +159,7 @@ class AudioDiskstream : public Diskstream
        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();
+       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 (framepos_t location);
@@ -169,23 +171,23 @@ class AudioDiskstream : public Diskstream
   protected:
        friend class AudioTrack;
 
-       int  process (framepos_t transport_frame, pframes_t nframes, bool can_record, bool rec_monitors_input, bool& need_butler);
+       int  process (framepos_t transport_frame, pframes_t nframes, bool can_record, bool& need_butler);
        bool commit  (framecnt_t nframes);
 
   private:
-        struct ChannelSource { 
-            std::string name;
+       struct ChannelSource {
+               std::string name;
 
-            bool is_physical () const;
-            void ensure_monitor_input (bool) const;
-        };
+               bool is_physical () const;
+               void ensure_monitor_input (bool) const;
+       };
 
        struct ChannelInfo : public boost::noncopyable {
 
-               ChannelInfo (framecnt_t playback_buffer_size, 
-                             framecnt_t capture_buffer_size,
-                             framecnt_t speed_buffer_size, 
-                             framecnt_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;
@@ -194,12 +196,11 @@ class AudioDiskstream : public Diskstream
 
                float       peak_power;
 
-               boost::shared_ptr<AudioFileSource> fades_source;
                boost::shared_ptr<AudioFileSource> write_source;
 
                /// information the Port that our audio data comes from
-               
-                ChannelSource source;
+
+               ChannelSource source;
 
                Sample       *current_capture_buffer;
                Sample       *current_playback_buffer;
@@ -218,8 +219,8 @@ class AudioDiskstream : public Diskstream
                // the following are used in the butler thread only
                framecnt_t                     curr_capture_cnt;
 
-                void resize_playback (framecnt_t);
-                void resize_capture (framecnt_t);
+               void resize_playback (framecnt_t);
+               void resize_capture (framecnt_t);
        };
 
        typedef std::vector<ChannelInfo*> ChannelList;
@@ -233,10 +234,10 @@ class AudioDiskstream : public Diskstream
        int do_refill_with_alloc ();
 
        int read (Sample* buf, Sample* mixdown_buffer, float* gain_buffer,
-                  framepos_t& start, framecnt_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 finish_capture (boost::shared_ptr<ChannelList>);
        void transport_stopped_wallclock (struct tm&, time_t, bool abort);
        void transport_looped (framepos_t transport_frame);
 
@@ -259,8 +260,8 @@ class AudioDiskstream : public Diskstream
        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 ();