added osc ports to the settings interface, bumped the version num

This commit is contained in:
Dave Griffiths
2022-10-14 19:23:07 +01:00
parent 5e347f7f13
commit b5fd6dd3e0
8 changed files with 224 additions and 29 deletions

View File

@@ -27,7 +27,7 @@
using namespace std;
MainWindow::MainWindow(const string &port, const string &audio_port, const string &process_port) :
MainWindow::MainWindow(const string &port, const string &audio_port, const string &process_port, QSettings *settings) :
m_last_file("."),
m_feedback(port),
m_audio_port(audio_port),
@@ -51,7 +51,7 @@ MainWindow::MainWindow(const string &port, const string &audio_port, const strin
m_Ui.brain_contents->setSpacing(0);
m_Ui.brain_contents->setContentsMargins(0,0,0,0);
m_settings_dialog = new SettingsDialog(this);
m_settings_dialog = new SettingsDialog(this,settings);
// add default local dest
// turn on first one

View File

@@ -33,13 +33,15 @@
using namespace std;
using namespace spiralcore;
class QSettings;
class MainWindow : public QMainWindow
{
Q_OBJECT
public:
MainWindow(const string &port, const string &audio_port, const string &process_port);
MainWindow(const string &port, const string &audio_port, const string &process_port, QSettings *settings);
void message(const string &msg) {
QMessageBox::information(this,"problem",msg.c_str(), QMessageBox::Ok);
}
@@ -453,4 +455,5 @@ private:
string m_audio_port;
string m_process_port;
};

View File

@@ -24,12 +24,16 @@
using namespace std;
SettingsDialog::SettingsDialog(MainWindow *parent):
SettingsDialog::SettingsDialog(MainWindow *parent, QSettings *settings):
m_device(""),
m_parent(parent),
m_buffersize(2048),
m_samplerate(44100) {
m_samplerate(44100),
m_settings(settings) {
m_Ui.setupUi(this);
m_Ui.guiOSCLineEdit->setText(settings->value("gui_port").toByteArray().constData());
m_Ui.processOSCLineEdit->setText(settings->value("process_port").toByteArray().constData());
m_Ui.audioOSCLineEdit->setText(settings->value("audio_port").toByteArray().constData());
}
void SettingsDialog::connect() {

View File

@@ -20,6 +20,7 @@
#include <QtGui>
#include <QDialog>
#include <QLineEdit>
#include <QSettings>
#include "ui_settings.h"
#include <iostream>
@@ -36,7 +37,7 @@ class SettingsDialog : public QDialog
{
Q_OBJECT
public:
SettingsDialog(MainWindow *parent);
SettingsDialog(MainWindow *parent, QSettings *settings);
Ui_SettingsDialog m_Ui;
string m_device;
@@ -61,15 +62,28 @@ class SettingsDialog : public QDialog
void accept() { connect(); hide(); }
void reject() { hide(); }
void apply() { connect(); }
void gui_port(QString str) {
m_settings->setValue("gui_port",str);
}
void process_port(QString str) {
m_settings->setValue("process_port",str);
}
void audio_port(QString str) {
m_settings->setValue("audio_port",str);
}
private:
void connect();
MainWindow *m_parent;
void connect();
MainWindow *m_parent;
unsigned int m_buffersize;
unsigned int m_samplerate;
unsigned int m_buffersize;
unsigned int m_samplerate;
QSettings *m_settings;
};
#endif

View File

@@ -50,7 +50,7 @@ int main( int argc , char *argv[] ){
status::set_port(gui_port);
MainWindow mainWin(gui_port,audio_port,process_port);
MainWindow mainWin(gui_port,audio_port,process_port,&settings);
mainWin.show();
process_thread pt(process_port);
audio_thread at(audio_port,pt);