From 6a23ad5702be1f737c99d5cda2720a3ac37d42d0 Mon Sep 17 00:00:00 2001 From: "amyfong@webrtc.org" Date: Tue, 27 Sep 2011 19:19:10 +0000 Subject: [PATCH] Fixed the CameraCap button to say Version, also change the function name inside ChannelDlg.cpp Review URL: http://webrtc-codereview.appspot.com/182001 git-svn-id: http://webrtc.googlecode.com/svn/trunk@655 4adac7df-926f-26a2-2b94-8c16560cd09d --- src/video_engine/main/test/WindowsTest/Capture.rc | 2 +- .../main/test/WindowsTest/ChannelDlg.cpp | 4 ++-- .../main/test/WindowsTest/ChannelDlg.h | 2 +- src/video_engine/main/test/WindowsTest/resource.h | 14 +------------- 4 files changed, 5 insertions(+), 17 deletions(-) diff --git a/src/video_engine/main/test/WindowsTest/Capture.rc b/src/video_engine/main/test/WindowsTest/Capture.rc index 7ad089bd09..66642b0e30 100644 --- a/src/video_engine/main/test/WindowsTest/Capture.rc +++ b/src/video_engine/main/test/WindowsTest/Capture.rc @@ -191,7 +191,7 @@ BEGIN COMBOBOX IDC_PACKETBURST,653,118,36,57,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP LTEXT "Packet Burst",IDC_STATIC,649,109,40,8 CONTROL "Stop Log",IDC_FREEZELOG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,465,292,44,10 - PUSHBUTTON "Camera Cap",IDC_CAMERACAP,530,291,55,16 + PUSHBUTTON "Version",IDC_VERSION,530,291,55,16 CONTROL "Ext",IDC_EXTTRANSPORT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,493,66,25,10 LTEXT "loss",IDC_STATIC,519,66,15,8 LTEXT "delay",IDC_STATIC,578,66,18,8 diff --git a/src/video_engine/main/test/WindowsTest/ChannelDlg.cpp b/src/video_engine/main/test/WindowsTest/ChannelDlg.cpp index cea17c16fa..ff67f928c8 100644 --- a/src/video_engine/main/test/WindowsTest/ChannelDlg.cpp +++ b/src/video_engine/main/test/WindowsTest/ChannelDlg.cpp @@ -153,7 +153,7 @@ BEGIN_MESSAGE_MAP(CDXChannelDlg, CDialog) ON_BN_CLICKED(IDC_PROT_NONE, &CDXChannelDlg::OnBnClickedProtNone) ON_BN_CLICKED(IDC_PROT_FEC, &CDXChannelDlg::OnBnClickedProtFec) ON_BN_CLICKED(IDC_FREEZELOG, &CDXChannelDlg::OnBnClickedFreezelog) - ON_BN_CLICKED(IDC_CAMERACAP, &CDXChannelDlg::OnBnClickedCameracap) + ON_BN_CLICKED(IDC_VERSION, &CDXChannelDlg::OnBnClickedVersion) ON_BN_CLICKED(IDC_EXTTRANSPORT, &CDXChannelDlg::OnBnClickedExttransport) ON_CBN_SELCHANGE(IDC_PACKETLOSS, &CDXChannelDlg::OnCbnSelchangePacketloss) ON_CBN_SELCHANGE(IDC_DELAY, &CDXChannelDlg::OnCbnSelchangeDelay) @@ -969,7 +969,7 @@ void CDXChannelDlg::OnBnClickedProtFec() TEST_MUSTPASS(_vieRTPRTCP->SetFECStatus(_channelId,true,redPayloadType,fecPayloadType),-5); } -void CDXChannelDlg::OnBnClickedCameracap() +void CDXChannelDlg::OnBnClickedVersion() { char version[1024]; _vieBase->GetVersion(version); diff --git a/src/video_engine/main/test/WindowsTest/ChannelDlg.h b/src/video_engine/main/test/WindowsTest/ChannelDlg.h index 59b8d073e4..3ed5296895 100644 --- a/src/video_engine/main/test/WindowsTest/ChannelDlg.h +++ b/src/video_engine/main/test/WindowsTest/ChannelDlg.h @@ -256,7 +256,6 @@ private: afx_msg void OnBnClickedProtNone(); afx_msg void OnBnClickedProtFec(); afx_msg void OnBnClickedFreezelog(); - afx_msg void OnBnClickedCameracap(); public: afx_msg void OnBnClickedExttransport(); afx_msg void OnCbnSelchangePacketloss(); @@ -264,6 +263,7 @@ public: afx_msg void OnBnClickedBtnRecordIncoming(); afx_msg void OnBnClickedBtnRecordOutgoing(); afx_msg void OnBnClickedBtnCreateSlave(); + afx_msg void OnBnClickedVersion(); }; //{{AFX_INSERT_LOCATION}} diff --git a/src/video_engine/main/test/WindowsTest/resource.h b/src/video_engine/main/test/WindowsTest/resource.h index deb7944c40..83529b0d45 100644 --- a/src/video_engine/main/test/WindowsTest/resource.h +++ b/src/video_engine/main/test/WindowsTest/resource.h @@ -1,13 +1,3 @@ -/* - * Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - //{{NO_DEPENDENCIES}} // Microsoft Visual C++ generated include file. // Used by Capture.rc @@ -48,13 +38,11 @@ #define IDC_INFORMATION 1050 #define IDC_PACKETLOSS 1051 #define IDC_FREEZELOG 1052 -#define IDC_BUTTON1 1053 -#define IDC_CAMERACAP 1053 +#define IDC_VERSION 1053 #define IDC_EXTTRANSPORT 1054 #define IDC_DELAY 1055 #define IDC_BTN_RECORD_INCOMING 1056 #define IDC_BTN_RECORD_OUTGOING 1057 -#define IDC_BUTTON2 1058 #define IDC_BTN_CREATE_SLAVE 1058 // Next default values for new objects