diff -rupN muse-2.2.1.org/muse/lv2host.cpp muse-2.2.1/muse/lv2host.cpp
--- muse-2.2.1.org/muse/lv2host.cpp 2015-01-28 15:43:21.000000000 -0500
+++ muse-2.2.1/muse/lv2host.cpp 2016-02-07 13:58:15.147861459 -0500
@@ -904,7 +904,7 @@ void LV2Synth::lv2state_InitMidiPorts(LV
synth->mapUrid(LV2_ATOM__Sequence)
);
state->midiInPorts [i].buffer = buffer;
- state->idx2EvtPorts.insert(std::make_pair<uint32_t, LV2EvBuf *>(state->midiInPorts [i].index, buffer));
+ state->idx2EvtPorts.insert(std::make_pair/*<uint32_t, LV2EvBuf *>*/(state->midiInPorts [i].index, buffer));
}
for(size_t i = 0; i < state->midiOutPorts.size(); i++)
@@ -915,7 +915,7 @@ void LV2Synth::lv2state_InitMidiPorts(LV
synth->mapUrid(LV2_ATOM__Sequence)
);
state->midiOutPorts [i].buffer = buffer;
- state->idx2EvtPorts.insert(std::make_pair<uint32_t, LV2EvBuf *>(state->midiOutPorts [i].index, buffer));
+ state->idx2EvtPorts.insert(std::make_pair/*<uint32_t, LV2EvBuf *>*/(state->midiOutPorts [i].index, buffer));
}
}
@@ -1668,9 +1668,9 @@ void LV2Synth::lv2prg_updatePrograms(LV2
extPrg.useIndex = true;
extPrg.name = QString(pDescr->name);
- state->index2prg.insert(std::make_pair<uint32_t, lv2ExtProgram>(iPrg, extPrg));
+ state->index2prg.insert(std::make_pair/*<uint32_t, lv2ExtProgram>*/(iPrg, extPrg));
uint32_t midiprg = ((extPrg.bank & 0xff) << 8) + extPrg.prog;
- state->prg2index.insert(std::make_pair<uint32_t, uint32_t>(midiprg, iPrg));
+ state->prg2index.insert(std::make_pair/*<uint32_t, uint32_t>*/(midiprg, iPrg));
++iPrg;
}
}
@@ -2277,7 +2277,7 @@ LV2Synth::LV2Synth(const QFileInfo &fi,
const char *strUiType = lilv_node_as_string(pluginUIType); //internal uis are preferred
std::cerr << "Plugin " << label.toStdString() << " supports ui of type " << strUiType << std::endl;
#endif
- _pluginUiTypes.insert(std::make_pair<const LilvUI *, std::pair<bool, const LilvNode *> >(ui, std::make_pair<bool, const LilvNode *>(false, pluginUIType)));
+ _pluginUiTypes.insert(std::make_pair/*<const LilvUI *, std::pair<bool, const LilvNode *> >*/(ui, std::make_pair/*<bool, const LilvNode *>*/(false, pluginUIType)));
}
else
{
@@ -2299,7 +2299,7 @@ LV2Synth::LV2Synth(const QFileInfo &fi,
#ifdef DEBUG_LV2
std::cerr << "Plugin " << label.toStdString() << " supports ui of type " << LV2_UI_EXTERNAL << std::endl;
#endif
- _pluginUiTypes.insert(std::make_pair<const LilvUI *, std::pair<bool, const LilvNode *> >(ui, std::make_pair<bool, const LilvNode *>(true, pluginUIType)));
+ _pluginUiTypes.insert(std::make_pair/*<const LilvUI *, std::pair<bool, const LilvNode *> >*/(ui, std::make_pair/*<bool, const LilvNode *>*/(true, pluginUIType)));
}
nit = lilv_nodes_next(nUiClss, nit);
@@ -2326,7 +2326,7 @@ LV2Synth::LV2Synth(const QFileInfo &fi,
if (pLabels != NULL)
{
const LilvNode* pLabel = lilv_nodes_get_first(pLabels);
- _presets.insert(std::make_pair<QString, LilvNode *>(lilv_node_as_string(pLabel), lilv_node_duplicate(preset)));
+ _presets.insert(std::make_pair/*<QString, LilvNode *>*/(lilv_node_as_string(pLabel), lilv_node_duplicate(preset)));
lilv_nodes_free(pLabels);
}
else
@@ -4114,7 +4114,7 @@ void LV2SynthIF::populatePatchPopup(MusE
submenu = new MusEGui::PopupMenu(menu->parent());
submenu->setTitle(QString("Bank #") + QString::number(bank + 1));
menu->addMenu(submenu);
- submenus.insert(std::make_pair<int, MusEGui::PopupMenu *>(bank, submenu));
+ submenus.insert(std::make_pair/*<int, MusEGui::PopupMenu *>*/(bank, submenu));
}
diff -rupN muse-2.2.1.org/muse/midiedit/ecanvas.cpp muse-2.2.1/muse/midiedit/ecanvas.cpp
--- muse-2.2.1.org/muse/midiedit/ecanvas.cpp 2015-01-28 15:43:21.000000000 -0500
+++ muse-2.2.1/muse/midiedit/ecanvas.cpp 2016-02-07 13:40:10.257682898 -0500
@@ -271,8 +271,8 @@ void EventCanvas::selectAtTick(unsigned
while (i != items.end()) {
CItem* cur=i->second;
- unsigned int curtk=abs(cur->x() + cur->part()->tick() - tick);
- unsigned int neartk=abs(nearest->x() + nearest->part()->tick() - tick);
+ unsigned int curtk=abs(cur->x() + int(cur->part()->tick() - tick));
+ unsigned int neartk=abs(nearest->x() + int(nearest->part()->tick() - tick));
if (curtk < neartk) {
nearest=cur;
diff -rupN muse-2.2.1.org/muse/sync.cpp muse-2.2.1/muse/sync.cpp
--- muse-2.2.1.org/muse/sync.cpp 2015-01-28 15:43:21.000000000 -0500
+++ muse-2.2.1/muse/sync.cpp 2016-02-07 14:06:27.980673369 -0500
@@ -961,7 +961,7 @@ void MidiSeq::realtimeSystemInput(int po
if(_preDetect && pole == 0)
{
double real_tempo = 60.0/(avg_diff * 24.0);
- double real_tempo_diff = abs(real_tempo - _lastRealTempo);
+ double real_tempo_diff = fabs(real_tempo - _lastRealTempo);
// If the tempo changed a large amount, reset.
if(real_tempo_diff >= 10.0) // TODO: User-adjustable?
@@ -1009,7 +1009,7 @@ void MidiSeq::realtimeSystemInput(int po
if(pole == fin_idx)
{
double real_tempo = 60.0/(avg_diff * 24.0);
- double real_tempo_diff = abs(real_tempo - _lastRealTempo);
+ double real_tempo_diff = fabs(real_tempo - _lastRealTempo);
if(real_tempo_diff >= _tempoQuantizeAmount/2.0) // Anti-hysteresis
{
diff -rupN muse-2.2.1.org/muse/widgets/knob_and_meter.cpp muse-2.2.1/muse/widgets/knob_and_meter.cpp
--- muse-2.2.1.org/muse/widgets/knob_and_meter.cpp 2015-01-28 15:43:21.000000000 -0500
+++ muse-2.2.1/muse/widgets/knob_and_meter.cpp 2016-02-07 13:05:44.525872090 -0500
@@ -171,7 +171,7 @@ void KnobWithMeter::drawKnob(QPainter* p
QPen pn;
pn.setCapStyle(Qt::FlatCap);
- pn.setColor(d_shinyColor.lighter(l_const + abs(value() * l_slope)));
+ pn.setColor(d_shinyColor.lighter(l_const + fabs(value() * l_slope)));
pn.setWidth(d_shineWidth * 2);
p->setPen(pn);
p->drawArc(aRect, 0, 360 * 16);
diff -rupN muse-2.2.1.org/muse/widgets/knob.cpp muse-2.2.1/muse/widgets/knob.cpp
--- muse-2.2.1.org/muse/widgets/knob.cpp 2015-01-28 15:43:21.000000000 -0500
+++ muse-2.2.1/muse/widgets/knob.cpp 2016-02-07 12:44:50.150460578 -0500
@@ -172,7 +172,7 @@ void Knob::drawKnob(QPainter* p, const Q
QPen pn;
pn.setCapStyle(Qt::FlatCap);
- pn.setColor(d_shinyColor.lighter(l_const + abs(value() * l_slope)));
+ pn.setColor(d_shinyColor.lighter(l_const + fabs(value() * l_slope)));
pn.setWidth(d_shineWidth * 2);
p->setPen(pn);
p->drawArc(aRect, 0, 360 * 16);