forks/DroidStar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Qt6 fixes

Browse source
This commit is contained in:
Doug McLain 2023-10-14 13:23:54 -04:00
parent b858d3e207
commit 1723b764d5
4 changed files with 23 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
DroidStar.pro
View file

@ -5,7 +5,7 @@ equals(QT_MAJOR_VERSION, 5){
} }
unix:!ios:QT += serialport unix:!ios:QT += serialport
CONFIG += c++11 CONFIG += c++17
LFLAGS += LFLAGS +=
android:INCLUDEPATH += $$(HOME)/Android/local/include android:INCLUDEPATH += $$(HOME)/Android/local/include
LIBS += -limbe_vocoder -lvocoder LIBS += -limbe_vocoder -lvocoder

41
audioengine.cpp
View file

@ -176,20 +176,15 @@ QStringList AudioEngine::discover_audio_devices(uint8_t d)
void AudioEngine::init() void AudioEngine::init()
{ {
QAudioFormat format; QAudioFormat format;
QAudioFormat tempformat;
format.setSampleRate(8000); format.setSampleRate(8000);
format.setChannelCount(1); format.setChannelCount(1);
format.setSampleFormat(QAudioFormat::Int16); format.setSampleFormat(QAudioFormat::Int16);
//format.setSampleSize(16);
//format.setCodec("audio/pcm");
//format.setByteOrder(QAudioFormat::LittleEndian);
//format.setSampleType(QAudioFormat::SignedInt);
m_agc = true; m_agc = true;
QList<QAudioDevice> devices = QMediaDevices::audioOutputs(); QList<QAudioDevice> devices = QMediaDevices::audioOutputs();
if(devices.size() == 0){ if(devices.size() == 0){
fprintf(stderr, "No audio playback hardware found\n");fflush(stderr); qDebug() << "No audio playback hardware found";
} }
else{ else{
QAudioDevice device(QMediaDevices::defaultAudioOutput()); QAudioDevice device(QMediaDevices::defaultAudioOutput());
@ -204,25 +199,20 @@ void AudioEngine::init()
} }
} }
if (!device.isFormatSupported(format)) { if (!device.isFormatSupported(format)) {
qWarning() << "Raw audio format not supported by backend, trying nearest format."; qWarning() << "Raw audio format not supported by playback device";
//tempformat = device.nearestFormat(format); }
//qWarning() << "Format now set to " << format.sampleRate() << ":" << format.sampleSize();
}
else{
tempformat = format;
}
fprintf(stderr, "Using playback device %s\n", device.description().toStdString().c_str());fflush(stderr);
m_out = new QAudioSink(device, tempformat, this); qDebug() << "Playback device: " << device.description() << "SR: " << format.sampleRate();
m_out = new QAudioSink(device, format, this);
m_out->setBufferSize(1280); m_out->setBufferSize(1280);
connect(m_out, SIGNAL(stateChanged(QAudio::State)), this, SLOT(handleStateChanged(QAudio::State))); connect(m_out, SIGNAL(stateChanged(QAudio::State)), this, SLOT(handleStateChanged(QAudio::State)));
//m_outdev = m_out->start();
} }
devices = QMediaDevices::audioInputs(); devices = QMediaDevices::audioInputs();
if(devices.size() == 0){ if(devices.size() == 0){
fprintf(stderr, "No audio recording hardware found\n");fflush(stderr); qDebug() << "No audio capture hardware found";
} }
else{ else{
QAudioDevice device(QMediaDevices::defaultAudioInput()); QAudioDevice device(QMediaDevices::defaultAudioInput());
@ -237,13 +227,8 @@ void AudioEngine::init()
} }
} }
if (!device.isFormatSupported(format)) { if (!device.isFormatSupported(format)) {
qWarning() << "Raw audio format not supported by backend, trying nearest format."; qWarning() << "Raw audio format not supported by capture device";
//tempformat = device.nearestFormat(format); }
//qWarning() << "Format now set to " << format.sampleRate() << ":" << format.sampleSize();
}
else{
tempformat = format;
}
int sr = 8000; int sr = 8000;
if(MACHAK){ if(MACHAK){
@ -251,11 +236,9 @@ void AudioEngine::init()
m_srm = (float)sr / 8000.0; m_srm = (float)sr / 8000.0;
} }
format.setSampleRate(sr); format.setSampleRate(sr);
m_in = new QAudioSource(device, format, this); m_in = new QAudioSource(device, format, this);
fprintf(stderr, "Capture device: %s SR: %d resample factor: %f\n", device.description().toStdString().c_str(), sr, m_srm);fflush(stderr); qDebug() << "Capture device: " << device.description() << " SR: " << sr << " resample factor: " << m_srm;
} }
//start_playback();
} }
#endif #endif

2
dmr.cpp
View file

@ -188,7 +188,7 @@ void DMR::process_udp()
(m_modeinfo.status == CONNECTED_RW)) (m_modeinfo.status == CONNECTED_RW))
{ {
m_rxwatchdog = 0; m_rxwatchdog = 0;
uint8_t t; uint8_t t = 0;
if((uint8_t)buf.data()[15] & 0x02){ if((uint8_t)buf.data()[15] & 0x02){
qDebug() << "DMR RX EOT"; qDebug() << "DMR RX EOT";
m_modeinfo.stream_state = STREAM_END; m_modeinfo.stream_state = STREAM_END;

17
droidstar.cpp
View file

@ -417,7 +417,7 @@ void DroidStar::process_connect()
m_modethread->start(); m_modethread->start();
} }
/*
qDebug() << "process_connect called m_callsign == " << m_callsign; qDebug() << "process_connect called m_callsign == " << m_callsign;
qDebug() << "process_connect called m_dmrid == " << m_dmrid; qDebug() << "process_connect called m_dmrid == " << m_dmrid;
qDebug() << "process_connect called m_bm_password == " << m_bm_password; qDebug() << "process_connect called m_bm_password == " << m_bm_password;
@ -428,6 +428,7 @@ void DroidStar::process_connect()
qDebug() << "process_connect called m_module == " << m_module; qDebug() << "process_connect called m_module == " << m_module;
qDebug() << "process_connect called m_protocol == " << m_protocol; qDebug() << "process_connect called m_protocol == " << m_protocol;
qDebug() << "process_connect called m_port == " << m_port; qDebug() << "process_connect called m_port == " << m_port;
*/
} }
void DroidStar::process_host_change(const QString &h) void DroidStar::process_host_change(const QString &h)
@ -720,7 +721,7 @@ void DroidStar::process_dstar_hosts(QString m)
} }
m_customhosts = m_localhosts.split('\n'); m_customhosts = m_localhosts.split('\n');
for (const auto& i : qAsConst(m_customhosts)){ for (const auto& i : std::as_const(m_customhosts)){
QStringList line = i.simplified().split(' '); QStringList line = i.simplified().split(' ');
if(line.at(0) == m){ if(line.at(0) == m){
@ -761,7 +762,7 @@ void DroidStar::process_ysf_hosts()
} }
m_customhosts = m_localhosts.split('\n'); m_customhosts = m_localhosts.split('\n');
for (const auto& i : qAsConst(m_customhosts)){ for (const auto& i : std::as_const(m_customhosts)){
QStringList line = i.simplified().split(' '); QStringList line = i.simplified().split(' ');
if(line.at(0) == "YSF"){ if(line.at(0) == "YSF"){
@ -804,7 +805,7 @@ void DroidStar::process_fcs_rooms()
} }
m_customhosts = m_localhosts.split('\n'); m_customhosts = m_localhosts.split('\n');
for (const auto& i : qAsConst(m_customhosts)){ for (const auto& i : std::as_const(m_customhosts)){
QStringList line = i.simplified().split(' '); QStringList line = i.simplified().split(' ');
if(line.at(0) == "FCS"){ if(line.at(0) == "FCS"){
@ -850,7 +851,7 @@ void DroidStar::process_dmr_hosts()
} }
m_customhosts = m_localhosts.split('\n'); m_customhosts = m_localhosts.split('\n');
for (const auto& i : qAsConst(m_customhosts)){ for (const auto& i : std::as_const(m_customhosts)){
QStringList line = i.simplified().split(' '); QStringList line = i.simplified().split(' ');
if(line.at(0) == "DMR"){ if(line.at(0) == "DMR"){
@ -891,7 +892,7 @@ void DroidStar::process_p25_hosts()
} }
m_customhosts = m_localhosts.split('\n'); m_customhosts = m_localhosts.split('\n');
for (const auto& i : qAsConst(m_customhosts)){ for (const auto& i : std::as_const(m_customhosts)){
QStringList line = i.simplified().split(' '); QStringList line = i.simplified().split(' ');
if(line.at(0) == "P25"){ if(line.at(0) == "P25"){
@ -935,7 +936,7 @@ void DroidStar::process_nxdn_hosts()
} }
m_customhosts = m_localhosts.split('\n'); m_customhosts = m_localhosts.split('\n');
for (const auto& i : qAsConst(m_customhosts)){ for (const auto& i : std::as_const(m_customhosts)){
QStringList line = i.simplified().split(' '); QStringList line = i.simplified().split(' ');
if(line.at(0) == "NXDN"){ if(line.at(0) == "NXDN"){
@ -980,7 +981,7 @@ void DroidStar::process_m17_hosts()
} }
m_customhosts = m_localhosts.split('\n'); m_customhosts = m_localhosts.split('\n');
for (const auto& i : qAsConst(m_customhosts)){ for (const auto& i : std::as_const(m_customhosts)){
QStringList line = i.simplified().split(' '); QStringList line = i.simplified().split(' ');
if(line.at(0) == "M17"){ if(line.at(0) == "M17"){