From bf131583879008bbcee6f5bf1414e887e0883d7a Mon Sep 17 00:00:00 2001
From: Doug McLain <doug@nostar.net>
Date: Mon, 29 Nov 2021 09:12:21 -0500
Subject: [PATCH] Remove plugin loading from Downloads folder

---
 codec.cpp     | 5 +++++
 codec.h       | 8 ++++++++
 droidstar.cpp | 2 ++
 ysfcodec.cpp  | 3 +--
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/codec.cpp b/codec.cpp
index e07a426..9f822a8 100644
--- a/codec.cpp
+++ b/codec.cpp
@@ -185,6 +185,7 @@ void Codec::stop_tx()
 
 bool Codec::load_vocoder_plugin()
 {
+#ifdef VOCODER_PLUGIN
 	QString config_path = QStandardPaths::writableLocation(QStandardPaths::ConfigLocation);
 #if !defined(Q_OS_ANDROID) && !defined(Q_OS_WIN)
 	config_path += "/dudetronics";
@@ -234,6 +235,10 @@ bool Codec::load_vocoder_plugin()
 		return false;
 	}
 #endif
+#else
+	m_mbevocoder = new VocoderPlugin();
+	return true;
+#endif
 }
 
 void Codec::deleteLater()
diff --git a/codec.h b/codec.h
index 105012b..f859682 100644
--- a/codec.h
+++ b/codec.h
@@ -24,7 +24,11 @@
 #include <flite/flite.h>
 #endif
 #include <imbe_vocoder_api.h>
+#ifdef VOCODER_PLUGIN
 #include "vocoder_plugin.h"
+#else
+#include <vocoder_plugin_api.h>
+#endif
 #include "audioengine.h"
 #include "serialambe.h"
 #include "serialmodem.h"
@@ -173,7 +177,11 @@ protected:
 	QQueue<uint8_t> m_txcodecq;
 	QQueue<uint8_t> m_rxmodemq;
 	imbe_vocoder vocoder;
+#ifdef VOCODER_PLUGIN
 	Vocoder *m_mbevocoder;
+#else
+	VocoderPlugin *m_mbevocoder;
+#endif
 	QString m_vocoder;
 	QString m_modemport;
 	SerialModem *m_modem;
diff --git a/droidstar.cpp b/droidstar.cpp
index 6f463f5..1e365c5 100644
--- a/droidstar.cpp
+++ b/droidstar.cpp
@@ -1368,6 +1368,7 @@ void DroidStar::check_host_files()
 	}
 	m_update_host_files = false;
 	//process_mode_change(ui->modeCombo->currentText().simplified());
+/*
 #if defined(Q_OS_ANDROID)
 	QString vocname = "/vocoder_plugin." + QSysInfo::productType() + "." + QSysInfo::currentCpuArchitecture();
 #else
@@ -1399,6 +1400,7 @@ void DroidStar::check_host_files()
 	else{
 		qDebug() << newvoc << " not found";
 	}
+*/
 }
 
 void DroidStar::update_ref_data(Codec::MODEINFO info)
diff --git a/ysfcodec.cpp b/ysfcodec.cpp
index dba316f..453b4ec 100755
--- a/ysfcodec.cpp
+++ b/ysfcodec.cpp
@@ -138,9 +138,8 @@ void YSFCodec::process_udp()
 			connect(m_ping_timer, SIGNAL(timeout()), this, SLOT(send_ping()));
 			set_fcs_mode(false);
 			//m_mbeenc->set_gain_adjust(2.5);
-#ifdef VOCODER_PLUGIN
 			m_modeinfo.sw_vocoder_loaded = load_vocoder_plugin();
-#endif
+
 			m_rxtimer = new QTimer();
 			connect(m_rxtimer, SIGNAL(timeout()), this, SLOT(process_rx_data()));