From 24e9b335f0414428512eb9d61661b88d906448a5 Mon Sep 17 00:00:00 2001
From: Chris Xiong <chirs241097@gmail.com>
Date: Fri, 31 Jan 2020 23:23:13 +0800
Subject: Simple visualization now reflects changes made in preset selection
 and channel editor dialog.

Documentation update.
---
 doc/mainwindow.html                          | 2 +-
 doc/optionsdialog.html                       | 6 +++++-
 doc/troubleshooting.html                     | 5 +++--
 qmidiplayer-desktop/qmpchanneleditor.cpp     | 1 +
 qmidiplayer-desktop/qmppresetselect.cpp      | 1 +
 simple-visualization/simplevisualization.cpp | 7 +++++--
 6 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/doc/mainwindow.html b/doc/mainwindow.html
index 7928c9f..d80aa40 100644
--- a/doc/mainwindow.html
+++ b/doc/mainwindow.html
@@ -36,7 +36,7 @@
 		<li>FluidSynth polyphony indicator.</li>
 		<li>A dumb button.</li>
 	</ol>
-	<h3><a name="fileop">File operation menu</a></h3>
+	<h3><a name="fileop">File action menu</a></h3>
 	<p>
 	Note that actual actions in this menu can be configured in settings.
 	</p>
diff --git a/doc/optionsdialog.html b/doc/optionsdialog.html
index b473b91..6a1d26d 100644
--- a/doc/optionsdialog.html
+++ b/doc/optionsdialog.html
@@ -40,7 +40,11 @@
 		When QMidiPlayer starts, selected devices will be examined from top to bottom, the first connected
 		one will be chosen as the default output device.
 		</li>
-		<li>External MIDI output device setup*: set initialzation file for external MIDI devices.</li>
+		<li>External MIDI output device setup*: set initialzation file for external MIDI devices.
+		Initialzation file may contain a short, device-specific MIDI sequence to initialize the device
+		which is sent before a file begins to play, and may also provide information about the device
+		(instrument preset names, initialzation data etc.) to enhance the user experience.
+		</li>
 	</ul>
 	<img src="../img/options2.png" width="440"><br>
 	<ul>
diff --git a/doc/troubleshooting.html b/doc/troubleshooting.html
index 7caf8be..8aab8f4 100644
--- a/doc/troubleshooting.html
+++ b/doc/troubleshooting.html
@@ -29,9 +29,10 @@
 			<ol>
 			<li>Check current audio driver in the option dialog. Do not use an audio driver
 			that is not installed on your system.</li>
+			<li>If you are using an external device, make sure your audio equipments are correctly set up.</li>
 			<li>If no soundfont is loaded, the internal synthesizer won't make any sound...</li>
 			<li>Check audio driver/buffer settings in the synth section.</li>
-			<li>Check if your midi file is valid/having correct bank selecting method<s>/having zero volume</s>.</li>
+			<li>Check if your midi file is valid/has correct bank selecting method<s>/has zero volume</s>.</li>
 			</ol>
 		</p>
 		<h3>2. The playback is intermittent.</h3>
@@ -69,7 +70,7 @@
 		</p>
 		<h3>9. 3D visualization is upsidedown/rotated/black/blinking.</h3>
 		<p>
-			For those who see a rotated and blinking display, try setting
+			If you are experiencing rotated and blinking visualization, try setting
 			Visualization-Video/Multisampling to 1 or above. If that doesn't
 			solve your problem or you see nothing at all, please send me more
 			details about your problem (graphics card, drivers etc.).
diff --git a/qmidiplayer-desktop/qmpchanneleditor.cpp b/qmidiplayer-desktop/qmpchanneleditor.cpp
index 445b68e..5343c1c 100644
--- a/qmidiplayer-desktop/qmpchanneleditor.cpp
+++ b/qmidiplayer-desktop/qmpchanneleditor.cpp
@@ -77,6 +77,7 @@ void qmpChannelEditor::sendCC()
 	player->setCC(ch,76,ui->dRate->value());
 	player->setCC(ch,77,ui->dDepth->value());
 	player->setCC(ch,78,ui->dDelay->value());
+	qmpMainWindow::getInstance()->invokeCallback("channel.ccchange",nullptr);
 }
 
 void qmpChannelEditor::showEvent(QShowEvent *e)
diff --git a/qmidiplayer-desktop/qmppresetselect.cpp b/qmidiplayer-desktop/qmppresetselect.cpp
index 8286053..8c28fe6 100644
--- a/qmidiplayer-desktop/qmppresetselect.cpp
+++ b/qmidiplayer-desktop/qmppresetselect.cpp
@@ -102,6 +102,7 @@ void qmpPresetSelector::on_pbOk_clicked()
 		else if(s=="CC#0")b<<=7;
 		plyr->setChannelPreset(ch,b,p);
 	}
+	qmpMainWindow::getInstance()->invokeCallback("preset.set",nullptr);
 	close();
 }
 
diff --git a/simple-visualization/simplevisualization.cpp b/simple-visualization/simplevisualization.cpp
index 71dac7a..c8191b6 100644
--- a/simple-visualization/simplevisualization.cpp
+++ b/simple-visualization/simplevisualization.cpp
@@ -13,8 +13,11 @@ void qmpSimpleVisualization::init()
 		api->registerOptionUint("","","Keyboard/bcolor"+std::to_string(i),0,0xffffff,0xff66ccff);
 	}
 	p=new qmpKeyboardWindow(api,(QWidget*)api->getMainWindow());
-	uihs=api->registerUIHook("main.stop",[this](const void*,void*){this->p->resetAll();},nullptr);
-	uihsk=api->registerUIHook("main.seek",[this](const void*,void*){this->p->resetAll();},nullptr);
+	auto refreshfn=[this](const void*,void*){this->p->resetAll();};
+	uihs=api->registerUIHook("main.stop",refreshfn,nullptr);
+	uihsk=api->registerUIHook("main.seek",refreshfn,nullptr);
+	uihsk=api->registerUIHook("preset.set",refreshfn,nullptr);
+	uihsk=api->registerUIHook("channel.ccchange",refreshfn,nullptr);
 }
 void qmpSimpleVisualization::deinit()
 {
-- 
cgit v1.2.3