Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 30 additions & 2 deletions arm9/source/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ using namespace tobkit;
#include "sampleedit_all_raw.h"
#include "sampleedit_none_raw.h"
#include "sampleedit_del_raw.h"
#include "sampleedit_trim_raw.h"
#include "sampleedit_reverse_raw.h"
#include "sampleedit_record_raw.h"
#include "sampleedit_normalize_raw.h"
Expand Down Expand Up @@ -189,7 +190,7 @@ GUI *gui;

Label *labelsampleedit_select, *labelsampleedit_edit, *labelsampleedit_record;
BitButton *buttonsmpfadein, *buttonsmpfadeout, *buttonsmpselall, *buttonsmpselnone, *buttonsmpseldel,
*buttonsmpreverse, *buttonrecord, *buttonsmpnormalize;
*buttonsmpreverse, *buttonrecord, *buttonsmpnormalize, *buttonsmptrim;

GroupBox *gbsampleloop;
RadioButton::RadioButtonGroup *rbg_sampleloop;
Expand Down Expand Up @@ -623,6 +624,7 @@ void handleSampleChange(const u16 newsample)
buttonsmpselall->set_enabled(smp != NULL);
buttonsmpselnone->set_enabled(smp != NULL);
buttonsmpseldel->set_enabled(smp != NULL);
buttonsmptrim->set_enabled(smp != NULL);
buttonsmpreverse->set_enabled(smp != NULL);
buttonsmpnormalize->set_enabled(smp != NULL);
cbsnapto0xing->set_enabled(smp != NULL);
Expand Down Expand Up @@ -2706,6 +2708,28 @@ void sample_del_selection(void)
setHasUnsavedChanges(true);
}

void sample_crop_selection(void)
{
Instrument *inst = song->getInstrument(state->instrument);
if(inst==0) return;

Sample *smp = inst->getSample(state->sample);
if(smp==0) return;

stopPlay();

u32 startsample, endsample;
bool sel_exists = sampledisplay->getSelection(&startsample, &endsample);

if(!sel_exists || startsample == endsample) return;

if (endsample < smp->getNSamples()) smp->delPart(endsample, smp->getNSamples() - 1);
if (startsample > 0) smp->delPart(0, startsample - 1);

DC_FlushAll();
sampledisplay->setSample(smp);
}

void sample_fade_in(void)
{
Instrument *inst = song->getInstrument(state->instrument);
Expand Down Expand Up @@ -3309,13 +3333,17 @@ void setupGUI(bool dldi_enabled)
buttonsmpseldel = new BitButton(96, 128, 17, 17, &sub_vram, sampleedit_del_raw);
buttonsmpseldel->registerPushCallback(sample_del_selection);

buttonsmptrim = new BitButton(114, 128, 17, 17, &sub_vram, sampleedit_trim_raw);
buttonsmptrim->registerPushCallback(sample_crop_selection);

buttonsmpnormalize = new BitButton(114, 110, 17, 17, &sub_vram, sampleedit_normalize_raw);
buttonsmpnormalize->registerPushCallback(sample_show_normalize_window);

sampletabbox->registerWidget(buttonrecord, 0, 0);
sampletabbox->registerWidget(buttonsmpselall, 0, 0);
sampletabbox->registerWidget(buttonsmpselnone, 0, 0);
sampletabbox->registerWidget(buttonsmpseldel, 0, 0);
sampletabbox->registerWidget(buttonsmptrim, 0, 0);
sampletabbox->registerWidget(buttonsmpfadein, 0, 0);
sampletabbox->registerWidget(buttonsmpfadeout, 0, 0);
sampletabbox->registerWidget(buttonsmpreverse, 0, 0);
Expand Down Expand Up @@ -4249,4 +4277,4 @@ int main(int argc, char **argv) {
if (launch_path) ntxm_free(launch_path);

return 0;
}
}