diff options
Diffstat (limited to 'libs/ardour/audiosource.cc')
| -rw-r--r-- | libs/ardour/audiosource.cc | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/libs/ardour/audiosource.cc b/libs/ardour/audiosource.cc index 9af388c1cd..360e4cd48a 100644 --- a/libs/ardour/audiosource.cc +++ b/libs/ardour/audiosource.cc @@ -165,10 +165,6 @@ AudioSource::peaks_ready (boost::function<void()> doThisWhenReady, ScopedConnect bool ret; Glib::Mutex::Lock lm (_peaks_ready_lock); - /* check to see if the peak data is ready. if not - connect the slot while still holding the lock. - */ - if (!(ret = _peaks_built)) { *connect_here_if_not = new ScopedConnection; PeaksReady.connect (**connect_here_if_not, MISSING_INVALIDATOR, doThisWhenReady, event_loop); @@ -683,13 +679,7 @@ AudioSource::build_peaks_from_scratch () } done_with_peakfile_writes ((cnt == 0)); - } - - { - Glib::Mutex::Lock lm (_peaks_ready_lock); - - if (_peaks_built) { - PeaksReady (); /* EMIT SIGNAL */ + if (cnt == 0) { ret = 0; } } @@ -723,7 +713,9 @@ AudioSource::done_with_peakfile_writes (bool done) } if (done) { + Glib::Mutex::Lock lm (_peaks_ready_lock); _peaks_built = true; + PeaksReady (); /* EMIT SIGNAL */ } delete _peakfile_descriptor; @@ -955,3 +947,13 @@ AudioSource::dec_read_data_count (nframes_t cnt) _read_data_count = 0; } } + +void +AudioSource::mark_streaming_write_completed () +{ + Glib::Mutex::Lock lm (_peaks_ready_lock); + + if (_peaks_built) { + PeaksReady (); /* EMIT SIGNAL */ + } +} |