* Update to use the new libjingle release.

* Stop using any local mods for the default build (non-dev).
Review URL: http://webrtc-codereview.appspot.com/224001

git-svn-id: http://webrtc.googlecode.com/svn/trunk@737 4adac7df-926f-26a2-2b94-8c16560cd09d

DEPS

@@ -4,7 +4,7 @@ vars = {
   "googlecode_url": "http://%s.googlecode.com/svn",
   "chromium_trunk" : "http://src.chromium.org/svn/trunk",
   "chromium_revision": "98568",
-  "libjingle_revision": "85",
+  "libjingle_revision": "87",
 }
 
 # NOTE: Prefer revision numbers to tags for svn deps.

third_party_mods/libjingle/libjingle.gyp

@@ -112,7 +112,6 @@
       ['inside_chromium_build==1', {
         'include_dirs': [
           '<(overrides)',
-          '<(libjingle_mods)/source',
           '<(libjingle_orig)/source',
           '../..',  # the third_party folder for webrtc includes
           '../../third_party/expat/files',
@@ -120,7 +119,6 @@
         'direct_dependent_settings': {
           'include_dirs': [
             '<(overrides)',
-            '<(libjingle_mods)/source',
             '<(libjingle_orig)/source',
             '../../third_party/expat/files'
           ],
@@ -133,7 +131,6 @@
         'include_dirs': [
           # the third_party folder for webrtc/ includes (non-chromium).
           '../../src',
-          '<(libjingle_mods)/source',
           '<(libjingle_orig)/source',
           '../../third_party/expat/files',
         ],
@@ -522,7 +519,7 @@
         '<(libjingle_orig)/source/talk/p2p/client/basicportallocator.h',
         '<(libjingle_orig)/source/talk/p2p/client/httpportallocator.cc',
         '<(libjingle_orig)/source/talk/p2p/client/httpportallocator.h',
-        '<(libjingle_mods)/source/talk/p2p/client/fakeportallocator.h',
+        '<(libjingle_orig)/source/talk/p2p/client/fakeportallocator.h',
         '<(libjingle_orig)/source/talk/p2p/client/sessionmanagertask.h',
         '<(libjingle_orig)/source/talk/p2p/client/sessionsendtask.h',
         '<(libjingle_orig)/source/talk/p2p/client/socketmonitor.cc',
@@ -531,8 +528,8 @@
         '<(libjingle_orig)/source/talk/session/phone/audiomonitor.h',
         '<(libjingle_orig)/source/talk/session/phone/call.cc',
         '<(libjingle_orig)/source/talk/session/phone/call.h',
-        '<(libjingle_mods)/source/talk/session/phone/channel.cc',
-        '<(libjingle_mods)/source/talk/session/phone/channel.h',
+        '<(libjingle_orig)/source/talk/session/phone/channel.cc',
+        '<(libjingle_orig)/source/talk/session/phone/channel.h',
         '<(libjingle_orig)/source/talk/session/phone/channelmanager.cc',
         '<(libjingle_orig)/source/talk/session/phone/channelmanager.h',
         '<(libjingle_orig)/source/talk/session/phone/codec.cc',
@@ -540,8 +537,8 @@
         '<(libjingle_orig)/source/talk/session/phone/cryptoparams.h',
         '<(libjingle_orig)/source/talk/session/phone/currentspeakermonitor.cc',
         '<(libjingle_orig)/source/talk/session/phone/currentspeakermonitor.h',
-        '<(libjingle_mods)/source/talk/session/phone/devicemanager.cc',
-        '<(libjingle_mods)/source/talk/session/phone/devicemanager.h',
+        '<(libjingle_orig)/source/talk/session/phone/devicemanager.cc',
+        '<(libjingle_orig)/source/talk/session/phone/devicemanager.h',
         '<(libjingle_orig)/source/talk/session/phone/filemediaengine.cc',
         '<(libjingle_orig)/source/talk/session/phone/filemediaengine.h',   
         '<(libjingle_orig)/source/talk/session/phone/mediachannel.h',
@@ -569,13 +566,13 @@
         '<(libjingle_orig)/source/talk/session/phone/webrtcpassthroughrender.cc',
         '<(libjingle_orig)/source/talk/session/phone/voicechannel.h',
         '<(libjingle_orig)/source/talk/session/phone/webrtccommon.h',
-        '<(libjingle_mods)/source/talk/session/phone/webrtcvideoengine.cc',
+        '<(libjingle_orig)/source/talk/session/phone/webrtcvideoengine.cc',
         '<(libjingle_orig)/source/talk/session/phone/webrtcvideoengine.h',
         '<(libjingle_orig)/source/talk/session/phone/webrtcvideoframe.cc',
         '<(libjingle_orig)/source/talk/session/phone/webrtcvideoframe.h',
         '<(libjingle_orig)/source/talk/session/phone/webrtcvie.h',
         '<(libjingle_orig)/source/talk/session/phone/webrtcvoe.h',
-        '<(libjingle_mods)/source/talk/session/phone/webrtcvoiceengine.cc',
+        '<(libjingle_orig)/source/talk/session/phone/webrtcvoiceengine.cc',
         '<(libjingle_orig)/source/talk/session/phone/webrtcvoiceengine.h',
         '<(libjingle_orig)/source/talk/session/tunnel/pseudotcpchannel.cc',
         '<(libjingle_orig)/source/talk/session/tunnel/pseudotcpchannel.h',

third_party_mods/libjingle/source/talk/session/phone/devicemanager.h

@@ -1,138 +0,0 @@
-/*
- * libjingle
- * Copyright 2004--2008, Google Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *  1. Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *  2. Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *  3. The name of the author may not be used to endorse or promote products
- *     derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
- * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef TALK_SESSION_PHONE_DEVICEMANAGER_H_
-#define TALK_SESSION_PHONE_DEVICEMANAGER_H_
-
-#include <string>
-#include <vector>
-
-#include "talk/base/sigslot.h"
-#include "talk/base/stringencode.h"
-#ifdef LINUX_SOUND_USED
-#include "talk/sound/soundsystemfactory.h"
-#endif
-
-namespace cricket {
-
-class DeviceWatcher;
-
-// Used to represent an audio or video capture or render device.
-struct Device {
-  Device() {}
-  Device(const std::string& first, int second)
-      : name(first),
-        id(talk_base::ToString(second)) {
-  }
-  Device(const std::string& first, const std::string& second)
-      : name(first), id(second) {}
-
-  std::string name;
-  std::string id;
-};
-
-// DeviceManagerInterface - interface to manage the audio and
-// video devices on the system.
-class DeviceManagerInterface {
- public:
-  virtual ~DeviceManagerInterface() { }
-
-  // Initialization
-  virtual bool Init() = 0;
-  virtual void Terminate() = 0;
-
-  // Capabilities
-  virtual int GetCapabilities() = 0;
-
-  // Device enumeration
-  virtual bool GetAudioInputDevices(std::vector<Device>* devices) = 0;
-  virtual bool GetAudioOutputDevices(std::vector<Device>* devices) = 0;
-
-  virtual bool GetAudioInputDevice(const std::string& name, Device* out) = 0;
-  virtual bool GetAudioOutputDevice(const std::string& name, Device* out) = 0;
-
-  virtual bool GetVideoCaptureDevices(std::vector<Device>* devs) = 0;
-  virtual bool GetVideoCaptureDevice(const std::string& name, Device* out) = 0;
-
-  sigslot::signal0<> SignalDevicesChange;
-
-  static const char kDefaultDeviceName[];
-};
-
-class DeviceManagerFactory {
- public:
-  static DeviceManagerInterface* Create();
- private:
-  DeviceManagerFactory();
-};
-
-class DeviceManager : public DeviceManagerInterface {
- public:
-  DeviceManager();
-  virtual ~DeviceManager();
-
-  // Initialization
-  virtual bool Init();
-  virtual void Terminate();
-
-  // Capabilities
-  virtual int GetCapabilities();
-
-  // Device enumeration
-  virtual bool GetAudioInputDevices(std::vector<Device>* devices);
-  virtual bool GetAudioOutputDevices(std::vector<Device>* devices);
-
-  virtual bool GetAudioInputDevice(const std::string& name, Device* out);
-  virtual bool GetAudioOutputDevice(const std::string& name, Device* out);
-
-  virtual bool GetVideoCaptureDevices(std::vector<Device>* devs);
-  virtual bool GetVideoCaptureDevice(const std::string& name, Device* out);
-
-  bool initialized() const { return initialized_; }
-  void OnDevicesChange() { SignalDevicesChange(); }
-
- protected:
-  virtual bool GetAudioDevice(bool is_input, const std::string& name,
-                              Device* out);
-  virtual bool GetDefaultVideoCaptureDevice(Device* device);
-
- private:
-  bool GetAudioDevicesByPlatform(bool input, std::vector<Device>* devs);
-
-  bool initialized_;
-#ifdef WIN32
-  bool need_couninitialize_;
-#endif
-  DeviceWatcher* watcher_;
-#ifdef LINUX_SOUND_USED
-  SoundSystemHandle sound_system_;
-#endif
-};
-
-}  // namespace cricket
-
-#endif  // TALK_SESSION_PHONE_DEVICEMANAGER_H_