From 3270ec6072b333c548587621b141ee283beecc29 Mon Sep 17 00:00:00 2001 From: Chris Xiong Date: Sun, 28 Feb 2016 20:53:12 +0800 Subject: Pristine Beat. --- ChangeLog | 5 ++ debian/changelog | 6 ++ doc/channeldialog.html | 43 ++++++++++ doc/index.html | 4 +- doc/mainwindow.html | 2 +- doc/version.html | 2 +- img/chanw.png | Bin 0 -> 58092 bytes img/chparaw.png | Bin 0 -> 34388 bytes img/mainw.png | Bin 32886 -> 35328 bytes qmpmainwindow.cpp | 17 ++-- qmpmidiplay.cpp | 41 +++++++--- qmpmidiplay.hpp | 10 ++- qmpsettingswindow.cpp | 5 ++ qmpsettingswindow.ui | 209 +++++++++++++++++++++++++++++++------------------ resources.qrc | 4 +- 15 files changed, 247 insertions(+), 101 deletions(-) create mode 100644 doc/channeldialog.html create mode 100644 img/chanw.png create mode 100644 img/chparaw.png diff --git a/ChangeLog b/ChangeLog index 117910e..c352ce8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2016-02-28 0.7.0 beta +RPN pitch bend range handling. +Added an option to disable waiting for remaining voices before stopping. +Documentation... + 2016-02-28 0.7.0 beta Significant sleep precision improvments for Windows. Also save master volume in configuration file. diff --git a/debian/changelog b/debian/changelog index 5b25b81..6437ab1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +qmidiplayer (0.7.0-2) UNRELEASED; urgency=low + + * New upstream release. + + -- chrisoft Sun, 28 Feb 2016 20:50:36 +0800 + qmidiplayer (0.7.0-1) UNRELEASED; urgency=low * New upstream release. diff --git a/doc/channeldialog.html b/doc/channeldialog.html new file mode 100644 index 0000000..8ddf246 --- /dev/null +++ b/doc/channeldialog.html @@ -0,0 +1,43 @@ + + + +QMidiPlayer Help + + + + + + + + diff --git a/doc/index.html b/doc/index.html index a36d7cf..a9135bd 100644 --- a/doc/index.html +++ b/doc/index.html @@ -10,7 +10,7 @@

Overview
Main Window
Channels Dialog
Channels Dialog
Channel Editor
Playlist
Effects

Using QMidiPlayer

The main window
The channels dialog
The channels dialog
The channels parameters editor
The playlist dialog
The effects dialog

Overview
Main Window
Channels Dialog
Channels Dialog
Channel Editor
Playlist
Effects

Overview
Main Window
Channels Dialog
Channels Dialog
Channel Editor
Playlist
Effects

getEventCount();) { @@ -197,7 +211,7 @@ void CMidiPlayer::fileTimer2Pass() ctime+=(midiFile->getEvent(eptr)->time-ct)*dpt/1e9; while(ctime>ftime*c/100.) { - for(int i=0;i<16;++i)for(int j=0;j<134;++j) + for(int i=0;i<16;++i)for(int j=0;j<135;++j) ccstamps[c][i][j]=ccc[i][j]; stamps[c++]=eptr; if(c>100)break; @@ -206,7 +220,7 @@ void CMidiPlayer::fileTimer2Pass() } while(c<101) { - for(int i=0;i<16;++i)for(int j=0;j<132;++j) + for(int i=0;i<16;++i)for(int j=0;j<135;++j) ccstamps[c][i][j]=ccc[i][j]; stamps[c++]=midiFile->getEventCount(); } @@ -214,13 +228,19 @@ void CMidiPlayer::fileTimer2Pass() CMidiPlayer::CMidiPlayer(bool singleInst) { midiFile=NULL;resumed=false;singleInstance=singleInst; - settings=NULL;synth=NULL;adriver=NULL; + settings=NULL;synth=NULL;adriver=NULL;waitvoice=true; } CMidiPlayer::~CMidiPlayer(){if(singleInstance)fluidDeinitialize();} -void CMidiPlayer::playerPanic() +void CMidiPlayer::playerPanic(bool reset) { + if(reset)for(int i=0;i<16;++i) + { + fluid_synth_pitch_bend(synth,i,8192); + fluid_synth_cc(synth,i,7,100); + fluid_synth_cc(synth,i,10,64); + fluid_synth_cc(synth,i,11,127); + } for(int i=0;i<16;++i)fluid_synth_all_notes_off(synth,i); - //for(int i=0;i<16;++i)for(int j=0;j<128;++j)fluid_synth_noteoff(synth,i,j); } bool CMidiPlayer::playerLoadFile(const char* fn) { @@ -235,7 +255,7 @@ void CMidiPlayer::playerInit() { ctempo=0x7A120;ctsn=4;ctsd=4;cks=0;dpt=ctempo*1000/divs; tceptr=0;tcstop=0;tcpaused=0;finished=0;mute=solo=0; - sendSysEx=true; + sendSysEx=true;rpnid=rpnval=-1; if(!singleInstance)fluidPreInitialize(); } void CMidiPlayer::playerDeinit() @@ -307,6 +327,7 @@ uint32_t CMidiPlayer::getTCpaused(){return tcpaused;} void CMidiPlayer::setTCpaused(uint32_t ps){tcpaused=ps;} uint32_t CMidiPlayer::isFinished(){return finished;} void CMidiPlayer::setResumed(){resumed=true;} +void CMidiPlayer::setWaitVoice(bool wv){waitvoice=wv;} void CMidiPlayer::setGain(double gain){if(settings)fluid_settings_setnum(settings,"synth.gain",gain);} int CMidiPlayer::getPolyphone(){return synth?fluid_synth_get_active_voice_count(synth):0;} int CMidiPlayer::getMaxPolyphone(){return synth?fluid_synth_get_polyphony(synth):0;} diff --git a/qmpmidiplay.hpp b/qmpmidiplay.hpp index 6525c87..fafd677 100644 --- a/qmpmidiplay.hpp +++ b/qmpmidiplay.hpp @@ -54,11 +54,12 @@ class CMidiPlayer private: CMidiFile *midiFile; uint32_t stamps[101]; - uint32_t ccstamps[101][16][134],ccc[16][134]; - //0..127:cc 128:pc 129:cp 130:pb 131:tempo 132:ts 133:ks + uint32_t ccstamps[101][16][135],ccc[16][135]; + //0..127:cc 128:pc 129:cp 130:pb 131:tempo 132:ts 133:ks 134:pbr + int32_t rpnid,rpnval; uint16_t mute,solo; double ftime; - bool sendSysEx,singleInstance; + bool sendSysEx,singleInstance,waitvoice; fluid_settings_t* settings; fluid_synth_t* synth; fluid_audio_driver_t* adriver; @@ -85,7 +86,7 @@ class CMidiPlayer void fluidDeinitialize(); void playerDeinit(); void playerThread(); - void playerPanic(); + void playerPanic(bool reset=false); void rendererLoadFile(const char* ofn); void rendererInit(const char *fn); @@ -100,6 +101,7 @@ class CMidiPlayer void setTCpaused(uint32_t ps); uint32_t isFinished(); void setResumed(); + void setWaitVoice(bool wv); double getFtime(); void getCurrentTimeSignature(int *n,int *d); diff --git a/qmpsettingswindow.cpp b/qmpsettingswindow.cpp index b1f620c..c2e31a2 100644 --- a/qmpsettingswindow.cpp +++ b/qmpsettingswindow.cpp @@ -63,6 +63,9 @@ void qmpSettingsWindow::settingsInit() settings->setValue("Midi/SendSysEx",settings->value("Midi/SendSysEx",1)); ui->cbSendSysx->setChecked(settings->value("Midi/SendSysEx",1).toInt()); + settings->setValue("Midi/WaitVoice",settings->value("Midi/WaitVoice",1)); + ui->cbWaitVoice->setChecked(settings->value("Midi/WaitVoice",1).toInt()); + int selected=-1; for(int i=0;icbEncoding->count();++i) if(ui->cbEncoding->itemText(i)==settings->value("Midi/TextEncoding","Unicode").toString()) @@ -171,6 +174,8 @@ void qmpSettingsWindow::settingsUpdate() settings->setValue("Midi/SendSysEx",ui->cbSendSysx->isChecked()?1:0); + settings->setValue("Midi/WaitVoice",ui->cbWaitVoice->isChecked()?1:0); + settings->setValue("Midi/TextEncoding",ui->cbEncoding->currentText()); settings->setValue("Audio/Driver",ui->cbAudioDrv->currentText()); diff --git a/qmpsettingswindow.ui b/qmpsettingswindow.ui index 4fdb6f1..330afa2 100644 --- a/qmpsettingswindow.ui +++ b/qmpsettingswindow.ui @@ -29,102 +29,159 @@ Midi - - + + + + + + + + 0 + 0 + + + + Default Output Device + + + + + + + + 0 + 0 + + + + + Internal FluidSynth + + + + + + + - - Disable Midi Mapping + + + 0 + 0 + - - - - - Default Output Device + Disable Midi Mapping - - - - - Internal FluidSynth - - - - - + + + + 0 + 0 + + Send SysEx - - + + + + + 0 + 0 + + - Text Encoding + Wait for remaining voices before stopping - - - - - Unicode - - - - - Big5 - - - - - Big5-HKSCS - - - - - CP949 - - - - - EUC-JP - - - - - EUC-KR - - - - - GB18030 - - - - - KOI8-R - - - - - KOI8-U - - + + - - Macintosh - + + + + 0 + 0 + + + + Text Encoding + + - - Shift-JIS - + + + + 0 + 0 + + + + + Unicode + + + + + Big5 + + + + + Big5-HKSCS + + + + + CP949 + + + + + EUC-JP + + + + + EUC-KR + + + + + GB18030 + + + + + KOI8-R + + + + + KOI8-U + + + + + Macintosh + + + + + Shift-JIS + + + - + diff --git a/resources.qrc b/resources.qrc index 03997c5..2eb232c 100644 --- a/resources.qrc +++ b/resources.qrc @@ -25,10 +25,12 @@ img/stop.png img/up.png img/visualization.png + img/mainw.png + img/chanw.png doc/index.html doc/version.html doc/license.html doc/mainwindow.html - img/mainw.png + doc/channeldialog.html -- cgit v1.2.3

Overview
Main Window
Channels Dialog
Channel Editor
Playlist
Effects
Settings
Version Info.
License

Channel Dialog

Columns in the channel table

M(Mute): Tick this to mute the corresponding channel.
S(Solo): Tick this to solo the corresponding channel.
Device: The player sends midi messages from this channel to the selected device.
Preset: Displays the current preset of the corresponding channel.
+ Preset can be changed by double clicking the cells from this column.
...: Brings up the channel parameter editor dialog.

Buttons

Save/Load: not yet implemented.
Unmute All: Remove tick mark from all mute checkboxes.
Unsolo All: Remove tick mark from all solo checkboxes.

+
Return +