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

Compare commits

base: JailDoctor:4d447f4d366e83eb7cfbae616ef95364c5126bd8
Branches Tags
JailDoctor:master
...
compare: JailDoctor:master
Branches Tags
JailDoctor:master

4 Commits
4d447f4d36 ... master

Author SHA1 Message Date
JailDoctor
31df3cc0a8 selection by mouse works (still no copy/paste) 2022-07-11 22:46:51 +02:00
JailDoctor
ee84a7883a mute bug solved. Noe plays while being modified 2022-07-11 20:03:12 +02:00
JailDoctor
e0b349496a mute implementat 2022-07-11 19:52:13 +02:00
JailDoctor
3b79bf2575 Silences added 2022-07-11 19:27:41 +02:00
5 changed files with 159 additions and 102 deletions
Expand all files Collapse all files

240
main.cpp
View File

@@ -9,6 +9,12 @@
#define SOUND_NUM_SAMPLES SOUND_DURATION*SAMPLES_PER_SECOND
#define SOUND_SIZE_IN_BYTES SOUND_NUM_SAMPLES*AUDIO_FORMAT_SIZE
struct selection_t {
int channel = 0;
int row = 0;
int part = 0;
};
/*#define get_note(x) (x>>10)
#define get_instrument(x) ((x>>8) & 0x3)
#define get_volume(x) ((x>>4) & 0xF)
@@ -19,13 +25,7 @@ char note_names[12][3] = { "C ", "C#", "D ", "D#", "E ", "F ", "F#", "G ", "G#",
Song song;
bool muted[4] = { false, false, false, false };
int selected_channel = 0;
int selected_row = 0;
int selected_part = 0;
int selected_channel_end = -1;
int selected_row_end = -1;
int selected_part_end = -1;
selection_t sel_start, sel_end;
int scroll = 0;
int base_octave = 4;
@@ -80,6 +80,13 @@ const char* get_zero_padded(const uint8_t num) {
return zero_padded;
}
void playNote(Note &note) {
channel[0].setup(note.Get());
channel[1].setup(0);
channel[2].setup(0);
channel[3].setup(0);
SDL_PauseAudioDevice(sdlAudioDevice, 0);
}
int main(int argc, char* argv[]) {
for (int i=0; i<4; ++i) channel[i].setNoteLength(SOUND_NUM_SAMPLES);
song.SetCurrentNote(0, 0, (34<<10) + (2<<8) + (7<<4) + 5);
@@ -141,25 +148,47 @@ int main(int argc, char* argv[]) {
if (sdlEvent.type == SDL_MOUSEBUTTONDOWN) {
if (sdlEvent.button.button == SDL_BUTTON_LEFT) {
if ((sdlEvent.button.x >= 13) && (sdlEvent.button.x <= 149) && (sdlEvent.button.y >= 14) && (sdlEvent.button.y <= 239) ) {
selected_channel_end = -1;
selected_row = scroll + int((sdlEvent.button.y-14)/7);
selected_channel = (sdlEvent.button.x-13)/35;
int part_pos = (sdlEvent.button.x-13)-(selected_channel*35);
//selected_channel_end = -1;
sel_start.channel = (sdlEvent.button.x-13)/35;
sel_start.row = scroll + int((sdlEvent.button.y-14)/7);
int part_pos = (sdlEvent.button.x-13)-(sel_start.channel*35);
if (part_pos <= 10) {
selected_part = 0;
sel_start.part = 0;
} else if (part_pos <= 15) {
selected_part = 1;
sel_start.part = 1;
} else if (part_pos <= 21) {
selected_part = 2;
sel_start.part = 2;
} else if (part_pos <= 26) {
selected_part = 3;
sel_start.part = 3;
} else if (part_pos <= 31) {
selected_part = 4;
sel_start.part = 4;
}
sel_end = sel_start;
}
for (int i=0; i<4; ++i) {
if ((sdlEvent.button.x >= 12+i*35) && (sdlEvent.button.x <= 45+i*35) && (sdlEvent.button.y >= 2) && (sdlEvent.button.y <= 13) ) {
muted[i] = not muted[i];
channel[i].setMute(muted[i]);
}
}
}
}
if (sdlEvent.type == SDL_MOUSEMOTION) {
if (sdlEvent.motion.state & SDL_BUTTON_LMASK != 0) {
if ((sdlEvent.motion.x >= 13) && (sdlEvent.motion.x <= 149) && (sdlEvent.motion.y >= 14) && (sdlEvent.motion.y <= 239) ) {
sel_end.channel = (sdlEvent.motion.x-13)/35;
sel_end.row = scroll + int((sdlEvent.motion.y-14)/7);
int part_pos = (sdlEvent.motion.x-13)-(sel_end.channel*35);
if (part_pos <= 10) {
sel_end.part = 0;
} else if (part_pos <= 15) {
sel_end.part = 1;
} else if (part_pos <= 21) {
sel_end.part = 2;
} else if (part_pos <= 26) {
sel_end.part = 3;
} else if (part_pos <= 31) {
sel_end.part = 4;
}
}
}
@@ -171,61 +200,61 @@ int main(int argc, char* argv[]) {
if (sdlEvent.type == SDL_KEYDOWN) {
SDL_Scancode key = sdlEvent.key.keysym.scancode;
if (key == SDL_SCANCODE_DOWN) {
if (selected_row < 63) selected_row++;
if (selected_row >= 32 + scroll) scroll = selected_row-31;
if (sel_start.row < 63) sel_start.row++;
if (sel_start.row >= 32 + scroll) scroll = sel_start.row-31;
sel_end = sel_start;
} else if (key == SDL_SCANCODE_UP) {
if (selected_row > 0) selected_row--;
if (selected_row < scroll) scroll = selected_row;
if (sel_start.row > 0) sel_start.row--;
if (sel_start.row < scroll) scroll = sel_start.row;
sel_end = sel_start;
} else if (key == SDL_SCANCODE_LEFT) {
if (selected_channel > 0 || selected_part > 0) {
if (selected_part > 0) {
selected_part--;
if (sel_start.channel > 0 || sel_start.part > 0) {
if (sel_start.part > 0) {
sel_start.part--;
} else {
selected_channel--;
selected_part = 4;
sel_start.channel--;
sel_start.part = 4;
}
}
sel_end = sel_start;
} else if (key == SDL_SCANCODE_RIGHT) {
if (selected_channel < 3 || selected_part < 4) {
if (selected_part < 4) {
selected_part++;
if (sel_start.channel < 3 || sel_start.part < 4) {
if (sel_start.part < 4) {
sel_start.part++;
} else {
selected_channel++;
selected_part = 0;
sel_start.channel++;
sel_start.part = 0;
}
}
sel_end = sel_start;
}
Note note(song.GetCurrentNote(selected_channel, selected_row));
Note note(song.GetCurrentNote(sel_start.channel, sel_start.row));
//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_RETURN) copied_note = note.Get();
if (key == SDL_SCANCODE_SPACE) {
note.Set(copied_note);
channel[0].setup(note.Get());
channel[1].setup(0);
channel[2].setup(0);
channel[3].setup(0);
SDL_PauseAudioDevice(sdlAudioDevice, 0);
playNote(note);
}
if (key == SDL_SCANCODE_F4) {
channel[0].setup(song.GetCurrentNote(0, selected_row));
channel[1].setup(song.GetCurrentNote(1, selected_row));
channel[2].setup(song.GetCurrentNote(2, selected_row));
channel[3].setup(song.GetCurrentNote(3, selected_row));
for (int i=0;i<4;++i) {
channel[i].setup(song.GetCurrentNote(i, sel_start.row));
channel[i].setMute(muted[i]);
}
SDL_PauseAudioDevice(sdlAudioDevice, 0);
}
if (key == SDL_SCANCODE_F5) {
song.Play();
channel[0].setup(song.GetCurrentNote(0));
channel[1].setup(song.GetCurrentNote(1));
channel[2].setup(song.GetCurrentNote(2));
channel[3].setup(song.GetCurrentNote(3));
for (int i=0;i<4;++i) {
channel[i].setup(song.GetCurrentNote(i));
channel[i].setMute(muted[i]);
}
SDL_PauseAudioDevice(sdlAudioDevice, 0);
}
if (key == SDL_SCANCODE_F8) {
song.Stop();
}
if (selected_part==0) {
if (sel_start.part==0) {
bool m = true;
switch(key) {
case SDL_SCANCODE_Z: note.SetFirstNote(0, base_octave, current_instrument, current_volume, current_effect); break;
@@ -240,78 +269,80 @@ int main(int argc, char* argv[]) {
case SDL_SCANCODE_N: note.SetFirstNote(9, base_octave, current_instrument, current_volume, current_effect); break;
case SDL_SCANCODE_J: note.SetFirstNote(10, base_octave, current_instrument, current_volume, current_effect); break;
case SDL_SCANCODE_M: note.SetFirstNote(11, base_octave, current_instrument, current_volume, current_effect); break;
case SDL_SCANCODE_A: note.SetSilence(); break;
default: m = false; break;
};
if (m) {
channel[0].setup(note.Get());
playNote(note);
/*channel[0].setup(note.Get());
channel[1].setup(0);
channel[2].setup(0);
channel[3].setup(0);
SDL_PauseAudioDevice(sdlAudioDevice, 0);
SDL_PauseAudioDevice(sdlAudioDevice, 0);*/
}
}
if (selected_part==1) {
if (sel_start.part==1) {
switch(key) {
case SDL_SCANCODE_2: note.SetOctave(2); break;
case SDL_SCANCODE_3: note.SetOctave(3); break;
case SDL_SCANCODE_4: note.SetOctave(4); break;
case SDL_SCANCODE_5: note.SetOctave(5); break;
case SDL_SCANCODE_6: note.SetOctave(6); break;
case SDL_SCANCODE_2: note.SetOctave(2); playNote(note); break;
case SDL_SCANCODE_3: note.SetOctave(3); playNote(note); break;
case SDL_SCANCODE_4: note.SetOctave(4); playNote(note); break;
case SDL_SCANCODE_5: note.SetOctave(5); playNote(note); break;
case SDL_SCANCODE_6: note.SetOctave(6); playNote(note); break;
default: break;
};
}
if (selected_part==2) {
if (sel_start.part==2) {
switch(key) {
case SDL_SCANCODE_0: note.SetInstrument(0); break;
case SDL_SCANCODE_1: note.SetInstrument(1); break;
case SDL_SCANCODE_2: note.SetInstrument(2); break;
case SDL_SCANCODE_3: note.SetInstrument(3); break;
case SDL_SCANCODE_0: note.SetInstrument(0); playNote(note); break;
case SDL_SCANCODE_1: note.SetInstrument(1); playNote(note); break;
case SDL_SCANCODE_2: note.SetInstrument(2); playNote(note); break;
case SDL_SCANCODE_3: note.SetInstrument(3); playNote(note); break;
default: break;
};
}
if (selected_part==3) {
if (sel_start.part==3) {
switch(key) {
case SDL_SCANCODE_0: note.SetVolume(0); break;
case SDL_SCANCODE_1: note.SetVolume(1); break;
case SDL_SCANCODE_2: note.SetVolume(2); break;
case SDL_SCANCODE_3: note.SetVolume(3); break;
case SDL_SCANCODE_4: note.SetVolume(4); break;
case SDL_SCANCODE_5: note.SetVolume(5); break;
case SDL_SCANCODE_6: note.SetVolume(6); break;
case SDL_SCANCODE_7: note.SetVolume(7); break;
case SDL_SCANCODE_8: note.SetVolume(8); break;
case SDL_SCANCODE_9: note.SetVolume(9); break;
case SDL_SCANCODE_A: note.SetVolume(10); break;
case SDL_SCANCODE_B: note.SetVolume(11); break;
case SDL_SCANCODE_C: note.SetVolume(12); break;
case SDL_SCANCODE_D: note.SetVolume(13); break;
case SDL_SCANCODE_E: note.SetVolume(14); break;
case SDL_SCANCODE_F: note.SetVolume(15); break;
case SDL_SCANCODE_0: note.SetVolume(0); playNote(note); break;
case SDL_SCANCODE_1: note.SetVolume(1); playNote(note); break;
case SDL_SCANCODE_2: note.SetVolume(2); playNote(note); break;
case SDL_SCANCODE_3: note.SetVolume(3); playNote(note); break;
case SDL_SCANCODE_4: note.SetVolume(4); playNote(note); break;
case SDL_SCANCODE_5: note.SetVolume(5); playNote(note); break;
case SDL_SCANCODE_6: note.SetVolume(6); playNote(note); break;
case SDL_SCANCODE_7: note.SetVolume(7); playNote(note); break;
case SDL_SCANCODE_8: note.SetVolume(8); playNote(note); break;
case SDL_SCANCODE_9: note.SetVolume(9); playNote(note); break;
case SDL_SCANCODE_A: note.SetVolume(10); playNote(note); break;
case SDL_SCANCODE_B: note.SetVolume(11); playNote(note); break;
case SDL_SCANCODE_C: note.SetVolume(12); playNote(note); break;
case SDL_SCANCODE_D: note.SetVolume(13);playNote(note); break;
case SDL_SCANCODE_E: note.SetVolume(14); playNote(note); break;
case SDL_SCANCODE_F: note.SetVolume(15); playNote(note); break;
default: break;
};
}
if (selected_part==4) {
if (sel_start.part==4) {
switch(key) {
case SDL_SCANCODE_0: note.SetEffect(0); break;
case SDL_SCANCODE_1: note.SetEffect(1); break;
case SDL_SCANCODE_2: note.SetEffect(2); break;
case SDL_SCANCODE_3: note.SetEffect(3); break;
case SDL_SCANCODE_4: note.SetEffect(4); break;
case SDL_SCANCODE_5: note.SetEffect(5); break;
case SDL_SCANCODE_6: note.SetEffect(6); break;
case SDL_SCANCODE_7: note.SetEffect(7); break;
case SDL_SCANCODE_8: note.SetEffect(8); break;
case SDL_SCANCODE_9: note.SetEffect(9); break;
case SDL_SCANCODE_A: note.SetEffect(10); break;
case SDL_SCANCODE_B: note.SetEffect(11); break;
case SDL_SCANCODE_C: note.SetEffect(12); break;
case SDL_SCANCODE_D: note.SetEffect(13); break;
case SDL_SCANCODE_E: note.SetEffect(14); break;
case SDL_SCANCODE_F: note.SetEffect(15); break;
case SDL_SCANCODE_0: note.SetEffect(0); playNote(note); break;
case SDL_SCANCODE_1: note.SetEffect(1); playNote(note); break;
case SDL_SCANCODE_2: note.SetEffect(2); playNote(note); break;
case SDL_SCANCODE_3: note.SetEffect(3); playNote(note); break;
case SDL_SCANCODE_4: note.SetEffect(4); playNote(note); break;
case SDL_SCANCODE_5: note.SetEffect(5); playNote(note); break;
case SDL_SCANCODE_6: note.SetEffect(6); playNote(note); break;
case SDL_SCANCODE_7: note.SetEffect(7); playNote(note); break;
case SDL_SCANCODE_8: note.SetEffect(8); playNote(note); break;
case SDL_SCANCODE_9: note.SetEffect(9); playNote(note); break;
case SDL_SCANCODE_A: note.SetEffect(10); playNote(note); break;
case SDL_SCANCODE_B: note.SetEffect(11); playNote(note); break;
case SDL_SCANCODE_C: note.SetEffect(12); playNote(note); break;
case SDL_SCANCODE_D: note.SetEffect(13); playNote(note); break;
case SDL_SCANCODE_E: note.SetEffect(14); playNote(note); break;
case SDL_SCANCODE_F: note.SetEffect(15); playNote(note); break;
default: break;
};
}
song.SetCurrentNote(selected_channel, selected_row, note.Get());
song.SetCurrentNote(sel_start.channel, sel_start.row, note.Get());
}
}
draw_clear(color_dark_grey);
@@ -334,23 +365,30 @@ int main(int argc, char* argv[]) {
for (int y=0; y<32; ++y) {
if ((song.IsPlaying()) && (y+scroll == song.GetCurrentRow())) {
draw_fill(xp-1, yp-1, 32, 7, color_yellow);
} else if (x == selected_channel && (y+scroll) == selected_row) {
} else if (x >= sel_start.channel && x <= sel_end.channel && (y+scroll) >= sel_start.row && (y+scroll) <= sel_end.row) {
draw_fill(xp-1, yp-1, 32, 7, color_dark_blue);
switch (selected_part) {
case 0: draw_fill(xp-1, yp-1, 11, 7, color_yellow); break;
case 1: draw_fill(9+xp, yp-1, 6, 7, color_yellow); break;
case 2: draw_fill(15+xp, yp-1, 6, 7, color_yellow); break;
case 3: draw_fill(20+xp, yp-1, 6, 7, color_yellow); break;
case 4: draw_fill(25+xp, yp-1, 6, 7, color_yellow); break;
if (x == sel_start.channel && (y+scroll) == sel_start.row) {
switch (sel_start.part) {
case 0: draw_fill(xp-1, yp-1, 11, 7, color_yellow); break;
case 1: draw_fill(9+xp, yp-1, 6, 7, color_yellow); break;
case 2: draw_fill(15+xp, yp-1, 6, 7, color_yellow); break;
case 3: draw_fill(20+xp, yp-1, 6, 7, color_yellow); break;
case 4: draw_fill(25+xp, yp-1, 6, 7, color_yellow); break;
}
}
}
Note note(song.GetCurrentNote(x, y+scroll));
//Uint16 current_note = pattern[x][y];
if (note.GetAbsoluteNote() == 0) {
uint8_t color = color_dark_blue;
if (x == selected_channel && (y+scroll) == selected_row) color = color_dark_purple;
if (x >= sel_start.channel && x <= sel_end.channel && (y+scroll) >= sel_start.row && (y+scroll) <= sel_end.row) color = color_dark_purple;
draw_string("...", xp, yp, color);
draw_string("...", 16+xp, yp, color);
} else if (note.GetAbsoluteNote() == 63) {
uint8_t color = color_light_grey;
//if (x == selected_channel && (y+scroll) == selected_row) color = color_dark_purple;
draw_string("===", xp, yp, color);
draw_string("===", 16+xp, yp, color);
} else {
//uint8_t note_num = get_note(current_note);

10
note.cpp
View File

@@ -64,6 +64,14 @@ void Note::SetFirstNote(const uint8_t note, const uint8_t octave, const uint8_t
this->note = note;
}
void Note::SetSilence() {
this->note = 63;
this->octave = 0;
this->instrument = 0;
this->volume = 0;
this->effect = 0;
}
void Note::SetOctave(const uint8_t octave) {
this->octave = octave;
}
@@ -89,6 +97,8 @@ const uint16_t Note::Get() {
const uint8_t Note::GetAbsoluteNote() {
if ((this->note == 0) && (this->octave == 0)) {
return 0;
} else if (this->note == 63) {
return 63;
} else {
uint8_t result = ((this->octave-2)*12)+this->note+1;
return result;

1
note.h
View File

@@ -17,6 +17,7 @@ class Note {
void SetInstrument(const uint8_t instrument);
void SetVolume(const uint8_t volume);
void SetEffect(const uint8_t effect);
void SetSilence();
const uint16_t Get();
const uint8_t GetAbsoluteNote();

8
tonegen.cpp
View File

@@ -11,6 +11,7 @@ toneGen::toneGen() {
this->instrument = CHIPTUNE_INSTRUMENT_NOISE;
this->volume = 0;
this->effect = CHIPTUNE_EFFECT_FADEOUT;
this->muted = false;
this->current_volume = this->nominal_volume = 1.0f;
@@ -37,6 +38,7 @@ void toneGen::setup(const uint8_t note, const uint8_t instrument, const uint8_t
this->instrument = instrument;
this->volume = volume;
this->effect = effect;
//this->muted = false;
this->nominal_volume = float(volume) / 15.0f;
this->current_volume = this->effect == CHIPTUNE_EFFECT_FADEIN ? 0.0f : this->nominal_volume;
@@ -92,9 +94,13 @@ const int toneGen::getSamples(const int numSamples, Sint16 *buffer) {
buffer[i] = (rand()*2)-AUDIO_FORMAT_MAX_VALUE;
break;
}
buffer[i] *= this->current_volume;
buffer[i] *= (muted ? 0 : this->current_volume);
}
this->current_pos += actual_samples_generated;
return actual_samples_generated;
}
void toneGen::setMute(const bool value) {
muted = value;
}

2
tonegen.h
View File

@@ -21,6 +21,7 @@ class toneGen {
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);
void setMute(const bool value);
private:
uint8_t note, instrument, volume, effect;
@@ -29,4 +30,5 @@ class toneGen {
int note_length;
int current_pos;
float vibrato_counter;
bool muted;
};