generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

(Auto)update libjingle 74202294-> 74230205

Browse Source 
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6990 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
buildbot@webrtc.org 2014-08-27 17:21:19 +00:00
parent 18584fcde4
commit 573a1eef3d
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
talk/libjingle.gyp
View File

@ -456,6 +456,7 @@
'<(webrtc_root)/modules/modules.gyp:video_render_module', '<(webrtc_root)/modules/modules.gyp:video_render_module',
'<(webrtc_root)/webrtc.gyp:webrtc', '<(webrtc_root)/webrtc.gyp:webrtc',
'<(webrtc_root)/voice_engine/voice_engine.gyp:voice_engine', '<(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:system_wrappers',
'<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:field_trial_default', '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:field_trial_default',
'libjingle', 'libjingle',

16
talk/media/devices/linuxdevicemanager.cc
View File

@ -31,10 +31,10 @@
#include "talk/media/base/mediacommon.h" #include "talk/media/base/mediacommon.h"
#include "talk/media/devices/libudevsymboltable.h" #include "talk/media/devices/libudevsymboltable.h"
#include "talk/media/devices/v4llookup.h" #include "talk/media/devices/v4llookup.h"
#include "talk/sound/platformsoundsystem.h" #include "webrtc/sound/platformsoundsystem.h"
#include "talk/sound/platformsoundsystemfactory.h" #include "webrtc/sound/platformsoundsystemfactory.h"
#include "talk/sound/sounddevicelocator.h" #include "webrtc/sound/sounddevicelocator.h"
#include "talk/sound/soundsysteminterface.h" #include "webrtc/sound/soundsysteminterface.h"
#include "webrtc/base/fileutils.h" #include "webrtc/base/fileutils.h"
#include "webrtc/base/linux.h" #include "webrtc/base/linux.h"
#include "webrtc/base/logging.h" #include "webrtc/base/logging.h"
@ -89,7 +89,7 @@ static const char* kFilteredVideoDevicesName[] = {
}; };
LinuxDeviceManager::LinuxDeviceManager() LinuxDeviceManager::LinuxDeviceManager()
: sound_system_(new PlatformSoundSystemFactory()) { : sound_system_(new rtc::PlatformSoundSystemFactory()) {
set_watcher(new LinuxDeviceWatcher(this)); set_watcher(new LinuxDeviceWatcher(this));
} }
@ -102,7 +102,7 @@ bool LinuxDeviceManager::GetAudioDevices(bool input,
if (!sound_system_.get()) { if (!sound_system_.get()) {
return false; return false;
} }
SoundSystemInterface::SoundDeviceLocatorList list; rtc::SoundSystemInterface::SoundDeviceLocatorList list;
bool success; bool success;
if (input) { if (input) {
success = sound_system_->EnumerateCaptureDevices(&list); success = sound_system_->EnumerateCaptureDevices(&list);
@ -118,12 +118,12 @@ bool LinuxDeviceManager::GetAudioDevices(bool input,
// device at index 0, but Enumerate(Capture|Playback)Devices does not include // device at index 0, but Enumerate(Capture|Playback)Devices does not include
// a locator for the default device. // a locator for the default device.
int index = 1; int index = 1;
for (SoundSystemInterface::SoundDeviceLocatorList::iterator i = list.begin(); for (rtc::SoundSystemInterface::SoundDeviceLocatorList::iterator i = list.begin();
i != list.end(); i != list.end();
++i, ++index) { ++i, ++index) {
devs->push_back(Device((*i)->name(), index)); devs->push_back(Device((*i)->name(), index));
} }
SoundSystemInterface::ClearSoundDeviceLocatorList(&list); rtc::SoundSystemInterface::ClearSoundDeviceLocatorList(&list);
sound_system_.release(); sound_system_.release();
return FilterDevices(devs, kFilteredAudioDevicesName); return FilterDevices(devs, kFilteredAudioDevicesName);
} }

4
talk/media/devices/linuxdevicemanager.h
View File

@ -32,7 +32,7 @@
#include <vector> #include <vector>
#include "talk/media/devices/devicemanager.h" #include "talk/media/devices/devicemanager.h"
#include "talk/sound/soundsystemfactory.h" #include "webrtc/sound/soundsystemfactory.h"
#include "webrtc/base/sigslot.h" #include "webrtc/base/sigslot.h"
#include "webrtc/base/stringencode.h" #include "webrtc/base/stringencode.h"
@ -47,7 +47,7 @@ class LinuxDeviceManager : public DeviceManager {
private: private:
virtual bool GetAudioDevices(bool input, std::vector<Device>* devs); virtual bool GetAudioDevices(bool input, std::vector<Device>* devs);
SoundSystemHandle sound_system_; rtc::SoundSystemHandle sound_system_;
}; };
} // namespace cricket } // namespace cricket