Skip to content

Commit

Permalink
Mix music with application audio and don't stop the music
Browse files Browse the repository at this point in the history
  • Loading branch information
mazurio committed Jan 7, 2017
1 parent 66d2d75 commit dddf9ad
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
4 changes: 2 additions & 2 deletions BodyweightFitness/Bodyweight Fitness.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.5.0</string>
<string>1.5.1</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>150</string>
<string>151</string>
<key>Fabric</key>
<dict>
<key>APIKey</key>
Expand Down
2 changes: 2 additions & 0 deletions BodyweightFitness/Controller/WorkoutViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ class WorkoutViewController: UIViewController {
override func viewDidLoad() {
super.viewDidLoad()

_ = try? AVAudioSession.sharedInstance().setCategory(AVAudioSessionCategoryAmbient)

self.restTimerViewController.rootViewController = self
self.timedViewController.rootViewController = self
self.weightedViewController.rootViewController = self
Expand Down

0 comments on commit dddf9ad

Please sign in to comment.