hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge pull request #1851 from M374LX/settings

Browse Source 
Fix issue #1848
This commit is contained in:
Tres Finocchiaro
2015-03-10 20:06:14 +00:00
parent 06e1415bbd b3f60dde95
commit 19197d3481
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/gui/SetupDialog.cpp
View File

@@ -685,9 +685,12 @@ SetupDialog::SetupDialog( ConfigTabs _tab_to_open ) :
asw_layout->addWidget( audioWidget );
m_audioInterfaces->addItem( it.key() );
}
m_audioInterfaces->setCurrentIndex( m_audioInterfaces->findText(
ConfigManager::inst()->value( "mixer", "audiodev" ) ) );
m_audioIfaceSetupWidgets[Engine::mixer()->audioDevName()]->show();
QString audioDevName =
ConfigManager::inst()->value( "mixer", "audiodev" );
m_audioInterfaces->
setCurrentIndex( m_audioInterfaces->findText( audioDevName ) );
m_audioIfaceSetupWidgets[audioDevName]->show();
connect( m_audioInterfaces, SIGNAL( activated( const QString & ) ),
this, SLOT( audioInterfaceChanged( const QString & ) ) );
@@ -766,9 +769,11 @@ SetupDialog::SetupDialog( ConfigTabs _tab_to_open ) :
m_midiInterfaces->addItem( it.key() );
}
m_midiInterfaces->setCurrentIndex( m_midiInterfaces->findText(
ConfigManager::inst()->value( "mixer", "mididev" ) ) );
m_midiIfaceSetupWidgets[Engine::mixer()->midiClientName()]->show();
QString midiDevName =
ConfigManager::inst()->value( "mixer", "mididev" );
m_midiInterfaces->setCurrentIndex(
m_midiInterfaces->findText( midiDevName ) );
m_midiIfaceSetupWidgets[midiDevName]->show();
connect( m_midiInterfaces, SIGNAL( activated( const QString & ) ),
this, SLOT( midiInterfaceChanged( const QString & ) ) );
@@ -1373,5 +1378,3 @@ void SetupDialog::displayMIDIHelp()