diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | doc/index.html | 2 | ||||
| -rw-r--r-- | doc/mainwindow.html | 24 | ||||
| -rw-r--r-- | doc/version.html | 19 | ||||
| -rw-r--r-- | qmidiplayer.pro | 3 | ||||
| -rw-r--r-- | qmpimidimapper.hpp | 16 | ||||
| -rw-r--r-- | qmpsettingswindow.cpp | 14 |
7 files changed, 74 insertions, 8 deletions
@@ -1,3 +1,7 @@ +2016-01-31 0.7.0 beta +Modify default settings in for Win32. +Initial MIDI mapper stub. + 2016-01-30 0.7.0 beta Add support for a single, persistent fluidsynth instance. (Experimental, may also break the original mode...) diff --git a/doc/index.html b/doc/index.html index 6d1af38..a36d7cf 100644 --- a/doc/index.html +++ b/doc/index.html @@ -6,7 +6,7 @@ <body> <table> <tr> - <td style="vertical-align:top;align:left;"> + <td style="vertical-align:top;"> <ul> <li>Overview</li> <li><a href="mainwindow.html">Main Window</a></li> diff --git a/doc/mainwindow.html b/doc/mainwindow.html index bbb1ba3..c82fa67 100644 --- a/doc/mainwindow.html +++ b/doc/mainwindow.html @@ -4,13 +4,29 @@ <title>QMidiPlayer Help</title> </head> <body> + <table> + <tr> + <td style="vertical-align:top;"> + <ul> + <li><a href="index.html">Overview</a></li> + <li>Main Window</li> + <li>Channels Dialog</li> + <li>Channel Editor</li> + <li>Playlist</li> + <li>Effects</li> + <li>Settings</li> + <li><a href="version.html">Version Info.</a></li> + <li><a href="license.html">License</a></li> + </ul> + </td> + <td> <h1>Main Window</h1> <img src="../img/mainw.png"><br> <ul> <li>1. Now playing. Right clicking here will bring up the <a href="#fileop"> file operation menu</a>.</li> <li>2. Playing control slider. The total playing time is estimated and isn't 100% accurate.</li> <li>3. Playing control buttons.</li> - <li>4. Settings button.</li> + <li>4. Settings button. Read the Settings section for details.</li> <li>5. Dialog toggle buttons.</li> <li>6. Master gain slider.</li> <li>7. Polyphone indicator.</li> @@ -19,8 +35,12 @@ <h3><a name="fileop">File operation menu</a></h3> <ul> <li>File Information.</li> - <li>Render to Wave.</li> + <li>Render to Wave.<br> + It's not possible to use this action unless the player is stopped.<br> + The output wave file, with the name (source file name)+'.wav', <br> + is always placed in the folder that the source midi file is in.</li> </ul> <br><a href="index.html">Return</a> + </td> </body> </html> diff --git a/doc/version.html b/doc/version.html index f756da2..5428ef7 100644 --- a/doc/version.html +++ b/doc/version.html @@ -4,6 +4,22 @@ <title>QMidiPlayer Help</title> </head> <body> + <table> + <tr> + <td style="vertical-align:top;"> + <ul> + <li><a href="index.html">Overview</a></li> + <li><a href="mainwindow.html">Main Window</a></li> + <li>Channels Dialog</li> + <li>Channel Editor</li> + <li>Playlist</li> + <li>Effects</li> + <li>Settings</li> + <li>Version Info.</li> + <li><a href="license.html">License</a></li> + </ul> + </td> + <td> <h1>Version information</h1> <div style="text-align:center;"> <img src="../img/qmidiplyr.png"><br> @@ -14,5 +30,8 @@ Qt version: RT_QT_VERSION_STR (Built against CT_QT_VERSION_STR)<br> </div><br> <a href="index.html">Return</a> + </td> + </tr> + </table> </body> </html>
\ No newline at end of file diff --git a/qmidiplayer.pro b/qmidiplayer.pro index 1128e97..da193e2 100644 --- a/qmidiplayer.pro +++ b/qmidiplayer.pro @@ -36,7 +36,8 @@ HEADERS += qmpmainwindow.hpp \ qmpinfowindow.hpp \ qmpsettingswindow.hpp \ qmphelpwindow.hpp \ - qdialskulpturestyle.hpp + qdialskulpturestyle.hpp \ + qmpimidimapper.hpp FORMS += qmpmainwindow.ui \ qmpplistwindow.ui \ diff --git a/qmpimidimapper.hpp b/qmpimidimapper.hpp new file mode 100644 index 0000000..d35dbb9 --- /dev/null +++ b/qmpimidimapper.hpp @@ -0,0 +1,16 @@ +#ifndef QMPIMIDIMAPPER_H +#define QMPIMIDIMAPPER_H +class qmpIMidiMapper +{ + virtual void deviceInit(int id)=0; + virtual void deviceDeinit(int id)=0; + virtual void noteOn(int ch,int key,int vel)=0; + virtual void noteOff(int ch,int key)=0; + virtual void ctrlChange(int ch,int cc,int val)=0; + virtual void progChange(int ch,int val)=0; + virtual void pitchBend(int ch,int val)=0; + virtual void sysEx(int length,const char* data)=0; + virtual static int enumDevices()=0; + virtual static char* deviceName(int id)=0; +}; +#endif // QMPIMIDIMAPPER_H diff --git a/qmpsettingswindow.cpp b/qmpsettingswindow.cpp index 622093e..5058496 100644 --- a/qmpsettingswindow.cpp +++ b/qmpsettingswindow.cpp @@ -78,15 +78,21 @@ void qmpSettingsWindow::settingsInit() if(~selected)ui->cbAudioDrv->setCurrentIndex(selected); settings->setValue("Audio/Driver",ui->cbAudioDrv->currentText()); +#ifdef WIN32 +#define DefBufSize 8192 +#else +#define DefBufSize 128 +#endif selected=-1; for(int i=0;i<ui->cbBufSize->count();++i) - if(ui->cbBufSize->itemText(i).toInt()==settings->value("Audio/BufSize",128).toInt()) + if(ui->cbBufSize->itemText(i).toInt()==settings->value("Audio/BufSize",DefBufSize).toInt()) {selected=i;break;} if(~selected)ui->cbBufSize->setCurrentIndex(selected); - else if(settings->value("Audio/BufSize",128).toInt()>=64&&settings->value("Audio/BufSize",128).toInt()<=8192) - ui->cbBufSize->setCurrentText(settings->value("Audio/BufSize",128).toString()); - else ui->cbBufSize->setCurrentText("128"); + else if(settings->value("Audio/BufSize",DefBufSize).toInt()>=64&&settings->value("Audio/BufSize",DefBufSize).toInt()<=8192) + ui->cbBufSize->setCurrentText(settings->value("Audio/BufSize",DefBufSize).toString()); + else ui->cbBufSize->setCurrentText(QString::number(DefBufSize)); settings->setValue("Audio/BufSize",ui->cbBufSize->currentText().toInt()); +#undef DefBufSize selected=-1; for(int i=0;i<ui->cbBufCnt->count();++i) |