[Deinterlace-checkins] SF.net SVN: deinterlace:[4563] trunk/DScaler/DScaler
Brought to you by:
adcockj,
dschmelzer
From: <ad...@us...> - 2009-03-31 08:00:14
|
Revision: 4563 http://deinterlace.svn.sourceforge.net/deinterlace/?rev=4563&view=rev Author: adcockj Date: 2009-03-31 08:00:05 +0000 (Tue, 31 Mar 2009) Log Message: ----------- Avoid having NULL Settings added to keep spacing aligned with API in SettingsHolder, use CEmptySetting instead Modified Paths: -------------- trunk/DScaler/DScaler/BT848Source.cpp trunk/DScaler/DScaler/CX2388xSource.cpp trunk/DScaler/DScaler/Setting.cpp trunk/DScaler/DScaler/Setting.h Modified: trunk/DScaler/DScaler/BT848Source.cpp =================================================================== --- trunk/DScaler/DScaler/BT848Source.cpp 2009-03-31 07:58:30 UTC (rev 4562) +++ trunk/DScaler/DScaler/BT848Source.cpp 2009-03-31 08:00:05 UTC (rev 4563) @@ -360,10 +360,10 @@ m_Settings.push_back(m_Balance); // save per input removed - m_Settings.push_back(new CYesNoSetting("", FALSE, "", "")); + m_Settings.push_back(new CEmptySetting); // save per format removed - m_Settings.push_back(new CYesNoSetting("", FALSE, "", "")); + m_Settings.push_back(new CEmptySetting); m_AudioSource2 = new CAudioSource2Setting(this, "Audio Source 2", AUDIOINPUT_MUTE, AUDIOINPUT_TUNER, AUDIOINPUT_STEREO, IniSection, pAudioSource); m_Settings.push_back(m_AudioSource2); Modified: trunk/DScaler/DScaler/CX2388xSource.cpp =================================================================== --- trunk/DScaler/DScaler/CX2388xSource.cpp 2009-03-31 07:58:30 UTC (rev 4562) +++ trunk/DScaler/DScaler/CX2388xSource.cpp 2009-03-31 08:00:05 UTC (rev 4563) @@ -278,13 +278,13 @@ m_Settings.push_back(m_TunerType); // save per input removed - m_Settings.push_back(NULL); + m_Settings.push_back(new CEmptySetting); // save per format removed - m_Settings.push_back(NULL); + m_Settings.push_back(new CEmptySetting); // save per channel removed - m_Settings.push_back(NULL); + m_Settings.push_back(new CEmptySetting); m_IsVideoProgressive = new CIsVideoProgressiveSetting(this, "Is Video Progressive", FALSE, IniSection, pH3DGroup); m_Settings.push_back(m_IsVideoProgressive); Modified: trunk/DScaler/DScaler/Setting.cpp =================================================================== --- trunk/DScaler/DScaler/Setting.cpp 2009-03-31 07:58:30 UTC (rev 4562) +++ trunk/DScaler/DScaler/Setting.cpp 2009-03-31 08:00:05 UTC (rev 4563) @@ -933,6 +933,11 @@ } } +CEmptySetting::CEmptySetting() : + CYesNoSetting("", FALSE, "", "") +{ +} + CSettingWrapper::CSettingWrapper(SETTING* pSetting, CSettingGroup* pGroup) : CSimpleSetting(pSetting->szDisplayName, pSetting->szIniSection, pSetting->szIniEntry, pGroup), m_Setting(pSetting) Modified: trunk/DScaler/DScaler/Setting.h =================================================================== --- trunk/DScaler/DScaler/Setting.h 2009-03-31 07:58:30 UTC (rev 4562) +++ trunk/DScaler/DScaler/Setting.h 2009-03-31 08:00:05 UTC (rev 4563) @@ -245,6 +245,13 @@ }; +class CEmptySetting : public CYesNoSetting +{ +public: + CEmptySetting(); +}; + + /// This class should be used to store the value of all string settings within the /// main DScaler app, using this class means that the allocated string gets deleted properly on exit class SettingStringValue This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |