| Index: webrtc/pc/channelmanager.h
|
| diff --git a/webrtc/pc/channelmanager.h b/webrtc/pc/channelmanager.h
|
| index bd1bc2f46985ecd37794507a3ddf08c78aaebdce..9862fe03244c9adf62c24ac4068af8eb230c9b14 100644
|
| --- a/webrtc/pc/channelmanager.h
|
| +++ b/webrtc/pc/channelmanager.h
|
| @@ -8,8 +8,8 @@
|
| * be found in the AUTHORS file in the root of the source tree.
|
| */
|
|
|
| -#ifndef TALK_SESSION_MEDIA_CHANNELMANAGER_H_
|
| -#define TALK_SESSION_MEDIA_CHANNELMANAGER_H_
|
| +#ifndef WEBRTC_PC_CHANNELMANAGER_H_
|
| +#define WEBRTC_PC_CHANNELMANAGER_H_
|
|
|
| #include <string>
|
| #include <vector>
|
| @@ -129,9 +129,6 @@ class ChannelManager : public rtc::MessageHandler,
|
| // formats a a pseudo-handle.
|
| bool StartVideoCapture(VideoCapturer* video_capturer,
|
| const VideoFormat& video_format);
|
| - // When muting, produce black frames then pause the camera.
|
| - // When unmuting, start the camera. Camera starts unmuted.
|
| - bool MuteToBlackThenPause(VideoCapturer* video_capturer, bool muted);
|
| bool StopVideoCapture(VideoCapturer* video_capturer,
|
| const VideoFormat& video_format);
|
| bool RestartVideoCapture(VideoCapturer* video_capturer,
|
| @@ -221,4 +218,4 @@ class ChannelManager : public rtc::MessageHandler,
|
|
|
| } // namespace cricket
|
|
|
| -#endif // TALK_SESSION_MEDIA_CHANNELMANAGER_H_
|
| +#endif // WEBRTC_PC_CHANNELMANAGER_H_
|
|
|