diff --git a/English.lproj/VLDocument.nib/classes.nib b/English.lproj/VLDocument.nib/classes.nib index e7dc315..9be966e 100644 --- a/English.lproj/VLDocument.nib/classes.nib +++ b/English.lproj/VLDocument.nib/classes.nib @@ -54,6 +54,7 @@ outputToolItem = id; playToolItem = id; runToolItem = id; + stopToolItem = id; zoomInToolItem = id; zoomOutToolItem = id; }; diff --git a/English.lproj/VLDocument.nib/info.nib b/English.lproj/VLDocument.nib/info.nib index 7fdbc6c..5be6fa2 100644 --- a/English.lproj/VLDocument.nib/info.nib +++ b/English.lproj/VLDocument.nib/info.nib @@ -3,13 +3,13 @@ IBDocumentLocation - 372 26 356 240 0 0 1280 778 + 427 29 356 240 0 0 1280 778 IBFramework Version 454.0 IBOpenObjects - 144 5 + 144 IBSystem Version 9A321 diff --git a/English.lproj/VLDocument.nib/keyedobjects.nib b/English.lproj/VLDocument.nib/keyedobjects.nib index c4493cf..1f58fe1 100644 Binary files a/English.lproj/VLDocument.nib/keyedobjects.nib and b/English.lproj/VLDocument.nib/keyedobjects.nib differ diff --git a/Resources/stop.tiff b/Resources/stop.tiff new file mode 100644 index 0000000..6b4626f Binary files /dev/null and b/Resources/stop.tiff differ diff --git a/Sources/VLDocument.mm b/Sources/VLDocument.mm index 03462e6..b4e8412 100644 --- a/Sources/VLDocument.mm +++ b/Sources/VLDocument.mm @@ -384,6 +384,11 @@ [self fileURLWithExtension:@"mid"]])); } +- (IBAction) stop:(id)sender +{ + VLSoundOut::Instance()->Stop(); +} + - (IBAction) showOutput:(id)sender { [[self pdfWin] showWindow:sender]; diff --git a/Sources/VLSoundOut.cpp b/Sources/VLSoundOut.cpp index 2e14df3..22bfe95 100644 --- a/Sources/VLSoundOut.cpp +++ b/Sources/VLSoundOut.cpp @@ -27,10 +27,9 @@ public: virtual void PlayNote(const VLNote & note); virtual void PlayChord(const VLChord & chord); virtual void PlayFile(CFDataRef file); + virtual void Stop(); virtual ~VLAUSoundOut(); - - void Stop(); protected: VLAUSoundOut(bool fileOutput); diff --git a/Sources/VLSoundOut.h b/Sources/VLSoundOut.h index 09bfbbf..0442ae4 100644 --- a/Sources/VLSoundOut.h +++ b/Sources/VLSoundOut.h @@ -36,6 +36,7 @@ public: virtual void PlayNote(const VLNote & note) = 0; virtual void PlayChord(const VLChord & chord) = 0; virtual void PlayFile(CFDataRef file) = 0; + virtual void Stop() = 0; virtual ~VLSoundOut(); };