Move butler methods from Session to Butler.

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

diff --git a/libs/ardour/ardour/midi_diskstream.h b/libs/ardour/ardour/midi_diskstream.h
index 7035cdfd0231a400b3811dfb9b74902349b6cdab..930d37330ac0471d4595555ecad84fa341f733b8 100644 (file)
--- a/libs/ardour/ardour/midi_diskstream.h
+++ b/libs/ardour/ardour/midi_diskstream.h
@@ -75,7 +75,7 @@ class MidiDiskstream : public Diskstream
 
        /* stateful */
        XMLNode& get_state(void);
-       int set_state(const XMLNode& node);
+       int set_state(const XMLNode&, int version);
 
        void monitor_input (bool);
 
@@ -112,6 +112,7 @@ class MidiDiskstream : public Diskstream
 
   protected:
        friend class Session;
+       friend class Butler;
 
        /* the Session is the only point of access for these
           because they require that the Session is "inactive"
@@ -165,7 +166,6 @@ class MidiDiskstream : public Diskstream
        int use_pending_capture_data (XMLNode& node);
 
        void get_input_sources ();
-       void check_record_status (nframes_t transport_frame, nframes_t nframes, bool can_record);
        void set_align_style_from_io();
 
        void engage_record_enable ();