Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / third_party / webrtc / voice_engine / include / voe_base.h

diff --git a/src/third_party/webrtc/voice_engine/include/voe_base.h b/src/third_party/webrtc/voice_engine/include/voe_base.h
index c8db8c6..3a78f7b 100644 (file)
--- a/src/third_party/webrtc/voice_engine/include/voe_base.h
+++ b/src/third_party/webrtc/voice_engine/include/voe_base.h
@@ -85,7 +85,9 @@ public:
     // receives callbacks for generated trace messages.
     static int SetTraceCallback(TraceCallback* callback);
 
+#if !defined(WEBRTC_CHROMIUM_BUILD)
     static int SetAndroidObjects(void* javaVM, void* env, void* context);
+#endif
 
 protected:
     VoiceEngine() {}
@@ -170,24 +172,19 @@ public:
     // Gets the last VoiceEngine error code.
     virtual int LastError() = 0;
 
-    // Stops or resumes playout and transmission on a temporary basis.
-    virtual int SetOnHoldStatus(int channel, bool enable,
-                                OnHoldModes mode = kHoldSendAndPlay) = 0;
-
-    // Gets the current playout and transmission status.
-    virtual int GetOnHoldStatus(int channel, bool& enabled,
-                                OnHoldModes& mode) = 0;
-
-    // Sets the NetEQ playout mode for a specified |channel| number.
-    virtual int SetNetEQPlayoutMode(int channel, NetEqModes mode) = 0;
-
-    // Gets the NetEQ playout mode for a specified |channel| number.
-    virtual int GetNetEQPlayoutMode(int channel, NetEqModes& mode) = 0;
-
     // TODO(xians): Make the interface pure virtual after libjingle
     // implements the interface in its FakeWebRtcVoiceEngine.
     virtual AudioTransport* audio_transport() { return NULL; }
 
+    // To be removed. Don't use.
+    virtual int SetOnHoldStatus(int channel, bool enable,
+        OnHoldModes mode = kHoldSendAndPlay) { return -1; }
+    virtual int GetOnHoldStatus(int channel, bool& enabled,
+        OnHoldModes& mode) { return -1; }
+    virtual int SetNetEQPlayoutMode(int channel, NetEqModes mode) { return -1; }
+    virtual int GetNetEQPlayoutMode(int channel,
+        NetEqModes& mode) { return -1; }
+
 protected:
     VoEBase() {}
     virtual ~VoEBase() {}