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

Remove plugin loading from Downloads folder

Browse source
This commit is contained in:
Doug McLain 2021-11-29 09:12:21 -05:00
parent 4f674fa5e8
commit bf13158387
4 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
codec.cpp
View file

@ -185,6 +185,7 @@ void Codec::stop_tx()
bool Codec::load_vocoder_plugin() bool Codec::load_vocoder_plugin()
{ {
#ifdef VOCODER_PLUGIN
QString config_path = QStandardPaths::writableLocation(QStandardPaths::ConfigLocation); QString config_path = QStandardPaths::writableLocation(QStandardPaths::ConfigLocation);
#if !defined(Q_OS_ANDROID) && !defined(Q_OS_WIN) #if !defined(Q_OS_ANDROID) && !defined(Q_OS_WIN)
config_path += "/dudetronics"; config_path += "/dudetronics";
@ -234,6 +235,10 @@ bool Codec::load_vocoder_plugin()
return false; return false;
} }
#endif #endif
#else
m_mbevocoder = new VocoderPlugin();
return true;
#endif
} }
void Codec::deleteLater() void Codec::deleteLater()

8
codec.h
View file

@ -24,7 +24,11 @@
#include <flite/flite.h> #include <flite/flite.h>
#endif #endif
#include <imbe_vocoder_api.h> #include <imbe_vocoder_api.h>
#ifdef VOCODER_PLUGIN
#include "vocoder_plugin.h" #include "vocoder_plugin.h"
#else
#include <vocoder_plugin_api.h>
#endif
#include "audioengine.h" #include "audioengine.h"
#include "serialambe.h" #include "serialambe.h"
#include "serialmodem.h" #include "serialmodem.h"
@ -173,7 +177,11 @@ protected:
QQueue<uint8_t> m_txcodecq; QQueue<uint8_t> m_txcodecq;
QQueue<uint8_t> m_rxmodemq; QQueue<uint8_t> m_rxmodemq;
imbe_vocoder vocoder; imbe_vocoder vocoder;
#ifdef VOCODER_PLUGIN
Vocoder *m_mbevocoder; Vocoder *m_mbevocoder;
#else
VocoderPlugin *m_mbevocoder;
#endif
QString m_vocoder; QString m_vocoder;
QString m_modemport; QString m_modemport;
SerialModem *m_modem; SerialModem *m_modem;

2
droidstar.cpp
View file

@ -1368,6 +1368,7 @@ void DroidStar::check_host_files()
} }
m_update_host_files = false; m_update_host_files = false;
//process_mode_change(ui->modeCombo->currentText().simplified()); //process_mode_change(ui->modeCombo->currentText().simplified());
/*
#if defined(Q_OS_ANDROID) #if defined(Q_OS_ANDROID)
QString vocname = "/vocoder_plugin." + QSysInfo::productType() + "." + QSysInfo::currentCpuArchitecture(); QString vocname = "/vocoder_plugin." + QSysInfo::productType() + "." + QSysInfo::currentCpuArchitecture();
#else #else
@ -1399,6 +1400,7 @@ void DroidStar::check_host_files()
else{ else{
qDebug() << newvoc << " not found"; qDebug() << newvoc << " not found";
} }
*/
} }
void DroidStar::update_ref_data(Codec::MODEINFO info) void DroidStar::update_ref_data(Codec::MODEINFO info)

3
ysfcodec.cpp
View file

@ -138,9 +138,8 @@ void YSFCodec::process_udp()
connect(m_ping_timer, SIGNAL(timeout()), this, SLOT(send_ping())); connect(m_ping_timer, SIGNAL(timeout()), this, SLOT(send_ping()));
set_fcs_mode(false); set_fcs_mode(false);
//m_mbeenc->set_gain_adjust(2.5); //m_mbeenc->set_gain_adjust(2.5);
#ifdef VOCODER_PLUGIN
m_modeinfo.sw_vocoder_loaded = load_vocoder_plugin(); m_modeinfo.sw_vocoder_loaded = load_vocoder_plugin();
#endif
m_rxtimer = new QTimer(); m_rxtimer = new QTimer();
connect(m_rxtimer, SIGNAL(timeout()), this, SLOT(process_rx_data())); connect(m_rxtimer, SIGNAL(timeout()), this, SLOT(process_rx_data()));