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

fix #276194 Allow MIDI device refreshed without restart of MuseScore

Browse source 
Fixed memory leak/lack of handle closing when deleting Port Audio engine.

Can now have MIDI devices be discovered by pressing button in Prefs/IO or by toggling the MIDI enabled button.
This commit is contained in:
Mark McKay 2018-11-26 19:29:14 -05:00
parent 0ef5104f23
commit 32a6b128eb
6 changed files with 77 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
mscore/musescore.cpp
View file

@ -2772,6 +2772,30 @@ void MeasuresDialog::accept()
done(1);
}
//---------------------------------------------------------
// rebuildAudioDrivers
//---------------------------------------------------------
void MuseScore::restartAudioEngine()
{
if (seq)
seq->exit();
if (seq) {
Driver* driver = driverFactory(seq, "");
if (driver) {
// Updating synthesizer's sample rate
if (seq->synti()) {
seq->synti()->setSampleRate(driver->sampleRate());
seq->synti()->init();
}
seq->setDriver(driver);
}
if (!seq->init())
qDebug("sequencer init failed");
}
}
//---------------------------------------------------------
// midiinToggled
//---------------------------------------------------------
@ -2779,6 +2803,9 @@ void MeasuresDialog::accept()
void MuseScore::midiinToggled(bool val)
{
_midiinEnabled = val;
if (_midiinEnabled)
restartAudioEngine();
}
//---------------------------------------------------------

1
mscore/musescore.h
View file

@ -568,6 +568,7 @@ class MuseScore : public QMainWindow, public MuseScoreCore {
void changeWorkspace(Workspace* p, bool first=false);
void mixerPreferencesChanged(bool showMidiControls);
void checkForUpdates();
void restartAudioEngine();
public:
MuseScore();

3
mscore/pa.cpp
View file

@ -72,6 +72,9 @@ Portaudio::Portaudio(Seq* s)
Portaudio::~Portaudio()
{
if (initialized) {
if (midiDriver)
delete midiDriver;
PaError err = Pa_CloseStream(stream);
if (err != paNoError)
qDebug("Portaudio close stream failed: %s", Pa_GetErrorText(err));

28
mscore/prefsdialog.cpp
View file

@ -205,6 +205,7 @@ PreferenceDialog::PreferenceDialog(QWidget* parent)
connect(jackDriver, SIGNAL(toggled(bool)), SLOT(exclusiveAudioDriver(bool)));
connect(useJackAudio, SIGNAL(toggled(bool)), SLOT(nonExclusiveJackDriver(bool)));
connect(useJackMidi, SIGNAL(toggled(bool)), SLOT(nonExclusiveJackDriver(bool)));
connect(rescanDrivers, SIGNAL(clicked()), this, SLOT(restartAudioEngine()));
updateRemote();
advancedWidget = new PreferencesListWidget();
@ -988,8 +989,6 @@ void PreferenceDialog::apply()
|| (preferences.getInt(PREF_IO_ALSA_FRAGMENTS) != alsaFragments->value())
#endif
) {
if (seq)
seq->exit();
preferences.setPreference(PREF_IO_ALSA_USEALSAAUDIO, alsaDriver->isChecked());
preferences.setPreference(PREF_IO_PORTAUDIO_USEPORTAUDIO, portaudioDriver->isChecked());
@ -998,19 +997,8 @@ void PreferenceDialog::apply()
preferences.setPreference(PREF_IO_ALSA_SAMPLERATE, alsaSampleRate->currentData().toInt());
preferences.setPreference(PREF_IO_ALSA_PERIODSIZE, alsaPeriodSize->currentData().toInt());
preferences.setPreference(PREF_IO_ALSA_FRAGMENTS, alsaFragments->value());
if (seq) {
Driver* driver = driverFactory(seq, "");
if (driver) {
// Updating synthesizer's sample rate
if (seq->synti()) {
seq->synti()->setSampleRate(driver->sampleRate());
seq->synti()->init();
}
seq->setDriver(driver);
}
if (!seq->init())
qDebug("sequencer init failed");
}
restartAudioEngine();
}
#ifdef USE_PORTAUDIO
@ -1365,6 +1353,7 @@ void PreferenceDialog::defineShortcutClicked()
shortcutsChanged = true;
}
//---------------------------------------------------------
// printShortcutsClicked
//---------------------------------------------------------
@ -1437,5 +1426,14 @@ void PreferenceDialog::printShortcutsClicked()
#endif
}
//---------------------------------------------------------
// rebuildAudioDrivers
//---------------------------------------------------------
void PreferenceDialog::restartAudioEngine()
{
mscore->restartAudioEngine();
}
} // namespace Ms

1
mscore/prefsdialog.h
View file

@ -80,6 +80,7 @@ class PreferenceDialog : public AbstractDialog, private Ui::PrefsDialogBase {
void filterShortcutsTextChanged(const QString &);
void filterAdvancedPreferences(const QString&);
void resetAdvancedPreferenceToDefault();
void restartAudioEngine();
void changeSoundfontPaths();
void updateTranslationClicked();

32
mscore/prefsdialog.ui
View file

@ -3178,6 +3178,38 @@ Adjusting latency can help synchronize your MIDI hardware with MuseScore's inter
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox_14">
<property name="toolTip">
<string>Causes the audio engine to restart. This can allow you to connect to MIDI devices that have been started since you started MuseScore.</string>
</property>
<property name="title">
<string>Audio Engine</string>
</property>
<layout class="QGridLayout" name="gridLayout_11">
<item row="0" column="0">
<widget class="QPushButton" name="rescanDrivers">
<property name="text">
<string>Restart Audio &amp;&amp; MIDI Devices</string>
</property>
</widget>
</item>
<item row="0" column="1">
<spacer name="horizontalSpacer_20">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QLabel" name="restartWarning">
<property name="sizePolicy">