diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-08-03 16:45:07 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-08-03 16:45:07 -0400 |
| commit | 1d50d041c98f354f4615a0aa22cb019bc638c8be (patch) | |
| tree | c99c062d3fd8a2a03c7ea54f80fe7d6e2618dd24 /libs | |
| parent | f2ca3ecf0c2509bc0734c6faa6d99cbef8a20925 (diff) | |
fix problem with session exit caused by dangling unused members in AudioEngine
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/ardour/ardour/audioengine.h | 2 | ||||
| -rw-r--r-- | libs/ardour/audioengine.cc | 9 |
2 files changed, 1 insertions, 10 deletions
diff --git a/libs/ardour/ardour/audioengine.h b/libs/ardour/ardour/audioengine.h index f06890676d..994eda5a94 100644 --- a/libs/ardour/ardour/audioengine.h +++ b/libs/ardour/ardour/audioengine.h @@ -213,9 +213,7 @@ public: gain_t session_removal_gain_step; bool _running; bool _has_run; - mutable framecnt_t _buffer_size; std::map<DataType,size_t> _raw_buffer_sizes; - mutable framecnt_t _frame_rate; /// number of frames between each check for changes in monitor input framecnt_t monitor_check_interval; /// time of the last monitor check in frames diff --git a/libs/ardour/audioengine.cc b/libs/ardour/audioengine.cc index 2884f410df..49043b34f7 100644 --- a/libs/ardour/audioengine.cc +++ b/libs/ardour/audioengine.cc @@ -194,18 +194,14 @@ AudioEngine::process_callback (pframes_t nframes) return 0; } - cerr << "pc, srp = " << session_remove_pending << endl; - if (session_remove_pending) { /* perform the actual session removal */ - cerr << "\tsrc = " << session_removal_countdown << endl; - if (session_removal_countdown < 0) { /* fade out over 1 second */ - session_removal_countdown = _frame_rate/2; + session_removal_countdown = sample_rate()/2; session_removal_gain = 1.0; session_removal_gain_step = 1.0/session_removal_countdown; @@ -230,7 +226,6 @@ AudioEngine::process_callback (pframes_t nframes) _session = 0; session_removal_countdown = -1; // reset to "not in progress" session_remove_pending = false; - cerr << "Send removed signal\n"; session_removed.signal(); // wakes up thread that initiated session removal } } @@ -462,8 +457,6 @@ AudioEngine::died () stop_metering_thread (); _running = false; - _buffer_size = 0; - _frame_rate = 0; } int |