Improved: Midi initializations. New settings options, can be 'quiet'. Complete rewrite of initializations coding.

Improved: Midi controller graphs: Control selector 'S' popup now stay-open, AND NOW with multi-coloured dots. 
Bonus! Pianoroll and drum edit 'Ctrl' buttons ALSO now popup this very same menu. 
Improved: 'Old' drum track 'drum controllers' display and operation: Fixed several problems.

1 files changed, 25 insertions, 0 deletions

diff --git a/muse2/muse/confmport.cpp b/muse2/muse/confmport.cpp
index cd5c95e9..b0e68b09 100644
--- a/muse2/muse/confmport.cpp
+++ b/muse2/muse/confmport.cpp
@@ -69,12 +69,33 @@ enum { DEVCOL_NO = 0, DEVCOL_GUI, DEVCOL_REC, DEVCOL_PLAY, DEVCOL_INSTR, DEVCOL_
 //---------------------------------------------------------
 //   closeEvent
 //---------------------------------------------------------
+       
 void MPConfig::closeEvent(QCloseEvent *event)
 {
+    apply();
     QSettings settings("MusE", "MusE-qt");
     settings.setValue("MPConfig/geometry", saveGeometry());
     QWidget::closeEvent(event);
 }
+
+//---------------------------------------------------------
+//   apply
+//---------------------------------------------------------
+
+void MPConfig::apply()
+{
+  MusEGlobal::audio->msgInitMidiDevices(false);  // false = Don't force
+}
+
+//---------------------------------------------------------
+//   okClicked
+//---------------------------------------------------------
+
+void MPConfig::okClicked()
+{
+  close();  
+}
+
 //---------------------------------------------------------
 //   changeDefInputRoutes
 //---------------------------------------------------------
@@ -1116,6 +1137,10 @@ MPConfig::MPConfig(QWidget* parent)
       connect(synthList, SIGNAL(itemDoubleClicked(QTreeWidgetItem*,int)), SLOT(addInstanceClicked())); 
       connect(removeInstance, SIGNAL(clicked()), SLOT(removeInstanceClicked()));
       connect(instanceList,  SIGNAL(itemDoubleClicked(QTreeWidgetItem*,int)), SLOT(removeInstanceClicked()));
+      
+      connect(applyButton, SIGNAL(clicked()), SLOT(apply()));
+      connect(okButton, SIGNAL(clicked()), SLOT(okClicked()));
+      
       songChanged(SC_CONFIG);  
       }