diff --git a/hairless-midiserial.pro b/hairless-midiserial.pro index 78f8a25..9bd02b1 100644 --- a/hairless-midiserial.pro +++ b/hairless-midiserial.pro @@ -4,7 +4,7 @@ # #------------------------------------------------- -QT += core gui +QT += core gui widgets TARGET = hairless-midiserial TEMPLATE = app diff --git a/src/Bridge.cpp b/src/Bridge.cpp index d52fb24..f4adf91 100644 --- a/src/Bridge.cpp +++ b/src/Bridge.cpp @@ -216,7 +216,7 @@ void Bridge::sendMidiMessage() { if(msg_data.length() == 0) return; if(bufferStartsWith(MSG_DEBUG)) { - QString debug_msg = QString::fromAscii(msg_data.mid(4, msg_data[3]).data()); + QString debug_msg = QString::fromLatin1(msg_data.mid(4, msg_data[3]).data()); emit displayMessage(applyTimeStamp(QString("Serial Says: %1").arg(debug_msg))); } else { emit debugMessage(applyTimeStamp(QString("Serial In: %1").arg(describeMIDI(msg_data)))); diff --git a/src/main.cpp b/src/main.cpp index f08d1d8..d39632e 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,4 +1,4 @@ -#include +#include #include "ui/mainwindow.h" int main(int argc, char *argv[]) diff --git a/src/ui/aboutdialog.cpp b/src/ui/aboutdialog.cpp index 277521a..a08a36b 100644 --- a/src/ui/aboutdialog.cpp +++ b/src/ui/aboutdialog.cpp @@ -7,7 +7,7 @@ AboutDialog::AboutDialog(QWidget *parent) : { ui->setupUi(this); - QString text = ui->label_info->text().arg(QString::fromAscii(VERSION)).arg(QString::fromAscii(__DATE__)); + QString text = ui->label_info->text().arg(QString::fromLatin1(VERSION)).arg(QString::fromLatin1(__DATE__)); ui->label_info->setText(text); } diff --git a/src/ui/mainwindow.h b/src/ui/mainwindow.h index 33e5dc6..d7c956c 100644 --- a/src/ui/mainwindow.h +++ b/src/ui/mainwindow.h @@ -1,12 +1,15 @@ #ifndef MAINWINDOW_H #define MAINWINDOW_H +#include +/* #include #include #include #include #include #include +*/ #include "RtMidi.h" #include "Bridge.h" diff --git a/src/ui/settingsdialog.cpp b/src/ui/settingsdialog.cpp index a3107cb..fb40732 100644 --- a/src/ui/settingsdialog.cpp +++ b/src/ui/settingsdialog.cpp @@ -36,6 +36,7 @@ static void populateBaudRate(QComboBox *box, BaudRateType initialValue) box->addItem("14400", BAUD14400); #endif box->addItem("19200", BAUD19200); + box->addItem("31250 (Native MIDI)", BAUD31250); box->addItem("38400", BAUD38400); #ifdef Q_OS_WIN32 box->addItem("56000", BAUD56000);