Initial changes for Vivox/Azumarill merge. Lots of temporary code and conditional compile switches. Begin switch from statemachine to coroutine.

1 files changed, 14 insertions, 3 deletions

diff --git a/indra/newview/llvoicevivox.h b/indra/newview/llvoicevivox.h
index 2f671306b1..5c9a1b73a3 100755
--- a/indra/newview/llvoicevivox.h
+++ b/indra/newview/llvoicevivox.h
@@ -433,8 +433,8 @@ protected:
 	void connectorShutdown();	
 	void closeSocket(void);	
 	
-	void requestVoiceAccountProvision(S32 retries = 3);
-	void login(
+//	void requestVoiceAccountProvision(S32 retries = 3);
+	void setLoginInfo(
 			   const std::string& account_name,
 			   const std::string& password,
 			   const std::string& voice_sip_uri_hostname,
@@ -639,11 +639,22 @@ protected:
 
 private:
     
-    void voiceAccountProvisionCoro(std::string url, S32 retries);
+//  void voiceAccountProvisionCoro(std::string url, S32 retries);
     void parcelVoiceInfoRequestCoro(std::string url);
 
 	LLVoiceVersionInfo mVoiceVersion;
 
+    // Coroutine support methods
+    bool startAndConnectSession();
+
+    bool startAndLaunchDaemon();
+    bool provisionVoiceAccount();
+    bool establishVoiceConnection();
+    bool loginToVivox();
+    bool retrieveVoiceFonts();
+
+    bool performMicTuning(state exitState);
+
 	/// Clean up objects created during a voice session.
 	void cleanUp();