From 8a5290461195fab632d56e9dc276590a497c2a5d Mon Sep 17 00:00:00 2001
From: Doug McLain <doug@nostar.net>
Date: Wed, 15 Dec 2021 18:24:44 -0500
Subject: [PATCH] Some misc tweaks and cleanups

---
 android/AndroidManifest.xml |  4 ++--
 audioengine.cpp             | 13 ++++++++++---
 droidstar.cpp               | 16 ++++++++--------
 m17codec.cpp                |  6 +++---
 serialmodem.cpp             |  6 ++++--
 5 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 7ad432a..0cd234b 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<manifest package="org.dudetronics.droidstar" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="-- %%INSERT_VERSION_NAME%% --" android:versionCode="64" android:installLocation="auto">
+<manifest package="org.dudetronics.droidstar" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="-- %%INSERT_VERSION_NAME%% --" android:versionCode="66" android:installLocation="auto">
 	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="30"/>
 
 	<!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application.
@@ -81,5 +81,5 @@
 
 
 
-<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+
 </manifest>
diff --git a/audioengine.cpp b/audioengine.cpp
index 91e15c3..269620b 100644
--- a/audioengine.cpp
+++ b/audioengine.cpp
@@ -17,6 +17,7 @@
 
 #include "audioengine.h"
 #include <QDebug>
+#include <QTimer>
 #include <cmath>
 
 #ifdef Q_OS_MACOS
@@ -110,7 +111,7 @@ void AudioEngine::init()
 		fprintf(stderr, "Using playback device %s\n", info.deviceName().toStdString().c_str());fflush(stderr);
 
 		m_out = new QAudioOutput(info, tempformat, this);
-		m_out->setBufferSize(19200);
+		m_out->setBufferSize(2560);
 		connect(m_out, SIGNAL(stateChanged(QAudio::State)), this, SLOT(handleStateChanged(QAudio::State)));
 		//m_outdev = m_out->start();
 	}
@@ -176,12 +177,13 @@ void AudioEngine::stop_capture()
 
 void AudioEngine::start_playback()
 {
-	//m_out->reset();
 	m_outdev = m_out->start();
 }
 
 void AudioEngine::stop_playback()
 {
+	//m_outdev->reset();
+	m_out->reset();
 	m_out->stop();
 }
 
@@ -233,7 +235,12 @@ void AudioEngine::write(int16_t *pcm, size_t s)
 		process_audio(pcm, s);
 	}
 
-	m_outdev->write((const char *) pcm, sizeof(int16_t) * s);
+	size_t l = m_outdev->write((const char *) pcm, sizeof(int16_t) * s);
+
+	if (l*2 < s){
+		qDebug() << "AudioEngine::write() " << s << ":" << l << ":" << (int)m_out->bytesFree() << ":" << m_out->bufferSize() << ":" << m_out->error();
+	}
+
 	for(uint32_t i = 0; i < s; ++i){
 		if(pcm[i] > m_maxlevel){
 			m_maxlevel = pcm[i];
diff --git a/droidstar.cpp b/droidstar.cpp
index 1e365c5..20111ab 100644
--- a/droidstar.cpp
+++ b/droidstar.cpp
@@ -1429,7 +1429,7 @@ void DroidStar::update_ref_data(Codec::MODEINFO info)
 		}
 	}
 
-	m_netstatustxt = "Host: " + m_hostname + ":" + QString::number(m_port) + " Cnt: " + QString::number(info.count);
+	m_netstatustxt = "Connected ping cnt: " + QString::number(info.count);
 	m_ambestatustxt = "AMBE: " + (info.ambeprodid.isEmpty() ? "No device" : info.ambeprodid);
 	m_mmdvmstatustxt = "MMDVM: ";
 
@@ -1502,7 +1502,7 @@ void DroidStar::update_dcs_data(Codec::MODEINFO info)
 		}
 	}
 
-	m_netstatustxt = "Host: " + m_hostname + ":" + QString::number(m_port) + " Cnt: " + QString::number(info.count);
+	m_netstatustxt = "Connected ping cnt: " + QString::number(info.count);
 	m_ambestatustxt = "AMBE: " + (info.ambeprodid.isEmpty() ? "No device" : info.ambeprodid);
 	m_mmdvmstatustxt = "MMDVM: ";
 
@@ -1576,7 +1576,7 @@ void DroidStar::update_xrf_data(Codec::MODEINFO info)
 		}
 	}
 
-	m_netstatustxt = "Host: " + m_hostname + ":" + QString::number(m_port) + " Cnt: " + QString::number(info.count);
+	m_netstatustxt = "Connected ping cnt: " + QString::number(info.count);
 	m_ambestatustxt = "AMBE: " + (info.ambeprodid.isEmpty() ? "No device" : info.ambeprodid);
 	m_mmdvmstatustxt = "MMDVM: ";
 
@@ -1641,7 +1641,7 @@ void DroidStar::update_nxdn_data(Codec::MODEINFO info)
 		}
 	}
 
-	m_netstatustxt = "Host: " + m_hostname + ":" + QString::number(m_port) + " Cnt: " + QString::number(info.count);
+	m_netstatustxt = "Connected ping cnt: " + QString::number(info.count);
 	m_ambestatustxt = "AMBE: " + (info.ambeprodid.isEmpty() ? "No device" : info.ambeprodid);
 	m_mmdvmstatustxt = "MMDVM: ";
 
@@ -1722,7 +1722,7 @@ void DroidStar::update_dmr_data(Codec::MODEINFO info)
 		}
 	}
 
-	m_netstatustxt = "Host: " + m_hostname + ":" + QString::number(m_port) + " Cnt: " + QString::number(info.count);
+	m_netstatustxt = "Connected ping cnt: " + QString::number(info.count);
 	m_ambestatustxt = "AMBE: " + (info.ambeprodid.isEmpty() ? "No device" : info.ambeprodid);
 	m_mmdvmstatustxt = "MMDVM: ";
 
@@ -1810,7 +1810,7 @@ void DroidStar::update_ysf_data(Codec::MODEINFO info)
 		}
 	}
 
-	m_netstatustxt = "Host: " + m_hostname + ":" + QString::number(m_port) + " Cnt: " + QString::number(info.count);
+	m_netstatustxt = "Connected ping cnt: " + QString::number(info.count);
 	m_ambestatustxt = "AMBE: " + (info.ambeprodid.isEmpty() ? "No device" : info.ambeprodid);
 	m_mmdvmstatustxt = "MMDVM: ";
 
@@ -1948,7 +1948,7 @@ void DroidStar::update_m17_data(M17Codec::MODEINFO info)
 		emit update_log("Connected to " + m_protocol + " " + m_host + " " + m_hostname + ":" + QString::number(m_port));
 	}
 
-	m_netstatustxt = "Host: " + m_hostname + ":" + QString::number(m_port) + " Cnt: " + QString::number(info.count);
+	m_netstatustxt = "Connected ping cnt: " + QString::number(info.count);
 	m_ambestatustxt = "AMBE: " + (info.ambeprodid.isEmpty() ? "No device" : info.ambeprodid);
 	m_mmdvmstatustxt = "MMDVM: ";
 
@@ -2010,7 +2010,7 @@ void DroidStar::update_iax_data()
 		emit update_log("Connected to " + m_protocol + " " + m_iaxhost + ":" + QString::number(m_iaxport));
 	}
 
-	m_netstatustxt = "Host: " + m_iaxhost + ":" + QString::number(m_iaxport) + " Cnt: " + QString::number(m_iax->get_cnt());
+	m_netstatustxt = "Connected ping cnt: " + QString::number(m_iax->get_cnt());
 	emit update_data();
 }
 
diff --git a/m17codec.cpp b/m17codec.cpp
index 0eb1a58..aa395b5 100755
--- a/m17codec.cpp
+++ b/m17codec.cpp
@@ -474,19 +474,19 @@ void M17Codec::process_modem_data(QByteArray d)
 	CM17Convolution conv;
 	uint8_t tmp[M17_FRAME_LENGTH_BYTES];
 
-	if(d.size() < 3){
+	if( (d.size() < 3) || m_tx ){
 		return;
 	}
 
 	if( (d.data()[2] == MMDVM_M17_LINK_SETUP) &&
 		(((uint8_t)d.data()[4] != M17_LINK_SETUP_SYNC_BYTES[0]) || ((uint8_t)d.data()[5] != M17_LINK_SETUP_SYNC_BYTES[1]))){
-		qDebug() << "LSF with no sync bytes" << (d.data()[2] == MMDVM_M17_LINK_SETUP) << ((uint8_t)d.data()[4] != M17_LINK_SETUP_SYNC_BYTES[0]) << ((uint8_t)d.data()[5] != M17_LINK_SETUP_SYNC_BYTES[1]);
+		qDebug() << "M17 LSF with no sync bytes" << (d.data()[2] == MMDVM_M17_LINK_SETUP) << ((uint8_t)d.data()[4] != M17_LINK_SETUP_SYNC_BYTES[0]) << ((uint8_t)d.data()[5] != M17_LINK_SETUP_SYNC_BYTES[1]);
 		return;
 	}
 
 	if( (d.data()[2] == MMDVM_M17_STREAM) &&
 		(((uint8_t)d.data()[4] != M17_STREAM_SYNC_BYTES[0]) || ((uint8_t)d.data()[5] != M17_STREAM_SYNC_BYTES[1]))){
-		qDebug() << "stream frame with no sync bytes" << (d.data()[2] == MMDVM_M17_STREAM) << ((uint8_t)d.data()[4] != M17_STREAM_SYNC_BYTES[0]) << ((uint8_t)d.data()[5] != M17_STREAM_SYNC_BYTES[1]);
+		qDebug() << "M17 stream frame with no sync bytes" << (d.data()[2] == MMDVM_M17_STREAM) << ((uint8_t)d.data()[4] != M17_STREAM_SYNC_BYTES[0]) << ((uint8_t)d.data()[5] != M17_STREAM_SYNC_BYTES[1]);
 		return;
 	}
 
diff --git a/serialmodem.cpp b/serialmodem.cpp
index 53d2535..e3a37b6 100644
--- a/serialmodem.cpp
+++ b/serialmodem.cpp
@@ -174,9 +174,11 @@ void SerialModem::process_serial()
 void SerialModem::process_modem()
 {
 	QByteArray out;
+
 	if(m_serialdata.size() < 3){
 		return;
 	}
+
 	//qDebug() << "process_modem() " << (uint8_t)m_serialdata[0] << ":" << (uint8_t)m_serialdata[1] << ":" << m_serialdata.size();
 	if(((uint8_t)m_serialdata[0] == MMDVM_FRAME_START) && (m_serialdata.size() >= m_serialdata[1])){
 		const uint8_t r = (uint8_t)m_serialdata[2];
@@ -187,14 +189,14 @@ void SerialModem::process_modem()
 			for(int i = 0; i < s; ++i){
 				m_serialdata.dequeue();
 			}
-			if(m_serialdata[3] == 2){
+			if( (m_serialdata.size() > 3) && (m_serialdata[3] == 2) ){
 
 			}
 		}
 
 		else if(r == MMDVM_ACK){
 			qDebug() << "Received MMDVM_ACK";
-			if(m_serialdata[3] == 2){
+			if( (m_serialdata.size() > 3) && (m_serialdata[3] == 2) ){
 				emit connected(true);
 			}
 			for(int i = 0; i < s; ++i){