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

Merge pull request #5490 from Jojo-Schmitz/warning

Browse source 
Fix MinGW and MSVC compiler warnings
This commit is contained in:
Dmitri Ovodok 2019-11-25 11:42:46 +02:00 committed by GitHub
commit 3f65eb100e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
mscore/playpanel.cpp
View file

@ -251,6 +251,7 @@ void PlayPanel::setRelTempo(qreal val)
void PlayPanel::setGain(float gain) // respond to gainChanged() SIGNAL from MasterSynthesizer
{
Q_UNUSED(gain);
const QSignalBlocker blockVolumeSpinBoxSignals(volSpinBox);
volumeSlider->setValue(synti->gainAsDecibels());
volLabel();

1
mscore/synthcontrol.cpp
View file

@ -116,6 +116,7 @@ SynthControl::SynthControl(QWidget* parent)
// synthesizer has signalled a gain change - update the slider
void SynthControl::setGain(float val)
{
Q_UNUSED(val);
gainSlider->setValue(synti->gainAsDecibels());
}

2
mscore/synthcontrol.ui
View file

@ -459,7 +459,7 @@
<tabstop>effectB</tabstop>
<tabstop>masterTuning</tabstop>
<tabstop>changeTuningButton</tabstop>
<tabstop>gain</tabstop>
<tabstop>gainSlider</tabstop>
<tabstop>saveButton</tabstop>
<tabstop>loadButton</tabstop>
<tabstop>storeButton</tabstop>

2
synthesizer/msynthesizer.h
View file

@ -47,7 +47,7 @@ class MasterSynthesizer : public QObject {
public:
static const int MAX_BUFFERSIZE = 8192;
static const int MAX_EFFECTS = 2;
static constexpr float defaultGain = 0.1; // -20dB
static constexpr float defaultGain = 0.1f; // -20dB
private:
std::atomic<bool> lock1 { false };