smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-06 13:45:43 +01:00
Code Issues Projects Releases Wiki Activity

fixes from carl for #1158 and #1554, plus better behaviour when building the region boundary cache

Browse source 
git-svn-id: svn://localhost/ardour2/trunk@1694 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2007-04-10 14:42:11 +00:00
parent 3b885c3126
commit a588b517e8
5 changed files with 48 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libs/ardour/ardour/route.h
View file

@ -169,9 +169,9 @@ class Route : public IO
int copy_redirects (const Route&, Placement, uint32_t* err_streams = 0);
int sort_redirects (uint32_t* err_streams = 0);
void clear_redirects (void *src);
void clear_redirects (Placement, void *src);
void all_redirects_flip();
void all_redirects_active (bool state);
void all_redirects_active (Placement, bool state);
virtual nframes_t update_total_latency();
nframes_t signal_latency() const { return _own_latency; }

37
libs/ardour/route.cc
View file

@ -112,7 +112,8 @@ Route::init ()
Route::~Route ()
{
clear_redirects (this);
clear_redirects (PreFader, this);
clear_redirects (PostFader, this);
for (OrderKeys::iterator i = order_keys.begin(); i != order_keys.end(); ++i) {
free ((void*)(i->first));
@ -924,10 +925,13 @@ Route::add_redirects (const RedirectList& others, void *src, uint32_t* err_strea
return 0;
}
/** Remove redirects with a given placement.
* @param p Placement of redirects to remove.
*/
void
Route::clear_redirects (void *src)
Route::clear_redirects (Placement p, void *src)
{
uint32_t old_rmo = redirect_max_outs;
const uint32_t old_rmo = redirect_max_outs;
if (!_session.engine().connected()) {
return;
@ -935,13 +939,22 @@ Route::clear_redirects (void *src)
{
Glib::RWLock::WriterLock lm (redirect_lock);
RedirectList::iterator i;
for (i = _redirects.begin(); i != _redirects.end(); ++i) {
(*i)->drop_references ();
RedirectList new_list;
for (RedirectList::iterator i = _redirects.begin(); i != _redirects.end(); ++i) {
if ((*i)->placement() == p) {
/* it's the placement we want to get rid of */
(*i)->drop_references ();
} else {
/* it's a different placement, so keep it */
new_list.push_back (*i);
}
}
_redirects.clear ();
_redirects = new_list;
}
/* FIXME: can't see how this test can ever fire */
if (redirect_max_outs != old_rmo) {
reset_panner ();
}
@ -1309,8 +1322,12 @@ Route::all_redirects_flip ()
}
}
/** Set all redirects with a given placement to a given active state.
* @param p Placement of redirects to change.
* @param state New active state for those redirects.
*/
void
Route::all_redirects_active (bool state)
Route::all_redirects_active (Placement p, bool state)
{
Glib::RWLock::ReaderLock lm (redirect_lock);
@ -1319,7 +1336,9 @@ Route::all_redirects_active (bool state)
}
for (RedirectList::iterator i = _redirects.begin(); i != _redirects.end(); ++i) {
(*i)->set_active (state, this);
if ((*i)->placement() == p) {
(*i)->set_active (state, this);
}
}
}