Skip to content

Commit

Permalink
Simple visualization now reflects changes made in preset selection an…
Browse files Browse the repository at this point in the history
…d channel editor dialog.

Documentation update.
  • Loading branch information
chirs241097 committed Jan 31, 2020
1 parent 63224bf commit 24e9b33
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 6 deletions.
2 changes: 1 addition & 1 deletion doc/mainwindow.html
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ <h1>Main Window</h1>
<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>
Expand Down
6 changes: 5 additions & 1 deletion doc/optionsdialog.html
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,11 @@ <h1>Settings Dialog</h1>
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>
Expand Down
5 changes: 3 additions & 2 deletions doc/troubleshooting.html
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,10 @@ <h3>1. I can't hear anything!</h3>
<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>
Expand Down Expand Up @@ -69,7 +70,7 @@ <h3>8. Bank selecting is incorrect for external devices.</h3>
</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.).
Expand Down
1 change: 1 addition & 0 deletions qmidiplayer-desktop/qmpchanneleditor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions qmidiplayer-desktop/qmppresetselect.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}

Expand Down
7 changes: 5 additions & 2 deletions simple-visualization/simplevisualization.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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()
{
Expand Down

0 comments on commit 24e9b33

Please sign in to comment.