JailDoctor/chirping
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://gitea.sustancia.synology.me/JailDoctor/chirping

Browse Source
This commit is contained in:
JailDoctor
2021-09-15 12:43:29 +02:00
parent eb568dd274 dc23d8f9c1
commit f5fe2396dd
4 changed files with 51 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
main.cpp
View File

@@ -26,7 +26,25 @@ int current_instrument = 0;
int current_volume = 2;
int current_effect = 0;
SDL_AudioSpec audioSpec{SAMPLES_PER_SECOND, AUDIO_FORMAT, 1, 0, 512, 0, 0, NULL, NULL};
toneGen channel[4];
SDL_AudioDeviceID sdlAudioDevice;
Sint16 auxBuffer[512];
void audioCallback(void* userdata, Uint8* stream, int len) {
Sint16* buffer = (Sint16*)stream;
int numBytesGenerated = channel[0].getSamples(len >> 1, buffer) * 2;
for (int i=1; i<4; ++i) {
channel[i].getSamples(len >> 1, auxBuffer);
for (int j=0; j<numBytesGenerated; ++j) buffer[j] += auxBuffer[j];
}
if (numBytesGenerated < len) {
int rest = len - numBytesGenerated;
SDL_memset(&stream[numBytesGenerated], 0, rest);
SDL_PauseAudioDevice(sdlAudioDevice, 1);
}
}
SDL_AudioSpec audioSpec{SAMPLES_PER_SECOND, AUDIO_FORMAT, 1, 0, 512, 0, 0, &audioCallback, NULL};
const char get_hex(const uint8_t num) {
static const char hexstr[17] = "0123456789ABCDEF";
@@ -41,17 +59,17 @@ const char* get_zero_padded(const uint8_t num) {
}
int main(int argc, char* argv[]) {
for (int i=0; i<4; ++i) channel[i].setNoteLength(SOUND_NUM_SAMPLES);
pattern[0][0] = (34<<10) + (2<<8) + (7<<4) + 5;
SDL_Init(SDL_INIT_EVERYTHING);
SDL_AudioDeviceID sdlAudioDevice = SDL_OpenAudioDevice(NULL, 0, &audioSpec, NULL, 0);
sdlAudioDevice = SDL_OpenAudioDevice(NULL, 0, &audioSpec, NULL, 0);
AUDIO_FORMAT_TYPE beeps[int(SOUND_NUM_SAMPLES*8)];
AUDIO_FORMAT_TYPE beeps2[int(SOUND_NUM_SAMPLES*8)];
AUDIO_FORMAT_TYPE *pointer = beeps;
toneGen tonegen(SOUND_NUM_SAMPLES);
tonegen.setup(22, CHIPTUNE_INSTRUMENT_TRIANGLE, 13, CHIPTUNE_EFFECT_DROP);
/*tonegen.setup(22, CHIPTUNE_INSTRUMENT_TRIANGLE, 13, CHIPTUNE_EFFECT_DROP);
int numSamples = tonegen.getSamples(SOUND_NUM_SAMPLES, pointer); pointer += int(SOUND_NUM_SAMPLES);
tonegen.setup(32, CHIPTUNE_INSTRUMENT_SQUARE, 0, CHIPTUNE_EFFECT_NONE);
numSamples = tonegen.getSamples(SOUND_NUM_SAMPLES, pointer); pointer += int(SOUND_NUM_SAMPLES);
@@ -85,6 +103,7 @@ int main(int argc, char* argv[]) {
numSamples = tonegen.getSamples(SOUND_NUM_SAMPLES, pointer); pointer += int(SOUND_NUM_SAMPLES);
tonegen.setup(47, CHIPTUNE_INSTRUMENT_SQUARE, 1, CHIPTUNE_EFFECT_NONE);
numSamples = tonegen.getSamples(SOUND_NUM_SAMPLES, pointer); pointer += int(SOUND_NUM_SAMPLES);
*/
for (int i=0; i<SOUND_NUM_SAMPLES*8;++i) {
beeps[i] += beeps2[i];
@@ -157,9 +176,10 @@ int main(int argc, char* argv[]) {
//uint8_t base_note = 1+(base_octave-2)*12;
if ((key == SDL_SCANCODE_PERIOD) || (key == SDL_SCANCODE_DELETE)) note.Set(0);
if (key == SDL_SCANCODE_SPACE) {
tonegen.setup(note.Get());
numSamples = tonegen.getSamples(SOUND_NUM_SAMPLES, beeps);
SDL_QueueAudio(sdlAudioDevice, &beeps[0], SOUND_SIZE_IN_BYTES);
channel[0].setup(pattern[0][selected_row]);
channel[1].setup(pattern[1][selected_row]);
channel[2].setup(pattern[2][selected_row]);
channel[3].setup(pattern[3][selected_row]);
SDL_PauseAudioDevice(sdlAudioDevice, 0);
}
if (selected_part==0) {
@@ -180,9 +200,7 @@ int main(int argc, char* argv[]) {
default: m = false; break;
};
if (m) {
tonegen.setup(note.Get());
numSamples = tonegen.getSamples(SOUND_NUM_SAMPLES, beeps);
SDL_QueueAudio(sdlAudioDevice, &beeps[0], SOUND_SIZE_IN_BYTES);
channel[0].setup(note.Get());
SDL_PauseAudioDevice(sdlAudioDevice, 0);
}
}

16
song.h Normal file
View File

@@ -0,0 +1,16 @@
#pragma once
#include <cstdint>
#include <vector>
//typedef uint16_t[4][64] Pattern;
class Song {
public:
Song();
uint16_t GetCurrentNote(const int channel);
private:
std::vector<uint16_t[4][64]> patterns;
};

7
tonegen.cpp
View File

@@ -4,8 +4,7 @@
Sint16 notes[64];
toneGen::toneGen(const int note_length) {
this->note_length = note_length;
toneGen::toneGen() {
this->current_pos = 0;
this->note = 34;
@@ -24,6 +23,10 @@ toneGen::toneGen(const int note_length) {
this->f = -AUDIO_FORMAT_MAX_VALUE;
}
void toneGen::setNoteLength(const int note_length) {
this->note_length = note_length;
}
void toneGen::setup(const uint8_t note, const uint8_t instrument, const uint8_t volume, const uint8_t effect) {
this->current_pos = 0;

3
tonegen.h
View File

@@ -16,7 +16,8 @@
class toneGen {
public:
toneGen(const int note_length);
toneGen();
void setNoteLength(const int note_length);
void setup(const uint8_t note, const uint8_t instrument, const uint8_t volume, const uint8_t effect);
void setup(const uint16_t tracker_note);
const int getSamples(const int numSamples, Sint16 *buffer);