Improve management of player conflicts

Closes #36

SoundSeer/Models/MusicApplication.swift

@@ -3,7 +3,7 @@ enum MusicApplication {
  static let app: SBMusicApplication? = SBApplicationManager.musicApp()
 
  static func getPlayerState() -> PlayerState? {
- guard let app = app else { return nil }
+ guard let app = app, Utils.isAppRunning(bundleID) else { return nil }
  return PlayerState(.music, app)
  }
 }

SoundSeer/Models/SpotifyApplication.swift

@@ -1,9 +1,9 @@
 enum SpotifyApplication {
  static let bundleID = "com.spotify.client"
  static let app: SBSpotifyApplication? = SBApplicationManager.spotifyApp()
-
+ 
  static func getPlayerState() -> PlayerState? {
- guard let app = app else { return nil }
+ guard let app = app, Utils.isAppRunning(bundleID) else { return nil }
  return PlayerState(.spotify, app)
  }
 }

SoundSeer/SoundSeerModel.swift

@@ -11,13 +11,7 @@ class SoundSeerModel {
  return nil
  }
 
- if Utils.isAppRunning(MusicApplication.bundleID) {
- playerState = MusicApplication.getPlayerState()
- } else if Utils.isAppRunning(SpotifyApplication.bundleID) {
- playerState = SpotifyApplication.getPlayerState()
- } else {
- Logger.model.debug("Neither app is running")
- }
+ playerState = getPlayerState()
 
  DistributedNotificationCenter.default().addObserver(
  forName: Notification.Name("com.apple.Music.playerInfo"), object: nil, queue: nil) { [weak self] in
@@ -33,4 +27,16 @@ class SoundSeerModel {
  deinit {
  DistributedNotificationCenter.default().removeObserver(self)
  }
+
+ func getPlayerState() -> PlayerState? {
+ let musicState = MusicApplication.getPlayerState()
+ let spotifyState = SpotifyApplication.getPlayerState()
+
+ if (spotifyState?.playbackState == .playing && (musicState == nil || musicState?.playbackState != .playing))
+ || (spotifyState?.playbackState != .playing && musicState == nil) {
+ return spotifyState
+ }
+
+ return musicState
+ }
 }