use XML state to store processors in mixer (strips) and fixup crash caused by missing...

[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 bf64cedd088897235e68792ea90f8a3f8f44c2a3..53c7a7e22cf92f0175612c4e49b0e778b914dbbe 100644 (file)
--- a/libs/ardour/ardour/midi_diskstream.h
+++ b/libs/ardour/ardour/midi_diskstream.h
@@ -68,13 +68,13 @@ class MidiDiskstream : public Diskstream
        float playback_buffer_load() const;
        float capture_buffer_load() const;
        
-       void get_playback(MidiBuffer& dst, jack_nframes_t start, jack_nframes_t end);
+       void get_playback(MidiBuffer& dst, nframes_t start, nframes_t end);
 
        void set_record_enabled (bool yn);
 
-       MidiPlaylist* midi_playlist () { return dynamic_cast<MidiPlaylist*>(_playlist); }
+       boost::shared_ptr<MidiPlaylist> midi_playlist () { return boost::dynamic_pointer_cast<MidiPlaylist>(_playlist); }
 
-       int use_playlist (Playlist *);
+       int use_playlist (boost::shared_ptr<Playlist>);
        int use_new_playlist ();
        int use_copy_playlist ();
 
@@ -85,9 +85,11 @@ class MidiDiskstream : public Diskstream
 
        void monitor_input (bool);
 
-       MidiSource* write_source() { return (MidiSource*)_write_source; }
+       boost::shared_ptr<SMFSource> write_source () { return _write_source; }
        
-       void set_destructive (bool yn); // doom!
+       int set_destructive (bool yn); // doom!
+       
+       void set_note_mode (NoteMode m);
 
   protected:
        friend class Session;
@@ -99,21 +101,21 @@ class MidiDiskstream : public Diskstream
 
        void set_pending_overwrite(bool);
        int  overwrite_existing_buffers ();
-       void set_block_size (jack_nframes_t);
-       int  internal_playback_seek (jack_nframes_t distance);
-       int  can_internal_playback_seek (jack_nframes_t distance);
+       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 ();
        void reset_write_sources (bool, bool force = false);
        void non_realtime_input_change ();
 
   protected:
-       int seek (jack_nframes_t which_sample, bool complete_refill = false);
+       int seek (nframes_t which_sample, bool complete_refill = false);
 
   protected:
        friend class MidiTrack;
 
-       int  process (jack_nframes_t transport_frame, jack_nframes_t nframes, jack_nframes_t offset, bool can_record, bool rec_monitors_input);
-       bool commit  (jack_nframes_t nframes);
+       int  process (nframes_t transport_frame, nframes_t nframes, nframes_t offset, bool can_record, bool rec_monitors_input);
+       bool commit  (nframes_t nframes);
 
   private:
 
@@ -123,10 +125,11 @@ class MidiDiskstream : public Diskstream
        
        int do_refill_with_alloc();
 
-       int read (jack_nframes_t& start, jack_nframes_t cnt, bool reversed);
+       int read (nframes_t& start, nframes_t cnt, bool reversed);
 
        void finish_capture (bool rec_monitors_input);
        void transport_stopped (struct tm&, time_t, bool abort);
+       void transport_looped (nframes_t transport_frame);
 
        void init (Diskstream::Flag);
 
@@ -139,25 +142,21 @@ class MidiDiskstream : public Diskstream
        int use_pending_capture_data (XMLNode& node);
 
        void get_input_sources ();
-       void check_record_status (jack_nframes_t transport_frame, jack_nframes_t nframes, bool can_record);
+       void check_record_status (nframes_t transport_frame, nframes_t nframes, bool can_record);
        void set_align_style_from_io();
        
        void engage_record_enable ();
        void disengage_record_enable ();
        
-       // FIXME: This is basically a single ChannelInfo.. abstractify that concept?
-       MidiRingBuffer*                    _playback_buf;
-       MidiRingBuffer*                    _capture_buf;
-       //RawMidi*                          _current_playback_buffer;
-       //RawMidi*                          _current_capture_buffer;
-       //RawMidi*                          _playback_wrap_buffer;
-       //RawMidi*                          _capture_wrap_buffer;
+       /* FIXME: too much code duplication in this class because of lack of ChannelInfo */
+
+       MidiRingBuffer*                   _playback_buf;
+       MidiRingBuffer*                   _capture_buf;
        MidiPort*                         _source_port;
-       SMFSource*                        _write_source; ///< aka capturing source
+       boost::shared_ptr<SMFSource>      _write_source;
        RingBufferNPT<CaptureTransition>* _capture_transition_buf;
-       //RingBufferNPT<RawMidi>::rw_vector _playback_vector;
-       //RingBufferNPT<RawMidi>::rw_vector _capture_vector;
-       jack_nframes_t _last_flush_frame;
+       nframes_t                         _last_flush_frame;
+       NoteMode                          _note_mode;  
 };
 
 }; /* namespace ARDOUR */