LoweBowe/MuseScore
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix audio export for zerberus; fix progress bar

Browse source
This commit is contained in:
ws 2013-04-18 16:54:51 +02:00
parent 3dfba0a3cc
commit 725882fcdb
2 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
mscore/exportaudio.cpp
View file

@ -80,10 +80,11 @@ bool MuseScore::saveAudio(Score* score, const QString& name, const QString& ext)
EventMap::const_iterator endPos = events.cend();
--endPos;
const int et = (score->utick2utime(endPos->first) + 1) * MScore::sampleRate;
pBar->setRange(0, et);
for (int pass = 0; pass < 2; ++pass) {
EventMap::const_iterator playPos;
playPos = events.cbegin();
pBar->setRange(0, et);
//
// init instruments
@ -148,7 +149,7 @@ bool MuseScore::saveAudio(Score* score, const QString& name, const QString& ext)
peak = qMax(peak, qAbs(buffer[i]));
}
playTime = endTime;
pBar->setValue(playTime);
pBar->setValue((pass * et + playTime) / 2);
if (playTime >= et)
break;

14
zerberus/zerberus.cpp
View file

@ -42,6 +42,7 @@ Zerberus::Zerberus()
freeVoices.push(new Voice(this));
for (int i = 0; i < MAX_CHANNEL; ++i)
_channel[i] = new Channel(this, i);
busy = true; // no sf loaded yet
}
//---------------------------------------------------------
@ -50,6 +51,7 @@ Zerberus::Zerberus()
Zerberus::~Zerberus()
{
busy = true;
while (!instruments.empty()) {
auto i = instruments.front();
auto it = instruments.begin();
@ -57,6 +59,7 @@ Zerberus::~Zerberus()
i->setRefCount(i->refCount() - 1);
if (i->refCount() <= 0) {
printf("delete sf <%s>\n", qPrintable(i->name()));
delete i;
auto it = find(globalInstruments.begin(), globalInstruments.end(), i);
if (it != globalInstruments.end())
@ -205,8 +208,10 @@ void Zerberus::play(const PlayEvent& event)
void Zerberus::process(unsigned frames, float* p, float*, float*)
{
if (busy)
if (busy) {
printf("busy\n");
return;
}
Voice* v = activeVoices;
Voice* pv = 0;
while (v) {
@ -336,6 +341,7 @@ bool Zerberus::removeSoundFont(const QString& s)
if (it == globalInstruments.end())
return false;
globalInstruments.erase(it);
printf("delete sf <%s>\n", qPrintable(i->name()));
delete i;
}
return true;
@ -393,6 +399,7 @@ ZInstrument* Zerberus::instrument(int n) const
bool Zerberus::loadInstrument(const QString& s)
{
printf("Zerberus::loadInstrument(%s)\n", qPrintable(s));
if (s.isEmpty())
return false;
for (ZInstrument* instr : instruments) {
@ -406,6 +413,11 @@ bool Zerberus::loadInstrument(const QString& s)
instruments.push_back(instr);
instr->setRefCount(instr->refCount() + 1);
printf("2: sf already loaded\n");
if (instruments.size() == 1) {
for (int i = 0; i < MAX_CHANNEL; ++i)
_channel[i]->setInstrument(instr);
}
busy = false;
return true;
}
}