Remove useless things
This commit is contained in:
parent
da9f419923
commit
4049f3f323
2 changed files with 1 additions and 17 deletions
10
src/external/tunings/include/Tunings.h
vendored
10
src/external/tunings/include/Tunings.h
vendored
|
|
@ -72,14 +72,11 @@ namespace Tunings
|
||||||
*
|
*
|
||||||
* In most normal use, you will simply pass around instances of this class
|
* In most normal use, you will simply pass around instances of this class
|
||||||
* to a Tunings::Tuning instance, but in some cases you may want to create
|
* to a Tunings::Tuning instance, but in some cases you may want to create
|
||||||
* or inspect this class yourself. Especially if you are displaying this
|
* or inspect this class yourself.
|
||||||
* class to your end users, you may want to use the rawText or count methods.
|
|
||||||
*/
|
*/
|
||||||
struct Scale
|
struct Scale
|
||||||
{
|
{
|
||||||
//std::string name = "empty scale"; // The name in the SCL file. Informational only
|
|
||||||
std::string description; // The description in the SCL file. Informational only
|
std::string description; // The description in the SCL file. Informational only
|
||||||
std::string rawText; // The raw text of the SCL file used to create this Scale
|
|
||||||
int count = 0; // The number of tones.
|
int count = 0; // The number of tones.
|
||||||
std::vector<Tone> tones; // The tones
|
std::vector<Tone> tones; // The tones
|
||||||
};
|
};
|
||||||
|
|
@ -90,8 +87,6 @@ namespace Tunings
|
||||||
* pick a fixed note in the midi keyboard when retuning. The KBM file can also
|
* pick a fixed note in the midi keyboard when retuning. The KBM file can also
|
||||||
* remap individual keys to individual points in a scale, which kere is done with the
|
* remap individual keys to individual points in a scale, which kere is done with the
|
||||||
* keys vector.
|
* keys vector.
|
||||||
*
|
|
||||||
* Just as with Scale, the rawText member contains the text of the KBM file used.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
struct KeyboardMapping
|
struct KeyboardMapping
|
||||||
|
|
@ -103,9 +98,6 @@ namespace Tunings
|
||||||
double tuningFrequency = MIDI_0_FREQ * 32.0, tuningPitch = 32.0; // pitch = frequency / MIDI_0_FREQ
|
double tuningFrequency = MIDI_0_FREQ * 32.0, tuningPitch = 32.0; // pitch = frequency / MIDI_0_FREQ
|
||||||
int octaveDegrees = 12;
|
int octaveDegrees = 12;
|
||||||
std::vector<int> keys; // rather than an 'x' we use a '-1' for skipped keys
|
std::vector<int> keys; // rather than an 'x' we use a '-1' for skipped keys
|
||||||
|
|
||||||
std::string rawText;
|
|
||||||
//std::string name;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
8
src/external/tunings/src/Tunings.cpp
vendored
8
src/external/tunings/src/Tunings.cpp
vendored
|
|
@ -78,11 +78,9 @@ namespace Tunings
|
||||||
int state = read_header;
|
int state = read_header;
|
||||||
|
|
||||||
Scale res;
|
Scale res;
|
||||||
std::ostringstream rawOSS;
|
|
||||||
int lineno = 0;
|
int lineno = 0;
|
||||||
while (std::getline(inf, line))
|
while (std::getline(inf, line))
|
||||||
{
|
{
|
||||||
rawOSS << line << "\n";
|
|
||||||
lineno ++;
|
lineno ++;
|
||||||
|
|
||||||
if (line.empty() || line[0] == '!')
|
if (line.empty() || line[0] == '!')
|
||||||
|
|
@ -121,7 +119,6 @@ namespace Tunings
|
||||||
throw TuningError(s);
|
throw TuningError(s);
|
||||||
|
|
||||||
}
|
}
|
||||||
res.rawText = rawOSS.str();
|
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -136,7 +133,6 @@ namespace Tunings
|
||||||
}
|
}
|
||||||
|
|
||||||
auto res = readSCLStream(inf);
|
auto res = readSCLStream(inf);
|
||||||
//res.name = std::move(fname);
|
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -144,7 +140,6 @@ namespace Tunings
|
||||||
{
|
{
|
||||||
std::istringstream iss(d);
|
std::istringstream iss(d);
|
||||||
auto res = readSCLStream(iss);
|
auto res = readSCLStream(iss);
|
||||||
//res.name = "Scale from Patch";
|
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -200,7 +195,6 @@ namespace Tunings
|
||||||
std::string line;
|
std::string line;
|
||||||
|
|
||||||
KeyboardMapping res;
|
KeyboardMapping res;
|
||||||
std::ostringstream rawOSS;
|
|
||||||
res.keys.clear();
|
res.keys.clear();
|
||||||
|
|
||||||
enum parsePosition {
|
enum parsePosition {
|
||||||
|
|
@ -219,7 +213,6 @@ namespace Tunings
|
||||||
int lineno = 0;
|
int lineno = 0;
|
||||||
while (std::getline(inf, line))
|
while (std::getline(inf, line))
|
||||||
{
|
{
|
||||||
rawOSS << line << "\n";
|
|
||||||
lineno ++;
|
lineno ++;
|
||||||
if (line.empty() || line[0] == '!')
|
if (line.empty() || line[0] == '!')
|
||||||
{
|
{
|
||||||
|
|
@ -298,7 +291,6 @@ namespace Tunings
|
||||||
+ std::to_string( res.count ) + " and we parsed " + std::to_string( res.keys.size() ) + " keys." );
|
+ std::to_string( res.count ) + " and we parsed " + std::to_string( res.keys.size() ) + " keys." );
|
||||||
}
|
}
|
||||||
|
|
||||||
res.rawText = rawOSS.str();
|
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue