otomatalabs/furnace
7
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Revert "style fixes"

Browse source 
This reverts commit 15d47d0aae.
This commit is contained in:
tildearrow 2024-08-19 02:49:14 -05:00
parent 73c61d9ac7
commit f1de0bf2b7
3 changed files with 42 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/engine/instrument.cpp
View file

@ -365,7 +365,7 @@ void DivInstrument::writeFeatureFM(SafeWriter* w, bool fui) {
} }
void MemPatch::clear() { void MemPatch::clear() {
data = NULL; data = nullptr;
offset = 0; offset = 0;
size = 0; size = 0;
} }
@ -374,8 +374,8 @@ bool MemPatch::calcDiff(const void* pre, const void* post, size_t inputSize) {
bool diffValid = false; bool diffValid = false;
size_t firstDiff = 0; size_t firstDiff = 0;
size_t lastDiff = 0; size_t lastDiff = 0;
const unsigned char* preBytes=(const unsigned char*)pre; const uint8_t* preBytes = (const uint8_t*)pre;
const unsigned char* postBytes=(const unsigned char*)post; const uint8_t* postBytes = (const uint8_t*)post;
for (size_t ii = 0; ii < inputSize; ++ii) { for (size_t ii = 0; ii < inputSize; ++ii) {
if (preBytes[ii] != postBytes[ii]) { if (preBytes[ii] != postBytes[ii]) {
@ -388,7 +388,7 @@ bool MemPatch::calcDiff(const void* pre, const void* post, size_t inputSize) {
if (diffValid) { if (diffValid) {
offset = firstDiff; offset = firstDiff;
size = lastDiff - firstDiff + 1; size = lastDiff - firstDiff + 1;
data=new unsigned char[size]; data = new uint8_t[size];
// the diff is to make pre into post (MemPatch is general, not specific to // the diff is to make pre into post (MemPatch is general, not specific to
// undo), so copy from postBytes // undo), so copy from postBytes
@ -399,13 +399,13 @@ bool MemPatch::calcDiff(const void* pre, const void* post, size_t inputSize) {
} }
void MemPatch::applyAndReverse(void* target, size_t targetSize) { void MemPatch::applyAndReverse(void* target, size_t targetSize) {
if (size==0) return; if (size == 0) { return; }
assert(offset + size <= targetSize); assert(offset + size <= targetSize);
unsigned char* targetBytes=(unsigned char*)target; uint8_t* targetBytes = (uint8_t*)target;
// swap this->data and its segment on target // swap this->data and its segment on target
for (size_t ii = 0; ii < size; ++ii) { for (size_t ii = 0; ii < size; ++ii) {
unsigned char tmp=targetBytes[offset+ii]; uint8_t tmp = targetBytes[offset + ii];
targetBytes[offset + ii] = data[ii]; targetBytes[offset + ii] = data[ii];
data[ii] = tmp; data[ii] = tmp;
} }
@ -428,7 +428,7 @@ bool DivInstrumentUndoStep::makeUndoPatch(size_t processTime_, const DivInstrume
// create the patch that will make post into pre // create the patch that will make post into pre
podPatch.calcDiff((const DivInstrumentPOD*)post, (const DivInstrumentPOD*)pre, sizeof(DivInstrumentPOD)); podPatch.calcDiff((const DivInstrumentPOD*)post, (const DivInstrumentPOD*)pre, sizeof(DivInstrumentPOD));
if (pre->name!=post->name != 0) { if (pre->name.compare(post->name) != 0) {
nameValid = true; nameValid = true;
name = pre->name; name = pre->name;
} }
@ -465,7 +465,7 @@ void DivInstrument::recordUndoStepIfChanged(size_t processTime, const DivInstrum
} }
int DivInstrument::undo() { int DivInstrument::undo() {
if (undoHist.empty()) return 0; if (undoHist.empty()) { return 0; }
DivInstrumentUndoStep* step = undoHist.back(); DivInstrumentUndoStep* step = undoHist.back();
undoHist.pop_back(); undoHist.pop_back();
@ -484,7 +484,7 @@ int DivInstrument::undo() {
} }
int DivInstrument::redo() { int DivInstrument::redo() {
if (redoHist.empty()) return 0; if (redoHist.empty()) { return 0; }
DivInstrumentUndoStep* step = redoHist.back(); DivInstrumentUndoStep* step = redoHist.back();
redoHist.pop_back(); redoHist.pop_back();

4
src/engine/instrument.h
View file

@ -888,7 +888,7 @@ struct DivInstrumentPOD {
struct MemPatch { struct MemPatch {
MemPatch() : MemPatch() :
data(NULL) data(nullptr)
, offset(0) , offset(0)
, size(0) { , size(0) {
} }
@ -904,7 +904,7 @@ struct MemPatch {
void applyAndReverse(void* target, size_t inputSize); void applyAndReverse(void* target, size_t inputSize);
bool isValid() const { return size > 0; } bool isValid() const { return size > 0; }
unsigned char* data; uint8_t* data;
size_t offset; size_t offset;
size_t size; size_t size;
}; };

4
src/gui/insEdit.cpp
View file

@ -5250,7 +5250,7 @@ void FurnaceGUI::drawInsEdit() {
ImGui::SetNextWindowSizeConstraints(ImVec2(440.0f*dpiScale,400.0f*dpiScale),ImVec2(canvasW,canvasH)); ImGui::SetNextWindowSizeConstraints(ImVec2(440.0f*dpiScale,400.0f*dpiScale),ImVec2(canvasW,canvasH));
} }
if (ImGui::Begin("Instrument Editor",&insEditOpen,globalWinFlags|(settings.allowEditDocking?0:ImGuiWindowFlags_NoDocking),_("Instrument Editor"))) { if (ImGui::Begin("Instrument Editor",&insEditOpen,globalWinFlags|(settings.allowEditDocking?0:ImGuiWindowFlags_NoDocking),_("Instrument Editor"))) {
DivInstrument* ins=NULL; DivInstrument* ins=nullptr;
if (curIns==-2) { if (curIns==-2) {
ImGui::SetCursorPosY(ImGui::GetCursorPosY()+(ImGui::GetContentRegionAvail().y-ImGui::GetFrameHeightWithSpacing()+ImGui::GetStyle().ItemSpacing.y)*0.5f); ImGui::SetCursorPosY(ImGui::GetCursorPosY()+(ImGui::GetContentRegionAvail().y-ImGui::GetFrameHeightWithSpacing()+ImGui::GetStyle().ItemSpacing.y)*0.5f);
CENTER_TEXT(_("waiting...")); CENTER_TEXT(_("waiting..."));
@ -7757,7 +7757,7 @@ void FurnaceGUI::drawInsEdit() {
cachedCurInsPtr = ins; cachedCurInsPtr = ins;
} else { } else {
cachedCurInsPtr=NULL; cachedCurInsPtr = nullptr;
} }
} }