diff options
author | Robin Gareus <robin@gareus.org> | 2018-11-23 22:09:13 +0100 |
---|---|---|
committer | Robin Gareus <robin@gareus.org> | 2018-11-23 22:09:13 +0100 |
commit | 771ddcc86fee434ccb2d06b5e28bc9274264a8f8 (patch) | |
tree | f74f3e7114ec3e2191213a4c2d9d7f5a6fbb0a12 /libs/ardour/ardour/auditioner.h | |
parent | 2e3e18320489c0da6e3172af4c6df6ca8d693c29 (diff) |
NO-OP: whitespace and re-organization
Diffstat (limited to 'libs/ardour/ardour/auditioner.h')
-rw-r--r-- | libs/ardour/ardour/auditioner.h | 39 |
1 files changed, 16 insertions, 23 deletions
diff --git a/libs/ardour/ardour/auditioner.h b/libs/ardour/ardour/auditioner.h index 8e13f47ecb..d849eaecb5 100644 --- a/libs/ardour/ardour/auditioner.h +++ b/libs/ardour/ardour/auditioner.h @@ -37,37 +37,29 @@ class MidiRegion; class LIBARDOUR_API Auditioner : public Track { - public: +public: Auditioner (Session&); ~Auditioner (); int init (); int connect (); + bool auditioning() const; void audition_region (boost::shared_ptr<Region>); - - void seek_to_sample (sampleoffset_t pos) { if (_seek_sample < 0 && !_seeking) { _seek_sample = pos; }} - void seek_to_percent (float const pos) { if (_seek_sample < 0 && !_seeking) { _seek_sample = floorf(length * pos / 100.0); }} - int play_audition (samplecnt_t nframes); + void cancel_audition (); - MonitorState monitoring_state () const; + void seek_to_sample (sampleoffset_t pos); + void seek_to_percent (float const pos); + sampleoffset_t seek_sample() const { return _seeking ? _seek_sample : -1;} + void seek_response(sampleoffset_t pos); - void cancel_audition () { - g_atomic_int_set (&_auditioning, 0); - } + MonitorState monitoring_state () const; - bool auditioning() const { return g_atomic_int_get (&_auditioning); } bool needs_monitor() const { return via_monitor; } virtual ChanCount input_streams () const; - sampleoffset_t seek_sample() const { return _seeking ? _seek_sample : -1;} - void seek_response(sampleoffset_t pos) { - _seek_complete = true; - if (_seeking) { current_sample = pos; _seek_complete = true;} - } - PBD::Signal2<void, ARDOUR::samplecnt_t, ARDOUR::samplecnt_t> AuditionProgress; /* Track */ @@ -84,16 +76,17 @@ class LIBARDOUR_API Auditioner : public Track void freeze_me (InterThreadInfo&) {} void unfreeze () {} - boost::shared_ptr<Region> bounce (InterThreadInfo&) - { return boost::shared_ptr<Region> (); } + boost::shared_ptr<Region> bounce (InterThreadInfo&) { + return boost::shared_ptr<Region> (); + } - boost::shared_ptr<Region> bounce_range (samplepos_t, samplepos_t, InterThreadInfo&, boost::shared_ptr<Processor>, bool) - { return boost::shared_ptr<Region> (); } + boost::shared_ptr<Region> bounce_range (samplepos_t, samplepos_t, InterThreadInfo&, boost::shared_ptr<Processor>, bool) { + return boost::shared_ptr<Region> (); + } - int export_stuff (BufferSet&, samplepos_t, samplecnt_t, boost::shared_ptr<Processor>, bool, bool, bool) - { return -1; } + int export_stuff (BufferSet&, samplepos_t, samplecnt_t, boost::shared_ptr<Processor>, bool, bool, bool) { return -1; } - private: +private: boost::shared_ptr<AudioRegion> the_region; boost::shared_ptr<MidiRegion> midi_region; samplepos_t current_sample; |