-Add Sound api

-Cleanup

Author: rawcreative

MG.xcodeproj/project.pbxproj

@@ -11,6 +11,7 @@
 		2237E67E192B0186001E1393 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2237E67D192B0186001E1393 /* WebKit.framework */; };
 		2237E680192B018D001E1393 /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2237E67F192B018D001E1393 /* JavaScriptCore.framework */; };
 		2237E6EF192BAF85001E1393 /* public in Resources */ = {isa = PBXBuildFile; fileRef = 2237E6EE192BAF85001E1393 /* public */; };
+		226AE65D193AA8FC00B15FB7 /* Sound.m in Sources */ = {isa = PBXBuildFile; fileRef = 226AE65C193AA8FC00B15FB7 /* Sound.m */; };
 		22B1CF2B1937734B00D2C294 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 22B1CEF51937734B00D2C294 /* AppDelegate.m */; };
 		22B1CF2C1937734B00D2C294 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 22B1CEF61937734B00D2C294 /* MainMenu.xib */; };
 		22B1CF2D1937734B00D2C294 /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 22B1CEF81937734B00D2C294 /* MainWindow.xib */; };
@@ -49,6 +50,8 @@
 		2237E67D192B0186001E1393 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; };
 		2237E67F192B018D001E1393 /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
 		2237E6EE192BAF85001E1393 /* public */ = {isa = PBXFileReference; lastKnownFileType = folder; path = public; sourceTree = "<group>"; };
+		226AE65B193AA8FC00B15FB7 /* Sound.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Sound.h; sourceTree = "<group>"; };
+		226AE65C193AA8FC00B15FB7 /* Sound.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Sound.m; sourceTree = "<group>"; };
 		22B1CEF41937734B00D2C294 /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
 		22B1CEF51937734B00D2C294 /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
 		22B1CEF71937734B00D2C294 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = "<group>"; };
@@ -222,6 +225,8 @@
 				22B1CF191937734B00D2C294 /* Task.m */,
 				22B1CF1A1937734B00D2C294 /* Window.h */,
 				22B1CF1B1937734B00D2C294 /* Window.m */,
+				226AE65B193AA8FC00B15FB7 /* Sound.h */,
+				226AE65C193AA8FC00B15FB7 /* Sound.m */,
 			);
 			path = Commands;
 			sourceTree = "<group>";
@@ -331,6 +336,7 @@
 				22B1CF2F1937734B00D2C294 /* NSData+Base64.m in Sources */,
 				22B1CF431937734B00D2C294 /* main.m in Sources */,
 				22B1CF321937734B00D2C294 /* Command.m in Sources */,
+				226AE65D193AA8FC00B15FB7 /* Sound.m in Sources */,
 				22B1CF331937734B00D2C294 /* Dialog.m in Sources */,
 				22B1CF361937734B00D2C294 /* Fonts.m in Sources */,
 				22B1CF2B1937734B00D2C294 /* AppDelegate.m in Sources */,

MacGap/Classes/Commands/App.h

@@ -31,6 +31,5 @@ JSExportAs(setUserAgent, - (void) setCustomUserAgent:(NSString *)userAgentString
 
 @interface App : Command <AppExports>
 
-@property (nonatomic, retain) WebView* webView;
 - (id) initWithWebView:(WebView *)view;
 @end

MacGap/Classes/Commands/MacGap.h

@@ -8,6 +8,7 @@
 
 
 #import <JavaScriptCore/JavaScriptCore.h>
+#import "WindowController.h"
 #import "WebViewDelegate.h"
 #import "Command.h"
 #import "App.h"
@@ -19,6 +20,7 @@
 #import "Task.h"
 #import "Notify.h"
 #import "Fonts.h"
+#import "StatusItem.h"
 
 #import "NSData+Base64.h"
 #import "JSON.h"

MacGap/Classes/Commands/Sound.h

@@ -0,0 +1,19 @@
+//
+//  Sound.h
+//  MG
+//
+//  Created by Tim Debo on 5/31/14.
+//
+//
+
+#import "Command.h"
+
+@protocol SoundExports <JSExport>
+JSExportAs(play, - (void) play:(NSString*)file onComplete:(JSValue*)callback);
+JSExportAs(playSystem, - (void) playSystem:(NSString*)name onComplete:(JSValue*)callback);
+@property (retain) JSValue* cb;
+@end
+
+@interface Sound : Command <SoundExports, NSSoundDelegate>
+
+@end

MacGap/Classes/Commands/Sound.m

@@ -0,0 +1,44 @@
+//
+//  Sound.m
+//  MG
+//
+//  Created by Tim Debo on 5/31/14.
+//
+//
+
+#import "Sound.h"
+@interface Sound ()
+@property (readwrite) JSContext* context;
+@end
+
+@implementation Sound
+@synthesize cb, context;
+
+- (void) playSound:(NSSound*)sound onComplete:(JSValue*)callback {
+    if (callback && ![callback isKindOfClass:[NSNull class]]) {
+        cb = callback;
+        context = [JSContext currentContext];
+        [sound setDelegate:self];
+    }
+    [sound play];
+}
+
+- (void) play:(NSString*)file onComplete:(JSValue*)callback {
+	NSURL* fileUrl  = [NSURL fileURLWithPath:pathForResource(file)];
+	DebugNSLog(@"Sound file:%@", [fileUrl description]);
+	
+	NSSound* sound = [[NSSound alloc] initWithContentsOfURL:fileUrl byReference:YES];
+    [self playSound:sound onComplete:callback];
+}
+
+- (void) playSystem:(NSString*)name onComplete:(JSValue*)callback {
+    NSSound *systemSound = [NSSound soundNamed:name];
+    [self playSound:systemSound onComplete:callback];
+}
+
+- (void)sound:(NSSound *)aSound didFinishPlaying:(BOOL)finishedPlaying {
+    [cb callWithArguments:@[aSound.name]];
+    cb = nil;
+}
+
+@end

MacGap/Classes/WebViewDelegate.h

@@ -9,22 +9,18 @@
 #import <Foundation/Foundation.h>
 #import <WebKit/WebKit.h>
 
-@class WindowController, Window, Dock, Menu, Dialog, App;
+@class WindowController, Window, Menu, App;
 
 @interface WebViewDelegate : NSObject {
     NSMenu *mainMenu;
     Window* window;
-    Dock* dock;
     Menu* menu;
-    Dialog* dialog;
     App* app;
 }
 
 @property (nonatomic, retain) WindowController *windowController;
 @property (nonatomic, retain) Window* window;
-@property (nonatomic, retain) Dock* dock;
 @property (nonatomic, retain) Menu* menu;
-@property (nonatomic, retain) Dialog* dialog;
 @property (nonatomic, retain) App* app;
 - (id) initWithMenu:(NSMenu*)menu;
 

MacGap/Classes/WebViewDelegate.m

@@ -13,7 +13,7 @@
 
 @implementation WebViewDelegate
 
-@synthesize windowController, window;
+@synthesize windowController;
 
 - (id) initWithMenu:(NSMenu*)aMenu
 {

public/config.json

@@ -8,9 +8,10 @@
                 "Dialog":"Dialog",
                 "Fonts" : "Fonts",
                 "Notify" : "Notify",
-            "Clipboard":"Clipboard",
-        "StatusItem":"StatusItem",
-        "Task" : "Task"
+                "Clipboard":"Clipboard",
+                "StatusItem":"StatusItem",
+                "Task" : "Task",
+                "Sound" : "Sound"
                  },
     "window" : {
         "title" : "MacGap",