Skip to content

Commit

Permalink
bugfix against ticket hydrogen-music#235, audio settings : enable 'pe…
Browse files Browse the repository at this point in the history
…r instrument out' has no effect

git-svn-id: http://svn.assembla.com/svn/hydrogen/trunk@2454 3b3fb362-3133-0410-aa15-cf69e0a59cb7
  • Loading branch information
wolkstein committed Feb 3, 2012
1 parent de472fa commit 012c3a4
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
10 changes: 8 additions & 2 deletions src/gui/src/PreferencesDialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,9 @@ PreferencesDialog::PreferencesDialog(QWidget* parent)
maxVoicesTxt->setValue( pPref->m_nMaxNotes );

// JACK
trackOutsCheckBox->setChecked( pPref->m_bJackTrackOuts );
trackOutsCheckBox->setChecked( pPref->m_bJackTrackOuts );
connect(trackOutsCheckBox, SIGNAL(toggled(bool)), this, SLOT(toggleTrackOutsCheckBox( bool )));

connectDefaultsCheckBox->setChecked( pPref->m_bJackConnectDefaults );
trackOutputComboBox->setCurrentIndex( pPref->m_nJackTrackOutputMode );
//~ JACK
Expand Down Expand Up @@ -338,7 +340,6 @@ void PreferencesDialog::on_okBtn_clicked()
}

// JACK
pPref->m_bJackTrackOuts = trackOutsCheckBox->isChecked();
pPref->m_bJackConnectDefaults = connectDefaultsCheckBox->isChecked();


Expand Down Expand Up @@ -722,3 +723,8 @@ void PreferencesDialog::onMidiDriverComboBoxIndexChanged ( int index )
m_bNeedDriverRestart = true;
}

void PreferencesDialog::toggleTrackOutsCheckBox(bool toggled)
{
Preferences::get_instance()->m_bJackTrackOuts = toggled;
m_bNeedDriverRestart = true;
}
1 change: 1 addition & 0 deletions src/gui/src/PreferencesDialog.h
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ class PreferencesDialog : public QDialog, private Ui_PreferencesDialog_UI, publi
void on_styleComboBox_activated( int index );
void on_useLashCheckbox_clicked();
void onMidiDriverComboBoxIndexChanged( int index );
void toggleTrackOutsCheckBox(bool toggled);

private:
bool m_bNeedDriverRestart;
Expand Down

0 comments on commit 012c3a4

Please sign in to comment.