aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--doc/channeldialog.html1
-rw-r--r--doc/optionsdialog.html7
-rw-r--r--doc/version.html2
-rw-r--r--img/chanw.pngbin58092 -> 64046 bytes
-rw-r--r--img/mainw.pngbin35328 -> 33481 bytes
-rw-r--r--img/options1.pngbin32153 -> 32867 bytes
-rw-r--r--img/options2.pngbin44016 -> 44719 bytes
-rw-r--r--img/options3.pngbin32396 -> 33196 bytes
-rw-r--r--img/options4.pngbin41683 -> 31324 bytes
-rw-r--r--img/options5.pngbin0 -> 22614 bytes
-rw-r--r--include/qmpcorepublic.hpp4
-rw-r--r--qmidiplayer-desktop/qmpplugin.cpp4
13 files changed, 21 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 727e2d1..f4fe229 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2016-04-29 0.7.8 beta
+Update documentation.
+Added two missing option proxy function...
+
2016-04-28 0.7.8 beta
List plugins in settings window.
Plugins can be disabled now.
diff --git a/doc/channeldialog.html b/doc/channeldialog.html
index 12d6554..5b5eff3 100644
--- a/doc/channeldialog.html
+++ b/doc/channeldialog.html
@@ -26,6 +26,7 @@
<img src="../img/chanw.png"><br>
<h2>Columns in the channel table</h2>
<ul>
+ <li>A(Activity): Shows the activity of the corresponding channel.</li>
<li>M(Mute): Tick this to mute the corresponding channel.</li>
<li>S(Solo): Tick this to solo the corresponding channel.</li>
<li>Device: The player sends midi messages from this channel to the device selected here.</li>
diff --git a/doc/optionsdialog.html b/doc/optionsdialog.html
index 1854f57..4e0bc71 100644
--- a/doc/optionsdialog.html
+++ b/doc/optionsdialog.html
@@ -72,6 +72,13 @@
<li>Persistent fluidsynth instance*: If checked, the synthesizer engine will keep running
through the whole session. Otherwise it is restarted every time when a new song is played.</li>
</ul>
+ <img src="../img/options5.png"><br>
+ Plugin manager. View details of plugins, enable or disable them here.<br>
+ Plugin scanning follows the order below:
+ <ul>
+ <li>(*nix) /usr/lib/qmidiplayer</li>
+ <li>The folder containing QMidiPlayer's executable file.</li>
+ </ul>
<br><a href="index.html">Return</a>
</div>
</body>
diff --git a/doc/version.html b/doc/version.html
index b28ca13..7fcafdf 100644
--- a/doc/version.html
+++ b/doc/version.html
@@ -25,7 +25,7 @@
<h1>Version information</h1>
<div style="text-align:center;">
<img src="../img/qmidiplyr.png"><br>
- QMidiPlayer documentation for version 0.7.2<br>
+ QMidiPlayer documentation for version 0.7.8<br>
An MIDI player based on fluidsynth and Qt.<br>
Written by Chris Xiong.<br>
</div><br>
diff --git a/img/chanw.png b/img/chanw.png
index 670244f..02c7960 100644
--- a/img/chanw.png
+++ b/img/chanw.png
Binary files differ
diff --git a/img/mainw.png b/img/mainw.png
index f197d5d..6d88937 100644
--- a/img/mainw.png
+++ b/img/mainw.png
Binary files differ
diff --git a/img/options1.png b/img/options1.png
index e9ce70a..aa9304a 100644
--- a/img/options1.png
+++ b/img/options1.png
Binary files differ
diff --git a/img/options2.png b/img/options2.png
index ec14aeb..339416e 100644
--- a/img/options2.png
+++ b/img/options2.png
Binary files differ
diff --git a/img/options3.png b/img/options3.png
index 39a5ca7..b8fc3ba 100644
--- a/img/options3.png
+++ b/img/options3.png
Binary files differ
diff --git a/img/options4.png b/img/options4.png
index 9ddd2c0..3cd0faa 100644
--- a/img/options4.png
+++ b/img/options4.png
Binary files differ
diff --git a/img/options5.png b/img/options5.png
new file mode 100644
index 0000000..2ae303f
--- /dev/null
+++ b/img/options5.png
Binary files differ
diff --git a/include/qmpcorepublic.hpp b/include/qmpcorepublic.hpp
index 03e99a0..54365b6 100644
--- a/include/qmpcorepublic.hpp
+++ b/include/qmpcorepublic.hpp
@@ -73,6 +73,10 @@ class qmpPluginAPI
virtual void registerOptionInt(std::string desc,std::string key,int min,int max,int defaultval);
virtual int getOptionInt(std::string key);
+ virtual void registerOptionUint(std::string desc,std::string key,unsigned min,unsigned max,unsigned defaultval);
+ virtual unsigned getOptionUint(std::string key);
+ virtual void registerOptionBool(std::string desc,std::string key,bool defaultval);
+ virtual bool getOptionBool(std::string key);
virtual void registerOptionDouble(std::string desc,std::string key,double min,double max,double defaultval);
virtual double getOptionDouble(std::string key);
virtual void registerOptionString(std::string desc,std::string key,std::string defaultval);
diff --git a/qmidiplayer-desktop/qmpplugin.cpp b/qmidiplayer-desktop/qmpplugin.cpp
index 3db7b08..546122b 100644
--- a/qmidiplayer-desktop/qmpplugin.cpp
+++ b/qmidiplayer-desktop/qmpplugin.cpp
@@ -119,6 +119,10 @@ void qmpPluginAPI::unregisterVisualizationIntf(int intfhandle)
{qmw->unregisterVisualizationIntf(intfhandle);}
void qmpPluginAPI::registerOptionInt(std::string,std::string,int,int,int){}
int qmpPluginAPI::getOptionInt(std::string){return 0;}
+void qmpPluginAPI::registerOptionUint(std::string,std::string,unsigned,unsigned,unsigned){}
+unsigned qmpPluginAPI::getOptionUint(std::string){return 0;}
+void qmpPluginAPI::registerOptionBool(std::string,std::string,bool){}
+bool qmpPluginAPI::getOptionBool(std::string){return false;}
void qmpPluginAPI::registerOptionDouble(std::string,std::string,double,double,double){}
double qmpPluginAPI::getOptionDouble(std::string){return 0;}
void qmpPluginAPI::registerOptionString(std::string,std::string,std::string){}