change name of a Session method to makes its intended function clear

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

diff --git a/libs/ardour/ardour/public_diskstream.h b/libs/ardour/ardour/public_diskstream.h
old mode 100755 (executable)
new mode 100644 (file)
index 37bac7b..1fc93a6
--- a/libs/ardour/ardour/public_diskstream.h
+++ b/libs/ardour/ardour/public_diskstream.h
@@ -26,25 +26,24 @@ class Playlist;
 class Source;
 class Location;
 
-/** Public interface to a Diskstream */        
-class PublicDiskstream
+/** Public interface to a Diskstream */
+class LIBARDOUR_API PublicDiskstream
 {
 public:
        virtual ~PublicDiskstream() {}
 
        virtual boost::shared_ptr<Playlist> playlist () = 0;
-       virtual void monitor_input (bool) = 0;
+       virtual void request_input_monitoring (bool) = 0;
+       virtual void ensure_input_monitoring (bool) = 0;
        virtual bool destructive () const = 0;
        virtual std::list<boost::shared_ptr<Source> > & last_capture_sources () = 0;
        virtual void set_capture_offset () = 0;
-       virtual std::list<boost::shared_ptr<Source> > steal_write_sources () = 0;
+       virtual std::string steal_write_source_name () = 0;
        virtual void reset_write_sources (bool, bool force = false) = 0;
        virtual float playback_buffer_load () const = 0;
        virtual float capture_buffer_load () const = 0;
        virtual int do_refill () = 0;
        virtual int do_flush (RunContext, bool force = false) = 0;
-       virtual uint32_t read_data_count() const = 0;
-       virtual uint32_t write_data_count() const = 0;
        virtual void set_pending_overwrite (bool) = 0;
        virtual int seek (framepos_t, bool complete_refill = false) = 0;
        virtual bool hidden () const = 0;
@@ -61,7 +60,7 @@ public:
        virtual void transport_stopped_wallclock (struct tm &, time_t, bool) = 0;
        virtual bool pending_overwrite () const = 0;
        virtual double speed () const = 0;
-        virtual void prepare_to_stop (framepos_t) = 0;
+       virtual void prepare_to_stop (framepos_t,framepos_t) = 0;
        virtual void set_slaved (bool) = 0;
        virtual ChanCount n_channels () = 0;
        virtual framepos_t get_capture_start_frame (uint32_t n = 0) const = 0;
@@ -70,12 +69,12 @@ public:
        virtual framepos_t current_capture_end () const = 0;
        virtual void playlist_modified () = 0;
        virtual int use_playlist (boost::shared_ptr<Playlist>) = 0;
-       virtual void set_align_style (AlignStyle) = 0;
+       virtual void set_align_style (AlignStyle, bool force=false) = 0;
+       virtual void set_align_choice (AlignChoice, bool force=false) = 0;
        virtual int use_copy_playlist () = 0;
        virtual int use_new_playlist () = 0;
-        virtual void adjust_playback_buffering () = 0;
-        virtual void adjust_capture_buffering () = 0;
-       
+       virtual void adjust_playback_buffering () = 0;
+       virtual void adjust_capture_buffering () = 0;
 };
 
 }