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

Process MMDVM version string correctly for both protocols and fix audio device selection bug

Browse source
This commit is contained in:
Doug McLain 2021-12-17 13:14:00 -05:00
parent 8a52904611
commit a3117dca78
3 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
audioengine.cpp
View file

@ -85,6 +85,7 @@ void AudioEngine::init()
} }
else{ else{
QAudioDeviceInfo info(QAudioDeviceInfo::defaultOutputDevice()); QAudioDeviceInfo info(QAudioDeviceInfo::defaultOutputDevice());
for (QList<QAudioDeviceInfo>::ConstIterator it = devices.constBegin(); it != devices.constEnd(); ++it ) { for (QList<QAudioDeviceInfo>::ConstIterator it = devices.constBegin(); it != devices.constEnd(); ++it ) {
if(MACHAK){ if(MACHAK){
qDebug() << "Playback device name = " << (*it).deviceName(); qDebug() << "Playback device name = " << (*it).deviceName();
@ -96,10 +97,12 @@ void AudioEngine::init()
qDebug() << (*it).supportedSampleTypes(); qDebug() << (*it).supportedSampleTypes();
qDebug() << (*it).preferredFormat(); qDebug() << (*it).preferredFormat();
} }
if((*it).deviceName() == m_outputdevice){ if((*it).deviceName() == m_outputdevice){
info = *it; info = *it;
} }
} }
if (!info.isFormatSupported(format)) { if (!info.isFormatSupported(format)) {
qWarning() << "Raw audio format not supported by backend, trying nearest format."; qWarning() << "Raw audio format not supported by backend, trying nearest format.";
tempformat = info.nearestFormat(format); tempformat = info.nearestFormat(format);
@ -108,7 +111,7 @@ void AudioEngine::init()
else{ else{
tempformat = format; tempformat = format;
} }
fprintf(stderr, "Using playback device %s\n", info.deviceName().toStdString().c_str());fflush(stderr); fprintf(stderr, "Playback device: %s\n", info.deviceName().toStdString().c_str());fflush(stderr);
m_out = new QAudioOutput(info, tempformat, this); m_out = new QAudioOutput(info, tempformat, this);
m_out->setBufferSize(2560); m_out->setBufferSize(2560);

19
droidstar.cpp
View file

@ -333,7 +333,7 @@ void DroidStar::process_connect()
emit update_log("Connecting to " + m_hostname + ":" + QString::number(m_port) + "..."); emit update_log("Connecting to " + m_hostname + ":" + QString::number(m_port) + "...");
if( (m_protocol == "REF") || ((m_protocol == "XRF") && m_xrf2ref) ){ if( (m_protocol == "REF") || ((m_protocol == "XRF") && m_xrf2ref) ){
m_ref = new REFCodec(m_callsign, m_host, m_module, m_hostname, 20001, false, vocoder, modem, m_playback, m_capture); m_ref = new REFCodec(m_callsign, m_host, m_module, m_hostname, 20001, false, vocoder, modem, m_capture, m_playback);
m_ref->set_modem_flags(rxInvert, txInvert, pttInvert, useCOSAsLockout, duplex); m_ref->set_modem_flags(rxInvert, txInvert, pttInvert, useCOSAsLockout, duplex);
m_ref->set_modem_params(m_modemBaud.toUInt(), rxfreq, txfreq, m_modemTxDelay.toInt(), m_modemRxLevel.toFloat(), m_modemRFLevel.toFloat(), ysfTXHang, m_modemCWIdTxLevel.toFloat(), m_modemDstarTxLevel.toFloat(), m_modemDMRTxLevel.toFloat(), m_modemYSFTxLevel.toFloat(), m_modemP25TxLevel.toFloat(), m_modemNXDNTxLevel.toFloat(), pocsagTXLevel, m17TXLevel); m_ref->set_modem_params(m_modemBaud.toUInt(), rxfreq, txfreq, m_modemTxDelay.toInt(), m_modemRxLevel.toFloat(), m_modemRFLevel.toFloat(), ysfTXHang, m_modemCWIdTxLevel.toFloat(), m_modemDstarTxLevel.toFloat(), m_modemDMRTxLevel.toFloat(), m_modemYSFTxLevel.toFloat(), m_modemP25TxLevel.toFloat(), m_modemNXDNTxLevel.toFloat(), pocsagTXLevel, m17TXLevel);
m_modethread = new QThread; m_modethread = new QThread;
@ -365,7 +365,7 @@ void DroidStar::process_connect()
m_modethread->start(); m_modethread->start();
} }
if(m_protocol == "DCS"){ if(m_protocol == "DCS"){
m_dcs = new DCSCodec(m_callsign, m_host, m_module, m_hostname, m_port, false, vocoder, modem, m_playback, m_capture); m_dcs = new DCSCodec(m_callsign, m_host, m_module, m_hostname, m_port, false, vocoder, modem, m_capture, m_playback);
m_dcs->set_modem_flags(rxInvert, txInvert, pttInvert, useCOSAsLockout, duplex); m_dcs->set_modem_flags(rxInvert, txInvert, pttInvert, useCOSAsLockout, duplex);
m_dcs->set_modem_params(m_modemBaud.toUInt(), rxfreq, txfreq, m_modemTxDelay.toInt(), m_modemRxLevel.toFloat(), m_modemRFLevel.toFloat(), ysfTXHang, m_modemCWIdTxLevel.toFloat(), m_modemDstarTxLevel.toFloat(), m_modemDMRTxLevel.toFloat(), m_modemYSFTxLevel.toFloat(), m_modemP25TxLevel.toFloat(), m_modemNXDNTxLevel.toFloat(), pocsagTXLevel, m17TXLevel); m_dcs->set_modem_params(m_modemBaud.toUInt(), rxfreq, txfreq, m_modemTxDelay.toInt(), m_modemRxLevel.toFloat(), m_modemRFLevel.toFloat(), ysfTXHang, m_modemCWIdTxLevel.toFloat(), m_modemDstarTxLevel.toFloat(), m_modemDMRTxLevel.toFloat(), m_modemYSFTxLevel.toFloat(), m_modemP25TxLevel.toFloat(), m_modemNXDNTxLevel.toFloat(), pocsagTXLevel, m17TXLevel);
m_modethread = new QThread; m_modethread = new QThread;
@ -395,7 +395,7 @@ void DroidStar::process_connect()
m_modethread->start(); m_modethread->start();
} }
if( (m_protocol == "XRF") && (m_xrf2ref == false) ){ if( (m_protocol == "XRF") && (m_xrf2ref == false) ){
m_xrf = new XRFCodec(m_callsign, m_host, m_module, m_hostname, m_port, false, vocoder, modem, m_playback, m_capture); m_xrf = new XRFCodec(m_callsign, m_host, m_module, m_hostname, m_port, false, vocoder, modem, m_capture, m_playback);
m_xrf->set_modem_flags(rxInvert, txInvert, pttInvert, useCOSAsLockout, duplex); m_xrf->set_modem_flags(rxInvert, txInvert, pttInvert, useCOSAsLockout, duplex);
m_xrf->set_modem_params(m_modemBaud.toUInt(), rxfreq, txfreq, m_modemTxDelay.toInt(), m_modemRxLevel.toFloat(), m_modemRFLevel.toFloat(), ysfTXHang, m_modemCWIdTxLevel.toFloat(), m_modemDstarTxLevel.toFloat(), m_modemDMRTxLevel.toFloat(), m_modemYSFTxLevel.toFloat(), m_modemP25TxLevel.toFloat(), m_modemNXDNTxLevel.toFloat(), pocsagTXLevel, m17TXLevel); m_xrf->set_modem_params(m_modemBaud.toUInt(), rxfreq, txfreq, m_modemTxDelay.toInt(), m_modemRxLevel.toFloat(), m_modemRFLevel.toFloat(), ysfTXHang, m_modemCWIdTxLevel.toFloat(), m_modemDstarTxLevel.toFloat(), m_modemDMRTxLevel.toFloat(), m_modemYSFTxLevel.toFloat(), m_modemP25TxLevel.toFloat(), m_modemNXDNTxLevel.toFloat(), pocsagTXLevel, m17TXLevel);
m_modethread = new QThread; m_modethread = new QThread;
@ -439,7 +439,7 @@ void DroidStar::process_connect()
} }
} }
m_dmr = new DMRCodec(m_callsign, m_dmrid, m_essid, dmrpass, m_latitude, m_longitude, m_location, m_description, m_freq, m_url, m_swid, m_pkgid, m_dmropts, m_dmr_destid, m_hostname, m_port, false, vocoder, modem, m_playback, m_capture); m_dmr = new DMRCodec(m_callsign, m_dmrid, m_essid, dmrpass, m_latitude, m_longitude, m_location, m_description, m_freq, m_url, m_swid, m_pkgid, m_dmropts, m_dmr_destid, m_hostname, m_port, false, vocoder, modem, m_capture, m_playback);
m_dmr->set_modem_flags(rxInvert, txInvert, pttInvert, useCOSAsLockout, duplex); m_dmr->set_modem_flags(rxInvert, txInvert, pttInvert, useCOSAsLockout, duplex);
m_dmr->set_modem_params(m_modemBaud.toUInt(), rxfreq, txfreq, m_modemTxDelay.toInt(), m_modemRxLevel.toFloat(), m_modemRFLevel.toFloat(), ysfTXHang, m_modemCWIdTxLevel.toFloat(), m_modemDstarTxLevel.toFloat(), m_modemDMRTxLevel.toFloat(), m_modemYSFTxLevel.toFloat(), m_modemP25TxLevel.toFloat(), m_modemNXDNTxLevel.toFloat(), pocsagTXLevel, m17TXLevel); m_dmr->set_modem_params(m_modemBaud.toUInt(), rxfreq, txfreq, m_modemTxDelay.toInt(), m_modemRxLevel.toFloat(), m_modemRFLevel.toFloat(), ysfTXHang, m_modemCWIdTxLevel.toFloat(), m_modemDstarTxLevel.toFloat(), m_modemDMRTxLevel.toFloat(), m_modemYSFTxLevel.toFloat(), m_modemP25TxLevel.toFloat(), m_modemNXDNTxLevel.toFloat(), pocsagTXLevel, m17TXLevel);
m_modethread = new QThread; m_modethread = new QThread;
@ -463,7 +463,7 @@ void DroidStar::process_connect()
m_modethread->start(); m_modethread->start();
} }
if( (m_protocol == "YSF") || (m_protocol == "FCS") ){ if( (m_protocol == "YSF") || (m_protocol == "FCS") ){
m_ysf = new YSFCodec(m_callsign, m_host, m_hostname, m_port, false, vocoder, modem, m_playback, m_capture); m_ysf = new YSFCodec(m_callsign, m_host, m_hostname, m_port, false, vocoder, modem, m_capture, m_playback);
m_ysf->set_modem_flags(rxInvert, txInvert, pttInvert, useCOSAsLockout, duplex); m_ysf->set_modem_flags(rxInvert, txInvert, pttInvert, useCOSAsLockout, duplex);
m_ysf->set_modem_params(m_modemBaud.toUInt(), rxfreq, txfreq, m_modemTxDelay.toInt(), m_modemRxLevel.toFloat(), m_modemRFLevel.toFloat(), ysfTXHang, m_modemCWIdTxLevel.toFloat(), m_modemDstarTxLevel.toFloat(), m_modemDMRTxLevel.toFloat(), m_modemYSFTxLevel.toFloat(), m_modemP25TxLevel.toFloat(), m_modemNXDNTxLevel.toFloat(), pocsagTXLevel, m17TXLevel); m_ysf->set_modem_params(m_modemBaud.toUInt(), rxfreq, txfreq, m_modemTxDelay.toInt(), m_modemRxLevel.toFloat(), m_modemRFLevel.toFloat(), ysfTXHang, m_modemCWIdTxLevel.toFloat(), m_modemDstarTxLevel.toFloat(), m_modemDMRTxLevel.toFloat(), m_modemYSFTxLevel.toFloat(), m_modemP25TxLevel.toFloat(), m_modemNXDNTxLevel.toFloat(), pocsagTXLevel, m17TXLevel);
m_modethread = new QThread; m_modethread = new QThread;
@ -486,7 +486,7 @@ void DroidStar::process_connect()
if(m_protocol == "P25"){ if(m_protocol == "P25"){
m_dmrid = m_dmrids.key(m_callsign); m_dmrid = m_dmrids.key(m_callsign);
m_dmr_destid = m_host.toUInt(); m_dmr_destid = m_host.toUInt();
m_p25 = new P25Codec(m_callsign, m_dmrid, m_dmr_destid, m_hostname, m_port, false, modem, m_playback, m_capture); m_p25 = new P25Codec(m_callsign, m_dmrid, m_dmr_destid, m_hostname, m_port, false, modem, m_capture, m_playback);
m_modethread = new QThread; m_modethread = new QThread;
m_p25->moveToThread(m_modethread); m_p25->moveToThread(m_modethread);
connect(m_p25, SIGNAL(update(Codec::MODEINFO)), this, SLOT(update_p25_data(Codec::MODEINFO))); connect(m_p25, SIGNAL(update(Codec::MODEINFO)), this, SLOT(update_p25_data(Codec::MODEINFO)));
@ -503,7 +503,7 @@ void DroidStar::process_connect()
} }
if(m_protocol == "NXDN"){ if(m_protocol == "NXDN"){
m_dmr_destid = m_host.toUInt(); m_dmr_destid = m_host.toUInt();
m_nxdn = new NXDNCodec(m_callsign, m_nxdnids.key(m_callsign), m_dmr_destid, m_hostname, m_port, false, vocoder, modem, m_playback, m_capture); m_nxdn = new NXDNCodec(m_callsign, m_nxdnids.key(m_callsign), m_dmr_destid, m_hostname, m_port, false, vocoder, modem, m_capture, m_playback);
m_modethread = new QThread; m_modethread = new QThread;
m_nxdn->moveToThread(m_modethread); m_nxdn->moveToThread(m_modethread);
connect(m_nxdn, SIGNAL(update(Codec::MODEINFO)), this, SLOT(update_nxdn_data(Codec::MODEINFO))); connect(m_nxdn, SIGNAL(update(Codec::MODEINFO)), this, SLOT(update_nxdn_data(Codec::MODEINFO)));
@ -521,7 +521,7 @@ void DroidStar::process_connect()
m_modethread->start(); m_modethread->start();
} }
if(m_protocol == "M17"){ if(m_protocol == "M17"){
m_m17 = new M17Codec(m_callsign, m_module, m_host, m_hostname, m_port, false, modem, m_playback, m_capture); m_m17 = new M17Codec(m_callsign, m_module, m_host, m_hostname, m_port, false, modem, m_capture, m_playback);
m_m17->set_modem_flags(rxInvert, txInvert, pttInvert, useCOSAsLockout, duplex); m_m17->set_modem_flags(rxInvert, txInvert, pttInvert, useCOSAsLockout, duplex);
m_m17->set_modem_params(m_modemBaud.toUInt(), rxfreq, txfreq, m_modemTxDelay.toInt(), m_modemRxLevel.toFloat(), m_modemRFLevel.toFloat(), ysfTXHang, m_modemCWIdTxLevel.toFloat(), m_modemDstarTxLevel.toFloat(), m_modemDMRTxLevel.toFloat(), m_modemYSFTxLevel.toFloat(), m_modemP25TxLevel.toFloat(), m_modemNXDNTxLevel.toFloat(), pocsagTXLevel, m17TXLevel); m_m17->set_modem_params(m_modemBaud.toUInt(), rxfreq, txfreq, m_modemTxDelay.toInt(), m_modemRxLevel.toFloat(), m_modemRFLevel.toFloat(), ysfTXHang, m_modemCWIdTxLevel.toFloat(), m_modemDstarTxLevel.toFloat(), m_modemDMRTxLevel.toFloat(), m_modemYSFTxLevel.toFloat(), m_modemP25TxLevel.toFloat(), m_modemNXDNTxLevel.toFloat(), pocsagTXLevel, m17TXLevel);
m_modethread = new QThread; m_modethread = new QThread;
@ -541,7 +541,7 @@ void DroidStar::process_connect()
m_modethread->start(); m_modethread->start();
} }
if(m_protocol == "IAX"){ if(m_protocol == "IAX"){
m_iax = new IAXCodec(m_callsign, m_iaxuser, m_iaxpassword, m_iaxnode, m_iaxhost, m_iaxport, m_playback, m_capture); m_iax = new IAXCodec(m_callsign, m_iaxuser, m_iaxpassword, m_iaxnode, m_iaxhost, m_iaxport, m_capture, m_playback);
m_modethread = new QThread; m_modethread = new QThread;
m_iax->moveToThread(m_modethread); m_iax->moveToThread(m_modethread);
connect(m_iax, SIGNAL(update()), this, SLOT(update_iax_data())); connect(m_iax, SIGNAL(update()), this, SLOT(update_iax_data()));
@ -1310,6 +1310,7 @@ void DroidStar::check_host_files()
if( (!check_file.exists() && !(check_file.isFile())) || m_update_host_files ){ if( (!check_file.exists() && !(check_file.isFile())) || m_update_host_files ){
download_file("/dplus.txt"); download_file("/dplus.txt");
} }
qDebug() << "dplus.txt time == " << check_file.birthTime();
check_file.setFile(config_path + "/dextra.txt"); check_file.setFile(config_path + "/dextra.txt");
if( (!check_file.exists() && !check_file.isFile() ) || m_update_host_files ){ if( (!check_file.exists() && !check_file.isFile() ) || m_update_host_files ){

6
serialmodem.cpp
View file

@ -208,8 +208,10 @@ void SerialModem::process_modem()
if(m_serialdata.size() >= s){ if(m_serialdata.size() >= s){
m_protocol = m_serialdata[3]; m_protocol = m_serialdata[3];
m_version.clear(); m_version.clear();
for(int i = 0; i < (s-4); ++i){ uint8_t desc_offset = (m_protocol == 2) ? 23 : 4;
m_version.append(m_serialdata[4+i]);
for(int i = 0; i < (s-desc_offset); ++i){
m_version.append(m_serialdata[desc_offset+i]);
} }
qDebug() << "MMDVM Protocol " << m_protocol << ": " << m_version; qDebug() << "MMDVM Protocol " << m_protocol << ": " << m_version;
} }