Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/gui/SetupDialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -685,7 +685,14 @@ SetupDialog::SetupDialog(ConfigTabs tab_to_open) :
m_assignableMidiDevices = new QComboBox(midiAutoAssign_tw);
m_assignableMidiDevices->setGeometry(10, 20, 240, 28);
m_assignableMidiDevices->addItem("none");
m_assignableMidiDevices->addItems(Engine::mixer()->midiClient()->readablePorts());
if ( !Engine::mixer()->midiClient()->isRaw() )
{
m_assignableMidiDevices->addItems(Engine::mixer()->midiClient()->readablePorts());
}
else
{
m_assignableMidiDevices->addItem("yes");
}
int current = m_assignableMidiDevices->findText(ConfigManager::inst()->value("midi", "midiautoassign"));
if (current >= 0)
{
Expand Down
6 changes: 6 additions & 0 deletions src/tracks/InstrumentTrack.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -940,6 +940,12 @@ void InstrumentTrack::autoAssignMidiDevice(bool assign)
}

const QString &device = ConfigManager::inst()->value("midi", "midiautoassign");
if ( Engine::mixer()->midiClient()->isRaw() && device != "none" )
{
m_midiPort.setReadable( assign );
return;
}

// Check if the device exists
if ( Engine::mixer()->midiClient()->readablePorts().indexOf(device) >= 0 )
{
Expand Down