Merge branch 'master' into spectrum
This commit is contained in:
commit
bfc2e3a60c
1 changed files with 7 additions and 0 deletions
|
|
@ -3860,6 +3860,9 @@ bool DivEngine::switchMaster(bool full) {
|
|||
disCont[i].setRates(got.rate);
|
||||
disCont[i].setQuality(lowQuality,dcHiPass);
|
||||
}
|
||||
if (curFilePlayer!=NULL) {
|
||||
curFilePlayer->setOutputRate(got.rate);
|
||||
}
|
||||
if (!output->setRun(true)) {
|
||||
logE("error while activating audio!");
|
||||
return false;
|
||||
|
|
@ -4421,6 +4424,10 @@ bool DivEngine::init() {
|
|||
reset();
|
||||
active=true;
|
||||
|
||||
if (curFilePlayer!=NULL) {
|
||||
curFilePlayer->setOutputRate(got.rate);
|
||||
}
|
||||
|
||||
if (!haveAudio) {
|
||||
return false;
|
||||
} else {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue