starred/mt32-pi
1
0
Fork 0
mirror of https://github.com/dwhinham/mt32-pi.git synced 2026-07-08 17:56:50 +00:00
Code Issues Packages Projects Releases 20 Wiki Activity

Fix broken network disconnection notifications

Browse Source
This commit is contained in:
Dale Whinham
2022-04-12 18:50:42 +01:00
parent 97894a2d85
commit 02e6af1afd
3 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed
- Ethernet connectivity was broken on some Raspberry Pi models. Thanks to Sal Bugliarisi, @retro and @MorkMikael for the reports!
- Network disconnection/reconnection notifications were broken.
## [0.11.2] - 2022-03-25

1
include/mt32pi.h
View File

@@ -159,6 +159,7 @@ private:
// Networking
CNetSubSystem* m_pNet;
CNetDevice* m_pNetDevice;
CBcm4343Device m_WLAN;
CWPASupplicant m_WPASupplicant;
bool m_bNetworkReady;

21
src/mt32pi.cpp
View File

@@ -78,6 +78,7 @@ CMT32Pi::CMT32Pi(CI2CMaster* pI2CMaster, CSPIMaster* pSPIMaster, CInterruptSyste
m_bUSBAvailable(false),
m_pNet(nullptr),
m_pNetDevice(nullptr),
m_WLAN(WLANFirmwarePath),
m_WPASupplicant(WLANConfigFile),
m_bNetworkReady(false),
@@ -359,6 +360,8 @@ bool CMT32Pi::InitNetwork()
delete m_pNet;
m_pNet = nullptr;
}
m_pNetDevice = CNetDevice::GetNetDevice(NetDeviceType);
}
return m_pNet != nullptr;
@@ -828,7 +831,11 @@ void CMT32Pi::UpdateNetwork()
if (!m_pNet)
return;
const bool bNetIsRunning = m_pNet->IsRunning();
bool bNetIsRunning = m_pNet->IsRunning();
if (m_pConfig->NetworkMode == CConfig::TNetworkMode::Ethernet)
bNetIsRunning &= m_pNetDevice->IsLinkUp();
else if (m_pConfig->NetworkMode == CConfig::TNetworkMode::WiFi)
bNetIsRunning &= m_WPASupplicant.IsConnected();
if (!m_bNetworkReady && bNetIsRunning)
{
@@ -840,7 +847,7 @@ void CMT32Pi::UpdateNetwork()
m_pLogger->Write(MT32PiName, LogNotice, "Network up and running at: %s", static_cast<const char *>(IPString));
LCDLog(TLCDLogType::Notice, "%s: %s", GetNetworkDeviceShortName(), static_cast<const char*>(IPString));
if (m_pConfig->NetworkRTPMIDI)
if (m_pConfig->NetworkRTPMIDI && !m_pAppleMIDIParticipant)
{
m_pAppleMIDIParticipant = new CAppleMIDIParticipant(&m_Random, this);
if (!m_pAppleMIDIParticipant->Initialize())
@@ -853,7 +860,7 @@ void CMT32Pi::UpdateNetwork()
m_pLogger->Write(MT32PiName, LogNotice, "AppleMIDI receiver initialized");
}
if (m_pConfig->NetworkUDPMIDI)
if (m_pConfig->NetworkUDPMIDI && !m_pUDPMIDIReceiver)
{
m_pUDPMIDIReceiver = new CUDPMIDIReceiver(this);
if (!m_pUDPMIDIReceiver->Initialize())
@@ -866,7 +873,7 @@ void CMT32Pi::UpdateNetwork()
m_pLogger->Write(MT32PiName, LogNotice, "UDP MIDI receiver initialized");
}
if (m_pConfig->NetworkFTPServer)
if (m_pConfig->NetworkFTPServer && !m_pFTPDaemon)
{
m_pFTPDaemon = new CFTPDaemon(m_pConfig->NetworkFTPUsername, m_pConfig->NetworkFTPPassword);
if (!m_pFTPDaemon->Initialize())
@@ -885,12 +892,6 @@ void CMT32Pi::UpdateNetwork()
m_pLogger->Write(MT32PiName, LogNotice, "Network disconnected.");
LCDLog(TLCDLogType::Notice, "%s disconnected!", GetNetworkDeviceShortName());
delete m_pAppleMIDIParticipant;
m_pAppleMIDIParticipant = nullptr;
delete m_pUDPMIDIReceiver;
m_pUDPMIDIReceiver = nullptr;
delete m_pFTPDaemon;
m_pFTPDaemon = nullptr;
}
}