From 20283f4c5629f659d05ba18475492c43163bb16e Mon Sep 17 00:00:00 2001 From: Chris Xiong Date: Sun, 31 Jan 2016 21:03:23 +0800 Subject: Waltzing Matilda. --- ChangeLog | 4 ++++ doc/index.html | 2 +- doc/mainwindow.html | 24 ++++++++++++++++++++++-- doc/version.html | 19 +++++++++++++++++++ qmidiplayer.pro | 3 ++- qmpimidimapper.hpp | 16 ++++++++++++++++ qmpsettingswindow.cpp | 14 ++++++++++---- 7 files changed, 74 insertions(+), 8 deletions(-) create mode 100644 qmpimidimapper.hpp diff --git a/ChangeLog b/ChangeLog index c39d55f..4fe05a0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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 @@ -
+
  • Overview
  • Main Window
    • 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 @@ QMidiPlayer Help + + + + 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 @@ QMidiPlayer Help +
    + +

    Main Window


    • 1. Now playing. Right clicking here will bring up the file operation menu.
    • 2. Playing control slider. The total playing time is estimated and isn't 100% accurate.
    • 3. Playing control buttons.
      • -
    • 4. Settings button.
      • +
    • 4. Settings button. Read the Settings section for details.
    • 5. Dialog toggle buttons.
    • 6. Master gain slider.
    • 7. Polyphone indicator.
      • @@ -19,8 +35,12 @@

      File operation menu

      • File Information.
        • -
      • Render to Wave.
        • +
      • Render to Wave.
        + It's not possible to use this action unless the player is stopped.
        + The output wave file, with the name (source file name)+'.wav',
        + is always placed in the folder that the source midi file is in.

      Return +
    + + + + +
    + +

    Version information


    @@ -14,5 +30,8 @@ Qt version: RT_QT_VERSION_STR (Built against CT_QT_VERSION_STR)

    Return +
    \ 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;icbBufSize->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;icbBufCnt->count();++i) -- cgit v1.2.3