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

Update talk to 55863981.

Browse Source 
TBR=mallinath

Review URL: https://webrtc-codereview.appspot.com/3089006

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5056 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
wu@webrtc.org 2013-10-30 17:57:33 +00:00
parent d6e46638ec
commit f424cb8e13
3 changed files with 14 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
talk/base/move.h
View File

@ -26,7 +26,7 @@
// //
// template <typename T> // template <typename T>
// class scoped_ptr { // class scoped_ptr {
// MOVE_ONLY_TYPE_FOR_CPP_03(scoped_ptr, RValue) // TALK_MOVE_ONLY_TYPE_FOR_CPP_03(scoped_ptr, RValue)
// public: // public:
// scoped_ptr(RValue& other) : ptr_(other.release()) { } // scoped_ptr(RValue& other) : ptr_(other.release()) { }
// scoped_ptr& operator=(RValue& other) { // scoped_ptr& operator=(RValue& other) {
@ -88,7 +88,7 @@
// Here's an example with comments explaining what gets triggered where: // Here's an example with comments explaining what gets triggered where:
// //
// class Foo { // class Foo {
// MOVE_ONLY_TYPE_FOR_CPP_03(Foo, RValue); // TALK_MOVE_ONLY_TYPE_FOR_CPP_03(Foo, RValue);
// //
// public: // public:
// ... API ... // ... API ...
@ -191,7 +191,7 @@
// //
// The workaround is to explicitly declare your copy constructor. // The workaround is to explicitly declare your copy constructor.
// //
#define MOVE_ONLY_TYPE_FOR_CPP_03(type, rvalue_type) \ #define TALK_MOVE_ONLY_TYPE_FOR_CPP_03(type, rvalue_type) \
private: \ private: \
struct rvalue_type { \ struct rvalue_type { \
explicit rvalue_type(type* object) : object(object) {} \ explicit rvalue_type(type* object) : object(object) {} \

14
talk/base/scoped_ptr.h
View File

@ -95,7 +95,7 @@
#include "talk/base/common.h" // for ASSERT #include "talk/base/common.h" // for ASSERT
#include "talk/base/compile_assert.h" // for COMPILE_ASSERT #include "talk/base/compile_assert.h" // for COMPILE_ASSERT
#include "talk/base/move.h" // for MOVE_ONLY_TYPE_FOR_CPP_03 #include "talk/base/move.h" // for TALK_MOVE_ONLY_TYPE_FOR_CPP_03
#include "talk/base/template_util.h" // for is_convertible, is_array #include "talk/base/template_util.h" // for is_convertible, is_array
#ifdef _WIN32 #ifdef _WIN32
@ -304,7 +304,7 @@ class scoped_ptr_impl {
// types. // types.
template <class T, class D = talk_base::DefaultDeleter<T> > template <class T, class D = talk_base::DefaultDeleter<T> >
class scoped_ptr { class scoped_ptr {
MOVE_ONLY_TYPE_FOR_CPP_03(scoped_ptr, RValue) TALK_MOVE_ONLY_TYPE_FOR_CPP_03(scoped_ptr, RValue)
public: public:
// The element and deleter types. // The element and deleter types.
@ -449,7 +449,7 @@ class scoped_ptr {
template <class T, class D> template <class T, class D>
class scoped_ptr<T[], D> { class scoped_ptr<T[], D> {
MOVE_ONLY_TYPE_FOR_CPP_03(scoped_ptr, RValue) TALK_MOVE_ONLY_TYPE_FOR_CPP_03(scoped_ptr, RValue)
public: public:
// The element and deleter types. // The element and deleter types.
@ -587,12 +587,4 @@ bool operator!=(T* p1, const talk_base::scoped_ptr<T, D>& p2) {
return p1 != p2.get(); return p1 != p2.get();
} }
// A function to convert T* into talk_base::scoped_ptr<T>
// Doing e.g. make_scoped_ptr(new FooBarBaz<type>(arg)) is a shorter notation
// for talk_base::scoped_ptr<FooBarBaz<type> >(new FooBarBaz<type>(arg))
template <typename T>
talk_base::scoped_ptr<T> make_scoped_ptr(T* ptr) {
return talk_base::scoped_ptr<T>(ptr);
}
#endif // #ifndef TALK_BASE_SCOPED_PTR_H__ #endif // #ifndef TALK_BASE_SCOPED_PTR_H__

6
talk/media/base/capturemanager.h
View File

@ -67,16 +67,16 @@ class CaptureManager : public sigslot::has_slots<> {
CaptureManager() {} CaptureManager() {}
virtual ~CaptureManager(); virtual ~CaptureManager();
bool StartVideoCapture(VideoCapturer* video_capturer, virtual bool StartVideoCapture(VideoCapturer* video_capturer,
const VideoFormat& desired_format); const VideoFormat& desired_format);
bool StopVideoCapture(VideoCapturer* video_capturer, virtual bool StopVideoCapture(VideoCapturer* video_capturer,
const VideoFormat& format); const VideoFormat& format);
// Possibly restarts the capturer. If |options| is set to kRequestRestart, // Possibly restarts the capturer. If |options| is set to kRequestRestart,
// the CaptureManager chooses whether this request can be handled with the // the CaptureManager chooses whether this request can be handled with the
// current state or if a restart is actually needed. If |options| is set to // current state or if a restart is actually needed. If |options| is set to
// kForceRestart, the capturer is restarted. // kForceRestart, the capturer is restarted.
bool RestartVideoCapture(VideoCapturer* video_capturer, virtual bool RestartVideoCapture(VideoCapturer* video_capturer,
const VideoFormat& previous_format, const VideoFormat& previous_format,
const VideoFormat& desired_format, const VideoFormat& desired_format,
RestartOptions options); RestartOptions options);