| Index: Source/modules/mediastream/SourceInfo.cpp
|
| diff --git a/Source/core/platform/mediastream/chromium/RTCDTMFSenderHandlerChromium.cpp b/Source/modules/mediastream/SourceInfo.cpp
|
| similarity index 52%
|
| copy from Source/core/platform/mediastream/chromium/RTCDTMFSenderHandlerChromium.cpp
|
| copy to Source/modules/mediastream/SourceInfo.cpp
|
| index 04cbfcd4366229a1ea08feb57418d7869c6ff205..d369a62e8dc1553071b2046858fdb1ecbec723b2 100644
|
| --- a/Source/core/platform/mediastream/chromium/RTCDTMFSenderHandlerChromium.cpp
|
| +++ b/Source/modules/mediastream/SourceInfo.cpp
|
| @@ -24,57 +24,61 @@
|
| */
|
|
|
| #include "config.h"
|
| +#include "modules/mediastream/SourceInfo.h"
|
|
|
| -#include "core/platform/mediastream/chromium/RTCDTMFSenderHandlerChromium.h"
|
| -
|
| -#include "core/platform/mediastream/RTCDTMFSenderHandlerClient.h"
|
| -#include <public/WebRTCDTMFSenderHandler.h>
|
| -#include <wtf/PassOwnPtr.h>
|
| -
|
| -using namespace WebKit;
|
| +#include "wtf/text/WTFString.h"
|
|
|
| namespace WebCore {
|
|
|
| -PassOwnPtr<RTCDTMFSenderHandler> RTCDTMFSenderHandlerChromium::create(WebRTCDTMFSenderHandler* webHandler)
|
| +PassRefPtr<SourceInfo> SourceInfo::create(const WebKit::WebSourceInfo& webSourceInfo)
|
| {
|
| - return adoptPtr(new RTCDTMFSenderHandlerChromium(webHandler));
|
| + ASSERT(!webSourceInfo.isNull());
|
| + return adoptRef(new SourceInfo(webSourceInfo));
|
| }
|
|
|
| -RTCDTMFSenderHandlerChromium::RTCDTMFSenderHandlerChromium(WebRTCDTMFSenderHandler* webHandler)
|
| - : m_webHandler(adoptPtr(webHandler))
|
| - , m_client(0)
|
| +SourceInfo::SourceInfo(const WebKit::WebSourceInfo& webSourceInfo)
|
| + : m_webSourceInfo(webSourceInfo)
|
| {
|
| }
|
|
|
| -RTCDTMFSenderHandlerChromium::~RTCDTMFSenderHandlerChromium()
|
| +String SourceInfo::id() const
|
| {
|
| + return m_webSourceInfo.id();
|
| }
|
|
|
| -void RTCDTMFSenderHandlerChromium::setClient(RTCDTMFSenderHandlerClient* client)
|
| +String SourceInfo::kind() const
|
| {
|
| - m_client = client;
|
| - m_webHandler->setClient(m_client ? this : 0);
|
| -}
|
| + switch (m_webSourceInfo.kind()) {
|
| + case WebKit::WebSourceInfo::SourceKindAudio:
|
| + return ASCIILiteral("audio");
|
| + case WebKit::WebSourceInfo::SourceKindVideo:
|
| + return ASCIILiteral("video");
|
| + case WebKit::WebSourceInfo::SourceKindNone:
|
| + return ASCIILiteral("none");
|
| + }
|
|
|
| -String RTCDTMFSenderHandlerChromium::currentToneBuffer()
|
| -{
|
| - return m_webHandler->currentToneBuffer();
|
| + ASSERT_NOT_REACHED();
|
| + return String();
|
| }
|
|
|
| -bool RTCDTMFSenderHandlerChromium::canInsertDTMF()
|
| +String SourceInfo::label() const
|
| {
|
| - return m_webHandler->canInsertDTMF();
|
| + return m_webSourceInfo.label();
|
| }
|
|
|
| -bool RTCDTMFSenderHandlerChromium::insertDTMF(const String& tones, long duration, long interToneGap)
|
| +String SourceInfo::facing() const
|
| {
|
| - return m_webHandler->insertDTMF(tones, duration, interToneGap);
|
| -}
|
| + switch (m_webSourceInfo.facing()) {
|
| + case WebKit::WebSourceInfo::VideoFacingModeNone:
|
| + return String();
|
| + case WebKit::WebSourceInfo::VideoFacingModeUser:
|
| + return ASCIILiteral("user");
|
| + case WebKit::WebSourceInfo::VideoFacingModeEnvironment:
|
| + return ASCIILiteral("environment");
|
| + }
|
|
|
| -void RTCDTMFSenderHandlerChromium::didPlayTone(const WebString& tone) const
|
| -{
|
| - if (m_client)
|
| - m_client->didPlayTone(tone);
|
| + ASSERT_NOT_REACHED();
|
| + return String();
|
| }
|
|
|
| } // namespace WebCore
|
|
|