ardour/livetrax
13
0
Fork 0
Code

fix problem with session exit caused by dangling unused members in AudioEngine

Browse Source
This commit is contained in:
Paul Davis 2013-08-03 16:45:07 -04:00
parent f2ca3ecf0c
commit 1d50d041c9
2 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/ardour/ardour/audioengine.h
View File

@ -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

9
libs/ardour/audioengine.cc
View File

@ -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