wirtz
/
MiniDexed
mirror of https://github.com/probonopd/MiniDexed
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Code cleanup for src/minidexed.*

Browse Source 
Move implementation of constructors to minidexed.cpp
Reorder member variables
pull/37/head
Rene Stange 3 years ago
parent adadc17690
commit e65b4f6654
2 changed files with 209 additions and 159 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 140
      src/minidexed.cpp
  2. 86
      src/minidexed.h

140
src/minidexed.cpp
Unescape View File

@ -20,9 +20,24 @@
#include "minidexed.h"
#include <circle/logger.h>
#include <stdio.h>
#include <assert.h>
LOGMODULE ("minidexed");
CMiniDexed::CMiniDexed (CConfig *pConfig, CInterruptSystem *pInterrupt)
: CDexedAdapter (CConfig::MaxNotes, pConfig->GetSampleRate ()),
m_pConfig (pConfig),
m_UI (this, pConfig),
m_MIDIKeyboard (this, pConfig),
m_PCKeyboard (this),
m_SerialMIDI (this, pInterrupt, pConfig),
m_bUseSerial (false),
m_GetChunkTimer ("GetChunk",
1000000U * pConfig->GetChunkSize ()/2 / pConfig->GetSampleRate ()),
m_bProfileEnabled (m_pConfig->GetProfileEnabled ())
{
};
bool CMiniDexed::Initialize (void)
{
if (!m_UI.Initialize ())
@ -39,7 +54,7 @@ bool CMiniDexed::Initialize (void)
m_bUseSerial = true;
}
activate();
activate ();
ProgramChange (0);
setTranspose (24);
@ -47,15 +62,8 @@ bool CMiniDexed::Initialize (void)
return true;
}
void CMiniDexed::Process(boolean bPlugAndPlayUpdated)
void CMiniDexed::Process (bool bPlugAndPlayUpdated)
{
if (m_pConfig->GetProfileEnabled ())
{
m_GetChunkTimer.Dump ();
}
m_UI.Process ();
m_MIDIKeyboard.Process (bPlugAndPlayUpdated);
m_PCKeyboard.Process (bPlugAndPlayUpdated);
@ -64,6 +72,13 @@ void CMiniDexed::Process(boolean bPlugAndPlayUpdated)
{
m_SerialMIDI.Process ();
}
m_UI.Process ();
if (m_bProfileEnabled)
{
m_GetChunkTimer.Dump ();
}
}
void CMiniDexed::BankSelectLSB (unsigned nBankLSB)
@ -79,23 +94,32 @@ void CMiniDexed::BankSelectLSB (unsigned nBankLSB)
m_SysExFileLoader.SelectVoiceBank (nBankLSB);
}
void CMiniDexed::ProgramChange (unsigned program)
void CMiniDexed::ProgramChange (unsigned nProgram)
{
if (program > 31)
if (nProgram > 31)
{
return;
}
uint8_t Buffer[156];
m_SysExFileLoader.GetVoice (program, Buffer);
m_SysExFileLoader.GetVoice (nProgram, Buffer);
loadVoiceParameters (Buffer);
m_UI.ProgramChanged (program);
m_UI.ProgramChanged (nProgram);
}
//// PWM //////////////////////////////////////////////////////////////////////
CMiniDexedPWM::CMiniDexedPWM (CConfig *pConfig, CInterruptSystem *pInterrupt)
: CMiniDexed (pConfig, pInterrupt),
CPWMSoundBaseDevice (pInterrupt, pConfig->GetSampleRate (),
pConfig->GetChunkSize ())
{
}
bool CMiniDexedPWM::Initialize (void)
{
if (!CMiniDexed::Initialize())
if (!CMiniDexed::Initialize ())
{
return false;
}
@ -103,19 +127,21 @@ bool CMiniDexedPWM::Initialize (void)
return Start ();
}
unsigned CMiniDexedPWM::GetChunk(u32 *pBuffer, unsigned nChunkSize)
unsigned CMiniDexedPWM::GetChunk (u32 *pBuffer, unsigned nChunkSize)
{
m_GetChunkTimer.Start();
if (m_bProfileEnabled)
{
m_GetChunkTimer.Start ();
}
unsigned nResult = nChunkSize;
int16_t int16_buf[nChunkSize/2];
getSamples(nChunkSize/2, int16_buf);
int16_t SampleBuffer[nChunkSize/2];
getSamples (nChunkSize/2, SampleBuffer);
for (unsigned i = 0; nChunkSize > 0; nChunkSize -= 2) // fill the whole buffer
{
s32 nSample = int16_buf[i++];
s32 nSample = SampleBuffer[i++];
nSample += 32768;
nSample *= GetRangeMax()/2;
nSample /= 32768;
@ -124,14 +150,28 @@ unsigned CMiniDexedPWM::GetChunk(u32 *pBuffer, unsigned nChunkSize)
*pBuffer++ = nSample;
}
m_GetChunkTimer.Stop();
if (m_bProfileEnabled)
{
m_GetChunkTimer.Stop ();
}
return(nResult);
return nResult;
};
//// I2S //////////////////////////////////////////////////////////////////////
CMiniDexedI2S::CMiniDexedI2S (CConfig *pConfig, CInterruptSystem *pInterrupt,
CI2CMaster *pI2CMaster)
: CMiniDexed (pConfig, pInterrupt),
CI2SSoundBaseDevice (pInterrupt, pConfig->GetSampleRate (),
pConfig->GetChunkSize (), false, pI2CMaster,
pConfig->GetDACI2CAddress ())
{
}
bool CMiniDexedI2S::Initialize (void)
{
if (!CMiniDexed::Initialize())
if (!CMiniDexed::Initialize ())
{
return false;
}
@ -139,33 +179,47 @@ bool CMiniDexedI2S::Initialize (void)
return Start ();
}
unsigned CMiniDexedI2S::GetChunk(u32 *pBuffer, unsigned nChunkSize)
unsigned CMiniDexedI2S::GetChunk (u32 *pBuffer, unsigned nChunkSize)
{
m_GetChunkTimer.Start();
if (m_bProfileEnabled)
{
m_GetChunkTimer.Start ();
}
unsigned nResult = nChunkSize;
int16_t int16_buf[nChunkSize/2];
getSamples(nChunkSize/2, int16_buf);
int16_t SampleBuffer[nChunkSize/2];
getSamples (nChunkSize/2, SampleBuffer);
for (unsigned i = 0; nChunkSize > 0; nChunkSize -= 2) // fill the whole buffer
{
s32 nSample = int16_buf[i++];
s32 nSample = SampleBuffer[i++];
nSample <<= 8;
*pBuffer++ = nSample; // 2 stereo channels
*pBuffer++ = nSample;
}
m_GetChunkTimer.Stop();
if (m_bProfileEnabled)
{
m_GetChunkTimer.Stop ();
}
return(nResult);
return nResult;
};
//// HDMI /////////////////////////////////////////////////////////////////////
CMiniDexedHDMI::CMiniDexedHDMI (CConfig *pConfig, CInterruptSystem *pInterrupt)
: CMiniDexed (pConfig, pInterrupt),
CHDMISoundBaseDevice (pInterrupt, pConfig->GetSampleRate (),
pConfig->GetChunkSize ())
{
}
bool CMiniDexedHDMI::Initialize (void)
{
if (!CMiniDexed::Initialize())
if (!CMiniDexed::Initialize ())
{
return false;
}
@ -175,30 +229,36 @@ bool CMiniDexedHDMI::Initialize (void)
unsigned CMiniDexedHDMI::GetChunk(u32 *pBuffer, unsigned nChunkSize)
{
m_GetChunkTimer.Start();
if (m_bProfileEnabled)
{
m_GetChunkTimer.Start ();
}
unsigned nResult = nChunkSize;
int16_t int16_buf[nChunkSize/2];
unsigned nFrame = 0;
getSamples(nChunkSize/2, int16_buf);
int16_t SampleBuffer[nChunkSize/2];
getSamples (nChunkSize/2, SampleBuffer);
unsigned nFrame = 0;
for (unsigned i = 0; nChunkSize > 0; nChunkSize -= 2) // fill the whole buffer
{
s32 nSample = int16_buf[i++];
s32 nSample = SampleBuffer[i++];
nSample <<= 8;
nSample = ConvertIEC958Sample (nSample, nFrame);
if (++nFrame == IEC958_FRAMES_PER_BLOCK)
{
nFrame = 0;
}
*pBuffer++ = nSample; // 2 stereo channels
*pBuffer++ = nSample;
}
if (m_bProfileEnabled)
{
m_GetChunkTimer.Stop();
}
return(nResult);
return nResult;
};

86
src/minidexed.h
Unescape View File

@ -21,93 +21,83 @@
#define _minidexed_h
#include "dexedadapter.h"
#include <stdint.h>
#include <math.h>
#include <circle/interrupt.h>
#include <circle/i2cmaster.h>
#include <circle/types.h>
#include <circle/pwmsoundbasedevice.h>
#include <circle/i2ssoundbasedevice.h>
#include <circle/hdmisoundbasedevice.h>
#include "config.h"
#include "userinterface.h"
#include "sysexfileloader.h"
#include "midikeyboard.h"
#include "pckeyboard.h"
#include "serialmididevice.h"
#include "perftimer.h"
#include "userinterface.h"
#include <stdint.h>
#include <circle/types.h>
#include <circle/interrupt.h>
#include <circle/i2cmaster.h>
#include <circle/pwmsoundbasedevice.h>
#include <circle/i2ssoundbasedevice.h>
#include <circle/hdmisoundbasedevice.h>
class CMiniDexed : public CDexedAdapter
{
public:
CMiniDexed(CConfig *pConfig, CInterruptSystem *pInterrupt)
: CDexedAdapter (CConfig::MaxNotes, pConfig->GetSampleRate ()),
m_MIDIKeyboard (this, pConfig),
m_PCKeyboard (this),
m_SerialMIDI (this, pInterrupt, pConfig),
m_bUseSerial (FALSE),
m_pConfig (pConfig),
m_UI (this, pConfig),
m_GetChunkTimer ("GetChunk", 1000000U * pConfig->GetChunkSize ()/2 / pConfig->GetSampleRate ())
{
};
public:
CMiniDexed (CConfig *pConfig, CInterruptSystem *pInterrupt);
virtual bool Initialize (void);
void Process(boolean bPlugAndPlayUpdated);
void Process (bool bPlugAndPlayUpdated);
void BankSelectLSB (unsigned nBankLSB);
void ProgramChange (unsigned program);
void ProgramChange (unsigned nProgram);
private:
CConfig *m_pConfig;
CUserInterface m_UI;
CSysExFileLoader m_SysExFileLoader;
private:
CMIDIKeyboard m_MIDIKeyboard;
CPCKeyboard m_PCKeyboard;
CSerialMIDIDevice m_SerialMIDI;
boolean m_bUseSerial;
CSysExFileLoader m_SysExFileLoader;
CConfig *m_pConfig;
CUserInterface m_UI;
bool m_bUseSerial;
protected:
protected:
CPerformanceTimer m_GetChunkTimer;
bool m_bProfileEnabled;
};
//// PWM //////////////////////////////////////////////////////////////////////
class CMiniDexedPWM : public CMiniDexed, public CPWMSoundBaseDevice
{
public:
CMiniDexedPWM(CConfig *pConfig, CInterruptSystem *pInterrupt)
: CMiniDexed(pConfig, pInterrupt),
CPWMSoundBaseDevice (pInterrupt, pConfig->GetSampleRate (), pConfig->GetChunkSize ())
{
}
public:
CMiniDexedPWM (CConfig *pConfig, CInterruptSystem *pInterrupt);
bool Initialize (void);
unsigned GetChunk (u32 *pBuffer, unsigned nChunkSize);
};
//// I2S //////////////////////////////////////////////////////////////////////
class CMiniDexedI2S : public CMiniDexed, public CI2SSoundBaseDevice
{
public:
CMiniDexedI2S(CConfig *pConfig, CInterruptSystem *pInterrupt, CI2CMaster *pI2CMaster)
: CMiniDexed(pConfig, pInterrupt),
CI2SSoundBaseDevice (pInterrupt, pConfig->GetSampleRate (), pConfig->GetChunkSize (),
FALSE, pI2CMaster, pConfig->GetDACI2CAddress ())
{
}
public:
CMiniDexedI2S (CConfig *pConfig, CInterruptSystem *pInterrupt,
CI2CMaster *pI2CMaster);
bool Initialize (void);
unsigned GetChunk (u32 *pBuffer, unsigned nChunkSize);
};
//// HDMI /////////////////////////////////////////////////////////////////////
class CMiniDexedHDMI : public CMiniDexed, public CHDMISoundBaseDevice
{
public:
CMiniDexedHDMI(CConfig *pConfig, CInterruptSystem *pInterrupt)
: CMiniDexed(pConfig, pInterrupt),
CHDMISoundBaseDevice (pInterrupt, pConfig->GetSampleRate (), pConfig->GetChunkSize ())
{
}
public:
CMiniDexedHDMI (CConfig *pConfig, CInterruptSystem *pInterrupt);
bool Initialize (void);
unsigned GetChunk (u32 *pBuffer, unsigned nChunkSize);
};

Write Preview
Loading…
Cancel
Save