X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fmidi_diskstream.h;h=126857a858e1d0f67a245059694d68340e278e33;hb=90172686b92b53cc5ab1d60c0e6daecb65d17d3d;hp=9632c1566ab93599586a8395fab57b78091cd3dd;hpb=e0aaed6d65f160c328cb8b56d7c6552ee15d65e2;p=ardour.git diff --git a/libs/ardour/ardour/midi_diskstream.h b/libs/ardour/ardour/midi_diskstream.h index 9632c1566a..126857a858 100644 --- a/libs/ardour/ardour/midi_diskstream.h +++ b/libs/ardour/ardour/midi_diskstream.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2000 Paul Davis + Copyright (C) 2000 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -21,7 +21,6 @@ #ifndef __ardour_midi_diskstream_h__ #define __ardour_midi_diskstream_h__ -#include #include #include @@ -36,11 +35,9 @@ #include "pbd/ringbufferNPT.h" #include "ardour/ardour.h" -#include "ardour/configuration.h" #include "ardour/diskstream.h" #include "ardour/midi_playlist.h" #include "ardour/midi_ring_buffer.h" -#include "ardour/midi_state_tracker.h" #include "ardour/utils.h" struct tm; @@ -56,7 +53,7 @@ class Send; class Session; class MidiDiskstream : public Diskstream -{ +{ public: MidiDiskstream (Session &, const string& name, Diskstream::Flag f = Recordable); MidiDiskstream (Session &, const XMLNode&); @@ -64,8 +61,8 @@ class MidiDiskstream : public Diskstream float playback_buffer_load() const; float capture_buffer_load() const; - - void get_playback(MidiBuffer& dst, nframes_t start, nframes_t end, nframes_t offset); + + void get_playback(MidiBuffer& dst, framepos_t start, framepos_t end); void set_record_enabled (bool yn); @@ -77,17 +74,17 @@ 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); - boost::shared_ptr write_source () { return _write_source; } - + boost::shared_ptr write_source () { return _write_source; } + int set_destructive (bool yn); // doom! - + void set_note_mode (NoteMode m); - - uint16_t get_channel_mask() { + + uint16_t get_channel_mask() { uint16_t playback_mask = _playback_buf->get_channel_mask(); #ifndef NDEBUG uint16_t capture_mask = _capture_buf->get_channel_mask(); @@ -97,10 +94,10 @@ class MidiDiskstream : public Diskstream } void set_channel_mode(ChannelMode mode, uint16_t mask) { - _playback_buf->set_channel_mode(mode, mask); - _capture_buf->set_channel_mode(mode, mask); + _playback_buf->set_channel_mode(mode, mask); + _capture_buf->set_channel_mode(mode, mask); } - + ChannelMode get_channel_mode() { ChannelMode playback_mode = _playback_buf->get_channel_mode(); #ifndef NDEBUG @@ -110,8 +107,15 @@ class MidiDiskstream : public Diskstream return playback_mode; } + /** Emitted when some MIDI data has been received for recording. + * First parameter is the data. + * Second parameter is the source that it is destined for. + */ + PBD::Signal2, boost::weak_ptr > DataRecorded; + 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" @@ -121,22 +125,23 @@ class MidiDiskstream : public Diskstream void set_pending_overwrite(bool); int overwrite_existing_buffers (); void set_block_size (nframes_t); - int internal_playback_seek (nframes_t distance); - int can_internal_playback_seek (nframes_t distance); + int internal_playback_seek (framecnt_t distance); + int can_internal_playback_seek (framecnt_t distance); int rename_write_sources (); + std::list > steal_write_sources(); void reset_write_sources (bool, bool force = false); void non_realtime_input_change (); - void non_realtime_locate (nframes_t location); + void non_realtime_locate (framepos_t location); - static void set_readahed_frames( nframes_t frames_ahead ) { midi_readahead = frames_ahead; } + static void set_readahead_frames(nframes_t frames_ahead) { midi_readahead = frames_ahead; } protected: - int seek (nframes_t which_sample, bool complete_refill = false); + int seek (framepos_t which_sample, bool complete_refill = false); protected: friend class MidiTrack; - int process (nframes_t transport_frame, nframes_t nframes, nframes_t offset, bool can_record, bool rec_monitors_input); + int process (framepos_t transport_frame, nframes_t nframes, bool can_record, bool rec_monitors_input, bool& need_butler); bool commit (nframes_t nframes); static nframes_t midi_readahead; @@ -145,16 +150,16 @@ class MidiDiskstream : public Diskstream /* The two central butler operations */ int do_flush (RunContext context, bool force = false); int do_refill (); - + int do_refill_with_alloc(); - int read (nframes_t& start, nframes_t cnt, bool reversed); + int read (framepos_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 transport_stopped_wallclock (struct tm&, time_t, bool abort); + void transport_looped (framepos_t transport_frame); - void init (Diskstream::Flag); + void init (); int use_new_write_source (uint32_t n=0); @@ -165,9 +170,14 @@ 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(); - + + /* fixed size buffers per instance of ardour for now (non-dynamic) + */ + + void adjust_playback_buffering () {} + void adjust_capture_buffering () {} + void engage_record_enable (); void disengage_record_enable (); @@ -176,8 +186,7 @@ class MidiDiskstream : public Diskstream MidiPort* _source_port; boost::shared_ptr _write_source; nframes_t _last_flush_frame; - NoteMode _note_mode; - MidiStateTracker _midi_state_tracker; + NoteMode _note_mode; volatile gint _frames_written_to_ringbuffer; volatile gint _frames_read_from_ringbuffer; };