admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Delete unused classes DesktopId and ScreencastEventCatcher.

Browse Source 
BUG=webrtc:6424

Review-Url: https://codereview.webrtc.org/2650703002
Cr-Commit-Position: refs/heads/master@{#16228}
This commit is contained in:
nisse 2017-01-24 00:03:32 -08:00 committed by Commit bot
parent ad452287b0
commit c23b0b26df
2 changed files with 0 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
webrtc/base/window.h
View File

@ -69,54 +69,6 @@ class WindowId {
WindowT id_;
};
class DesktopId {
public:
// Define DesktopT for each platform.
#if defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID)
typedef Window DesktopT;
#elif defined(WEBRTC_WIN)
typedef HMONITOR DesktopT;
#elif defined(WEBRTC_MAC) && !defined(WEBRTC_IOS)
typedef CGDirectDisplayID DesktopT;
#else
typedef unsigned int DesktopT;
#endif
static DesktopId Cast(int id, int index) {
#if defined(WEBRTC_WIN)
return DesktopId(reinterpret_cast<DesktopId::DesktopT>(id), index);
#else
return DesktopId(static_cast<DesktopId::DesktopT>(id), index);
#endif
}
DesktopId() : id_(0), index_(-1) {}
DesktopId(const DesktopT& id, int index) // NOLINT
: id_(id), index_(index) {
}
const DesktopT& id() const { return id_; }
int index() const { return index_; }
bool IsValid() const { return index_ != -1; }
bool Equals(const DesktopId& other) const {
return id_ == other.id() && index_ == other.index();
}
private:
// Id is the platform specific desktop identifier.
DesktopT id_;
// Index is the desktop index as enumerated by each platform.
// Desktop capturer typically takes the index instead of id.
int index_;
};
// Window event types.
enum WindowEvent {
WE_RESIZE = 0,
WE_CLOSE = 1,
WE_MINIMIZE = 2,
WE_RESTORE = 3,
};
inline std::string ToString(const WindowId& window) {
return ToString(window.id());
}

14
webrtc/media/base/testutils.h
View File

@ -105,20 +105,6 @@ class VideoCapturerListener
bool resolution_changed_;
};
class ScreencastEventCatcher : public sigslot::has_slots<> {
public:
ScreencastEventCatcher() : ssrc_(0), ev_(rtc::WE_RESIZE) { }
uint32_t ssrc() const { return ssrc_; }
rtc::WindowEvent event() const { return ev_; }
void OnEvent(uint32_t ssrc, rtc::WindowEvent ev) {
ssrc_ = ssrc;
ev_ = ev;
}
private:
uint32_t ssrc_;
rtc::WindowEvent ev_;
};
class VideoMediaErrorCatcher : public sigslot::has_slots<> {
public:
VideoMediaErrorCatcher() : ssrc_(0), error_(VideoMediaChannel::ERROR_NONE) { }