versustunez/VulcanoLE
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Cleanup Code

Browse source 
- FIXED: Same Naming camelCase
- FIXED: member variables marked with m_
This commit is contained in:
Maurice Grönwoldt 2021-02-22 14:27:34 +01:00
commit 9b791f0765
21 changed files with 201 additions and 196 deletions
Download patch file Download diff file Expand all files Collapse all files

6
headers/VulcanoLE/API/HIDHelper.h
View file

@ -10,9 +10,9 @@ public:
HIDHelper();
~HIDHelper();
int openDevices();
int get_feature_report(unsigned char *buf, int size) const;
int send_feature_report(unsigned char *buf, int size) const;
void close_ctrl_device();
int getFeatureReport(unsigned char *buf, int size) const;
int sendFeatureReport(unsigned char *buf, int size) const;
void closeCtrlDevice();
hid_device *m_ledDevice{};
int ctrl_device{};

40
headers/VulcanoLE/Audio/AudioGrabber.h
View file

@ -12,13 +12,13 @@
#include <VulcanoLE/Audio/FFT.h>
#include <VulcanoLE/Audio/Types.h>
static const char k_record_stream_name[] = "vulcanoLE";
static const char k_record_stream_description[] = "Keyboard Input Stream";
static const char recStreamName[] = "vulcanoLE";
static const char recStreamDescription[] = "Keyboard Input Stream";
static const int32_t k_sample_rate = 44100;
static const int32_t k_channels = 2;
static const int32_t sampleRate = 44100;
static const int32_t channels = 2;
static const std::string k_default_monitor_postfix = ".monitor";
static const std::string defaultMonitorPostfix = ".monitor";
class AudioGrabber {
public:
@ -30,29 +30,29 @@ public:
};
AudioGrabber();
~AudioGrabber();
bool read(pcm_stereo_sample *buffer, uint32_t buffer_size);
bool read(stereoSample *buffer, uint32_t bufferSize);
static AudioGrabber* createAudioGrabber();
void init();
FFT fft;
ReqMode requestMode = ReqMode::FFT;
double loudness = 0.0;
float getLoudness();
bool doWork();
bool work();
VUtils::Environment *env = nullptr;
private:
std::mutex m_mtx;
pcm_stereo_sample *m_pcm_buffer{};
pa_simple *m_pulseaudio_simple{};
pa_mainloop *m_pulseaudio_mainloop{};
std::string m_pulseaudio_default_source_name;
void populate_default_source_name();
bool open_pulseaudio_source(uint32_t max_buffer_size);
static void pulseaudio_context_state_callback(pa_context *c,
void *userdata);
static void pulseaudio_server_info_callback(pa_context *context,
const pa_server_info *i,
void *userdata);
void calculateRMS(pcm_stereo_sample *pFrame);
void calculatePEAK(pcm_stereo_sample *pFrame);
stereoSample *m_buffer{};
pa_simple *m_pulseaudioSimple{};
pa_mainloop *m_pulseaudioMainloop{};
std::string m_PulseaudioDefaultSourceName;
void populateDefaultSourceName();
bool openPulseaudioSource(uint32_t maxBufferSize);
static void pulseaudioContextStateCallback(pa_context *c,
void *userdata);
static void pulseaudioServerInfoCallback(pa_context *context,
const pa_server_info *i,
void *userdata);
void calculateRMS(stereoSample *pFrame);
void calculatePEAK(stereoSample *pFrame);
double m_scale = 1.0;
};

20
headers/VulcanoLE/Audio/FFT.h
View file

@ -2,23 +2,23 @@
#include <mutex>
#include <fftw3.h>
#include "Types.h"
#include <VulcanoLE/Audio/Types.h>
class FFT {
public:
FFT();
~FFT();
void process(pcm_stereo_sample *pFrame);
void process(stereoSample *frame);
outputSample *getData();
bool prepareInput(pcm_stereo_sample *buffer, uint32_t sample_size);
bool prepareInput(stereoSample *buffer, uint32_t sampleSize);
protected:
double *m_fftw_input_left{};
double *m_fftw_input_right{};
fftw_complex *m_fftw_output_left{};
fftw_complex *m_fftw_output_right{};
double *m_fftwInputLeft{};
double *m_fftwInputRight{};
fftw_complex *m_fftwOutputLeft{};
fftw_complex *m_fftwOutputRight{};
outputSample *m_sample = new outputSample(FFT_SIZE);
fftw_plan m_fftw_plan_left{};
fftw_plan m_fftw_plan_right{};
fftw_plan m_fftwPlanLeft{};
fftw_plan m_fftwPlanRight{};
std::mutex m_mtx;
size_t m_fftw_results;
size_t m_fftwResults;
};

4
headers/VulcanoLE/Audio/Types.h
View file

@ -2,12 +2,12 @@
#define FFT_SIZE 1024
#define BUFFER_SIZE 2048
struct stereo_sample_frame {
struct stereoSampleFrame {
float l;
float r;
};
using pcm_stereo_sample = struct stereo_sample_frame;
using stereoSample = struct stereoSampleFrame;
struct outputSample {
explicit outputSample(int fftSize) {

16
headers/VulcanoLE/Keyboards/Vulcan121.h
View file

@ -20,12 +20,12 @@ class Vulcan121 {
public:
explicit Vulcan121(HIDHelper *helper);
~Vulcan121();
int send_led_map(led_map *src, bool deleteMap = false);
int send_led_to(rgba rgb);
bool send_init_sequence();
bool query_ctrl_report(unsigned char);
bool send_ctrl_report(unsigned char id);
bool wait_for_ctrl_dev();
int sendLedMap(led_map *src, bool deleteMap = false);
int sendToLEDs(rgba rgb);
bool sendInitSequence();
bool queryCtrlReport(unsigned char id);
bool sendCtrlReport(unsigned char id);
bool waitForCtrlDev();
static led_map *createEmptyLEDMap();
struct DATA {
int num_rows = NUM_ROWS;
@ -43,8 +43,8 @@ protected:
void setupMap();
// we need some mapping feature! rows and cols dont have the same amount of keys. so the struct needs
HIDHelper *m_helper;
rgba *rv_fixed[NUM_KEYS]{};
rgba rv_color_off = { 0x0000, 0x0000, 0x0000 };
rgba *m_fixed[NUM_KEYS]{};
rgba m_colorOff = { 0x0000, 0x0000, 0x0000 };
keys *keyMapRow[NUM_ROWS];
keys *keyMapCol[NUM_COLS]; // need to find out the count!
};

4
headers/VulcanoLE/Scripts/Loudness.h
View file

@ -8,8 +8,8 @@ namespace VIZ {
public:
Loudness(AudioGrabber *pGrabber, Vulcan121 *pVulcan121);
~Loudness() override = default;
void on_setup() override;
void on_tick(float delta) override;
void onSetup() override;
void onTick(float delta) override;
float lastVal = 0;
const char *name() override;
std::string m_name = "Loudness Meter";

4
headers/VulcanoLE/Scripts/PoliceLike.h
View file

@ -11,8 +11,8 @@ namespace VIZ {
public:
PoliceLike(AudioGrabber *pGrabber, Vulcan121 *pVulcan121);
~PoliceLike() override = default;
void on_setup() override;
void on_tick(float delta) override;
void onSetup() override;
void onTick(float delta) override;
void switchOnPeak(double);
int tick = 0;
bool left = true;

5
headers/VulcanoLE/Scripts/RainbowLine.h
View file

@ -15,13 +15,14 @@ namespace VIZ {
public:
RainbowLine(AudioGrabber *pGrabber, Vulcan121 *vulcan);
~RainbowLine() override;
void on_setup() override;
void on_tick(float delta) override;
void onSetup() override;
void onTick(float delta) override;
void calcNextDelta(double ratio);
void updateMap(double factor);
const char *name() override;
std::string m_name = "Rainbow Line";
led_map *data = Vulcan121::createEmptyLEDMap();
bool firstUnder = true;
double deltaMove(double val);
};
}

4
headers/VulcanoLE/Scripts/Spectrum.h
View file

@ -7,8 +7,8 @@ namespace VIZ {
struct Spectrum : public VIZ {
Spectrum(AudioGrabber *pGrabber, Vulcan121 *pVulcan121);
~Spectrum() override = default;
void on_setup() override;
void on_tick(float delta) override;
void onSetup() override;
void onTick(float delta) override;
double lastVal = 0;
const char *name() override;
std::string m_name = "Spectrum One";

4
headers/VulcanoLE/Visual/VIZ.h
View file

@ -6,8 +6,8 @@ namespace VIZ {
struct VIZ {
VIZ(AudioGrabber *pGrabber, Vulcan121 *pVulcan121) : grabber(pGrabber), keyboard(pVulcan121) {}
virtual ~VIZ() = default;
virtual void on_setup() = 0;
virtual void on_tick(float delta) = 0;
virtual void onSetup() = 0;
virtual void onTick(float delta) = 0;
Vulcan121 *keyboard{};
Vulcan121::DATA keyboardData = Vulcan121::DATA{};
AudioGrabber *grabber{};

6
headers/VulcanoLE/Visual/VisPlugins.h
View file

@ -11,9 +11,9 @@ namespace VIZ {
struct VisPlugins {
int mode = 0;
void init(HIDHelper *, AudioGrabber *);
void on_startup();
void on_tick();
void on_shutdown();
void onStartup();
void onTick();
void onShutdown();
void setCurrentMode(int);
~VisPlugins();
VUtils::Environment *env{};