diff --git a/English.lproj/VLGroove.nib/classes.nib b/English.lproj/VLGroove.nib/classes.nib
deleted file mode 100644
index 917f133..0000000
--- a/English.lproj/VLGroove.nib/classes.nib
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- IBClasses = (
- {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; },
- {
- ACTIONS = {endSheet = id; updateDescription = id; };
- CLASS = VLGrooveController;
- LANGUAGE = ObjC;
- OUTLETS = {fBrowser = NSBrowser; fDescription = NSTextField; fOKButton = NSButton; };
- SUPERCLASS = NSWindowController;
- }
- );
- IBVersion = 1;
-}
\ No newline at end of file
diff --git a/English.lproj/VLGroove.nib/designable.nib b/English.lproj/VLGroove.nib/designable.nib
new file mode 100644
index 0000000..a14e51a
--- /dev/null
+++ b/English.lproj/VLGroove.nib/designable.nib
@@ -0,0 +1,845 @@
+
+
+
+ 1050
+ 9A412
+ 599
+ 902
+ 304.00
+
+
+
+
+
+ 0
+
+
+
diff --git a/English.lproj/VLGroove.nib/info.nib b/English.lproj/VLGroove.nib/info.nib
deleted file mode 100644
index b053b83..0000000
--- a/English.lproj/VLGroove.nib/info.nib
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
- IBDocumentLocation
- 59 9 356 240 0 0 1280 778
- IBFramework Version
- 460.0
- IBOpenObjects
-
- 13
-
- IBSystem Version
- 9A412
-
-
diff --git a/English.lproj/VLGroove.nib/keyedobjects.nib b/English.lproj/VLGroove.nib/keyedobjects.nib
index 2fd578f..94fbb27 100644
Binary files a/English.lproj/VLGroove.nib/keyedobjects.nib and b/English.lproj/VLGroove.nib/keyedobjects.nib differ
diff --git a/Sources/VLDocument.h b/Sources/VLDocument.h
index b036d69..e8d33ee 100644
--- a/Sources/VLDocument.h
+++ b/Sources/VLDocument.h
@@ -52,6 +52,8 @@
- (IBAction) showOutput:(id)sender;
- (IBAction) showLog:(id)sender;
+- (IBAction) play:(id)sender;
+- (IBAction) stop:(id)sender;
- (NSString *) tmpPath;
- (NSString *) workPath;
@@ -64,6 +66,7 @@
- (void) didChangeSong;
- (void) addObserver:(id)observer;
- (VLLogWindow *)logWin;
+- (void) playWithGroove:(NSString *)groove;
@end
diff --git a/Sources/VLDocument.mm b/Sources/VLDocument.mm
index 935395d..52d4089 100644
--- a/Sources/VLDocument.mm
+++ b/Sources/VLDocument.mm
@@ -418,6 +418,18 @@
[self fileURLWithExtension:@"mid"]]));
}
+- (void) playWithGroove:(NSString *)groove
+{
+ NSString * savedGroove = songGroove;
+ songGroove = groove;
+ [validTmpFiles removeObjectForKey:@"mma"];
+ [validTmpFiles removeObjectForKey:@"mid"];
+ [self play:groove];
+ songGroove = savedGroove;
+ [validTmpFiles removeObjectForKey:@"mma"];
+ [validTmpFiles removeObjectForKey:@"mid"];
+}
+
- (IBAction) stop:(id)sender
{
VLSoundOut::Instance()->Stop();
diff --git a/Sources/VLGrooveController.h b/Sources/VLGrooveController.h
index 779d7a4..6b71696 100644
--- a/Sources/VLGrooveController.h
+++ b/Sources/VLGrooveController.h
@@ -9,21 +9,25 @@
#import
@class VLSheetView;
+@class VLDocument;
@interface VLGrooveController : NSWindowController {
NSDictionary * fGrooves;
IBOutlet NSBrowser * fBrowser;
IBOutlet NSTextField * fDescription;
IBOutlet NSButton * fOKButton;
+ IBOutlet NSButton * fPlayButton;
NSString * fStyle;
NSDictionary * fSubStyles;
NSArray * fSubStyleList;
NSPredicate * fSubStyleFilter;
+ VLDocument * fDocument;
}
- (id) initWithSheetView:(VLSheetView *)view;
- (IBAction)endSheet:(id)sender;
- (IBAction)updateDescription:(id)sender;
+- (IBAction) togglePlay:(id)sender;
@end
diff --git a/Sources/VLGrooveController.mm b/Sources/VLGrooveController.mm
index de3be91..0b622d5 100644
--- a/Sources/VLGrooveController.mm
+++ b/Sources/VLGrooveController.mm
@@ -8,6 +8,7 @@
#import "VLGrooveController.h"
#import "VLSheetView.h"
+#import "VLDocument.h"
@implementation VLGrooveController
@@ -20,6 +21,7 @@
[[NSPredicate predicateWithFormat:
@"!(SELF like[c] '.DESC') AND !(SELF matches[c] '.*(Intro|End)\\\\d*$')"]
retain];
+ fDocument = [view document];
[NSApp beginSheet: [self window]
modalForWindow: [view window]
@@ -36,6 +38,14 @@
[super dealloc];
}
+- (IBAction) togglePlay:(id)sender
+{
+ if ([sender state])
+ [fDocument playWithGroove:[[fBrowser selectedCellInColumn:1] stringValue]];
+ else
+ [fDocument stop:sender];
+}
+
- (IBAction)endSheet:(id)sender
{
[NSApp endSheet:[self window] returnCode:[sender tag]];
@@ -43,9 +53,12 @@
- (void)didEndSheet:(NSWindow *)sheet returnCode:(int)returnCode contextInfo:(void *)contextInfo
{
+ [fDocument stop:self];
if (returnCode == NSAlertFirstButtonReturn)
[(VLSheetView *)contextInfo setGroove:[[fBrowser selectedCellInColumn:1] stringValue]];
-
+ else
+ [(VLSheetView *)contextInfo setGroove:nil];
+
[[self window] orderOut:self];
}
@@ -98,13 +111,16 @@
{
BOOL validStyle = [fBrowser selectedColumn];
[fOKButton setEnabled:validStyle];
- if (validStyle)
+ [fPlayButton setEnabled:validStyle];
+ if (validStyle) {
[fDescription setStringValue:
[NSString stringWithFormat:@"%@\n\n%@",
[fSubStyles objectForKey:@".DESC"],
[fSubStyles objectForKey:
[[fBrowser selectedCellInColumn:1] stringValue]]]];
- else
+ [fDocument stop:self];
+ [self togglePlay:fPlayButton];
+ } else
[fDescription setStringValue:[fSubStyles objectForKey:@".DESC"]];
}
diff --git a/Sources/VLMMADocument.mm b/Sources/VLMMADocument.mm
index 2d308e9..2f2e6fb 100644
--- a/Sources/VLMMADocument.mm
+++ b/Sources/VLMMADocument.mm
@@ -37,7 +37,7 @@
size_t m = *i;
sprintf(buf, "%-5d", ++meas);
mmaFile += buf;
- song->fMeasures[m].MMAChords(mmas, prop);
+ song->fMeasures[m].MMAChords(mmas, prop, i==song->begin());
mmaFile += mmas;
song->fMeasures[m].MMANotes(mmas, prop, song->TiedDuration(m+1));
mmaFile += "\t{ " + mmas + " }\n";
diff --git a/Sources/VLModel.cpp b/Sources/VLModel.cpp
index 95e2839..4790305 100644
--- a/Sources/VLModel.cpp
+++ b/Sources/VLModel.cpp
@@ -619,15 +619,15 @@ static const VLChordModifier kMMAModifiers[] = {
{NULL, 0, 0}
};
-void VLChord::MMAName(std::string & name, bool useSharps) const
+bool VLChord::MMAName(std::string & name, bool useSharps, bool initial) const
{
VLFraction dur = fDuration;
int quarters = static_cast(dur*4.0f+0.5f);
name = "";
if (!quarters--)
- return;
+ return initial;
if (fPitch == kNoPitch) {
- name = '/';
+ name = initial ? 'z' : '/';
} else {
std::string base, ext;
VLNote::Name(base, useSharps);
@@ -675,6 +675,8 @@ void VLChord::MMAName(std::string & name, bool useSharps) const
}
while (quarters--)
name += " /";
+
+ return false;
}
static VLFraction MaxNote(VLFraction d)
@@ -799,7 +801,8 @@ void VLMeasure::MMANotes(std::string & notes, const VLProperties & prop,
notes += "<>;";
}
-void VLMeasure::MMAChords(std::string & chords, const VLProperties & prop) const
+void VLMeasure::MMAChords(std::string & chords, const VLProperties & prop,
+ bool initial) const
{
VLChordList::const_iterator i = fChords.begin();
VLChordList::const_iterator e = fChords.end();
@@ -807,7 +810,7 @@ void VLMeasure::MMAChords(std::string & chords, const VLProperties & prop) const
chords.clear();
for (; i!=e; ++i) {
std::string chord;
- i->MMAName(chord, prop.fKey >= 0);
+ initial = i->MMAName(chord, prop.fKey >= 0, initial);
if (chords.size())
chords += ' ';
chords += chord;
diff --git a/Sources/VLModel.h b/Sources/VLModel.h
index db382c8..79065c9 100644
--- a/Sources/VLModel.h
+++ b/Sources/VLModel.h
@@ -202,7 +202,7 @@ struct VLChord : VLNote {
VLChord(std::string name);
void Name(std::string & base, std::string & ext, std::string & root, bool useSharps = false) const;
void LilypondName(std::string & name, bool useSharps = false) const;
- void MMAName(std::string & name, bool useSharps) const;
+ bool MMAName(std::string & name, bool useSharps, bool initial) const;
};
struct VLProperties {
@@ -245,7 +245,7 @@ struct VLMeasure {
VLMeasure();
void MMANotes(std::string & notes, const VLProperties & prop, VLFraction extra) const;
- void MMAChords(std::string & chords, const VLProperties & prop) const;
+ void MMAChords(std::string & chords, const VLProperties & prop, bool initial) const;
};
struct VLRepeat {
diff --git a/Sources/VLSheetView.mm b/Sources/VLSheetView.mm
index 4b0e3f3..c10d839 100644
--- a/Sources/VLSheetView.mm
+++ b/Sources/VLSheetView.mm
@@ -982,8 +982,12 @@ static int8_t sSharpAcc[] = {
- (void)setGroove:(NSString *)groove
{
- [[self document] setValue:groove forKey:@"songGroove"];
- [self setGrooveMenu:groove];
+ if (groove) {
+ [[self document] setValue:groove forKey:@"songGroove"];
+ [self setGrooveMenu:groove];
+ } else {
+ [fGrooveMenu selectItemAtIndex:2];
+ }
}
- (void)setGrooveMenu:(NSString *)groove