From 680c751989ccae1c5a8e3af8036ead90f9ae8fec Mon Sep 17 00:00:00 2001 From: sansnom05 Date: Sun, 21 Nov 2010 03:29:50 +0000 Subject: -using exist naming convention for variables in appsettings -small cleanups(remove unused variables, use const for const member functions, header files cleanup) git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@2739 10f7b99b-c216-0410-bff0-8a66a9350fd8 --- src/apps/mplayerc/PlayerCaptureDialog.cpp | 52 +++++++++++++++---------------- 1 file changed, 26 insertions(+), 26 deletions(-) (limited to 'src/apps/mplayerc/PlayerCaptureDialog.cpp') diff --git a/src/apps/mplayerc/PlayerCaptureDialog.cpp b/src/apps/mplayerc/PlayerCaptureDialog.cpp index b9a35af7e..cebe187e1 100644 --- a/src/apps/mplayerc/PlayerCaptureDialog.cpp +++ b/src/apps/mplayerc/PlayerCaptureDialog.cpp @@ -45,7 +45,7 @@ static bool LoadMediaType(CStringW DisplayName, AM_MEDIA_TYPE** ppmt) BYTE* pData; UINT len; - if(AfxGetApp()->GetProfileBinary(_T("Capture\\") + CString(DisplayName), _T("MediaType"), &pData, &len)) + if(AfxGetApp()->GetProfileBinary(IDS_RS_CAPTURE _T("\\") + CString(DisplayName), _T("MediaType"), &pData, &len)) { if ( len != sizeof(AM_MEDIA_TYPE) ) { @@ -60,7 +60,7 @@ static bool LoadMediaType(CStringW DisplayName, AM_MEDIA_TYPE** ppmt) fRet = true; - if(AfxGetApp()->GetProfileBinary(_T("Capture\\") + CString(DisplayName), _T("Format"), &pData, &len)) + if(AfxGetApp()->GetProfileBinary(IDS_RS_CAPTURE _T("\\") + CString(DisplayName), _T("Format"), &pData, &len)) { if ( !len ) { @@ -82,8 +82,8 @@ static void SaveMediaType(CStringW DisplayName, AM_MEDIA_TYPE* pmt) { if(DisplayName.IsEmpty() || !pmt) return; - AfxGetApp()->WriteProfileBinary(_T("Capture\\") + CString(DisplayName), _T("MediaType"), (BYTE*)pmt, sizeof(AM_MEDIA_TYPE)); - AfxGetApp()->WriteProfileBinary(_T("Capture\\") + CString(DisplayName), _T("Format"), pmt->pbFormat, pmt->cbFormat); + AfxGetApp()->WriteProfileBinary(IDS_RS_CAPTURE _T("\\") + CString(DisplayName), _T("MediaType"), (BYTE*)pmt, sizeof(AM_MEDIA_TYPE)); + AfxGetApp()->WriteProfileBinary(IDS_RS_CAPTURE _T("\\") + CString(DisplayName), _T("Format"), pmt->pbFormat, pmt->cbFormat); } static void LoadDefaultCodec(CAtlArray& codecs, CComboBox& box, const GUID& cat) @@ -93,7 +93,7 @@ static void LoadDefaultCodec(CAtlArray& codecs, CComboBox& box, const GUI if(cat == GUID_NULL) return; - CString DisplayName = AfxGetApp()->GetProfileString(_T("Capture\\") + CStringFromGUID(cat), _T("DisplayName")); + CString DisplayName = AfxGetApp()->GetProfileString(IDS_RS_CAPTURE _T("\\") + CStringFromGUID(cat), _T("DisplayName")); for(int i = 0; i < len; i++) { @@ -117,7 +117,7 @@ static void SaveDefaultCodec(CAtlArray& codecs, CComboBox& box, const GUI CString guid = CStringFromGUID(cat); - AfxGetApp()->WriteProfileString(_T("Capture\\") + guid, NULL, NULL); + AfxGetApp()->WriteProfileString(IDS_RS_CAPTURE _T("\\") + guid, NULL, NULL); int iSel = box.GetCurSel(); if(iSel < 0) return; @@ -126,7 +126,7 @@ static void SaveDefaultCodec(CAtlArray& codecs, CComboBox& box, const GUI Codec& codec = codecs[iSel]; - AfxGetApp()->WriteProfileString(_T("Capture\\") + guid, _T("DisplayName"), CString(codec.DisplayName)); + AfxGetApp()->WriteProfileString(IDS_RS_CAPTURE _T("\\") + guid, _T("DisplayName"), CString(codec.DisplayName)); } static void SetupDefaultCaps(AM_MEDIA_TYPE* pmt, VIDEO_STREAM_CONFIG_CAPS& caps) @@ -595,7 +595,7 @@ void CPlayerCaptureDialog::EmptyVideo() { long lChannel = 0, lVivSub = 0, lAudSub = 0; m_pAMTuner->get_Channel(&lChannel, &lVivSub, &lAudSub); - AfxGetApp()->WriteProfileInt(_T("Capture\\") + CString(m_VidDisplayName), _T("Channel"), lChannel); + AfxGetApp()->WriteProfileInt(IDS_RS_CAPTURE _T("\\") + CString(m_VidDisplayName), _T("Channel"), lChannel); } // @@ -1293,15 +1293,15 @@ BOOL CPlayerCaptureDialog::OnInitDialog() m_fEnableOgm = IsCLSIDRegistered(_T("{8cae96b7-85b1-4605-b23c-17ff5262b296}")); - m_nVidBuffers = AfxGetApp()->GetProfileInt(_T("Capture"), _T("VidBuffers"), 50); - m_nAudBuffers = AfxGetApp()->GetProfileInt(_T("Capture"), _T("AudBuffers"), 50); - m_fVidOutput = !!AfxGetApp()->GetProfileInt(_T("Capture"), _T("VidOutput"), TRUE); - m_fAudOutput = !!AfxGetApp()->GetProfileInt(_T("Capture"), _T("AudOutput"), TRUE); - m_fVidPreview = AfxGetApp()->GetProfileInt(_T("Capture"), _T("VidPreview"), TRUE); - m_fAudPreview = AfxGetApp()->GetProfileInt(_T("Capture"), _T("AudPreview"), TRUE); - m_muxtype = AfxGetApp()->GetProfileInt(_T("Capture"), _T("FileFormat"), 0); - m_file = AfxGetApp()->GetProfileString(_T("Capture"), _T("FileName"), _T("")); - m_fSepAudio = AfxGetApp()->GetProfileInt(_T("Capture"), _T("SepAudio"), TRUE); + m_nVidBuffers = AfxGetApp()->GetProfileInt(IDS_RS_CAPTURE, _T("VidBuffers"), 50); + m_nAudBuffers = AfxGetApp()->GetProfileInt(IDS_RS_CAPTURE, _T("AudBuffers"), 50); + m_fVidOutput = !!AfxGetApp()->GetProfileInt(IDS_RS_CAPTURE, _T("VidOutput"), TRUE); + m_fAudOutput = !!AfxGetApp()->GetProfileInt(IDS_RS_CAPTURE, _T("AudOutput"), TRUE); + m_fVidPreview = AfxGetApp()->GetProfileInt(IDS_RS_CAPTURE, _T("VidPreview"), TRUE); + m_fAudPreview = AfxGetApp()->GetProfileInt(IDS_RS_CAPTURE, _T("AudPreview"), TRUE); + m_muxtype = AfxGetApp()->GetProfileInt(IDS_RS_CAPTURE, _T("FileFormat"), 0); + m_file = AfxGetApp()->GetProfileString(IDS_RS_CAPTURE, _T("FileName"), _T("")); + m_fSepAudio = AfxGetApp()->GetProfileInt(IDS_RS_CAPTURE, _T("SepAudio"), TRUE); m_muxctrl.AddString(_T("AVI")); m_muxctrl.AddString(_T("Ogg Media")); @@ -1322,13 +1322,13 @@ void CPlayerCaptureDialog::OnDestroy() { UpdateData(); - AfxGetApp()->WriteProfileInt(_T("Capture"), _T("VidOutput"), m_fVidOutput); - AfxGetApp()->WriteProfileInt(_T("Capture"), _T("AudOutput"), m_fAudOutput); - AfxGetApp()->WriteProfileInt(_T("Capture"), _T("VidPreview"), m_fVidPreview); - AfxGetApp()->WriteProfileInt(_T("Capture"), _T("AudPreview"), m_fAudPreview); - AfxGetApp()->WriteProfileInt(_T("Capture"), _T("FileFormat"), m_muxtype); - AfxGetApp()->WriteProfileString(_T("Capture"), _T("FileName"), m_file); - AfxGetApp()->WriteProfileInt(_T("Capture"), _T("SepAudio"), m_fSepAudio); + AfxGetApp()->WriteProfileInt(IDS_RS_CAPTURE, _T("VidOutput"), m_fVidOutput); + AfxGetApp()->WriteProfileInt(IDS_RS_CAPTURE, _T("AudOutput"), m_fAudOutput); + AfxGetApp()->WriteProfileInt(IDS_RS_CAPTURE, _T("VidPreview"), m_fVidPreview); + AfxGetApp()->WriteProfileInt(IDS_RS_CAPTURE, _T("AudPreview"), m_fAudPreview); + AfxGetApp()->WriteProfileInt(IDS_RS_CAPTURE, _T("FileFormat"), m_muxtype); + AfxGetApp()->WriteProfileString(IDS_RS_CAPTURE, _T("FileName"), m_file); + AfxGetApp()->WriteProfileInt(IDS_RS_CAPTURE, _T("SepAudio"), m_fSepAudio); __super::OnDestroy(); } @@ -1646,13 +1646,13 @@ void CPlayerCaptureDialog::OnRecord() void CPlayerCaptureDialog::OnEnChangeEdit9() { UpdateData(); - AfxGetApp()->WriteProfileInt(_T("Capture"), _T("VidBuffers"), max(m_nVidBuffers, 0)); + AfxGetApp()->WriteProfileInt(IDS_RS_CAPTURE, _T("VidBuffers"), max(m_nVidBuffers, 0)); } void CPlayerCaptureDialog::OnEnChangeEdit12() { UpdateData(); - AfxGetApp()->WriteProfileInt(_T("Capture"), _T("AudBuffers"), max(m_nAudBuffers, 0)); + AfxGetApp()->WriteProfileInt(IDS_RS_CAPTURE, _T("AudBuffers"), max(m_nAudBuffers, 0)); } void CPlayerCaptureDialog::OnTimer(UINT_PTR nIDEvent) -- cgit v1.2.3