diff --git a/English.lproj/VLDocument.nib/keyedobjects.nib b/English.lproj/VLDocument.nib/keyedobjects.nib index b007baa..61dcccb 100644 Binary files a/English.lproj/VLDocument.nib/keyedobjects.nib and b/English.lproj/VLDocument.nib/keyedobjects.nib differ diff --git a/Sources/VLDocument.h b/Sources/VLDocument.h index 0004e3e..5f2077f 100644 --- a/Sources/VLDocument.h +++ b/Sources/VLDocument.h @@ -16,6 +16,9 @@ - (NSString *) stringValue; - (void) setStringValue:(NSString*)val; - (BOOL) validValue:(NSString*)val; +- (void) moveToNext; +- (void) moveToPrev; +- (void) highlightCursor; @end diff --git a/Sources/VLDocument.mm b/Sources/VLDocument.mm index bc67728..88746a8 100644 --- a/Sources/VLDocument.mm +++ b/Sources/VLDocument.mm @@ -24,6 +24,18 @@ return YES; } +- (void) moveToNext +{ +} + +- (void) moveToPrev +{ +} + +- (void) highlightCursor +{ +} + @end @implementation VLDocument diff --git a/Sources/VLSheetView.h b/Sources/VLSheetView.h index 5a0bb24..1f4f170 100644 --- a/Sources/VLSheetView.h +++ b/Sources/VLSheetView.h @@ -40,8 +40,14 @@ enum VLRegion { kRegionLyrics }; +enum VLRecalc { + kNoRecalc, + kRecalc, + kFirstRecalc +}; + @interface VLSheetView : NSView { - BOOL fNeedsRecalc; + VLRecalc fNeedsRecalc; BOOL fIsRest; float fClefKeyW; float fMeasureW; @@ -58,7 +64,6 @@ enum VLRegion { VLFract fCursorAt; int fCursorPitch; - BOOL fShowFieldEditor; IBOutlet id fFieldEditor; } diff --git a/Sources/VLSheetView.mm b/Sources/VLSheetView.mm index 41c33c6..9c1017e 100644 --- a/Sources/VLSheetView.mm +++ b/Sources/VLSheetView.mm @@ -79,15 +79,19 @@ static float sFlatPos[] = { [sMusic[i] setSize:sz]; } } - fNeedsRecalc = YES; + fNeedsRecalc = kFirstRecalc; fIsRest = NO; - fShowFieldEditor = NO; fDisplayScale = 1.0f; fCursorPitch = VLNote::kNoPitch; } return self; } +- (BOOL)acceptsFirstResponder +{ + return YES; +} + - (VLDocument *) document { return [[[self window] windowController] document]; @@ -167,7 +171,6 @@ static float sFlatPos[] = { - (void) recalculateDimensions { NSScrollView * scroll = [self enclosingScrollView]; - fNeedsRecalc = NO; NSSize sz = [scroll contentSize]; sz.width /= fDisplayScale; @@ -202,6 +205,16 @@ static float sFlatPos[] = { [self setFrameSize:frameSz]; [self setBoundsSize:sz]; [self setNeedsDisplay:YES]; + + if (fNeedsRecalc == kFirstRecalc) { + NSView *dv = [scroll documentView]; + NSView *cv = [scroll contentView]; + + [dv scrollPoint: + NSMakePoint(0.0, NSMaxY([dv frame])-NSHeight([cv bounds]))]; + } + + fNeedsRecalc = kNoRecalc; } - (void)drawGridForSystem:(int)system @@ -317,15 +330,16 @@ static float sFlatPos[] = { [self drawGridForSystem:system]; [self drawNotesForSystem:system]; [self drawChordsForSystem:system]; - } + } + VLEditable * editable = [[self document] valueForKey: @"editTarget"]; + [editable highlightCursor]; } - (IBAction) setKey:(id)sender { int key = [[sender selectedItem] tag]; [[self document] setKey: key transpose: YES]; - fNeedsRecalc = YES; - [self setNeedsDisplay: YES]; + fNeedsRecalc = kRecalc; } - (IBAction) setTime:(id)sender @@ -333,7 +347,7 @@ static float sFlatPos[] = { int time = [[sender selectedItem] tag]; [[self document] setTimeNum: time >> 8 denom: time & 0xFF]; - fNeedsRecalc = YES; + fNeedsRecalc = kRecalc; [self setNeedsDisplay: YES]; } @@ -342,15 +356,13 @@ static float sFlatPos[] = { int div = [[sender selectedItem] tag]; [[self document] setDivisions: div]; - fNeedsRecalc = YES; + fNeedsRecalc = kRecalc; [self setNeedsDisplay: YES]; } - (IBAction)hideFieldEditor:(id)sender { [fFieldEditor setAction:nil]; - [self setValue: [NSNumber numberWithBool:NO] - forKey: @"fShowFieldEditor"]; } const float kSemiFloor = -2.5f*kLineH; @@ -480,4 +492,26 @@ static int sSemiToPitch[] = { return [editable validValue:[fFieldEditor stringValue]]; } +- (void)controlTextDidEndEditing:(NSNotification *)note +{ + VLEditable * editable = [[self document] valueForKey: @"editTarget"]; + switch ([[[note userInfo] objectForKey:@"NSTextMovement"] intValue]) { + case NSTabTextMovement: + [editable moveToNext]; + break; + case NSBacktabTextMovement: + [editable moveToPrev]; + break; + default: + [editable autorelease]; + editable = nil; + } + [[self document] setValue:editable forKey: @"editTarget"]; + if (editable) + [fFieldEditor selectText:self]; + [[self window] performSelectorOnMainThread:@selector(makeFirstResponder:) + withObject:(editable ? fFieldEditor : self) + waitUntilDone:NO]; +} + @end diff --git a/Sources/VLSheetViewChords.h b/Sources/VLSheetViewChords.h index b3d500a..70d1e53 100644 --- a/Sources/VLSheetViewChords.h +++ b/Sources/VLSheetViewChords.h @@ -6,10 +6,34 @@ // Copyright 2006 __MyCompanyName__. All rights reserved. // +#import "VLDocument.h" + + +@interface VLChordEditable : VLEditable { + VLSheetView * fView; + VLSong * fSong; + int fMeasure; + VLFract fAt; +} + +- (VLChordEditable *)initWithView:(VLSheetView *)view + song:(VLSong *)song + measure:(int)measure + at:(VLFract)at; +- (NSString *) stringValue; +- (void) setStringValue:(NSString*)val; +- (BOOL) validValue:(NSString*)val; +- (void) moveToNext; +- (void) moveToPrev; +- (void) highlightCursor; + +@end + @interface VLSheetView (Chords) - (void) editChord; - (void) drawChordsForSystem:(int)system; +- (void) highlightChordInMeasure:(int)measure at:(VLFraction)at; @end diff --git a/Sources/VLSheetViewChords.mm b/Sources/VLSheetViewChords.mm index 25bd9d2..55c7ee8 100644 --- a/Sources/VLSheetViewChords.mm +++ b/Sources/VLSheetViewChords.mm @@ -12,12 +12,11 @@ #import "VLModel.h" #import "VLSoundOut.h" -#import "VLDocument.h" std::string NormalizeName(NSString* rawName) { std::string chordName = - (const char *)[[rawName lowercaseString] UTF8String]; + rawName ? (const char *)[[rawName lowercaseString] UTF8String] : ""; // // Normalize # and b // @@ -65,26 +64,9 @@ std::string NormalizeName(NSString* rawName) @end -@interface VLChordEditable : VLEditable { - NSView * fView; - VLSong * fSong; - int fMeasure; - VLFract fAt; -} - -- (VLChordEditable *)initWithView:(NSView *)view - song:(VLSong *)song - measure:(int)measure - at:(VLFract)at; -- (NSString *) stringValue; -- (void) setStringValue:(NSString*)val; -- (BOOL) validValue:(NSString*)val; - -@end - @implementation VLChordEditable -- (VLChordEditable *)initWithView:(NSView *)view +- (VLChordEditable *)initWithView:(VLSheetView *)view song:(VLSong *)song measure:(int)measure at:(VLFract)at; @@ -95,6 +77,8 @@ std::string NormalizeName(NSString* rawName) fMeasure= measure; fAt = at; + [fView setNeedsDisplay: YES]; + return self; } @@ -151,6 +135,33 @@ std::string NormalizeName(NSString* rawName) return chord.fPitch != VLNote::kNoPitch; } +- (void) moveToNext +{ + const VLProperties & prop = fSong->fProperties.front(); + + fAt = fAt+VLFraction(1,4); + if (fAt >= prop.fTime) { + fAt = VLFraction(0,4); + fMeasure = (fMeasure+1) % fSong->CountMeasures(); + } +} + +- (void) moveToPrev +{ + if (fAt < VLFraction(1,4)) { + const VLProperties & prop = fSong->fProperties.front(); + fAt = prop.fTime - VLFraction(1,4); + fMeasure = + (fMeasure+fSong->CountMeasures()-1) % fSong->CountMeasures(); + } else + fAt = fAt-VLFraction(1,4); +} + +- (void) highlightCursor +{ + [fView highlightChordInMeasure:fMeasure at:fAt]; +} + @end @implementation VLSheetView (Chords) @@ -236,7 +247,17 @@ std::string NormalizeName(NSString* rawName) measure:fCursorMeasure at:fCursorAt]; [doc setValue:e forKey:@"editTarget"]; - [self setValue:[NSNumber numberWithBool:YES] forKey:@"fShowFieldEditor"]; + [fFieldEditor selectText:self]; +} + +- (void) highlightChordInMeasure:(int)measure at:(VLFraction)at +{ + const float kSystemY = [self systemY:measure / fMeasPerSystem]; + NSRect r = + NSMakeRect([self noteXInMeasure:measure at:at], + kSystemY+kChordY, 3.0f*kNoteW, 20.0f); + [[NSColor colorWithCalibratedWhite:0.8f alpha:1.0f] setFill]; + NSRectFillUsingOperation(r, NSCompositePlusDarker); } @end diff --git a/Sources/VLSoundOut.cpp b/Sources/VLSoundOut.cpp index 688e48b..79c7aff 100644 --- a/Sources/VLSoundOut.cpp +++ b/Sources/VLSoundOut.cpp @@ -42,18 +42,66 @@ private: void Run(); void Stop(); void Play(const int8_t * note, size_t numNotes = 1); +protected: + friend class VLAUSoundEvent; + + void Play(const int8_t * note, size_t numNotes, + UInt32 msg, UInt32 velocity); }; -static std::auto_ptr sSoundOut; +VLSoundEvent::~VLSoundEvent() +{ +} + +class VLAUSoundEvent : public VLSoundEvent { +public: + VLAUSoundEvent(VLAUSoundOut * soundOut, + const int8_t * note, size_t numNotes, + UInt32 msg, UInt32 velocity) + : fSoundOut(soundOut), fNotes(note, note+numNotes), + fMsg(msg), fVelocity(velocity) + {} + + virtual void Perform(); +private: + VLAUSoundOut * fSoundOut; + std::vector fNotes; + UInt32 fMsg; + UInt32 fVelocity; +}; + +void VLAUSoundEvent::Perform() +{ + fSoundOut->Play(&fNotes[0], fNotes.size(), fMsg, fVelocity); + + delete this; +} + +void VLSoundScheduler::Schedule(VLSoundEvent * what, float when) +{ + usleep((int)(1000000.0f*when)); + what->Perform(); +} + +static std::auto_ptr sSoundOut; +static std::auto_ptr sSoundScheduler; VLSoundOut * VLSoundOut::Instance() { - if (!sSoundOut.get()) + if (!sSoundOut.get()) { sSoundOut.reset(new VLAUSoundOut); + if (!sSoundScheduler.get()) + sSoundScheduler.reset(new VLSoundScheduler); + } return sSoundOut.get(); } +void VLSoundOut::SetScheduler(VLSoundScheduler * scheduler) +{ + sSoundScheduler.reset(scheduler); +} + VLSoundOut::~VLSoundOut() { } @@ -149,11 +197,14 @@ void VLAUSoundOut::Play(const int8_t * note, size_t numNotes) const UInt32 kNoteOff = kMidiMessage_NoteOff << 4 | kMidiChannelInUse; const UInt32 kNoteVelocity= 127; - for (size_t i = 0; iSchedule( + new VLAUSoundEvent(this, note, numNotes, kNoteOff, kNoteVelocity), 0.5f); +} + +void VLAUSoundOut::Play(const int8_t * note, size_t numNotes, + UInt32 msg, UInt32 velocity) +{ + for (size_t i = 0; i +#import "VLSoundSched.h" int main(int argc, char *argv[]) { + [VLSoundSched setup]; return NSApplicationMain(argc, (const char **) argv); } diff --git a/Vocalese.xcodeproj/neeri.mode1v3 b/Vocalese.xcodeproj/neeri.mode1v3 index e9b308f..0b9dcb6 100644 --- a/Vocalese.xcodeproj/neeri.mode1v3 +++ b/Vocalese.xcodeproj/neeri.mode1v3 @@ -200,7 +200,87 @@ Content PBXProjectModuleGUID - 95B042FC0ACE431A00236B52 + 95D44D270AD8C1E800384FE5 + PBXProjectModuleLabel + main.m + PBXSplitModuleInNavigatorKey + + Split0 + + PBXProjectModuleGUID + 95D44D280AD8C1E800384FE5 + PBXProjectModuleLabel + main.m + _historyCapacity + 0 + bookmark + 95D44D600AD8C85600384FE5 + history + + 95D44D230AD8C1BE00384FE5 + + + SplitCount + 1 + + StatusBarVisibility + + + Geometry + + Frame + {{0, 20}, {763, 552}} + PBXModuleWindowStatusBarHidden2 + + RubberWindowFrame + 84 85 763 593 0 0 1024 746 + + + + Content + + PBXProjectModuleGUID + 95D44D390AD8C25200384FE5 + PBXProjectModuleLabel + VLSoundOut.h + PBXSplitModuleInNavigatorKey + + Split0 + + PBXProjectModuleGUID + 95D44D3A0AD8C25200384FE5 + PBXProjectModuleLabel + VLSoundOut.h + _historyCapacity + 0 + bookmark + 95D44D610AD8C85600384FE5 + history + + 95D44D370AD8C24800384FE5 + + + SplitCount + 1 + + StatusBarVisibility + + + Geometry + + Frame + {{0, 20}, {763, 552}} + PBXModuleWindowStatusBarHidden2 + + RubberWindowFrame + 61 106 763 593 0 0 1024 746 + + + + Content + + PBXProjectModuleGUID + 95E7B5510AD2D12A00753F9B PBXProjectModuleLabel <No Editor> PBXSplitModuleInNavigatorKey @@ -222,315 +302,7 @@ Content PBXProjectModuleGUID - 95B042FB0ACE431A00236B52 - PBXProjectModuleLabel - <No Editor> - PBXSplitModuleInNavigatorKey - - StatusBarVisibility - - - Geometry - - Frame - {{0, 20}, {763, 552}} - PBXModuleWindowStatusBarHidden2 - - RubberWindowFrame - 242 153 763 593 0 0 1024 746 - - - - Content - - PBXProjectModuleGUID - 95B042F70ACE431A00236B52 - PBXProjectModuleLabel - <No Editor> - PBXSplitModuleInNavigatorKey - - StatusBarVisibility - - - Geometry - - Frame - {{0, 20}, {763, 552}} - PBXModuleWindowStatusBarHidden2 - - RubberWindowFrame - 164 91 763 593 0 0 1024 746 - - - - Content - - PBXProjectModuleGUID - 95B042FA0ACE431A00236B52 - PBXProjectModuleLabel - <No Editor> - PBXSplitModuleInNavigatorKey - - StatusBarVisibility - - - Geometry - - Frame - {{0, 20}, {763, 552}} - PBXModuleWindowStatusBarHidden2 - - RubberWindowFrame - 242 153 763 593 0 0 1024 746 - - - - Content - - PBXProjectModuleGUID - 95D1F8310AB694EC00EE6AC8 - PBXProjectModuleLabel - <No Editor> - PBXSplitModuleInNavigatorKey - - StatusBarVisibility - - - Geometry - - Frame - {{0, 20}, {763, 552}} - PBXModuleWindowStatusBarHidden2 - - RubberWindowFrame - 164 91 763 593 0 0 1024 746 - - - - Content - - PBXProjectModuleGUID - 95D1F8660AB6970400EE6AC8 - PBXProjectModuleLabel - <No Editor> - PBXSplitModuleInNavigatorKey - - StatusBarVisibility - - - Geometry - - Frame - {{0, 20}, {763, 552}} - PBXModuleWindowStatusBarHidden2 - - RubberWindowFrame - 15 148 763 593 0 0 1024 746 - - - - Content - - PBXProjectModuleGUID - 95D1F8850AB69B6700EE6AC8 - PBXProjectModuleLabel - <No Editor> - PBXSplitModuleInNavigatorKey - - StatusBarVisibility - - - Geometry - - Frame - {{0, 20}, {763, 552}} - PBXModuleWindowStatusBarHidden2 - - RubberWindowFrame - 168 116 763 593 0 0 1024 746 - - - - Content - - PBXProjectModuleGUID - 95D1F8130AB6908400EE6AC8 - PBXProjectModuleLabel - <No Editor> - PBXSplitModuleInNavigatorKey - - StatusBarVisibility - - - Geometry - - Frame - {{0, 20}, {763, 552}} - PBXModuleWindowStatusBarHidden2 - - RubberWindowFrame - 186 75 763 593 0 0 1024 746 - - - - Content - - PBXProjectModuleGUID - 95D1F7FE0AB68C8C00EE6AC8 - PBXProjectModuleLabel - <No Editor> - PBXSplitModuleInNavigatorKey - - StatusBarVisibility - - - Geometry - - Frame - {{0, 20}, {763, 552}} - PBXModuleWindowStatusBarHidden2 - - RubberWindowFrame - 242 153 763 593 0 0 1024 746 - - - - Content - - PBXProjectModuleGUID - 95D1F82E0AB694EC00EE6AC8 - PBXProjectModuleLabel - <No Editor> - PBXSplitModuleInNavigatorKey - - StatusBarVisibility - - - Geometry - - Frame - {{0, 20}, {763, 552}} - PBXModuleWindowStatusBarHidden2 - - RubberWindowFrame - 15 148 763 593 0 0 1024 746 - - - - Content - - PBXProjectModuleGUID - 95DFE83A0AD105A300375606 - PBXProjectModuleLabel - <No Editor> - PBXSplitModuleInNavigatorKey - - StatusBarVisibility - - - Geometry - - Frame - {{0, 20}, {763, 552}} - PBXModuleWindowStatusBarHidden2 - - RubberWindowFrame - 164 91 763 593 0 0 1024 746 - - - - Content - - PBXProjectModuleGUID - 95E725400AD25B5700407A9B - PBXProjectModuleLabel - <No Editor> - PBXSplitModuleInNavigatorKey - - StatusBarVisibility - - - Geometry - - Frame - {{0, 20}, {763, 552}} - PBXModuleWindowStatusBarHidden2 - - RubberWindowFrame - 164 91 763 593 0 0 1024 746 - - - - Content - - PBXProjectModuleGUID - 95E725560AD25CA500407A9B - PBXProjectModuleLabel - <No Editor> - PBXSplitModuleInNavigatorKey - - StatusBarVisibility - - - Geometry - - Frame - {{0, 20}, {763, 552}} - PBXModuleWindowStatusBarHidden2 - - RubberWindowFrame - 164 91 763 593 0 0 1024 746 - - - - Content - - PBXProjectModuleGUID - 95E725270AD2587900407A9B - PBXProjectModuleLabel - <No Editor> - PBXSplitModuleInNavigatorKey - - StatusBarVisibility - - - Geometry - - Frame - {{0, 20}, {763, 552}} - PBXModuleWindowStatusBarHidden2 - - RubberWindowFrame - 15 148 763 593 0 0 1024 746 - - - - Content - - PBXProjectModuleGUID - 95E7B5000AD2CBD800753F9B - PBXProjectModuleLabel - <No Editor> - PBXSplitModuleInNavigatorKey - - StatusBarVisibility - - - Geometry - - Frame - {{0, 20}, {763, 552}} - PBXModuleWindowStatusBarHidden2 - - RubberWindowFrame - 15 148 763 593 0 0 1024 746 - - - - Content - - PBXProjectModuleGUID - 95E7B51C0AD2CDC800753F9B + 95E7B54E0AD2D12A00753F9B PBXProjectModuleLabel <No Editor> PBXSplitModuleInNavigatorKey @@ -574,7 +346,7 @@ Content PBXProjectModuleGUID - 95E7B54E0AD2D12A00753F9B + 95E7B51C0AD2CDC800753F9B PBXProjectModuleLabel <No Editor> PBXSplitModuleInNavigatorKey @@ -596,7 +368,7 @@ Content PBXProjectModuleGUID - 95E7B5510AD2D12A00753F9B + 95E7B5000AD2CBD800753F9B PBXProjectModuleLabel <No Editor> PBXSplitModuleInNavigatorKey @@ -614,6 +386,446 @@ 15 148 763 593 0 0 1024 746 + + Content + + PBXProjectModuleGUID + 95E725270AD2587900407A9B + PBXProjectModuleLabel + <No Editor> + PBXSplitModuleInNavigatorKey + + StatusBarVisibility + + + Geometry + + Frame + {{0, 20}, {763, 552}} + PBXModuleWindowStatusBarHidden2 + + RubberWindowFrame + 15 148 763 593 0 0 1024 746 + + + + Content + + PBXProjectModuleGUID + 95E725560AD25CA500407A9B + PBXProjectModuleLabel + <No Editor> + PBXSplitModuleInNavigatorKey + + StatusBarVisibility + + + Geometry + + Frame + {{0, 20}, {763, 552}} + PBXModuleWindowStatusBarHidden2 + + RubberWindowFrame + 164 91 763 593 0 0 1024 746 + + + + Content + + PBXProjectModuleGUID + 95E725400AD25B5700407A9B + PBXProjectModuleLabel + <No Editor> + PBXSplitModuleInNavigatorKey + + StatusBarVisibility + + + Geometry + + Frame + {{0, 20}, {763, 552}} + PBXModuleWindowStatusBarHidden2 + + RubberWindowFrame + 164 91 763 593 0 0 1024 746 + + + + Content + + PBXProjectModuleGUID + 95DFE83A0AD105A300375606 + PBXProjectModuleLabel + <No Editor> + PBXSplitModuleInNavigatorKey + + StatusBarVisibility + + + Geometry + + Frame + {{0, 20}, {763, 552}} + PBXModuleWindowStatusBarHidden2 + + RubberWindowFrame + 164 91 763 593 0 0 1024 746 + + + + Content + + PBXProjectModuleGUID + 95D1F82E0AB694EC00EE6AC8 + PBXProjectModuleLabel + <No Editor> + PBXSplitModuleInNavigatorKey + + StatusBarVisibility + + + Geometry + + Frame + {{0, 20}, {763, 552}} + PBXModuleWindowStatusBarHidden2 + + RubberWindowFrame + 15 148 763 593 0 0 1024 746 + + + + Content + + PBXProjectModuleGUID + 95D1F7FE0AB68C8C00EE6AC8 + PBXProjectModuleLabel + <No Editor> + PBXSplitModuleInNavigatorKey + + StatusBarVisibility + + + Geometry + + Frame + {{0, 20}, {763, 552}} + PBXModuleWindowStatusBarHidden2 + + RubberWindowFrame + 242 153 763 593 0 0 1024 746 + + + + Content + + PBXProjectModuleGUID + 95D1F8130AB6908400EE6AC8 + PBXProjectModuleLabel + <No Editor> + PBXSplitModuleInNavigatorKey + + StatusBarVisibility + + + Geometry + + Frame + {{0, 20}, {763, 552}} + PBXModuleWindowStatusBarHidden2 + + RubberWindowFrame + 186 75 763 593 0 0 1024 746 + + + + Content + + PBXProjectModuleGUID + 95D1F8850AB69B6700EE6AC8 + PBXProjectModuleLabel + <No Editor> + PBXSplitModuleInNavigatorKey + + StatusBarVisibility + + + Geometry + + Frame + {{0, 20}, {763, 552}} + PBXModuleWindowStatusBarHidden2 + + RubberWindowFrame + 168 116 763 593 0 0 1024 746 + + + + Content + + PBXProjectModuleGUID + 95D1F8660AB6970400EE6AC8 + PBXProjectModuleLabel + <No Editor> + PBXSplitModuleInNavigatorKey + + StatusBarVisibility + + + Geometry + + Frame + {{0, 20}, {763, 552}} + PBXModuleWindowStatusBarHidden2 + + RubberWindowFrame + 15 148 763 593 0 0 1024 746 + + + + Content + + PBXProjectModuleGUID + 95D1F8310AB694EC00EE6AC8 + PBXProjectModuleLabel + <No Editor> + PBXSplitModuleInNavigatorKey + + StatusBarVisibility + + + Geometry + + Frame + {{0, 20}, {763, 552}} + PBXModuleWindowStatusBarHidden2 + + RubberWindowFrame + 164 91 763 593 0 0 1024 746 + + + + Content + + PBXProjectModuleGUID + 95B042FA0ACE431A00236B52 + PBXProjectModuleLabel + <No Editor> + PBXSplitModuleInNavigatorKey + + StatusBarVisibility + + + Geometry + + Frame + {{0, 20}, {763, 552}} + PBXModuleWindowStatusBarHidden2 + + RubberWindowFrame + 242 153 763 593 0 0 1024 746 + + + + Content + + PBXProjectModuleGUID + 95B042F70ACE431A00236B52 + PBXProjectModuleLabel + <No Editor> + PBXSplitModuleInNavigatorKey + + StatusBarVisibility + + + Geometry + + Frame + {{0, 20}, {763, 552}} + PBXModuleWindowStatusBarHidden2 + + RubberWindowFrame + 164 91 763 593 0 0 1024 746 + + + + Content + + PBXProjectModuleGUID + 95B042FB0ACE431A00236B52 + PBXProjectModuleLabel + <No Editor> + PBXSplitModuleInNavigatorKey + + StatusBarVisibility + + + Geometry + + Frame + {{0, 20}, {763, 552}} + PBXModuleWindowStatusBarHidden2 + + RubberWindowFrame + 242 153 763 593 0 0 1024 746 + + + + Content + + PBXProjectModuleGUID + 95B042FC0ACE431A00236B52 + PBXProjectModuleLabel + <No Editor> + PBXSplitModuleInNavigatorKey + + StatusBarVisibility + + + Geometry + + Frame + {{0, 20}, {763, 552}} + PBXModuleWindowStatusBarHidden2 + + RubberWindowFrame + 15 148 763 593 0 0 1024 746 + + + + Content + + PBXProjectModuleGUID + 9514A0450AD78D5F00B21A41 + PBXProjectModuleLabel + <No Editor> + PBXSplitModuleInNavigatorKey + + StatusBarVisibility + + + Geometry + + Frame + {{0, 20}, {763, 552}} + PBXModuleWindowStatusBarHidden2 + + RubberWindowFrame + 15 148 763 593 0 0 1024 746 + + + + Content + + PBXProjectModuleGUID + 95D44D2A0AD8C1E800384FE5 + PBXProjectModuleLabel + <No Editor> + PBXSplitModuleInNavigatorKey + + StatusBarVisibility + + + Geometry + + Frame + {{0, 20}, {763, 552}} + PBXModuleWindowStatusBarHidden2 + + RubberWindowFrame + 222 82 763 593 0 0 1024 746 + + + + Content + + PBXProjectModuleGUID + 95D44D2B0AD8C1E800384FE5 + PBXProjectModuleLabel + <No Editor> + PBXSplitModuleInNavigatorKey + + StatusBarVisibility + + + Geometry + + Frame + {{0, 20}, {763, 552}} + PBXModuleWindowStatusBarHidden2 + + RubberWindowFrame + 222 82 763 593 0 0 1024 746 + + + + Content + + PBXProjectModuleGUID + 95D44D2C0AD8C1E800384FE5 + PBXProjectModuleLabel + <No Editor> + PBXSplitModuleInNavigatorKey + + StatusBarVisibility + + + Geometry + + Frame + {{0, 20}, {763, 552}} + PBXModuleWindowStatusBarHidden2 + + RubberWindowFrame + 38 127 763 593 0 0 1024 746 + + + + Content + + PBXProjectModuleGUID + 95D44D2D0AD8C1E800384FE5 + PBXProjectModuleLabel + <No Editor> + PBXSplitModuleInNavigatorKey + + StatusBarVisibility + + + Geometry + + Frame + {{0, 20}, {763, 552}} + PBXModuleWindowStatusBarHidden2 + + RubberWindowFrame + 61 106 763 593 0 0 1024 746 + + + + Content + + PBXProjectModuleGUID + 95D44D3D0AD8C25200384FE5 + PBXProjectModuleLabel + <No Editor> + PBXSplitModuleInNavigatorKey + + StatusBarVisibility + + + Geometry + + Frame + {{0, 20}, {763, 552}} + PBXModuleWindowStatusBarHidden2 + + RubberWindowFrame + 38 127 763 593 0 0 1024 746 + + PerspectiveWidths @@ -687,6 +899,7 @@ 2A37F4AAFDCFA73011CA2CEA 2A37F4ABFDCFA73011CA2CEA + 2A37F4AFFDCFA73011CA2CEA 955E59560957C0C50045FDA5 2A37F4B8FDCFA73011CA2CEA 1C37FBAC04509CD000000102 @@ -695,7 +908,7 @@ PBXSmartGroupTreeModuleOutlineStateSelectionKey - 4 + 3 1 0 @@ -720,7 +933,7 @@ 186 RubberWindowFrame - 167 326 690 397 0 0 1024 746 + 167 325 690 397 0 0 1024 746 Module PBXSmartGroupTreeModule @@ -757,7 +970,7 @@ Frame {{0, 0}, {482, 0}} RubberWindowFrame - 167 326 690 397 0 0 1024 746 + 167 325 690 397 0 0 1024 746 Module PBXNavigatorGroup @@ -777,7 +990,7 @@ Frame {{0, 5}, {482, 351}} RubberWindowFrame - 167 326 690 397 0 0 1024 746 + 167 325 690 397 0 0 1024 746 Module XCDetailModule @@ -801,9 +1014,9 @@ TableOfContents - 95E7B4FB0AD2CBD800753F9B + 95D44D250AD8C1E800384FE5 1CE0B1FE06471DED0097A5F4 - 95E7B4FC0AD2CBD800753F9B + 95D44D260AD8C1E800384FE5 1CE0B20306471E060097A5F4 1CE0B20506471E060097A5F4 @@ -937,40 +1150,44 @@ 5 WindowOrderList - 95E7B5B20AD2DA4F00753F9B - 95E7B5A10AD2D8EE00753F9B - 95E7B5A20AD2D8EE00753F9B - 95E7B56A0AD2D24400753F9B - 95E7B5510AD2D12A00753F9B - 95E7B54E0AD2D12A00753F9B - 1C530D57069F1CE1000CFCEE - 95E7B5280AD2CE8800753F9B - 95E7B51C0AD2CDC800753F9B - 95E7B5100AD2CC9400753F9B - 95E7B5110AD2CC9400753F9B - 95E7B5120AD2CC9400753F9B - 95D7BFC80AA6C1A500D5E02C - 95D7BFC00AA6C1A500D5E02C - 95E7B5000AD2CBD800753F9B + 95D44D450AD8C34600384FE5 + 95D44D460AD8C34600384FE5 + 95D44D470AD8C34600384FE5 + 95D44D3D0AD8C25200384FE5 + 95D44D2D0AD8C1E800384FE5 + 95D44D2C0AD8C1E800384FE5 + 95D44D2B0AD8C1E800384FE5 + 95D44D2A0AD8C1E800384FE5 1CD10A99069EF8BA00B06720 - 95E725270AD2587900407A9B - 95E725560AD25CA500407A9B - 95E725400AD25B5700407A9B - 95DFE83A0AD105A300375606 - 95D1F82E0AB694EC00EE6AC8 - 95D1F7FE0AB68C8C00EE6AC8 - 95D1F8130AB6908400EE6AC8 - 95D1F8850AB69B6700EE6AC8 - 95D1F8660AB6970400EE6AC8 - 95D1F8310AB694EC00EE6AC8 - 95B042FA0ACE431A00236B52 - 95B042F70ACE431A00236B52 - 95B042FB0ACE431A00236B52 + 9514A0450AD78D5F00B21A41 95B042FC0ACE431A00236B52 + 95B042FB0ACE431A00236B52 + 95B042F70ACE431A00236B52 + 95B042FA0ACE431A00236B52 + 95D1F8310AB694EC00EE6AC8 + 95D1F8660AB6970400EE6AC8 + 95D1F8850AB69B6700EE6AC8 + 95D1F8130AB6908400EE6AC8 + 95D1F7FE0AB68C8C00EE6AC8 + 95D1F82E0AB694EC00EE6AC8 + 95DFE83A0AD105A300375606 + 95E725400AD25B5700407A9B + 95E725560AD25CA500407A9B + 95E725270AD2587900407A9B + 95E7B5000AD2CBD800753F9B + 95E7B51C0AD2CDC800753F9B + 95E7B5280AD2CE8800753F9B + 95E7B54E0AD2D12A00753F9B + 95E7B5510AD2D12A00753F9B + 95D44D5B0AD8C75700384FE5 + 95D7BFC80AA6C1A500D5E02C + 95D44D390AD8C25200384FE5 + 95D44D270AD8C1E800384FE5 /Development/Vocalese/Vocalese.xcodeproj + 95D7BFC00AA6C1A500D5E02C WindowString - 167 326 690 397 0 0 1024 746 + 167 325 690 397 0 0 1024 746 WindowToolsV3 @@ -993,7 +1210,7 @@ PBXProjectModuleGUID 1CD0528F0623707200166675 PBXProjectModuleLabel - VLSheetViewChords.mm + VLSoundSched.mm StatusBarVisibility @@ -1049,7 +1266,7 @@ TableOfContents 95D7BFC00AA6C1A500D5E02C - 95E7B5010AD2CBD800753F9B + 95D44D2E0AD8C1E800384FE5 1CD0528F0623707200166675 XCMainBuildResultsModuleGUID @@ -1060,7 +1277,7 @@ WindowToolGUID 95D7BFC00AA6C1A500D5E02C WindowToolIsVisible - + FirstTimeWindowDisplayed @@ -1143,10 +1360,10 @@ Frame {{412, 0}, {516, 239}} RubberWindowFrame - 56 117 928 490 0 0 1024 746 + 94 141 928 490 0 0 1024 746 RubberWindowFrame - 56 117 928 490 0 0 1024 746 + 94 141 928 490 0 0 1024 746 Module PBXDebugSessionModule @@ -1169,18 +1386,18 @@ TableOfContents 1CD10A99069EF8BA00B06720 - 95E7B5020AD2CBD800753F9B + 95D44D2F0AD8C1E800384FE5 1C162984064C10D400B95A72 - 95E7B5030AD2CBD800753F9B - 95E7B5040AD2CBD800753F9B - 95E7B5050AD2CBD800753F9B - 95E7B5060AD2CBD800753F9B - 95E7B5070AD2CBD800753F9B + 95D44D300AD8C1E800384FE5 + 95D44D310AD8C1E800384FE5 + 95D44D320AD8C1E800384FE5 + 95D44D330AD8C1E800384FE5 + 95D44D340AD8C1E800384FE5 ToolbarConfiguration xcode.toolbar.config.debugV3 WindowString - 56 117 928 490 0 0 1024 746 + 94 141 928 490 0 0 1024 746 WindowToolGUID 1CD10A99069EF8BA00B06720 WindowToolIsVisible @@ -1306,7 +1523,7 @@ Frame {{0, 0}, {603, 492}} RubberWindowFrame - 188 168 603 533 0 0 1024 746 + 396 213 603 533 0 0 1024 746 Module PBXDebugCLIModule @@ -1329,11 +1546,11 @@ TableOfContents 95D7BFC80AA6C1A500D5E02C - 95E7B50E0AD2CC9400753F9B + 95D44D350AD8C1E800384FE5 1C78EAAC065D492600B07095 WindowString - 188 168 603 533 0 0 1024 746 + 396 213 603 533 0 0 1024 746 WindowToolGUID 95D7BFC80AA6C1A500D5E02C WindowToolIsVisible @@ -1626,8 +1843,8 @@ TableOfContents - 95E7B56A0AD2D24400753F9B - 95E7B56B0AD2D24400753F9B + 95D44D5B0AD8C75700384FE5 + 95D44D5C0AD8C75700384FE5 1CE0B1FE06471DED0097A5F4 1CA1AED706398EBD00589147 @@ -1636,7 +1853,7 @@ WindowString 117 147 744 409 0 0 1024 746 WindowToolGUID - 95E7B56A0AD2D24400753F9B + 95D44D5B0AD8C75700384FE5 WindowToolIsVisible diff --git a/Vocalese.xcodeproj/neeri.pbxuser b/Vocalese.xcodeproj/neeri.pbxuser index a8f5fed..9a4a12f 100644 --- a/Vocalese.xcodeproj/neeri.pbxuser +++ b/Vocalese.xcodeproj/neeri.pbxuser @@ -85,96 +85,29 @@ PBXFileDataSource_Warnings_ColumnID, ); }; - PBXPerProjectTemplateStateSaveDate = 181586793; - PBXWorkspaceStateSaveDate = 181586793; + PBXPerProjectTemplateStateSaveDate = 181966504; + PBXWorkspaceStateSaveDate = 181966504; }; perUserProjectItems = { - 956674AB0AD25F48007D5997 = 956674AB0AD25F48007D5997 /* PBXTextBookmark */; - 956674AC0AD25F48007D5997 = 956674AC0AD25F48007D5997 /* PBXTextBookmark */; - 956674AD0AD25F48007D5997 = 956674AD0AD25F48007D5997 /* PBXTextBookmark */; - 956674B60AD262F5007D5997 = 956674B60AD262F5007D5997 /* PBXTextBookmark */; - 956674B70AD262F5007D5997 = 956674B70AD262F5007D5997 /* PBXTextBookmark */; - 956674B80AD262F5007D5997 = 956674B80AD262F5007D5997 /* PBXTextBookmark */; - 95E725470AD25C2500407A9B = 95E725470AD25C2500407A9B /* PBXTextBookmark */; - 95E725480AD25C2500407A9B = 95E725480AD25C2500407A9B /* PBXTextBookmark */; - 95E7254C0AD25C3E00407A9B = 95E7254C0AD25C3E00407A9B /* PBXTextBookmark */; - 95E725600AD25CDD00407A9B = 95E725600AD25CDD00407A9B /* PBXTextBookmark */; - 95E725700AD25EA500407A9B = 95E725700AD25EA500407A9B /* PBXTextBookmark */; - 95E725710AD25EA500407A9B = 95E725710AD25EA500407A9B /* PBXTextBookmark */; - 95E7B4FD0AD2CBD800753F9B /* PBXTextBookmark */ = 95E7B4FD0AD2CBD800753F9B /* PBXTextBookmark */; - 95E7B4FE0AD2CBD800753F9B /* PBXTextBookmark */ = 95E7B4FE0AD2CBD800753F9B /* PBXTextBookmark */; - 95E7B4FF0AD2CBD800753F9B /* PBXTextBookmark */ = 95E7B4FF0AD2CBD800753F9B /* PBXTextBookmark */; - 95E7B50B0AD2CC9400753F9B /* PBXTextBookmark */ = 95E7B50B0AD2CC9400753F9B /* PBXTextBookmark */; - 95E7B50C0AD2CC9400753F9B /* PBXTextBookmark */ = 95E7B50C0AD2CC9400753F9B /* PBXTextBookmark */; - 95E7B50D0AD2CC9400753F9B /* PBXTextBookmark */ = 95E7B50D0AD2CC9400753F9B /* PBXTextBookmark */; - 95E7B5190AD2CDC800753F9B /* PBXTextBookmark */ = 95E7B5190AD2CDC800753F9B /* PBXTextBookmark */; - 95E7B51A0AD2CDC800753F9B /* PBXTextBookmark */ = 95E7B51A0AD2CDC800753F9B /* PBXTextBookmark */; - 95E7B51B0AD2CDC800753F9B /* PBXTextBookmark */ = 95E7B51B0AD2CDC800753F9B /* PBXTextBookmark */; - 95E7B51D0AD2CDDF00753F9B /* PBXTextBookmark */ = 95E7B51D0AD2CDDF00753F9B /* PBXTextBookmark */; - 95E7B51E0AD2CDDF00753F9B /* PBXTextBookmark */ = 95E7B51E0AD2CDDF00753F9B /* PBXTextBookmark */; - 95E7B51F0AD2CDDF00753F9B /* PBXTextBookmark */ = 95E7B51F0AD2CDDF00753F9B /* PBXTextBookmark */; - 95E7B5260AD2CE8800753F9B /* PBXTextBookmark */ = 95E7B5260AD2CE8800753F9B /* PBXTextBookmark */; - 95E7B5270AD2CE8800753F9B /* PBXTextBookmark */ = 95E7B5270AD2CE8800753F9B /* PBXTextBookmark */; - 95E7B52E0AD2CED100753F9B /* PBXTextBookmark */ = 95E7B52E0AD2CED100753F9B /* PBXTextBookmark */; - 95E7B52F0AD2CED100753F9B /* PBXTextBookmark */ = 95E7B52F0AD2CED100753F9B /* PBXTextBookmark */; - 95E7B5370AD2CF2F00753F9B /* PBXTextBookmark */ = 95E7B5370AD2CF2F00753F9B /* PBXTextBookmark */; - 95E7B5380AD2CF2F00753F9B /* PBXTextBookmark */ = 95E7B5380AD2CF2F00753F9B /* PBXTextBookmark */; - 95E7B53B0AD2CF8900753F9B /* PBXTextBookmark */ = 95E7B53B0AD2CF8900753F9B /* PBXTextBookmark */; - 95E7B53C0AD2CF8900753F9B /* PBXTextBookmark */ = 95E7B53C0AD2CF8900753F9B /* PBXTextBookmark */; - 95E7B53D0AD2CF9A00753F9B /* PBXTextBookmark */ = 95E7B53D0AD2CF9A00753F9B /* PBXTextBookmark */; - 95E7B53E0AD2CF9A00753F9B /* PBXTextBookmark */ = 95E7B53E0AD2CF9A00753F9B /* PBXTextBookmark */; - 95E7B5470AD2D05B00753F9B /* PBXTextBookmark */ = 95E7B5470AD2D05B00753F9B /* PBXTextBookmark */; - 95E7B54B0AD2D0E300753F9B /* PBXBookmark */ = 95E7B54B0AD2D0E300753F9B /* PBXBookmark */; - 95E7B54C0AD2D10400753F9B /* PBXBookmark */ = 95E7B54C0AD2D10400753F9B /* PBXBookmark */; - 95E7B5500AD2D12A00753F9B /* PBXTextBookmark */ = 95E7B5500AD2D12A00753F9B /* PBXTextBookmark */; - 95E7B5530AD2D12A00753F9B /* PBXTextBookmark */ = 95E7B5530AD2D12A00753F9B /* PBXTextBookmark */; - 95E7B5540AD2D12A00753F9B /* PBXTextBookmark */ = 95E7B5540AD2D12A00753F9B /* PBXTextBookmark */; - 95E7B5580AD2D19100753F9B /* PBXTextBookmark */ = 95E7B5580AD2D19100753F9B /* PBXTextBookmark */; - 95E7B5590AD2D19100753F9B /* PBXTextBookmark */ = 95E7B5590AD2D19100753F9B /* PBXTextBookmark */; - 95E7B55A0AD2D19100753F9B /* PBXTextBookmark */ = 95E7B55A0AD2D19100753F9B /* PBXTextBookmark */; - 95E7B55B0AD2D19100753F9B /* PBXTextBookmark */ = 95E7B55B0AD2D19100753F9B /* PBXTextBookmark */; - 95E7B55C0AD2D19100753F9B /* PBXTextBookmark */ = 95E7B55C0AD2D19100753F9B /* PBXTextBookmark */; - 95E7B55D0AD2D19100753F9B /* PBXTextBookmark */ = 95E7B55D0AD2D19100753F9B /* PBXTextBookmark */; - 95E7B5670AD2D24400753F9B /* PBXTextBookmark */ = 95E7B5670AD2D24400753F9B /* PBXTextBookmark */; - 95E7B5680AD2D24400753F9B /* PBXTextBookmark */ = 95E7B5680AD2D24400753F9B /* PBXTextBookmark */; - 95E7B5690AD2D24400753F9B /* PBXTextBookmark */ = 95E7B5690AD2D24400753F9B /* PBXTextBookmark */; - 95E7B56D0AD2D42000753F9B /* PBXTextBookmark */ = 95E7B56D0AD2D42000753F9B /* PBXTextBookmark */; - 95E7B56E0AD2D42000753F9B /* PBXTextBookmark */ = 95E7B56E0AD2D42000753F9B /* PBXTextBookmark */; - 95E7B56F0AD2D42000753F9B /* PBXTextBookmark */ = 95E7B56F0AD2D42000753F9B /* PBXTextBookmark */; - 95E7B5700AD2D49800753F9B /* PBXTextBookmark */ = 95E7B5700AD2D49800753F9B /* PBXTextBookmark */; - 95E7B5710AD2D49800753F9B /* PBXTextBookmark */ = 95E7B5710AD2D49800753F9B /* PBXTextBookmark */; - 95E7B5720AD2D49800753F9B /* PBXTextBookmark */ = 95E7B5720AD2D49800753F9B /* PBXTextBookmark */; - 95E7B5750AD2D4D500753F9B /* PBXTextBookmark */ = 95E7B5750AD2D4D500753F9B /* PBXTextBookmark */; - 95E7B5760AD2D4D500753F9B /* PBXTextBookmark */ = 95E7B5760AD2D4D500753F9B /* PBXTextBookmark */; - 95E7B5770AD2D4D500753F9B /* PBXTextBookmark */ = 95E7B5770AD2D4D500753F9B /* PBXTextBookmark */; - 95E7B57A0AD2D54200753F9B /* PBXTextBookmark */ = 95E7B57A0AD2D54200753F9B /* PBXTextBookmark */; - 95E7B57B0AD2D54200753F9B /* PBXTextBookmark */ = 95E7B57B0AD2D54200753F9B /* PBXTextBookmark */; - 95E7B57C0AD2D54200753F9B /* PBXTextBookmark */ = 95E7B57C0AD2D54200753F9B /* PBXTextBookmark */; - 95E7B57D0AD2D57B00753F9B /* PBXTextBookmark */ = 95E7B57D0AD2D57B00753F9B /* PBXTextBookmark */; - 95E7B57E0AD2D57B00753F9B /* PBXTextBookmark */ = 95E7B57E0AD2D57B00753F9B /* PBXTextBookmark */; - 95E7B57F0AD2D57B00753F9B /* PBXTextBookmark */ = 95E7B57F0AD2D57B00753F9B /* PBXTextBookmark */; - 95E7B5840AD2D5DB00753F9B /* PBXTextBookmark */ = 95E7B5840AD2D5DB00753F9B /* PBXTextBookmark */; - 95E7B5850AD2D5DB00753F9B /* PBXTextBookmark */ = 95E7B5850AD2D5DB00753F9B /* PBXTextBookmark */; - 95E7B5860AD2D5DB00753F9B /* PBXTextBookmark */ = 95E7B5860AD2D5DB00753F9B /* PBXTextBookmark */; - 95E7B58B0AD2D66900753F9B /* PBXTextBookmark */ = 95E7B58B0AD2D66900753F9B /* PBXTextBookmark */; - 95E7B58C0AD2D66900753F9B /* PBXTextBookmark */ = 95E7B58C0AD2D66900753F9B /* PBXTextBookmark */; - 95E7B58D0AD2D66900753F9B /* PBXTextBookmark */ = 95E7B58D0AD2D66900753F9B /* PBXTextBookmark */; - 95E7B5930AD2D79500753F9B /* PBXTextBookmark */ = 95E7B5930AD2D79500753F9B /* PBXTextBookmark */; - 95E7B5940AD2D79500753F9B /* PBXTextBookmark */ = 95E7B5940AD2D79500753F9B /* PBXTextBookmark */; - 95E7B5950AD2D79500753F9B /* PBXTextBookmark */ = 95E7B5950AD2D79500753F9B /* PBXTextBookmark */; - 95E7B5960AD2D79500753F9B /* PBXTextBookmark */ = 95E7B5960AD2D79500753F9B /* PBXTextBookmark */; - 95E7B5970AD2D79500753F9B /* PBXTextBookmark */ = 95E7B5970AD2D79500753F9B /* PBXTextBookmark */; - 95E7B5980AD2D79800753F9B /* PBXTextBookmark */ = 95E7B5980AD2D79800753F9B /* PBXTextBookmark */; - 95E7B5990AD2D79800753F9B /* PBXTextBookmark */ = 95E7B5990AD2D79800753F9B /* PBXTextBookmark */; - 95E7B59A0AD2D7B400753F9B /* PBXTextBookmark */ = 95E7B59A0AD2D7B400753F9B /* PBXTextBookmark */; - 95E7B59B0AD2D7B400753F9B /* PBXTextBookmark */ = 95E7B59B0AD2D7B400753F9B /* PBXTextBookmark */; - 95E7B59F0AD2D8EE00753F9B /* PBXTextBookmark */ = 95E7B59F0AD2D8EE00753F9B /* PBXTextBookmark */; - 95E7B5A00AD2D8EE00753F9B /* PBXTextBookmark */ = 95E7B5A00AD2D8EE00753F9B /* PBXTextBookmark */; - 95E7B5A30AD2D90E00753F9B /* PBXTextBookmark */ = 95E7B5A30AD2D90E00753F9B /* PBXTextBookmark */; - 95E7B5A40AD2D90E00753F9B /* PBXTextBookmark */ = 95E7B5A40AD2D90E00753F9B /* PBXTextBookmark */; - 95E7B5A50AD2D90E00753F9B /* PBXTextBookmark */ = 95E7B5A50AD2D90E00753F9B /* PBXTextBookmark */; - 95E7B5A60AD2D90E00753F9B /* PBXTextBookmark */ = 95E7B5A60AD2D90E00753F9B /* PBXTextBookmark */; - 95E7B5A70AD2D90E00753F9B /* PBXTextBookmark */ = 95E7B5A70AD2D90E00753F9B /* PBXTextBookmark */; + 9514A0410AD78D3E00B21A41 = 9514A0410AD78D3E00B21A41 /* PBXBookmark */; + 9514A05D0AD78F3700B21A41 = 9514A05D0AD78F3700B21A41 /* PBXTextBookmark */; + 95D44D230AD8C1BE00384FE5 /* PBXBookmark */ = 95D44D230AD8C1BE00384FE5 /* PBXBookmark */; + 95D44D290AD8C1E800384FE5 /* PBXTextBookmark */ = 95D44D290AD8C1E800384FE5 /* PBXTextBookmark */; + 95D44D370AD8C24800384FE5 /* PBXBookmark */ = 95D44D370AD8C24800384FE5 /* PBXBookmark */; + 95D44D3B0AD8C25200384FE5 /* PBXTextBookmark */ = 95D44D3B0AD8C25200384FE5 /* PBXTextBookmark */; + 95D44D3C0AD8C25200384FE5 /* PBXTextBookmark */ = 95D44D3C0AD8C25200384FE5 /* PBXTextBookmark */; + 95D44D3F0AD8C2BB00384FE5 /* PBXTextBookmark */ = 95D44D3F0AD8C2BB00384FE5 /* PBXTextBookmark */; + 95D44D400AD8C2BB00384FE5 /* PBXTextBookmark */ = 95D44D400AD8C2BB00384FE5 /* PBXTextBookmark */; + 95D44D430AD8C34600384FE5 /* PBXTextBookmark */ = 95D44D430AD8C34600384FE5 /* PBXTextBookmark */; + 95D44D440AD8C34600384FE5 /* PBXTextBookmark */ = 95D44D440AD8C34600384FE5 /* PBXTextBookmark */; + 95D44D4D0AD8C47000384FE5 /* PBXTextBookmark */ = 95D44D4D0AD8C47000384FE5 /* PBXTextBookmark */; + 95D44D4E0AD8C47000384FE5 /* PBXTextBookmark */ = 95D44D4E0AD8C47000384FE5 /* PBXTextBookmark */; + 95D44D520AD8C60C00384FE5 /* PBXTextBookmark */ = 95D44D520AD8C60C00384FE5 /* PBXTextBookmark */; + 95D44D530AD8C60C00384FE5 /* PBXTextBookmark */ = 95D44D530AD8C60C00384FE5 /* PBXTextBookmark */; + 95D44D590AD8C75700384FE5 /* PBXTextBookmark */ = 95D44D590AD8C75700384FE5 /* PBXTextBookmark */; + 95D44D5A0AD8C75700384FE5 /* PBXTextBookmark */ = 95D44D5A0AD8C75700384FE5 /* PBXTextBookmark */; + 95D44D600AD8C85600384FE5 /* PBXTextBookmark */ = 95D44D600AD8C85600384FE5 /* PBXTextBookmark */; + 95D44D610AD8C85600384FE5 /* PBXTextBookmark */ = 95D44D610AD8C85600384FE5 /* PBXTextBookmark */; }; sourceControlManager = 954D7413095406B2007D9571 /* Source Control */; userBuildSettings = { @@ -196,6 +129,13 @@ sepNavWindowFrame = "{{15, 92}, {763, 649}}"; }; }; + 2A37F4B0FDCFA73011CA2CEA /* main.m */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {704, 520}}"; + sepNavSelRange = "{248, 0}"; + sepNavVisRect = "{{0, 0}, {704, 520}}"; + }; + }; 2A37F4BAFDCFA73011CA2CEA /* English */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {724, 535}}"; @@ -210,6 +150,20 @@ 954D740509540691007D9571 /* Vocalese */, ); }; + 9514A0410AD78D3E00B21A41 /* PBXBookmark */ = { + isa = PBXBookmark; + fRef = 95BDA15809540BF1009F9D65 /* VLSheetView.mm */; + }; + 9514A05D0AD78F3700B21A41 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 95BDA15809540BF1009F9D65 /* VLSheetView.mm */; + name = "VLSheetView.mm: 334"; + rLen = 0; + rLoc = 8167; + rType = 0; + vrLen = 969; + vrLoc = 7454; + }; 952CBB97095FD19D00434E43 /* TVLSoundOut */ = { activeExec = 0; executables = ( @@ -243,12 +197,20 @@ }; 952CBB9A095FD1CA00434E43 /* VLSoundOut.cpp */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {724, 2030}}"; - sepNavSelRange = "{548, 0}"; - sepNavVisRect = "{{0, 1510}, {724, 520}}"; + sepNavIntBoundsRect = "{{0, 0}, {867, 1722}}"; + sepNavSelRange = "{4350, 0}"; + sepNavVisRect = "{{0, 1501}, {867, 178}}"; sepNavWindowFrame = "{{107, 8}, {763, 649}}"; }; }; + 952CBB9B095FD1CA00434E43 /* VLSoundOut.h */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {704, 588}}"; + sepNavSelRange = "{706, 0}"; + sepNavVisRect = "{{0, 0}, {704, 520}}"; + sepNavWindowFrame = "{{61, 50}, {763, 649}}"; + }; + }; 952CBB9E095FD1D900434E43 /* TVLSoundOut.cpp */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {944, 392}}"; @@ -266,9 +228,9 @@ }; 952DCD77096BBB11001C2316 /* VLSheetViewChords.mm */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {867, 1848}}"; - sepNavSelRange = "{5101, 0}"; - sepNavVisRect = "{{0, 1668}, {867, 178}}"; + sepNavIntBoundsRect = "{{0, 0}, {703, 3374}}"; + sepNavSelRange = "{6151, 0}"; + sepNavVisRect = "{{0, 3113}, {703, 261}}"; sepNavWindowFrame = "{{164, 35}, {763, 649}}"; }; }; @@ -406,63 +368,6 @@ sepNavWindowFrame = "{{84, 29}, {763, 649}}"; }; }; - 956674AB0AD25F48007D5997 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 952DCD77096BBB11001C2316 /* VLSheetViewChords.mm */; - name = "VLSheetViewChords.mm: 180"; - rLen = 0; - rLoc = 4043; - rType = 0; - vrLen = 946; - vrLoc = 4468; - }; - 956674AC0AD25F48007D5997 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 95BDA15809540BF1009F9D65 /* VLSheetView.mm */; - rLen = 0; - rLoc = 301; - rType = 1; - }; - 956674AD0AD25F48007D5997 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 952DCD77096BBB11001C2316 /* VLSheetViewChords.mm */; - name = "VLSheetViewChords.mm: 180"; - rLen = 0; - rLoc = 4043; - rType = 0; - vrLen = 946; - vrLoc = 4468; - }; - 956674B60AD262F5007D5997 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 95BDA15809540BF1009F9D65 /* VLSheetView.mm */; - name = "VLSheetView.mm: 302"; - rLen = 0; - rLoc = 7323; - rType = 0; - vrLen = 1029; - vrLoc = 6828; - }; - 956674B70AD262F5007D5997 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 95BDA15809540BF1009F9D65 /* VLSheetView.mm */; - name = "VLSheetView.mm: 476"; - rLen = 0; - rLoc = 11589; - rType = 0; - vrLen = 725; - vrLoc = 10842; - }; - 956674B80AD262F5007D5997 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 952DCD77096BBB11001C2316 /* VLSheetViewChords.mm */; - name = "VLSheetViewChords.mm: 228"; - rLen = 0; - rLoc = 5438; - rType = 0; - vrLen = 951; - vrLoc = 4468; - }; 9594089F096922CA007CCCF8 /* TVLEdit */ = { activeExec = 0; executables = ( @@ -536,790 +441,184 @@ }; 95BDA15809540BF1009F9D65 /* VLSheetView.mm */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {704, 4074}}"; - sepNavSelRange = "{11734, 0}"; - sepNavVisRect = "{{0, 2770}, {704, 497}}"; + sepNavIntBoundsRect = "{{0, 0}, {704, 5250}}"; + sepNavSelRange = "{8167, 0}"; + sepNavVisRect = "{{0, 2336}, {704, 520}}"; sepNavWindowFrame = "{{15, 92}, {763, 649}}"; }; }; - 95E725470AD25C2500407A9B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 95BDA15809540BF1009F9D65 /* VLSheetView.mm */; - name = "VLSheetView.mm: 473"; - rLen = 79; - rLoc = 11376; - rType = 0; - vrLen = 639; - vrLoc = 10905; + 95D44D1D0AD8BFEF00384FE5 /* VLSoundSched.h */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {703, 261}}"; + sepNavSelRange = "{209, 2}"; + sepNavVisRect = "{{0, 0}, {703, 261}}"; + sepNavWindowFrame = "{{222, 26}, {763, 649}}"; + }; }; - 95E725480AD25C2500407A9B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 952DCD77096BBB11001C2316 /* VLSheetViewChords.mm */; - name = "VLSheetViewChords.mm: 228"; - rLen = 0; - rLoc = 5438; - rType = 0; - vrLen = 907; - vrLoc = 4512; + 95D44D1E0AD8BFEF00384FE5 /* VLSoundSched.mm */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {867, 504}}"; + sepNavSelRange = "{710, 0}"; + sepNavVisRect = "{{0, 326}, {867, 178}}"; + sepNavWindowFrame = "{{38, 71}, {763, 649}}"; + }; }; - 95E7254C0AD25C3E00407A9B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 95BDA15809540BF1009F9D65 /* VLSheetView.mm */; - name = "VLSheetView.mm: 480"; - rLen = 0; - rLoc = 11637; - rType = 0; - vrLen = 1158; - vrLoc = 9304; + 95D44D230AD8C1BE00384FE5 /* PBXBookmark */ = { + isa = PBXBookmark; + fRef = 2A37F4B0FDCFA73011CA2CEA /* main.m */; }; - 95E725600AD25CDD00407A9B /* PBXTextBookmark */ = { + 95D44D290AD8C1E800384FE5 /* PBXTextBookmark */ = { isa = PBXTextBookmark; - fRef = 95BDA15809540BF1009F9D65 /* VLSheetView.mm */; - name = "VLSheetView.mm: 480"; + fRef = 2A37F4B0FDCFA73011CA2CEA /* main.m */; + name = "main.m: 14"; rLen = 0; - rLoc = 11637; + rLoc = 248; + rType = 0; + vrLen = 309; + vrLoc = 0; + }; + 95D44D370AD8C24800384FE5 /* PBXBookmark */ = { + isa = PBXBookmark; + fRef = 952CBB9B095FD1CA00434E43 /* VLSoundOut.h */; + }; + 95D44D3B0AD8C25200384FE5 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 952CBB9B095FD1CA00434E43 /* VLSoundOut.h */; + name = "VLSoundOut.h: 23"; + rLen = 0; + rLoc = 345; + rType = 0; + vrLen = 664; + vrLoc = 0; + }; + 95D44D3C0AD8C25200384FE5 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 2A37F4B0FDCFA73011CA2CEA /* main.m */; + name = "main.m: 14"; + rLen = 0; + rLoc = 248; + rType = 0; + vrLen = 309; + vrLoc = 0; + }; + 95D44D3F0AD8C2BB00384FE5 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 952CBB9B095FD1CA00434E43 /* VLSoundOut.h */; + name = "VLSoundOut.h: 23"; + rLen = 0; + rLoc = 345; + rType = 0; + vrLen = 664; + vrLoc = 0; + }; + 95D44D400AD8C2BB00384FE5 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 2A37F4B0FDCFA73011CA2CEA /* main.m */; + name = "main.m: 14"; + rLen = 0; + rLoc = 248; + rType = 0; + vrLen = 309; + vrLoc = 0; + }; + 95D44D430AD8C34600384FE5 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 952CBB9B095FD1CA00434E43 /* VLSoundOut.h */; + name = "VLSoundOut.h: 42"; + rLen = 0; + rLoc = 706; + rType = 0; + vrLen = 666; + vrLoc = 0; + }; + 95D44D440AD8C34600384FE5 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 2A37F4B0FDCFA73011CA2CEA /* main.m */; + name = "main.m: 14"; + rLen = 0; + rLoc = 248; + rType = 0; + vrLen = 309; + vrLoc = 0; + }; + 95D44D4D0AD8C47000384FE5 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 952CBB9B095FD1CA00434E43 /* VLSoundOut.h */; + name = "VLSoundOut.h: 42"; + rLen = 0; + rLoc = 706; rType = 0; vrLen = 662; - vrLoc = 10905; - }; - 95E725700AD25EA500407A9B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 95BDA15809540BF1009F9D65 /* VLSheetView.mm */; - name = "VLSheetView.mm: 476"; - rLen = 0; - rLoc = 11589; - rType = 0; - vrLen = 681; - vrLoc = 10886; - }; - 95E725710AD25EA500407A9B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 952DCD77096BBB11001C2316 /* VLSheetViewChords.mm */; - name = "VLSheetViewChords.mm: 228"; - rLen = 0; - rLoc = 5438; - rType = 0; - vrLen = 949; - vrLoc = 4470; - }; - 95E7B4FD0AD2CBD800753F9B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 95BDA15809540BF1009F9D65 /* VLSheetView.mm */; - name = "VLSheetView.mm: 476"; - rLen = 0; - rLoc = 11589; - rType = 0; - vrLen = 709; - vrLoc = 10886; - }; - 95E7B4FE0AD2CBD800753F9B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 952DCD77096BBB11001C2316 /* VLSheetViewChords.mm */; - name = "VLSheetViewChords.mm: 228"; - rLen = 0; - rLoc = 5438; - rType = 0; - vrLen = 827; - vrLoc = 2730; - }; - 95E7B4FF0AD2CBD800753F9B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 95BDA15809540BF1009F9D65 /* VLSheetView.mm */; - name = "VLSheetView.mm: 476"; - rLen = 0; - rLoc = 11589; - rType = 0; - vrLen = 753; - vrLoc = 10842; - }; - 95E7B50B0AD2CC9400753F9B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 95BDA15809540BF1009F9D65 /* VLSheetView.mm */; - name = "VLSheetView.mm: 476"; - rLen = 0; - rLoc = 11589; - rType = 0; - vrLen = 709; - vrLoc = 10886; - }; - 95E7B50C0AD2CC9400753F9B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 952DCD77096BBB11001C2316 /* VLSheetViewChords.mm */; - name = "VLSheetViewChords.mm: 228"; - rLen = 0; - rLoc = 5438; - rType = 0; - vrLen = 780; - vrLoc = 2730; - }; - 95E7B50D0AD2CC9400753F9B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 95BDA15809540BF1009F9D65 /* VLSheetView.mm */; - name = "VLSheetView.mm: 476"; - rLen = 0; - rLoc = 11589; - rType = 0; - vrLen = 748; - vrLoc = 10842; - }; - 95E7B5190AD2CDC800753F9B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 95BDA15809540BF1009F9D65 /* VLSheetView.mm */; - name = "VLSheetView.mm: 475"; - rLen = 0; - rLoc = 11499; - rType = 0; - vrLen = 790; - vrLoc = 10842; - }; - 95E7B51A0AD2CDC800753F9B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 95BDA15809540BF1009F9D65 /* VLSheetView.mm */; - name = "VLSheetView.mm: 477"; - rLen = 0; - rLoc = 11589; - rType = 0; - vrLen = 751; - vrLoc = 10886; - }; - 95E7B51B0AD2CDC800753F9B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 952DCD77096BBB11001C2316 /* VLSheetViewChords.mm */; - name = "VLSheetViewChords.mm: 228"; - rLen = 0; - rLoc = 5438; - rType = 0; - vrLen = 827; - vrLoc = 2730; - }; - 95E7B51D0AD2CDDF00753F9B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 95BDA15809540BF1009F9D65 /* VLSheetView.mm */; - name = "VLSheetView.mm: 475"; - rLen = 0; - rLoc = 11499; - rType = 0; - vrLen = 789; - vrLoc = 10842; - }; - 95E7B51E0AD2CDDF00753F9B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 95BDA15809540BF1009F9D65 /* VLSheetView.mm */; - name = "VLSheetView.mm: 477"; - rLen = 0; - rLoc = 11589; - rType = 0; - vrLen = 746; - vrLoc = 10886; - }; - 95E7B51F0AD2CDDF00753F9B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 952DCD77096BBB11001C2316 /* VLSheetViewChords.mm */; - name = "VLSheetViewChords.mm: 228"; - rLen = 0; - rLoc = 5438; - rType = 0; - vrLen = 780; - vrLoc = 2730; - }; - 95E7B5260AD2CE8800753F9B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 952DCD77096BBB11001C2316 /* VLSheetViewChords.mm */; - name = "VLSheetViewChords.mm: 152"; - rLen = 0; - rLoc = 3168; - rType = 0; - vrLen = 592; - vrLoc = 2564; - }; - 95E7B5270AD2CE8800753F9B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 95BDA15809540BF1009F9D65 /* VLSheetView.mm */; - name = "VLSheetView.mm: 475"; - rLen = 42; - rLoc = 11458; - rType = 0; - vrLen = 746; - vrLoc = 10886; - }; - 95E7B52E0AD2CED100753F9B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 952DCD77096BBB11001C2316 /* VLSheetViewChords.mm */; - name = "VLSheetViewChords.mm: 229"; - rLen = 0; - rLoc = 5421; - rType = 0; - vrLen = 951; - vrLoc = 4532; - }; - 95E7B52F0AD2CED100753F9B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 95BDA15809540BF1009F9D65 /* VLSheetView.mm */; - name = "VLSheetView.mm: 475"; - rLen = 42; - rLoc = 11458; - rType = 0; - vrLen = 746; - vrLoc = 10886; - }; - 95E7B5370AD2CF2F00753F9B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 952DCD77096BBB11001C2316 /* VLSheetViewChords.mm */; - name = "VLSheetViewChords.mm: 229"; - rLen = 0; - rLoc = 5421; - rType = 0; - vrLen = 951; - vrLoc = 4532; - }; - 95E7B5380AD2CF2F00753F9B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 95BDA15809540BF1009F9D65 /* VLSheetView.mm */; - name = "VLSheetView.mm: 475"; - rLen = 42; - rLoc = 11458; - rType = 0; - vrLen = 746; - vrLoc = 10886; - }; - 95E7B53B0AD2CF8900753F9B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 952DCD77096BBB11001C2316 /* VLSheetViewChords.mm */; - name = "VLSheetViewChords.mm: 233"; - rLen = 0; - rLoc = 5421; - rType = 0; - vrLen = 1001; - vrLoc = 4492; - }; - 95E7B53C0AD2CF8900753F9B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 95BDA15809540BF1009F9D65 /* VLSheetView.mm */; - name = "VLSheetView.mm: 475"; - rLen = 42; - rLoc = 11458; - rType = 0; - vrLen = 751; - vrLoc = 10886; - }; - 95E7B53D0AD2CF9A00753F9B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 952DCD77096BBB11001C2316 /* VLSheetViewChords.mm */; - name = "VLSheetViewChords.mm: 233"; - rLen = 0; - rLoc = 5421; - rType = 0; - vrLen = 998; - vrLoc = 4492; - }; - 95E7B53E0AD2CF9A00753F9B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 95BDA15809540BF1009F9D65 /* VLSheetView.mm */; - name = "VLSheetView.mm: 475"; - rLen = 42; - rLoc = 11458; - rType = 0; - vrLen = 746; - vrLoc = 10886; - }; - 95E7B5470AD2D05B00753F9B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 95BDA15809540BF1009F9D65 /* VLSheetView.mm */; - name = "VLSheetView.mm: 475"; - rLen = 42; - rLoc = 11458; - rType = 0; - vrLen = 746; - vrLoc = 10886; - }; - 95E7B54B0AD2D0E300753F9B /* PBXBookmark */ = { - isa = PBXBookmark; - fRef = 2A37F4ACFDCFA73011CA2CEA /* VLDocument.mm */; - }; - 95E7B54C0AD2D10400753F9B /* PBXBookmark */ = { - isa = PBXBookmark; - fRef = 2A37F4AEFDCFA73011CA2CEA /* VLDocument.h */; - }; - 95E7B5500AD2D12A00753F9B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 2A37F4ACFDCFA73011CA2CEA /* VLDocument.mm */; - name = "VLDocument.mm: 25"; - rLen = 0; - rLoc = 339; - rType = 0; - vrLen = 596; - vrLoc = 33; - }; - 95E7B5530AD2D12A00753F9B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 2A37F4AEFDCFA73011CA2CEA /* VLDocument.h */; - name = "VLDocument.h: 16"; - rLen = 104; - rLoc = 231; - rType = 0; - vrLen = 670; vrLoc = 0; }; - 95E7B5540AD2D12A00753F9B /* PBXTextBookmark */ = { + 95D44D4E0AD8C47000384FE5 /* PBXTextBookmark */ = { isa = PBXTextBookmark; - fRef = 95BDA15809540BF1009F9D65 /* VLSheetView.mm */; - name = "VLSheetView.mm: 475"; - rLen = 42; - rLoc = 11458; - rType = 0; - vrLen = 751; - vrLoc = 10886; - }; - 95E7B5580AD2D19100753F9B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 2A37F4ACFDCFA73011CA2CEA /* VLDocument.mm */; - name = "VLDocument.mm: 25"; + fRef = 2A37F4B0FDCFA73011CA2CEA /* main.m */; + name = "main.m: 14"; rLen = 0; - rLoc = 339; + rLoc = 248; rType = 0; - vrLen = 570; - vrLoc = 33; - }; - 95E7B5590AD2D19100753F9B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 952DCD77096BBB11001C2316 /* VLSheetViewChords.mm */; - rLen = 0; - rLoc = 89; - rType = 1; - }; - 95E7B55A0AD2D19100753F9B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 2A37F4ACFDCFA73011CA2CEA /* VLDocument.mm */; - name = "VLDocument.mm: 25"; - rLen = 0; - rLoc = 339; - rType = 0; - vrLen = 570; - vrLoc = 33; - }; - 95E7B55B0AD2D19100753F9B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 952DCD77096BBB11001C2316 /* VLSheetViewChords.mm */; - name = "VLSheetViewChords.mm: 89"; - rLen = 0; - rLoc = 1884; - rType = 0; - vrLen = 752; - vrLoc = 1485; - }; - 95E7B55C0AD2D19100753F9B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 2A37F4AEFDCFA73011CA2CEA /* VLDocument.h */; - name = "VLDocument.h: 16"; - rLen = 104; - rLoc = 231; - rType = 0; - vrLen = 665; + vrLen = 309; vrLoc = 0; }; - 95E7B55D0AD2D19100753F9B /* PBXTextBookmark */ = { + 95D44D520AD8C60C00384FE5 /* PBXTextBookmark */ = { isa = PBXTextBookmark; - fRef = 95BDA15809540BF1009F9D65 /* VLSheetView.mm */; - name = "VLSheetView.mm: 475"; - rLen = 42; - rLoc = 11458; - rType = 0; - vrLen = 746; - vrLoc = 10886; - }; - 95E7B5670AD2D24400753F9B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 952DCD77096BBB11001C2316 /* VLSheetViewChords.mm */; - name = "VLSheetViewChords.mm: 132"; + fRef = 952CBB9B095FD1CA00434E43 /* VLSoundOut.h */; + name = "VLSoundOut.h: 42"; rLen = 0; - rLoc = 2908; + rLoc = 706; rType = 0; - vrLen = 830; - vrLoc = 2212; - }; - 95E7B5680AD2D24400753F9B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 2A37F4AEFDCFA73011CA2CEA /* VLDocument.h */; - name = "VLDocument.h: 16"; - rLen = 104; - rLoc = 231; - rType = 0; - vrLen = 670; + vrLen = 662; vrLoc = 0; }; - 95E7B5690AD2D24400753F9B /* PBXTextBookmark */ = { + 95D44D530AD8C60C00384FE5 /* PBXTextBookmark */ = { isa = PBXTextBookmark; - fRef = 95BDA15809540BF1009F9D65 /* VLSheetView.mm */; - name = "VLSheetView.mm: 475"; - rLen = 42; - rLoc = 11458; - rType = 0; - vrLen = 751; - vrLoc = 10886; - }; - 95E7B56D0AD2D42000753F9B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 952DCD77096BBB11001C2316 /* VLSheetViewChords.mm */; - name = "VLSheetViewChords.mm: 240"; + fRef = 2A37F4B0FDCFA73011CA2CEA /* main.m */; + name = "main.m: 14"; rLen = 0; - rLoc = 5560; + rLoc = 248; rType = 0; - vrLen = 957; - vrLoc = 4559; - }; - 95E7B56E0AD2D42000753F9B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 2A37F4AEFDCFA73011CA2CEA /* VLDocument.h */; - name = "VLDocument.h: 16"; - rLen = 104; - rLoc = 231; - rType = 0; - vrLen = 670; + vrLen = 309; vrLoc = 0; }; - 95E7B56F0AD2D42000753F9B /* PBXTextBookmark */ = { + 95D44D590AD8C75700384FE5 /* PBXTextBookmark */ = { isa = PBXTextBookmark; - fRef = 95BDA15809540BF1009F9D65 /* VLSheetView.mm */; - name = "VLSheetView.mm: 484"; + fRef = 952CBB9B095FD1CA00434E43 /* VLSoundOut.h */; + name = "VLSoundOut.h: 42"; rLen = 0; - rLoc = 11734; + rLoc = 706; rType = 0; - vrLen = 1212; - vrLoc = 9400; - }; - 95E7B5700AD2D49800753F9B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 952DCD77096BBB11001C2316 /* VLSheetViewChords.mm */; - name = "VLSheetViewChords.mm: 242"; - rLen = 0; - rLoc = 5560; - rType = 0; - vrLen = 964; - vrLoc = 4585; - }; - 95E7B5710AD2D49800753F9B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 2A37F4AEFDCFA73011CA2CEA /* VLDocument.h */; - name = "VLDocument.h: 16"; - rLen = 104; - rLoc = 231; - rType = 0; - vrLen = 665; + vrLen = 662; vrLoc = 0; }; - 95E7B5720AD2D49800753F9B /* PBXTextBookmark */ = { + 95D44D5A0AD8C75700384FE5 /* PBXTextBookmark */ = { isa = PBXTextBookmark; - fRef = 95BDA15809540BF1009F9D65 /* VLSheetView.mm */; - name = "VLSheetView.mm: 484"; + fRef = 2A37F4B0FDCFA73011CA2CEA /* main.m */; + name = "main.m: 14"; rLen = 0; - rLoc = 11734; + rLoc = 248; rType = 0; - vrLen = 1211; - vrLoc = 9400; - }; - 95E7B5750AD2D4D500753F9B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 952DCD77096BBB11001C2316 /* VLSheetViewChords.mm */; - name = "VLSheetViewChords.mm: 245"; - rLen = 0; - rLoc = 5623; - rType = 0; - vrLen = 1223; - vrLoc = 3379; - }; - 95E7B5760AD2D4D500753F9B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 2A37F4AEFDCFA73011CA2CEA /* VLDocument.h */; - name = "VLDocument.h: 16"; - rLen = 104; - rLoc = 231; - rType = 0; - vrLen = 670; + vrLen = 309; vrLoc = 0; }; - 95E7B5770AD2D4D500753F9B /* PBXTextBookmark */ = { + 95D44D600AD8C85600384FE5 /* PBXTextBookmark */ = { isa = PBXTextBookmark; - fRef = 95BDA15809540BF1009F9D65 /* VLSheetView.mm */; - name = "VLSheetView.mm: 484"; + fRef = 2A37F4B0FDCFA73011CA2CEA /* main.m */; + name = "main.m: 14"; rLen = 0; - rLoc = 11734; + rLoc = 248; rType = 0; - vrLen = 1212; - vrLoc = 9400; - }; - 95E7B57A0AD2D54200753F9B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 952DCD77096BBB11001C2316 /* VLSheetViewChords.mm */; - name = "VLSheetViewChords.mm: 245"; - rLen = 0; - rLoc = 5623; - rType = 0; - vrLen = 1223; - vrLoc = 3379; - }; - 95E7B57B0AD2D54200753F9B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 2A37F4AEFDCFA73011CA2CEA /* VLDocument.h */; - name = "VLDocument.h: 16"; - rLen = 104; - rLoc = 231; - rType = 0; - vrLen = 670; + vrLen = 309; vrLoc = 0; }; - 95E7B57C0AD2D54200753F9B /* PBXTextBookmark */ = { + 95D44D610AD8C85600384FE5 /* PBXTextBookmark */ = { isa = PBXTextBookmark; - fRef = 95BDA15809540BF1009F9D65 /* VLSheetView.mm */; - name = "VLSheetView.mm: 484"; + fRef = 952CBB9B095FD1CA00434E43 /* VLSoundOut.h */; + name = "VLSoundOut.h: 42"; rLen = 0; - rLoc = 11734; + rLoc = 706; rType = 0; - vrLen = 1212; - vrLoc = 9400; - }; - 95E7B57D0AD2D57B00753F9B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 952DCD77096BBB11001C2316 /* VLSheetViewChords.mm */; - name = "VLSheetViewChords.mm: 241"; - rLen = 0; - rLoc = 5623; - rType = 0; - vrLen = 1086; - vrLoc = 3538; - }; - 95E7B57E0AD2D57B00753F9B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 2A37F4AEFDCFA73011CA2CEA /* VLDocument.h */; - name = "VLDocument.h: 16"; - rLen = 104; - rLoc = 231; - rType = 0; - vrLen = 665; + vrLen = 666; vrLoc = 0; }; - 95E7B57F0AD2D57B00753F9B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 95BDA15809540BF1009F9D65 /* VLSheetView.mm */; - name = "VLSheetView.mm: 484"; - rLen = 0; - rLoc = 11734; - rType = 0; - vrLen = 1211; - vrLoc = 9400; - }; - 95E7B5840AD2D5DB00753F9B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 952DCD77096BBB11001C2316 /* VLSheetViewChords.mm */; - name = "VLSheetViewChords.mm: 241"; - rLen = 0; - rLoc = 5623; - rType = 0; - vrLen = 1086; - vrLoc = 3497; - }; - 95E7B5850AD2D5DB00753F9B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 2A37F4AEFDCFA73011CA2CEA /* VLDocument.h */; - name = "VLDocument.h: 16"; - rLen = 104; - rLoc = 231; - rType = 0; - vrLen = 665; - vrLoc = 0; - }; - 95E7B5860AD2D5DB00753F9B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 95BDA15809540BF1009F9D65 /* VLSheetView.mm */; - name = "VLSheetView.mm: 484"; - rLen = 0; - rLoc = 11734; - rType = 0; - vrLen = 1211; - vrLoc = 9400; - }; - 95E7B58B0AD2D66900753F9B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 952DCD77096BBB11001C2316 /* VLSheetViewChords.mm */; - name = "VLSheetViewChords.mm: 241"; - rLen = 0; - rLoc = 5623; - rType = 0; - vrLen = 1086; - vrLoc = 3497; - }; - 95E7B58C0AD2D66900753F9B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 2A37F4AEFDCFA73011CA2CEA /* VLDocument.h */; - name = "VLDocument.h: 16"; - rLen = 104; - rLoc = 231; - rType = 0; - vrLen = 665; - vrLoc = 0; - }; - 95E7B58D0AD2D66900753F9B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 95BDA15809540BF1009F9D65 /* VLSheetView.mm */; - name = "VLSheetView.mm: 484"; - rLen = 0; - rLoc = 11734; - rType = 0; - vrLen = 1211; - vrLoc = 9400; - }; - 95E7B5930AD2D79500753F9B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 95BDA15809540BF1009F9D65 /* VLSheetView.mm */; - name = "VLSheetView.mm: 463"; - rLen = 30; - rLoc = 11249; - rType = 0; - vrLen = 350; - vrLoc = 11108; - }; - 95E7B5940AD2D79500753F9B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - comments = "warning: incomplete implementation of class 'VLChordEditable'"; - fRef = 952DCD77096BBB11001C2316 /* VLSheetViewChords.mm */; - rLen = 0; - rLoc = 152; - rType = 1; - }; - 95E7B5950AD2D79500753F9B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 952DCD77096BBB11001C2316 /* VLSheetViewChords.mm */; - name = "VLSheetViewChords.mm: 240"; - rLen = 0; - rLoc = 5560; - rType = 0; - vrLen = 413; - vrLoc = 4403; - }; - 95E7B5960AD2D79500753F9B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 95BDA15809540BF1009F9D65 /* VLSheetView.mm */; - name = "VLSheetView.mm: 463"; - rLen = 30; - rLoc = 11249; - rType = 0; - vrLen = 350; - vrLoc = 11108; - }; - 95E7B5970AD2D79500753F9B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 952DCD77096BBB11001C2316 /* VLSheetViewChords.mm */; - name = "VLSheetViewChords.mm: 153"; - rLen = 0; - rLoc = 3246; - rType = 0; - vrLen = 321; - vrLoc = 5275; - }; - 95E7B5980AD2D79800753F9B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 2A37F4AEFDCFA73011CA2CEA /* VLDocument.h */; - name = "VLDocument.h: 16"; - rLen = 104; - rLoc = 231; - rType = 0; - vrLen = 665; - vrLoc = 0; - }; - 95E7B5990AD2D79800753F9B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 95BDA15809540BF1009F9D65 /* VLSheetView.mm */; - name = "VLSheetView.mm: 484"; - rLen = 0; - rLoc = 11734; - rType = 0; - vrLen = 1211; - vrLoc = 9400; - }; - 95E7B59A0AD2D7B400753F9B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 2A37F4AEFDCFA73011CA2CEA /* VLDocument.h */; - name = "VLDocument.h: 16"; - rLen = 104; - rLoc = 231; - rType = 0; - vrLen = 665; - vrLoc = 0; - }; - 95E7B59B0AD2D7B400753F9B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 95BDA15809540BF1009F9D65 /* VLSheetView.mm */; - name = "VLSheetView.mm: 484"; - rLen = 0; - rLoc = 11734; - rType = 0; - vrLen = 1211; - vrLoc = 9400; - }; - 95E7B59F0AD2D8EE00753F9B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 95BDA15809540BF1009F9D65 /* VLSheetView.mm */; - name = "VLSheetView.mm: 484"; - rLen = 0; - rLoc = 11734; - rType = 0; - vrLen = 1211; - vrLoc = 9400; - }; - 95E7B5A00AD2D8EE00753F9B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 2A37F4AEFDCFA73011CA2CEA /* VLDocument.h */; - name = "VLDocument.h: 16"; - rLen = 104; - rLoc = 231; - rType = 0; - vrLen = 665; - vrLoc = 0; - }; - 95E7B5A30AD2D90E00753F9B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 95BDA15809540BF1009F9D65 /* VLSheetView.mm */; - name = "VLSheetView.mm: 484"; - rLen = 0; - rLoc = 11734; - rType = 0; - vrLen = 1211; - vrLoc = 9400; - }; - 95E7B5A40AD2D90E00753F9B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 2A37F4AEFDCFA73011CA2CEA /* VLDocument.h */; - name = "VLDocument.h: 16"; - rLen = 104; - rLoc = 231; - rType = 0; - vrLen = 665; - vrLoc = 0; - }; - 95E7B5A50AD2D90E00753F9B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 952DCD77096BBB11001C2316 /* VLSheetViewChords.mm */; - rLen = 0; - rLoc = 236; - rType = 1; - }; - 95E7B5A60AD2D90E00753F9B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 2A37F4AEFDCFA73011CA2CEA /* VLDocument.h */; - name = "VLDocument.h: 16"; - rLen = 104; - rLoc = 231; - rType = 0; - vrLen = 665; - vrLoc = 0; - }; - 95E7B5A70AD2D90E00753F9B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 952DCD77096BBB11001C2316 /* VLSheetViewChords.mm */; - name = "VLSheetViewChords.mm: 236"; - rLen = 0; - rLoc = 5525; - rType = 0; - vrLen = 723; - vrLoc = 2524; - }; } diff --git a/Vocalese.xcodeproj/project.pbxproj b/Vocalese.xcodeproj/project.pbxproj index 5e156f6..c38a84e 100644 --- a/Vocalese.xcodeproj/project.pbxproj +++ b/Vocalese.xcodeproj/project.pbxproj @@ -31,6 +31,7 @@ 95B3E1A70960E58B000E9C0D /* Music in Resources */ = {isa = PBXBuildFile; fileRef = 95B3E1980960E58B000E9C0D /* Music */; }; 95B66658096BCA1F00FE18C9 /* VLSheetViewNotes.mm in Sources */ = {isa = PBXBuildFile; fileRef = 95B66657096BCA1F00FE18C9 /* VLSheetViewNotes.mm */; }; 95BDA15909540BF1009F9D65 /* VLSheetView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 95BDA15809540BF1009F9D65 /* VLSheetView.mm */; }; + 95D44D1F0AD8BFEF00384FE5 /* VLSoundSched.mm in Sources */ = {isa = PBXBuildFile; fileRef = 95D44D1E0AD8BFEF00384FE5 /* VLSoundSched.mm */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -68,6 +69,8 @@ 95B66657096BCA1F00FE18C9 /* VLSheetViewNotes.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = VLSheetViewNotes.mm; path = Sources/VLSheetViewNotes.mm; sourceTree = ""; }; 95BDA15709540BF1009F9D65 /* VLSheetView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLSheetView.h; path = Sources/VLSheetView.h; sourceTree = ""; }; 95BDA15809540BF1009F9D65 /* VLSheetView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = VLSheetView.mm; path = Sources/VLSheetView.mm; sourceTree = ""; }; + 95D44D1D0AD8BFEF00384FE5 /* VLSoundSched.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLSoundSched.h; path = Sources/VLSoundSched.h; sourceTree = ""; }; + 95D44D1E0AD8BFEF00384FE5 /* VLSoundSched.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = VLSoundSched.mm; path = Sources/VLSoundSched.mm; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -167,6 +170,8 @@ 952DCD77096BBB11001C2316 /* VLSheetViewChords.mm */, 95B66656096BCA1F00FE18C9 /* VLSheetViewNotes.h */, 95B66657096BCA1F00FE18C9 /* VLSheetViewNotes.mm */, + 95D44D1D0AD8BFEF00384FE5 /* VLSoundSched.h */, + 95D44D1E0AD8BFEF00384FE5 /* VLSoundSched.mm */, ); name = Classes; sourceTree = ""; @@ -329,6 +334,7 @@ 952CBB9D095FD1CA00434E43 /* VLSoundOut.cpp in Sources */, 952DCD78096BBB11001C2316 /* VLSheetViewChords.mm in Sources */, 95B66658096BCA1F00FE18C9 /* VLSheetViewNotes.mm in Sources */, + 95D44D1F0AD8BFEF00384FE5 /* VLSoundSched.mm in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -447,7 +453,7 @@ GCC_PREFIX_HEADER = Sources/Vocalese_Prefix.pch; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; - INFOPLIST_FILE = Info.plist; + INFOPLIST_FILE = Resources/Info.plist; INSTALL_PATH = "$(HOME)/Applications"; PREBINDING = NO; PRODUCT_NAME = Vocalese;