(Auto)update libjingle 74202294-> 74230205
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6990 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/talk/libjingle.gyp b/talk/libjingle.gyp
index f4f9bf9..5f75226 100755
--- a/talk/libjingle.gyp
+++ b/talk/libjingle.gyp
@@ -456,6 +456,7 @@
'<(webrtc_root)/modules/modules.gyp:video_render_module',
'<(webrtc_root)/webrtc.gyp:webrtc',
'<(webrtc_root)/voice_engine/voice_engine.gyp:voice_engine',
+ '<(webrtc_root)/sound/sound.gyp:rtc_sound',
'<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
'<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:field_trial_default',
'libjingle',
diff --git a/talk/media/devices/linuxdevicemanager.cc b/talk/media/devices/linuxdevicemanager.cc
index a79e226..d122169 100644
--- a/talk/media/devices/linuxdevicemanager.cc
+++ b/talk/media/devices/linuxdevicemanager.cc
@@ -31,10 +31,10 @@
#include "talk/media/base/mediacommon.h"
#include "talk/media/devices/libudevsymboltable.h"
#include "talk/media/devices/v4llookup.h"
-#include "talk/sound/platformsoundsystem.h"
-#include "talk/sound/platformsoundsystemfactory.h"
-#include "talk/sound/sounddevicelocator.h"
-#include "talk/sound/soundsysteminterface.h"
+#include "webrtc/sound/platformsoundsystem.h"
+#include "webrtc/sound/platformsoundsystemfactory.h"
+#include "webrtc/sound/sounddevicelocator.h"
+#include "webrtc/sound/soundsysteminterface.h"
#include "webrtc/base/fileutils.h"
#include "webrtc/base/linux.h"
#include "webrtc/base/logging.h"
@@ -89,7 +89,7 @@
};
LinuxDeviceManager::LinuxDeviceManager()
- : sound_system_(new PlatformSoundSystemFactory()) {
+ : sound_system_(new rtc::PlatformSoundSystemFactory()) {
set_watcher(new LinuxDeviceWatcher(this));
}
@@ -102,7 +102,7 @@
if (!sound_system_.get()) {
return false;
}
- SoundSystemInterface::SoundDeviceLocatorList list;
+ rtc::SoundSystemInterface::SoundDeviceLocatorList list;
bool success;
if (input) {
success = sound_system_->EnumerateCaptureDevices(&list);
@@ -118,12 +118,12 @@
// device at index 0, but Enumerate(Capture|Playback)Devices does not include
// a locator for the default device.
int index = 1;
- for (SoundSystemInterface::SoundDeviceLocatorList::iterator i = list.begin();
+ for (rtc::SoundSystemInterface::SoundDeviceLocatorList::iterator i = list.begin();
i != list.end();
++i, ++index) {
devs->push_back(Device((*i)->name(), index));
}
- SoundSystemInterface::ClearSoundDeviceLocatorList(&list);
+ rtc::SoundSystemInterface::ClearSoundDeviceLocatorList(&list);
sound_system_.release();
return FilterDevices(devs, kFilteredAudioDevicesName);
}
diff --git a/talk/media/devices/linuxdevicemanager.h b/talk/media/devices/linuxdevicemanager.h
index 88aee4e..1eb648f 100644
--- a/talk/media/devices/linuxdevicemanager.h
+++ b/talk/media/devices/linuxdevicemanager.h
@@ -32,7 +32,7 @@
#include <vector>
#include "talk/media/devices/devicemanager.h"
-#include "talk/sound/soundsystemfactory.h"
+#include "webrtc/sound/soundsystemfactory.h"
#include "webrtc/base/sigslot.h"
#include "webrtc/base/stringencode.h"
@@ -47,7 +47,7 @@
private:
virtual bool GetAudioDevices(bool input, std::vector<Device>* devs);
- SoundSystemHandle sound_system_;
+ rtc::SoundSystemHandle sound_system_;
};
} // namespace cricket