some more cleanup

pull/744/head
Ömer Şiar Baysal 6 days ago
parent 8d5eef90b4
commit aeeceae12f
  1. 6
      .gitignore
  2. 3
      .gitmodules
  3. 18
      src/minidexed.cpp
  4. 11
      src/udpmididevice.cpp
  5. 20
      src/udpmididevice.h

6
.gitignore vendored

@ -46,7 +46,7 @@ sdcard
*.swp
*.swo
CMSIS_5/
Synth_Dexed/
circle-stdlib/
CMSIS_5/**
Synth_Dexed/**
circle-stdlib/**
.vscode/

3
.gitmodules vendored

@ -1,9 +1,12 @@
[submodule "circle-stdlib"]
path = circle-stdlib
url = https://github.com/smuehlst/circle-stdlib
ignore = all
[submodule "Synth_Dexed"]
path = Synth_Dexed
url = https://codeberg.org/dcoredump/Synth_Dexed.git
ignore = all
[submodule "CMSIS_5"]
path = CMSIS_5
url = https://github.com/ARM-software/CMSIS_5
ignore = all

@ -27,20 +27,11 @@
#include <string.h>
#include <stdio.h>
#include <assert.h>
//#include <circle/net/netsubsystem.h>
//#include <circle/sched/scheduler.h>
//#include "circle_stdlib_app.h"
//#include "mididevice.h"
const char WLANFirmwarePath[] = "SD:firmware/";
const char WLANConfigFile[] = "SD:wpa_supplicant.conf";
#define FTPUSERNAME "admin"
#define FTPPASSWORD "admin"
/*
const char WLANFirmwarePath[] = "SD:firmware/";
const char WLANConfigFile[] = "SD:wpa_supplicant.conf";
*/
LOGMODULE ("minidexed");
@ -289,9 +280,7 @@ bool CMiniDexed::Initialize (void)
}
#endif
InitNetwork();
//CMIDIDevice->InitializeRTP();
return true;
}
@ -1849,10 +1838,7 @@ void CMiniDexed::UpdateNetwork()
LOGNOTE("Network up and running at: %s", static_cast<const char *>(IPString));
if (m_UDPMIDI.Initialize ())
{
LOGNOTE ("RTP MIDI interface enabled");
}
m_UDPMIDI.Initialize();
m_pFTPDaemon = new CFTPDaemon(FTPUSERNAME, FTPPASSWORD);

@ -35,18 +35,8 @@ CUDPMIDIDevice::CUDPMIDIDevice (CMiniDexed *pSynthesizer,
: CMIDIDevice (pSynthesizer, pConfig, pUI),
m_pSynthesizer (pSynthesizer),
m_pConfig (pConfig)
//m_Serial (pInterrupt, TRUE),
//m_nSerialState (0),
//m_nSysEx (0),
//m_SendBuffer (&m_Serial)
{
AddDevice ("udp");
/*for (unsigned nTG = 0; nTG < CConfig::ToneGenerators; nTG++)
{
m_ChannelMap[nTG] = Disabled;
}*/
}
CUDPMIDIDevice::~CUDPMIDIDevice (void)
@ -86,7 +76,6 @@ void CUDPMIDIDevice::OnAppleMIDIDataReceived(const u8* pData, size_t nSize)
void CUDPMIDIDevice::OnAppleMIDIConnect(const CIPAddress* pIPAddress, const char* pName)
{
LOGNOTE("RTP Device connected");
//AddDevice ("udp1");
}
void CUDPMIDIDevice::OnAppleMIDIDisconnect(const CIPAddress* pIPAddress, const char* pName)

@ -30,11 +30,6 @@
#include "net/applemidi.h"
#include "net/udpmidi.h"
//#include <circle/interrupt.h>
//#include <circle/serial.h>
//#include <circle/writebuffer.h>
//#include <circle/types.h>
class CMiniDexed;
class CUDPMIDIDevice : CAppleMIDIHandler, CUDPMIDIHandler, public CMIDIDevice
@ -48,26 +43,11 @@ public:
virtual void OnAppleMIDIConnect(const CIPAddress* pIPAddress, const char* pName) override;
virtual void OnAppleMIDIDisconnect(const CIPAddress* pIPAddress, const char* pName) override;
virtual void OnUDPMIDIDataReceived(const u8* pData, size_t nSize) override;
//void OnAppleMIDIDataReceived(const u8* pData, size_t nSize);
//void OnAppleMIDIConnect(const CIPAddress* pIPAddress, const char* pName);
//void OnAppleMIDIDisconnect(const CIPAddress* pIPAddress, const char* pName);
//void Process (void);
//void Send (const u8 *pMessage, size_t nLength, unsigned nCable = 0) override;
private:
CMiniDexed *m_pSynthesizer;
CConfig *m_pConfig;
//u8 m_ChannelMap[CConfig::ToneGenerators];
//CSerialDevice m_Serial;
//unsigned m_nSerialState;
//unsigned m_nSysEx;
//u8 m_SerialMessage[MAX_MIDI_MESSAGE];
//CWriteBufferDevice m_SendBuffer;
CBcmRandomNumberGenerator m_Random;
//CAppleMIDIHandler* m_MIDIHandler;
CAppleMIDIParticipant* m_pAppleMIDIParticipant; // AppleMIDI participant instance
CUDPMIDIReceiver* m_pUDPMIDIReceiver;

Loading…
Cancel
Save