From 7f6f260dc888b8aafc141488cec6aaa9b3905a1f Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Mon, 5 Dec 2022 15:20:51 -0500 Subject: [PATCH] Start removing portAudio stuff. --- q65w/mainwindow.cpp | 17 ++--------------- q65w/mainwindow.h | 4 ++-- 2 files changed, 4 insertions(+), 17 deletions(-) diff --git a/q65w/mainwindow.cpp b/q65w/mainwindow.cpp index 28ef636a1..1ee50df71 100644 --- a/q65w/mainwindow.cpp +++ b/q65w/mainwindow.cpp @@ -200,10 +200,7 @@ MainWindow::MainWindow(QWidget *parent) : watcher2 = new QFutureWatcher; connect(watcher2, SIGNAL(finished()),this,SLOT(diskWriteFinished())); -// Assign input device and start input thread - soundInThread.setInputDevice(m_paInDevice); - if(m_fs96000) soundInThread.setRate(96000.0); - if(!m_fs96000) soundInThread.setRate(95238.1); + soundInThread.setRate(96000.0); soundInThread.setBufSize(10*7056); soundInThread.setNetwork(m_network); soundInThread.setPort(m_udpPort); @@ -295,8 +292,6 @@ void MainWindow::writeSettings() settings.setValue("NetworkInput", m_network); settings.setValue("FSam96000", m_fs96000); settings.setValue("SoundInIndex",m_nDevIn); - settings.setValue("paInDevice",m_paInDevice); - settings.setValue("paOutDevice",m_paOutDevice); settings.setValue("IQswap",m_IQswap); settings.setValue("Scale_dB",m_dB); settings.setValue("IQxt",m_bIQxt); @@ -357,8 +352,6 @@ void MainWindow::readSettings() m_network = settings.value("NetworkInput",true).toBool(); m_fs96000 = settings.value("FSam96000",true).toBool(); m_nDevIn = settings.value("SoundInIndex", 0).toInt(); - m_paInDevice = settings.value("paInDevice",0).toInt(); - m_paOutDevice = settings.value("paOutDevice",0).toInt(); m_IQswap = settings.value("IQswap",false).toBool(); m_dB = settings.value("Scale_dB",0).toInt(); m_initIQplus = settings.value("InitIQplus",false).toBool(); @@ -566,7 +559,6 @@ void MainWindow::on_actionDeviceSetup_triggered() //Setup Dialog dlg.m_network=m_network; dlg.m_fs96000=m_fs96000; dlg.m_nDevIn=m_nDevIn; - dlg.m_nDevOut=m_nDevOut; dlg.m_udpPort=m_udpPort; dlg.m_IQswap=m_IQswap; dlg.m_dB=m_dB; @@ -591,9 +583,6 @@ void MainWindow::on_actionDeviceSetup_triggered() //Setup Dialog m_fs96000=dlg.m_fs96000; m_network=dlg.m_network; m_nDevIn=dlg.m_nDevIn; - m_paInDevice=dlg.m_paInDevice; - m_nDevOut=dlg.m_nDevOut; - m_paOutDevice=dlg.m_paOutDevice; m_udpPort=dlg.m_udpPort; m_IQswap=dlg.m_IQswap; m_dB=dlg.m_dB; @@ -605,11 +594,9 @@ void MainWindow::on_actionDeviceSetup_triggered() //Setup Dialog soundInThread.quit(); soundInThread.wait(1000); soundInThread.setNetwork(m_network); - if(m_fs96000) soundInThread.setRate(96000.0); - if(!m_fs96000) soundInThread.setRate(95238.1); + soundInThread.setRate(96000.0); soundInThread.setFadd(m_fAdd); soundInThread.setNrx(1); - soundInThread.setInputDevice(m_paInDevice); soundInThread.start(QThread::HighestPriority); } } diff --git a/q65w/mainwindow.h b/q65w/mainwindow.h index 488c7813d..e084f1948 100644 --- a/q65w/mainwindow.h +++ b/q65w/mainwindow.h @@ -122,8 +122,8 @@ private: qint32 m_mode65; qint32 m_nrx; qint32 m_hsym0; - qint32 m_paInDevice; - qint32 m_paOutDevice; +// qint32 m_paInDevice; +// qint32 m_paOutDevice; qint32 m_udpPort; qint32 m_NBslider; qint32 m_adjustIQ;