diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index faa2412..0000000 Binary files a/.DS_Store and /dev/null differ diff --git a/.gitignore b/.gitignore index 198dfce..fce7e0e 100644 --- a/.gitignore +++ b/.gitignore @@ -25,6 +25,7 @@ xcuserdata *.moved-aside *.xcuserstate *.xcscmblueprint +.DS_Store ## Obj-C/Swift specific *.hmap diff --git a/DesignStudioExpress/Views/IntroViewController.swift b/DesignStudioExpress/Views/IntroViewController.swift index 5e5a49a..8c1f9e2 100644 --- a/DesignStudioExpress/Views/IntroViewController.swift +++ b/DesignStudioExpress/Views/IntroViewController.swift @@ -16,6 +16,8 @@ class IntroViewController: UIViewController { @IBOutlet weak var faqButton: UIButtonLightBlue! lazy var playerLayer:AVPlayerLayer = self.initVideoPlayer() + let videoFileName = "Intro" + let videoFileType = "mp4" override func viewDidLoad() { super.viewDidLoad() @@ -42,7 +44,7 @@ class IntroViewController: UIViewController { } func initVideoPlayer() -> AVPlayerLayer { - let videoBundle = NSBundle.mainBundle().pathForResource("Intro", ofType: "mp4") + let videoBundle = NSBundle.mainBundle().pathForResource(videoFileName, ofType: videoFileType) let player = AVPlayer(URL: NSURL(fileURLWithPath: videoBundle!)) player.muted = true player.allowsExternalPlayback = false