microtherion/VocalEasel
1
0
Fork 0
mirror of https://github.com/microtherion/VocalEasel.git synced 2024-12-22 19:23:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix chord editing display

Browse Source
This commit is contained in:
Matthias Neeracher 2006-10-29 07:48:39 +00:00
parent f059ffb24e
commit 6f67b7df9e
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Sources/VLModel.cpp
View File

@ -283,8 +283,9 @@ failed:
} }
static const char * kStepNames[] = { static const char * kStepNames[] = {
"", "", "sus2", "", "", "sus", "♭5", "", "+", "6", "7", "♯7", "", "", "", "sus2", "", "", "sus", kVLFlatStr "5", "", "+", "6",
"♭9", "9", "♯9", "", "11", "♯11", "", "♭13", "13" "7", kVLSharpStr "7", "", kVLFlatStr "9", "9", kVLSharpStr "9", "",
"11", kVLSharpStr "11", "", kVLFlatStr "13", "13"
}; };
void VLChord::Name(std::string & base, std::string & ext, std::string & root, bool useSharps) const void VLChord::Name(std::string & base, std::string & ext, std::string & root, bool useSharps) const

15
Sources/VLSheetViewChords.mm
View File

@ -23,12 +23,12 @@ std::string NormalizeName(NSString* rawName)
for (;;) { for (;;) {
size_t found; size_t found;
found = chordName.find("\xE2\x99\xAF", 0, 3); found = chordName.find(kVLSharpStr, 0, 3);
if (found != std::string::npos) { if (found != std::string::npos) {
chordName.replace(found, 3, 1, '#'); chordName.replace(found, 3, 1, '#');
continue; continue;
} }
found = chordName.find("\xE2\x99\xAD", 0, 3); found = chordName.find(kVLFlatStr, 0, 3);
if (found != std::string::npos) { if (found != std::string::npos) {
chordName.replace(found, 3, 1, 'b'); chordName.replace(found, 3, 1, 'b');
continue; continue;
@ -95,13 +95,18 @@ std::string NormalizeName(NSString* rawName)
// //
// Found it! // Found it!
// //
VLSoundOut::Instance()->PlayChord(*chord);
const VLProperties & prop = fSong->fProperties.front(); const VLProperties & prop = fSong->fProperties.front();
std::string name, ext, root; std::string name, ext, root;
chord->Name(name, ext, root, prop.fKey > 0); chord->Name(name, ext, root, prop.fKey > 0);
return [NSString stringWithFormat:@"%s%s%s", NSString * ns = [NSString stringWithUTF8String:name.c_str()];
name.c_str(), ext.c_str(), NSString * es = [NSString stringWithUTF8String:ext.c_str()];
root.size() ? ("/"+root).c_str() : ""]; NSString * rs = [NSString stringWithUTF8String:root.c_str()];
return [NSString stringWithFormat:@"%@%@%s%@", ns, es,
[rs length] ? "/" : "", rs];
} }
at += chord->fDuration; at += chord->fDuration;
} }