diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-03-05 23:16:32 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-03-05 23:16:32 +0000 |
| commit | 5999bd56dab2a2a5263d574b0df4c74811a97319 (patch) | |
| tree | 316ceae62e3980a94cdb97b0e2ff23b73dd54639 /libs/ardour/ardour | |
| parent | faeeb292020dc5aab162557409d13dd57c7b42ff (diff) | |
fix monitoring so that MIDI tracks don't work the same way as audio (basically, they are always in "ardour does monitoring" mode
git-svn-id: svn://localhost/ardour2/branches/3.0@9081 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour')
| -rw-r--r-- | libs/ardour/ardour/midi_track.h | 4 | ||||
| -rw-r--r-- | libs/ardour/ardour/route.h | 4 | ||||
| -rw-r--r-- | libs/ardour/ardour/session.h | 2 | ||||
| -rw-r--r-- | libs/ardour/ardour/track.h | 2 |
4 files changed, 10 insertions, 2 deletions
diff --git a/libs/ardour/ardour/midi_track.h b/libs/ardour/ardour/midi_track.h index 3c742bd3ce..0e36a6d9cb 100644 --- a/libs/ardour/ardour/midi_track.h +++ b/libs/ardour/ardour/midi_track.h @@ -113,8 +113,10 @@ protected: XMLNode& state (bool full); int _set_state (const XMLNode&, int, bool call_base); + bool should_monitor () const; + bool send_silence () const; -private: + private: boost::shared_ptr<MidiDiskstream> midi_diskstream () const; void write_out_of_band_data (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, framecnt_t nframes); diff --git a/libs/ardour/ardour/route.h b/libs/ardour/ardour/route.h index 4f6d18e4af..31b62d5e92 100644 --- a/libs/ardour/ardour/route.h +++ b/libs/ardour/ardour/route.h @@ -480,7 +480,9 @@ class Route : public SessionObject, public Automatable, public RouteGroupMember, uint32_t pans_required() const; ChanCount n_process_buffers (); - + + virtual bool should_monitor () const; + virtual int _set_state (const XMLNode&, int, bool call_base); boost::shared_ptr<Amp> _amp; diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h index c7a72a4e63..7d720cfa08 100644 --- a/libs/ardour/ardour/session.h +++ b/libs/ardour/ardour/session.h @@ -1486,6 +1486,8 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi void start_time_changed (framepos_t); void end_time_changed (framepos_t); + void set_track_monitor_input_status (bool); + boost::shared_ptr<Speakers> _speakers; }; diff --git a/libs/ardour/ardour/track.h b/libs/ardour/ardour/track.h index cd4acabaef..74dd95ef13 100644 --- a/libs/ardour/ardour/track.h +++ b/libs/ardour/ardour/track.h @@ -202,6 +202,8 @@ class Track : public Route, public PublicDiskstream XMLNode* pending_state; bool _destructive; + virtual bool send_silence () const; + boost::shared_ptr<RecEnableControllable> _rec_enable_control; private: |