diff options
| author | Robin Gareus <robin@gareus.org> | 2017-10-01 03:03:44 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2017-10-01 03:03:44 +0200 |
| commit | 05ab7a46b5cf4482ca999625da7405d47fd700a6 (patch) | |
| tree | e5caae0434d5fa192ae6593bce112a89679d2d6e /libs/ardour/ardour | |
| parent | 0431ed3d3e1d91a19f9ce382a5531f71449b2d0c (diff) | |
Fix recording MIDI
- Fix API call to add region(midi_region) -- set count to "1"
- Forward DataRecorded() signal
- remove botched merge/rebase"
a4a87f56 accidentally brought back code from old-destructive API
which was removed in af103cf3 and 08c13007
There is no per track NonLayered record mode anymore, it's session global.
- set can_record correctly to not accidentally clear last capture sources
for cont'd recording (toggle track's rec-arm)
Diffstat (limited to 'libs/ardour/ardour')
| -rw-r--r-- | libs/ardour/ardour/disk_io.h | 3 | ||||
| -rw-r--r-- | libs/ardour/ardour/disk_writer.h | 3 | ||||
| -rw-r--r-- | libs/ardour/ardour/midi_track.h | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/libs/ardour/ardour/disk_io.h b/libs/ardour/ardour/disk_io.h index 63378c4cac..bb93e51298 100644 --- a/libs/ardour/ardour/disk_io.h +++ b/libs/ardour/ardour/disk_io.h @@ -50,7 +50,7 @@ class LIBARDOUR_API DiskIOProcessor : public Processor Recordable = 0x1, Hidden = 0x2, Destructive = 0x4, - NonLayered = 0x8 + NonLayered = 0x8 // deprecated (kept only for enum compat) }; static const std::string state_node_name; @@ -77,7 +77,6 @@ class LIBARDOUR_API DiskIOProcessor : public Processor bool hidden() const { return _flags & Hidden; } bool recordable() const { return _flags & Recordable; } - bool non_layered() const { return _flags & NonLayered; } virtual void non_realtime_locate (samplepos_t); diff --git a/libs/ardour/ardour/disk_writer.h b/libs/ardour/ardour/disk_writer.h index 343bf566ea..fba494d383 100644 --- a/libs/ardour/ardour/disk_writer.h +++ b/libs/ardour/ardour/disk_writer.h @@ -97,9 +97,6 @@ public: virtual void set_record_safe (bool yn); bool destructive() const { return _flags & Destructive; } - int set_destructive (bool yn); - int set_non_layered (bool yn); - bool can_become_destructive (bool& requires_bounce) const; /** @return Start position of currently-running capture (in session samples) */ samplepos_t current_capture_start() const { return capture_start_sample; } diff --git a/libs/ardour/ardour/midi_track.h b/libs/ardour/ardour/midi_track.h index 93856282c4..417d7688f6 100644 --- a/libs/ardour/ardour/midi_track.h +++ b/libs/ardour/ardour/midi_track.h @@ -161,6 +161,8 @@ private: void track_input_active (IOChange, void*); void map_input_active (bool); + void data_recorded (boost::weak_ptr<MidiSource> src); + /** Update automation controls to reflect any changes in buffers. */ void update_controls (BufferSet const& bufs); void restore_controls (); |