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

Use flats in C major

Browse Source
This commit is contained in:
Matthias Neeracher 2008-04-06 22:33:07 +00:00
parent 0fc6618a8c
commit 45f98adcc5
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Sources/VLLilypondWriter.cpp
View File

@ -40,7 +40,7 @@ void VLLilypondWriter::VisitMeasure(size_t m, VLProperties & p, VLMeasure & meas
else else
measNo[0] = 0; measNo[0] = 0;
fUseSharps = p.fKey >= 0; fUseSharps = p.fKey > 0;
fInPickup = fInPickup && !m && meas.NoChords(); fInPickup = fInPickup && !m && meas.NoChords();
// //

6
Sources/VLSheetView.mm
View File

@ -159,8 +159,8 @@ VLMusicElement sSemi2Accidental[12][12] = {
{_ F _ _ N _ F _ _ N _ N}, // Eb major - 3 flats {_ F _ _ N _ F _ _ N _ N}, // Eb major - 3 flats
{_ F _ _ N _ F _ F _ _ N}, // Bb major - 2 flats {_ F _ _ N _ F _ F _ _ N}, // Bb major - 2 flats
{_ F _ F _ _ F _ F _ _ N}, // F major - 1 flat {_ F _ F _ _ F _ F _ _ N}, // F major - 1 flat
{_ F _ F _ _ F _ F _ F _}, // C major
// C C#D D#E F F#G G#A A#B // C C#D D#E F F#G G#A A#B
{_ S _ S _ _ S _ S _ S _}, // C major
{_ S _ S _ N _ _ S _ S _}, // G major - 1 sharp {_ S _ S _ N _ _ S _ S _}, // G major - 1 sharp
{N _ _ S _ N _ _ S _ S _}, // D major - 2 sharps {N _ _ S _ N _ _ S _ S _}, // D major - 2 sharps
{N _ _ S _ N _ N _ _ S _}, // A major - 3 sharps {N _ _ S _ N _ N _ _ S _}, // A major - 3 sharps
@ -177,7 +177,7 @@ VLMusicElement sSemi2Accidental[12][12] = {
{ {
int semi = pitch % 12; int semi = pitch % 12;
int key = [self song]->fProperties.front().fKey; int key = [self song]->fProperties.front().fKey;
bool useSharps = key >= 0; bool useSharps = key > 0;
return sSemi2Pitch[useSharps][semi]; return sSemi2Pitch[useSharps][semi];
} }
@ -901,13 +901,11 @@ static int8_t sSharpAcc[] = {
{ {
bool inMeasureSelection = fCursorRegion == kRegionMeasure; bool inMeasureSelection = fCursorRegion == kRegionMeasure;
NSLog(@"Dragged\n");
if (!inMeasureSelection) if (!inMeasureSelection)
[super mouseDragged:event]; [super mouseDragged:event];
[self autoscroll:event]; [self autoscroll:event];
if (inMeasureSelection) if (inMeasureSelection)
[self adjustSelection:event]; [self adjustSelection:event];
NSLog(@"Region: %d\n", fCursorRegion);
} }
- (void) keyDown:(NSEvent *)event - (void) keyDown:(NSEvent *)event