fix visual focus indication in IOSelector; import pays attention to audio file embedd...

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

diff --git a/libs/ardour/ardour/diskstream.h b/libs/ardour/ardour/diskstream.h
index d3b5d6dce41e8ac9d0f5931ec03473c1bd9e54e2..4cee6d126885eaecbc09b7831ca69bd58328658c 100644 (file)
--- a/libs/ardour/ardour/diskstream.h
+++ b/libs/ardour/ardour/diskstream.h
@@ -54,7 +54,7 @@ class Session;
 class Playlist;
 class IO;
 
- class Diskstream : public sigc::trackable, public PBD::StatefulDestructible
+ class Diskstream : public PBD::StatefulDestructible
 {      
   public:
        enum Flag {
@@ -90,7 +90,7 @@ class IO;
        virtual void set_record_enabled (bool yn) = 0;
 
        bool destructive() const { return _flags & Destructive; }
-       virtual void set_destructive (bool yn);
+       virtual int set_destructive (bool yn) { return -1; }
 
        bool           hidden()      const { return _flags & Hidden; }
        bool           recordable()  const { return _flags & Recordable; }
@@ -138,6 +138,8 @@ class IO;
 
        void handle_input_change (IOChange, void *src);
 
+       void remove_region_from_last_capture (boost::weak_ptr<Region> wregion);
+
        sigc::signal<void>            RecordEnableChanged;
        sigc::signal<void>            SpeedChanged;
        sigc::signal<void>            ReverseChanged;
@@ -147,7 +149,6 @@ class IO;
 
        static sigc::signal<void>                DiskOverrun;
        static sigc::signal<void>                DiskUnderrun;
-       static sigc::signal<void,std::list<boost::shared_ptr<Source> >*> DeleteSources;
 
   protected:
        friend class Session;
@@ -225,6 +226,7 @@ class IO;
        virtual bool realtime_set_speed (double, bool global_change);
 
        std::list<boost::shared_ptr<Region> > _last_capture_regions;
+
        virtual int use_pending_capture_data (XMLNode& node) = 0;
 
        virtual void get_input_sources () = 0;