Mercurial > hg > svapp
comparison framework/Document.cpp @ 412:c1b2b8b84165 tonioni
Merge from default branch
| author | Chris Cannam |
|---|---|
| date | Tue, 09 Sep 2014 16:36:21 +0100 |
| parents | edfdb1d5db3c |
| children | 8039c7352ae2 72c662fe7ea3 |
comparison
equal
deleted
inserted
replaced
| 404:08a45e4cf1b1 | 412:c1b2b8b84165 |
|---|---|
| 626 return; | 626 return; |
| 627 } | 627 } |
| 628 | 628 |
| 629 ModelRecord rec; | 629 ModelRecord rec; |
| 630 rec.source = 0; | 630 rec.source = 0; |
| 631 rec.channel = 0; | |
| 631 rec.refcount = 0; | 632 rec.refcount = 0; |
| 632 rec.additional = false; | 633 rec.additional = false; |
| 633 | 634 |
| 634 m_models[model] = rec; | 635 m_models[model] = rec; |
| 635 | 636 |
| 661 return; | 662 return; |
| 662 } | 663 } |
| 663 | 664 |
| 664 ModelRecord rec; | 665 ModelRecord rec; |
| 665 rec.source = 0; | 666 rec.source = 0; |
| 667 rec.channel = 0; | |
| 666 rec.refcount = 0; | 668 rec.refcount = 0; |
| 667 rec.additional = true; | 669 rec.additional = true; |
| 668 | 670 |
| 669 m_models[model] = rec; | 671 m_models[model] = rec; |
| 670 | 672 |