From dfcc193d4070c99bf217ac74a492160968dba766 Mon Sep 17 00:00:00 2001 From: Chris Xiong Date: Tue, 26 Apr 2016 23:16:46 +0800 Subject: The visualization plugin is usable now... --- core/qmpmidiplay.cpp | 3 ++- core/qmpmidiplay.hpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'core') diff --git a/core/qmpmidiplay.cpp b/core/qmpmidiplay.cpp index ca2878c..5021640 100644 --- a/core/qmpmidiplay.cpp +++ b/core/qmpmidiplay.cpp @@ -196,7 +196,7 @@ void CMidiPlayer::prePlayInit() } void CMidiPlayer::playEvents() { - for(uint32_t ct=midiFile->getEvent(0)->time;tceptrgetEventCount();) + for(ct=midiFile->getEvent(0)->time;tceptrgetEventCount();) { while(tcpaused)std::this_thread::sleep_for(std::chrono::milliseconds(100)); using namespace std::chrono; @@ -402,6 +402,7 @@ uint32_t CMidiPlayer::getFileStandard(){return midiFile?midiFile->getStandard(): const char* CMidiPlayer::getTitle(){return midiFile?midiFile->getTitle():"";} const char* CMidiPlayer::getCopyright(){return midiFile?midiFile->getCopyright():"";} double CMidiPlayer::getTempo(){return 60./(ctempo/1e6);} +uint32_t CMidiPlayer::getTick(){return ct;} uint32_t CMidiPlayer::getRawTempo(){return ctempo;} uint32_t CMidiPlayer::getDivision(){return divs;} uint32_t CMidiPlayer::getTCpaused(){return tcpaused;} diff --git a/core/qmpmidiplay.hpp b/core/qmpmidiplay.hpp index a89a925..96dfd12 100644 --- a/core/qmpmidiplay.hpp +++ b/core/qmpmidiplay.hpp @@ -73,7 +73,7 @@ class CMidiPlayer uint32_t ctempo,ctsn,ctsd,dpt,divs,cks; //raw tempo, timesig num., timesig den., delay per tick, division, keysig //thread control - uint32_t tceptr,tcpaused,tcstop; + uint32_t tceptr,tcpaused,tcstop,ct; uint32_t finished,resumed; qmpMidiMapperRtMidi *mapper; int mappedoutput[16],deviceusage[16],deviceiid[128]; @@ -123,6 +123,7 @@ class CMidiPlayer uint32_t getFileNoteCount(); uint32_t getFileStandard(); double getTempo(); + uint32_t getTick(); uint32_t getRawTempo(); uint32_t getDivision(); const char* getTitle(); -- cgit v1.2.3