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

Fixed the CameraCap button to say Version, also change the function name inside ChannelDlg.cpp

Browse Source 
Review URL: http://webrtc-codereview.appspot.com/182001

git-svn-id: http://webrtc.googlecode.com/svn/trunk@655 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
amyfong@webrtc.org 2011-09-27 19:19:10 +00:00
parent 2d08d43206
commit 6a23ad5702
4 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/video_engine/main/test/WindowsTest/Capture.rc
View File

@ -191,7 +191,7 @@ BEGIN
COMBOBOX IDC_PACKETBURST,653,118,36,57,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_PACKETBURST,653,118,36,57,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
LTEXT "Packet Burst",IDC_STATIC,649,109,40,8 LTEXT "Packet Burst",IDC_STATIC,649,109,40,8
CONTROL "Stop Log",IDC_FREEZELOG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,465,292,44,10 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 CONTROL "Ext",IDC_EXTTRANSPORT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,493,66,25,10
LTEXT "loss",IDC_STATIC,519,66,15,8 LTEXT "loss",IDC_STATIC,519,66,15,8
LTEXT "delay",IDC_STATIC,578,66,18,8 LTEXT "delay",IDC_STATIC,578,66,18,8

4
src/video_engine/main/test/WindowsTest/ChannelDlg.cpp
View File

@ -153,7 +153,7 @@ BEGIN_MESSAGE_MAP(CDXChannelDlg, CDialog)
ON_BN_CLICKED(IDC_PROT_NONE, &CDXChannelDlg::OnBnClickedProtNone) ON_BN_CLICKED(IDC_PROT_NONE, &CDXChannelDlg::OnBnClickedProtNone)
ON_BN_CLICKED(IDC_PROT_FEC, &CDXChannelDlg::OnBnClickedProtFec) ON_BN_CLICKED(IDC_PROT_FEC, &CDXChannelDlg::OnBnClickedProtFec)
ON_BN_CLICKED(IDC_FREEZELOG, &CDXChannelDlg::OnBnClickedFreezelog) 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_BN_CLICKED(IDC_EXTTRANSPORT, &CDXChannelDlg::OnBnClickedExttransport)
ON_CBN_SELCHANGE(IDC_PACKETLOSS, &CDXChannelDlg::OnCbnSelchangePacketloss) ON_CBN_SELCHANGE(IDC_PACKETLOSS, &CDXChannelDlg::OnCbnSelchangePacketloss)
ON_CBN_SELCHANGE(IDC_DELAY, &CDXChannelDlg::OnCbnSelchangeDelay) ON_CBN_SELCHANGE(IDC_DELAY, &CDXChannelDlg::OnCbnSelchangeDelay)
@ -969,7 +969,7 @@ void CDXChannelDlg::OnBnClickedProtFec()
TEST_MUSTPASS(_vieRTPRTCP->SetFECStatus(_channelId,true,redPayloadType,fecPayloadType),-5); TEST_MUSTPASS(_vieRTPRTCP->SetFECStatus(_channelId,true,redPayloadType,fecPayloadType),-5);
} }
void CDXChannelDlg::OnBnClickedCameracap() void CDXChannelDlg::OnBnClickedVersion()
{ {
char version[1024]; char version[1024];
_vieBase->GetVersion(version); _vieBase->GetVersion(version);

2
src/video_engine/main/test/WindowsTest/ChannelDlg.h
View File

@ -256,7 +256,6 @@ private:
afx_msg void OnBnClickedProtNone(); afx_msg void OnBnClickedProtNone();
afx_msg void OnBnClickedProtFec(); afx_msg void OnBnClickedProtFec();
afx_msg void OnBnClickedFreezelog(); afx_msg void OnBnClickedFreezelog();
afx_msg void OnBnClickedCameracap();
public: public:
afx_msg void OnBnClickedExttransport(); afx_msg void OnBnClickedExttransport();
afx_msg void OnCbnSelchangePacketloss(); afx_msg void OnCbnSelchangePacketloss();
@ -264,6 +263,7 @@ public:
afx_msg void OnBnClickedBtnRecordIncoming(); afx_msg void OnBnClickedBtnRecordIncoming();
afx_msg void OnBnClickedBtnRecordOutgoing(); afx_msg void OnBnClickedBtnRecordOutgoing();
afx_msg void OnBnClickedBtnCreateSlave(); afx_msg void OnBnClickedBtnCreateSlave();
afx_msg void OnBnClickedVersion();
}; };
//{{AFX_INSERT_LOCATION}} //{{AFX_INSERT_LOCATION}}

14
src/video_engine/main/test/WindowsTest/resource.h
View File

@ -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}} //{{NO_DEPENDENCIES}}
// Microsoft Visual C++ generated include file. // Microsoft Visual C++ generated include file.
// Used by Capture.rc // Used by Capture.rc
@ -48,13 +38,11 @@
#define IDC_INFORMATION 1050 #define IDC_INFORMATION 1050
#define IDC_PACKETLOSS 1051 #define IDC_PACKETLOSS 1051
#define IDC_FREEZELOG 1052 #define IDC_FREEZELOG 1052
#define IDC_BUTTON1 1053 #define IDC_VERSION 1053
#define IDC_CAMERACAP 1053
#define IDC_EXTTRANSPORT 1054 #define IDC_EXTTRANSPORT 1054
#define IDC_DELAY 1055 #define IDC_DELAY 1055
#define IDC_BTN_RECORD_INCOMING 1056 #define IDC_BTN_RECORD_INCOMING 1056
#define IDC_BTN_RECORD_OUTGOING 1057 #define IDC_BTN_RECORD_OUTGOING 1057
#define IDC_BUTTON2 1058
#define IDC_BTN_CREATE_SLAVE 1058 #define IDC_BTN_CREATE_SLAVE 1058
// Next default values for new objects // Next default values for new objects