From 1afedc4cc39c1dcbe49f8c99843a1732bf22fa28 Mon Sep 17 00:00:00 2001 From: Chris Xiong Date: Wed, 8 Feb 2017 00:02:14 +0800 Subject: First steps for the file reader API. API additions and changes. Fixed wrong button shown when started from file. --- qmidiplayer-desktop/qmphelpwindow.hpp | 2 +- qmidiplayer-desktop/qmpmainwindow.cpp | 2 +- qmidiplayer-desktop/qmpplugin.cpp | 6 +++++- 3 files changed, 7 insertions(+), 3 deletions(-) (limited to 'qmidiplayer-desktop') diff --git a/qmidiplayer-desktop/qmphelpwindow.hpp b/qmidiplayer-desktop/qmphelpwindow.hpp index 61d9963..75f8679 100644 --- a/qmidiplayer-desktop/qmphelpwindow.hpp +++ b/qmidiplayer-desktop/qmphelpwindow.hpp @@ -2,7 +2,7 @@ #define QMPHELPWINDOW_H #include -#define APP_VERSION "0.8.3" +#define APP_VERSION "0.8.5" #ifndef BUILD_MACHINE #define BUILD_MACHINE UNKNOWN #endif diff --git a/qmidiplayer-desktop/qmpmainwindow.cpp b/qmidiplayer-desktop/qmpmainwindow.cpp index 1927350..876b0e9 100644 --- a/qmidiplayer-desktop/qmpmainwindow.cpp +++ b/qmidiplayer-desktop/qmpmainwindow.cpp @@ -125,7 +125,6 @@ void qmpMainWindow::init() connect(timer,SIGNAL(timeout()),this,SLOT(updateWidgets())); connect(timer,SIGNAL(timeout()),chnlw,SLOT(channelWindowsUpdate())); connect(timer,SIGNAL(timeout()),infow,SLOT(updateInfo())); - if(havemidi)on_pbPlayPause_clicked(); ui->pbNext->setIcon(QIcon(getThemedIcon(":/img/next.png"))); ui->pbPrev->setIcon(QIcon(getThemedIcon(":/img/prev.png"))); ui->pbPlayPause->setIcon(QIcon(getThemedIcon(":/img/play.png"))); @@ -135,6 +134,7 @@ void qmpMainWindow::init() ui->pbPList->setIcon(QIcon(getThemedIcon(":/img/list.png"))); ui->pbVisualization->setIcon(QIcon(getThemedIcon(":/img/visualization.png"))); ui->pbSettings->setIcon(QIcon(getThemedIcon(":/img/settings.png"))); + if(havemidi)on_pbPlayPause_clicked(); } int qmpMainWindow::pharseArgs() diff --git a/qmidiplayer-desktop/qmpplugin.cpp b/qmidiplayer-desktop/qmpplugin.cpp index 0c8c04d..5f5d82e 100644 --- a/qmidiplayer-desktop/qmpplugin.cpp +++ b/qmidiplayer-desktop/qmpplugin.cpp @@ -165,7 +165,7 @@ std::string qmpPluginAPI::getChannelPresetString(int ch) return std::string(ret); } -void qmpPluginAPI::discardLastEvent(){if(qmw&&qmw->getPlayer())qmw->getPlayer()->discardLastEvent();} +void qmpPluginAPI::discardCurrentEvent(){if(qmw&&qmw->getPlayer())qmw->getPlayer()->discardCurrentEvent();} void qmpPluginAPI::commitEventChange(SEventCallBackData d){if(qmw&&qmw->getPlayer())qmw->getPlayer()->commitEventChange(d);} int qmpPluginAPI::registerEventHandlerIntf(IMidiCallBack *cb,void *userdata) @@ -184,6 +184,10 @@ int qmpPluginAPI::registerFileReadFinishedHandlerIntf(IMidiCallBack* cb,void* us {qmw->getPlayer()->setFileReadFinishedCB(cb,userdata);} void qmpPluginAPI::unregisterFileReadFinishedHandlerIntf(int intfhandle) {qmw->getPlayer()->unsetFileReadFinishedCB(intfhandle);} +void qmpPluginAPI::registerFileReader(IMidiFileReader* reader,std::string name) +{qmw->getPlayer()->registerReader(reader,name);} +void qmpPluginAPI::unregisterFileReader(std::string name) +{qmw->getPlayer()->unregisterReader(name);} void qmpPluginAPI::registerOptionInt(std::string tab,std::string desc,std::string key,int min,int max,int defaultval) {qsw->registerOptionInt(tab,desc,key,min,max,defaultval);} -- cgit v1.2.3