call: ensure audio output

Ensure that audio output for video call is loudspeaker

Change-Id: I86e78e02d03f10238557eca83318e04636b0031a
diff --git a/Ring/Ring/Calls/CallViewModel.swift b/Ring/Ring/Calls/CallViewModel.swift
index df9511b..e1e030b 100644
--- a/Ring/Ring/Calls/CallViewModel.swift
+++ b/Ring/Ring/Calls/CallViewModel.swift
@@ -334,9 +334,9 @@
     }
 
     func answerCall() -> Completable {
-        // switch to rcv if that's what we were last using
-        if !self.audioService.isHeadsetConnected.value && !self.audioService.isOutputToSpeaker.value {
-            self.audioService.overrideToReceiver()
+        if !self.audioService.isHeadsetConnected.value {
+            isAudioOnly ?
+                self.audioService.overrideToReceiver() : self.audioService.overrideToSpeaker()
         }
         return self.callService.accept(call: call)
     }
@@ -346,9 +346,9 @@
         guard let account = self.accountService.currentAccount else {
             return
         }
-        // switch to rcv if audio only and no headset connected
-        if isAudioOnly && !self.audioService.isHeadsetConnected.value {
-            self.audioService.overrideToReceiver()
+        if !self.audioService.isHeadsetConnected.value {
+            isAudioOnly ?
+                self.audioService.overrideToReceiver() : self.audioService.overrideToSpeaker()
         }
         self.callService.placeCall(withAccount: account,
                                    toRingId: uri,