diff --git a/English.lproj/MainMenu.nib/designable.nib b/English.lproj/MainMenu.nib/designable.nib
index 537ce0c..ba4de91 100644
--- a/English.lproj/MainMenu.nib/designable.nib
+++ b/English.lproj/MainMenu.nib/designable.nib
@@ -2,17 +2,18 @@
1050
- 9A529
- 625
- 930
- 328.00
+ 9B18
+ 629
+ 949
+ 343.00
@@ -635,14 +636,105 @@
+
@@ -731,8 +823,8 @@
1048576
2147483647
-
-
+
+
submenuAction:
@@ -898,7 +990,7 @@
100279
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -3250,32 +3464,11 @@
- 100279
+ 100295
+
diff --git a/English.lproj/MainMenu.nib/keyedobjects.nib b/English.lproj/MainMenu.nib/keyedobjects.nib
index 62bde0d..9eee532 100644
Binary files a/English.lproj/MainMenu.nib/keyedobjects.nib and b/English.lproj/MainMenu.nib/keyedobjects.nib differ
diff --git a/English.lproj/VLDocument.nib/designable.nib b/English.lproj/VLDocument.nib/designable.nib
index 400eb11..eb84754 100644
--- a/English.lproj/VLDocument.nib/designable.nib
+++ b/English.lproj/VLDocument.nib/designable.nib
@@ -2,18 +2,19 @@
1040
- 9A412
- 599
- 902
- 304.00
+ 9B18
+ 629
+ 949
+ 343.00
diff --git a/English.lproj/VLDocument.nib/keyedobjects.nib b/English.lproj/VLDocument.nib/keyedobjects.nib
index b8c7313..ac264ab 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 cbbf4ee..2b53a61 100644
--- a/Sources/VLDocument.h
+++ b/Sources/VLDocument.h
@@ -17,6 +17,13 @@
@class VLLogWindow;
@class PDFDocument;
+enum {
+ kVLPlayAccompaniment = 1,
+ kVLPlayMelody = 2,
+ kVLPlayMetronome = 4,
+ kVLPlayCountIn = 8
+};
+
@interface VLDocument : NSDocument
{
VLSong * song;
@@ -27,6 +34,7 @@
NSString * songArranger;
NSString * songGroove;
NSNumber * songTempo;
+ int playElements;
NSString * tmpPath;
NSFileWrapper * vcsWrapper;
NSMutableArray* observers;
@@ -56,6 +64,9 @@
- (IBAction) showLog:(id)sender;
- (IBAction) play:(id)sender;
- (IBAction) stop:(id)sender;
+- (IBAction) playStop:(id)sender;
+- (IBAction) togglePlayElements:(id)sender;
+- (IBAction) playStop:(id)sender;
- (NSString *) tmpPath;
- (NSString *) workPath;
diff --git a/Sources/VLDocument.mm b/Sources/VLDocument.mm
index d6c24da..9c63b4d 100644
--- a/Sources/VLDocument.mm
+++ b/Sources/VLDocument.mm
@@ -77,6 +77,7 @@
songArranger = @"";
songGroove = @"Swing";
songTempo = [[NSNumber numberWithInt:120] retain];
+ playElements = kVLPlayAccompaniment|kVLPlayMelody|kVLPlayCountIn;
sheetWin = nil;
pdfWin = nil;
logWin = nil;
@@ -249,6 +250,21 @@
return repeatVolta;
}
+- (IBAction) togglePlayElements:(id)sender
+{
+ playElements ^= [sender tag];
+ [validTmpFiles removeObjectForKey:@"mma"];
+ [validTmpFiles removeObjectForKey:@"mid"];
+}
+
+- (BOOL) validateMenuItem:(NSMenuItem *)menuItem
+{
+ if (int tag = [menuItem tag])
+ [menuItem setState:(playElements & tag) != 0];
+
+ return YES;
+}
+
- (bool) brandNew
{
return brandNew && ![self isDocumentEdited];
@@ -435,6 +451,17 @@
VLSoundOut::Instance()->Stop();
}
+- (IBAction) playStop:(id)sender
+{
+ if (VLSoundOut::Instance()->Playing()) {
+ [self stop:sender];
+ [sender setTitle:@"Play"];
+ } else {
+ [self play:sender];
+ [sender setTitle:@"Stop"];
+ }
+}
+
- (IBAction) showOutput:(id)sender
{
[self createTmpFileWithExtension:@"pdf" ofType:@"VLPDFType"];
diff --git a/Sources/VLMMADocument.mm b/Sources/VLMMADocument.mm
index c1a1fe3..f45e67e 100644
--- a/Sources/VLMMADocument.mm
+++ b/Sources/VLMMADocument.mm
@@ -29,10 +29,27 @@
+ "Solo Volume fff\n";
sprintf(buf, "Tempo %d\n", [songTempo intValue]);
mmaFile += buf;
+ if (playElements & kVLPlayCountIn)
+ switch ([[self songTime] intValue]) {
+ case 0x404:
+ mmaFile += "Groove Metronome2-4\nz\nz\n";
+ break;
+ case 0x304:
+ case 0x608:
+ mmaFile += "Groove Metronome3\nz\nz\n";
+ break;
+ default:
+ // Can't handle these yet
+ break;
+ }
sprintf(buf, "Groove %s\n", [songGroove UTF8String]);
mmaFile += buf;
sprintf(buf, "KeySig %d%c\n", labs(prop.fKey), prop.fKey>=0 ? '#' : '&');
mmaFile += buf;
+ if (!(playElements & kVLPlayAccompaniment))
+ mmaFile += "AllTracks Off\nSolo On\n";
+ if (!(playElements & kVLPlayMelody))
+ mmaFile += "Solo Off\n";
mmaFile += '\n'+writer.Measures();
return [[NSString stringWithUTF8String:mmaFile.c_str()]
diff --git a/Sources/VLSoundOut.cpp b/Sources/VLSoundOut.cpp
index 7facc4b..918736e 100644
--- a/Sources/VLSoundOut.cpp
+++ b/Sources/VLSoundOut.cpp
@@ -29,6 +29,7 @@ public:
virtual void PlayChord(const VLChord & chord);
virtual void PlayFile(CFDataRef file);
virtual void Stop();
+ virtual bool Playing();
virtual ~VLAUSoundOut();
protected:
@@ -200,6 +201,11 @@ void VLAUSoundOut::Stop()
}
}
+bool VLAUSoundOut::Playing()
+{
+ return fRunning;
+}
+
void VLAUSoundOut::PlayNote(const VLNote & note)
{
Play(¬e.fPitch);
diff --git a/Sources/VLSoundOut.h b/Sources/VLSoundOut.h
index 6df2b7f..07df0ac 100644
--- a/Sources/VLSoundOut.h
+++ b/Sources/VLSoundOut.h
@@ -38,6 +38,7 @@ public:
virtual void PlayChord(const VLChord & chord) = 0;
virtual void PlayFile(CFDataRef file) = 0;
virtual void Stop() = 0;
+ virtual bool Playing() = 0;
virtual ~VLSoundOut();
};
diff --git a/TODO b/TODO
index 9026778..ad2e482 100644
--- a/TODO
+++ b/TODO
@@ -1,5 +1,11 @@
+TODO
+
* Change styles / divisions within song
-* Play chords / melody only
-* Count-off
* Tweak output
* Flexible line breaking
+
+DONE
+
+* Play chords / melody only [03Dec07]
+* Count In (4/4 and 3/4 only) [03Dec07]
+