Skip to content
This repository has been archived by the owner on Aug 31, 2023. It is now read-only.

Commit

Permalink
Fixed indentation.
Browse files Browse the repository at this point in the history
  • Loading branch information
Veikko Sariola committed Oct 6, 2017
1 parent 1e6fd4c commit f13eb85
Showing 1 changed file with 144 additions and 144 deletions.
288 changes: 144 additions & 144 deletions gui.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -451,55 +451,55 @@ var CGUI = function()

return song;
};
var putInstrument = function(bin,instrI)
{
// Oscillator 1
bin.putUBYTE(instrI[OSC1_WAVEFORM]);
bin.putUBYTE(instrI[OSC1_VOL]);
bin.putUBYTE(instrI[OSC1_SEMI]);
bin.putUBYTE(instrI[OSC1_XENV]);

// Oscillator 2
bin.putUBYTE(instrI[OSC2_WAVEFORM]);
bin.putUBYTE(instrI[OSC2_VOL]);
bin.putUBYTE(instrI[OSC2_SEMI]);
bin.putUBYTE(instrI[OSC2_DETUNE]);
bin.putUBYTE(instrI[OSC2_XENV]);

// Noise oscillator
bin.putUBYTE(instrI[NOISE_VOL]);

// Envelope
bin.putUBYTE(instrI[ENV_ATTACK]);
bin.putUBYTE(instrI[ENV_SUSTAIN]);
bin.putUBYTE(instrI[ENV_RELEASE]);

// Arpeggio
bin.putUBYTE(instrI[ARP_CHORD]);
bin.putUBYTE(instrI[ARP_SPEED]);

// LFO
bin.putUBYTE(instrI[LFO_WAVEFORM]);
bin.putUBYTE(instrI[LFO_AMT]);
bin.putUBYTE(instrI[LFO_FREQ]);
bin.putUBYTE(instrI[LFO_FX_FREQ]);

// Effects
bin.putUBYTE(instrI[FX_FILTER]);
bin.putUBYTE(instrI[FX_FREQ]);
bin.putUBYTE(instrI[FX_RESONANCE]);
bin.putUBYTE(instrI[FX_DIST]);
bin.putUBYTE(instrI[FX_DRIVE]);
bin.putUBYTE(instrI[FX_PAN_AMT]);
bin.putUBYTE(instrI[FX_PAN_FREQ]);
bin.putUBYTE(instrI[FX_DELAY_AMT]);
bin.putUBYTE(instrI[FX_DELAY_TIME]);
}
var compress = function(unpackedData)
{
// Pack the song data
var putInstrument = function(bin,instrI)
{
// Oscillator 1
bin.putUBYTE(instrI[OSC1_WAVEFORM]);
bin.putUBYTE(instrI[OSC1_VOL]);
bin.putUBYTE(instrI[OSC1_SEMI]);
bin.putUBYTE(instrI[OSC1_XENV]);

// Oscillator 2
bin.putUBYTE(instrI[OSC2_WAVEFORM]);
bin.putUBYTE(instrI[OSC2_VOL]);
bin.putUBYTE(instrI[OSC2_SEMI]);
bin.putUBYTE(instrI[OSC2_DETUNE]);
bin.putUBYTE(instrI[OSC2_XENV]);

// Noise oscillator
bin.putUBYTE(instrI[NOISE_VOL]);

// Envelope
bin.putUBYTE(instrI[ENV_ATTACK]);
bin.putUBYTE(instrI[ENV_SUSTAIN]);
bin.putUBYTE(instrI[ENV_RELEASE]);

// Arpeggio
bin.putUBYTE(instrI[ARP_CHORD]);
bin.putUBYTE(instrI[ARP_SPEED]);

// LFO
bin.putUBYTE(instrI[LFO_WAVEFORM]);
bin.putUBYTE(instrI[LFO_AMT]);
bin.putUBYTE(instrI[LFO_FREQ]);
bin.putUBYTE(instrI[LFO_FX_FREQ]);

// Effects
bin.putUBYTE(instrI[FX_FILTER]);
bin.putUBYTE(instrI[FX_FREQ]);
bin.putUBYTE(instrI[FX_RESONANCE]);
bin.putUBYTE(instrI[FX_DIST]);
bin.putUBYTE(instrI[FX_DRIVE]);
bin.putUBYTE(instrI[FX_PAN_AMT]);
bin.putUBYTE(instrI[FX_PAN_FREQ]);
bin.putUBYTE(instrI[FX_DELAY_AMT]);
bin.putUBYTE(instrI[FX_DELAY_TIME]);
}
var compress = function(unpackedData)
{
// Pack the song data
// FIXME: To avoid bugs, we try different compression methods here until we
// find something that works (this should not be necessary).
var packedData, testData, compressionMethod = 0;
Expand All @@ -519,25 +519,25 @@ var CGUI = function()
else
packedData = unpackedData;
}
// method:
// 0: none
// method:
// 0: none
// 1: RLE
// 2: DEFLATE
return {method:compressionMethod,data:packedData};
}
var uncompress = function(method,packedData)
{
switch (method) {
default:
case 0:
return packedData;
case 1:
return rle_decode(packedData);
case 2:
return RawDeflate.inflate(packedData);
}
}
return {method:compressionMethod,data:packedData};
}
var uncompress = function(method,packedData)
{
switch (method) {
default:
case 0:
return packedData;
case 1:
return rle_decode(packedData);
case 2:
return RawDeflate.inflate(packedData);
}
}

var songToBin = function (song) {
var bin = new CBinWriter();
Expand All @@ -560,7 +560,7 @@ var CGUI = function()
instr = song.songData[i];

putInstrument(bin,instr.i);
// Patterns
for (j = 0; j <= song.endPattern; j++)
bin.putUBYTE(instr.p[j]);
Expand All @@ -574,8 +574,8 @@ var CGUI = function()
bin.putUBYTE(col.f[k]);
}
}
var compressedData = compress(bin.getData());
var compressedData = compress(bin.getData());

// Create a new binary stream - this is the actual file
bin = new CBinWriter();
Expand Down Expand Up @@ -615,7 +615,7 @@ var CGUI = function()

// Unpack song data
var packedData = bin.getTail();
var unpackedData = uncompress(compressionMethod,packedData);
var unpackedData = uncompress(compressionMethod,packedData);
bin = new CBinParser(unpackedData);
}

Expand Down Expand Up @@ -968,16 +968,16 @@ var CGUI = function()

return song;
};
var instrumentToBin = function (instrI) {
var instrumentToBin = function (instrI) {
var bin = new CBinWriter();

putInstrument(bin,instrI);
putInstrument(bin,instrI);

// The code and file format are ready to support compressed data;
// However, at the moment, the instruments are so small that no point
// compressing. Replace this line with compress(bin.getData()) if needed
var compressedData = {method:0,data:bin.getData()};
// However, at the moment, the instruments are so small that no point
// compressing. Replace this line with compress(bin.getData()) if needed
var compressedData = {method:0,data:bin.getData()};

// Create a new binary stream - this is the actual file
bin = new CBinWriter();
Expand All @@ -996,8 +996,8 @@ var CGUI = function()

return bin.getData();
};
var binToInstrument = function (d) {
var binToInstrument = function (d) {
var bin = new CBinParser(d);
var instrI = [];

Expand All @@ -1013,53 +1013,53 @@ var CGUI = function()

var compressionMethod = bin.getUBYTE();

// Unpack instrument data
var packedData = bin.getTail();
var unpackedData = uncompress(compressionMethod,packedData);
bin = new CBinParser(unpackedData);
// Unpack instrument data
var packedData = bin.getTail();
var unpackedData = uncompress(compressionMethod,packedData);
bin = new CBinParser(unpackedData);

// Oscillator 1
instrI[OSC1_WAVEFORM] = bin.getUBYTE();
instrI[OSC1_VOL] = bin.getUBYTE();
instrI[OSC1_SEMI] = bin.getUBYTE();
instrI[OSC1_XENV] = bin.getUBYTE();

// Oscillator 2
instrI[OSC2_WAVEFORM] = bin.getUBYTE();
instrI[OSC2_VOL] = bin.getUBYTE();
instrI[OSC2_SEMI] = bin.getUBYTE();
instrI[OSC2_DETUNE] = bin.getUBYTE();
instrI[OSC2_XENV] = bin.getUBYTE();
// Noise oscillator
instrI[NOISE_VOL] = bin.getUBYTE();

// Envelope
instrI[ENV_ATTACK] = bin.getUBYTE();
instrI[ENV_SUSTAIN] = bin.getUBYTE();
instrI[ENV_RELEASE] = bin.getUBYTE();
// Arpeggio
instrI[ARP_CHORD] = bin.getUBYTE();
instrI[ARP_SPEED] = bin.getUBYTE();

// LFO
instrI[LFO_WAVEFORM] = bin.getUBYTE();
instrI[LFO_AMT] = bin.getUBYTE();
instrI[LFO_FREQ] = bin.getUBYTE();
instrI[LFO_FX_FREQ] = bin.getUBYTE();

// Effects
instrI[FX_FILTER] = bin.getUBYTE();
instrI[FX_FREQ] = bin.getUBYTE();
instrI[FX_RESONANCE] = bin.getUBYTE();
instrI[FX_DIST] = bin.getUBYTE();
instrI[FX_DRIVE] = bin.getUBYTE();
instrI[FX_PAN_AMT] = bin.getUBYTE();
instrI[FX_PAN_FREQ] = bin.getUBYTE();
instrI[FX_DELAY_AMT] = bin.getUBYTE();
instrI[FX_DELAY_TIME] = bin.getUBYTE();
instrI[OSC1_VOL] = bin.getUBYTE();
instrI[OSC1_SEMI] = bin.getUBYTE();
instrI[OSC1_XENV] = bin.getUBYTE();

// Oscillator 2
instrI[OSC2_WAVEFORM] = bin.getUBYTE();
instrI[OSC2_VOL] = bin.getUBYTE();
instrI[OSC2_SEMI] = bin.getUBYTE();
instrI[OSC2_DETUNE] = bin.getUBYTE();
instrI[OSC2_XENV] = bin.getUBYTE();
// Noise oscillator
instrI[NOISE_VOL] = bin.getUBYTE();

// Envelope
instrI[ENV_ATTACK] = bin.getUBYTE();
instrI[ENV_SUSTAIN] = bin.getUBYTE();
instrI[ENV_RELEASE] = bin.getUBYTE();
// Arpeggio
instrI[ARP_CHORD] = bin.getUBYTE();
instrI[ARP_SPEED] = bin.getUBYTE();

// LFO
instrI[LFO_WAVEFORM] = bin.getUBYTE();
instrI[LFO_AMT] = bin.getUBYTE();
instrI[LFO_FREQ] = bin.getUBYTE();
instrI[LFO_FX_FREQ] = bin.getUBYTE();

// Effects
instrI[FX_FILTER] = bin.getUBYTE();
instrI[FX_FREQ] = bin.getUBYTE();
instrI[FX_RESONANCE] = bin.getUBYTE();
instrI[FX_DIST] = bin.getUBYTE();
instrI[FX_DRIVE] = bin.getUBYTE();
instrI[FX_PAN_AMT] = bin.getUBYTE();
instrI[FX_PAN_FREQ] = bin.getUBYTE();
instrI[FX_DELAY_AMT] = bin.getUBYTE();
instrI[FX_DELAY_TIME] = bin.getUBYTE();

return instrI;
};
Expand Down Expand Up @@ -1822,20 +1822,20 @@ var CGUI = function()
updatePattern();
updateFxTrack();
updateInstrument(true);
return true;
return true;
}
return false;
return false;
};
var loadInstrumentFromData = function (instrumentData) {
var loadInstrumentFromData = function (instrumentData) {
var instrI = binToInstrument(instrumentData);
if (instrI) {
stopAudio();
mSong.songData[mSeqCol].i = instrI;
mSong.songData[mSeqCol].i = instrI;
updateInstrument(true);
return true;
return true;
}
return false;
return false;
};

var showOpenDialog = function () {
Expand Down Expand Up @@ -2617,13 +2617,13 @@ var CGUI = function()
}
updateInstrument(true);
};
var instrSaveMouseDown = function () {
var instrI = mSong.songData[mSeqCol].i;
var dataURI = "data:application/octet-stream;base64," + btoa(instrumentToBin(instrI));
window.open(dataURI);
hideDialog();
return false;
var instrSaveMouseDown = function () {
var instrI = mSong.songData[mSeqCol].i;
var dataURI = "data:application/octet-stream;base64," + btoa(instrumentToBin(instrI));
window.open(dataURI);
hideDialog();
return false;
};

var patternCopyMouseDown = function (e) {
Expand Down Expand Up @@ -3619,13 +3619,13 @@ var CGUI = function()
// Load the file into the editor
var reader = new FileReader();
reader.onload = function(e) {
var data = getURLSongData(e.target.result);
// try first loading the file as a song
var success = loadSongFromData(data);
if (!success) // if it is not a song, maybe its an instrument
success = loadInstrumentFromData(data);
if (!success)
alert("Binary format not recognized.");
var data = getURLSongData(e.target.result);
// try first loading the file as a song
var success = loadSongFromData(data);
if (!success) // if it is not a song, maybe its an instrument
success = loadInstrumentFromData(data);
if (!success)
alert("Binary format not recognized.");
};
reader.readAsDataURL(file);
};
Expand Down Expand Up @@ -4038,7 +4038,7 @@ var CGUI = function()

document.getElementById("instrCopy").onmousedown = instrCopyMouseDown;
document.getElementById("instrPaste").onmousedown = instrPasteMouseDown;
document.getElementById("instrSave").onmousedown = instrSaveMouseDown;
document.getElementById("instrSave").onmousedown = instrSaveMouseDown;

// Initialize the MIDI handler
initMIDI();
Expand Down

0 comments on commit f13eb85

Please sign in to comment.