[Deinterlace-checkins] SF.net SVN: deinterlace:[4594] trunk
Brought to you by:
adcockj,
dschmelzer
Menu
▾
▴
[Deinterlace-checkins] SF.net SVN: deinterlace:[4594] trunk
|
From: <ad...@us...> - 2009-05-09 11:54:42
|
Revision: 4594
http://deinterlace.svn.sourceforge.net/deinterlace/?rev=4594&view=rev
Author: adcockj
Date: 2009-05-09 11:54:34 +0000 (Sat, 09 May 2009)
Log Message:
-----------
Fix compilation under VS6
Modified Paths:
--------------
trunk/DSRend/DSRend.dsp
trunk/DScaler/DScaler/AspectFilters.cpp
trunk/DScaler/DScaler/BT848Card.cpp
trunk/DScaler/DScaler/BT848Card_Atlas.cpp
trunk/DScaler/DScaler/BT848Card_Audio.cpp
trunk/DScaler/DScaler/BT848Card_PMS.cpp
trunk/DScaler/DScaler/BT848Card_Tuner.cpp
trunk/DScaler/DScaler/BT848Provider.cpp
trunk/DScaler/DScaler/BT848Source.cpp
trunk/DScaler/DScaler/BT848Source_UI.cpp
trunk/DScaler/DScaler/Bitmap.cpp
trunk/DScaler/DScaler/CX2388xCard_H3D.cpp
trunk/DScaler/DScaler/CX2388xCard_Tuner.cpp
trunk/DScaler/DScaler/CX2388xProvider.cpp
trunk/DScaler/DScaler/CX2388xSource.cpp
trunk/DScaler/DScaler/CX2388xSource_UI.cpp
trunk/DScaler/DScaler/Channels.cpp
trunk/DScaler/DScaler/Channels.h
trunk/DScaler/DScaler/DScaler.cpp
trunk/DScaler/DScaler/DScaler.dsp
trunk/DScaler/DScaler/DScaler2005.vcproj
trunk/DScaler/DScaler/DebugLog.cpp
trunk/DScaler/DScaler/EPG.cpp
trunk/DScaler/DScaler/GenericTuner.cpp
trunk/DScaler/DScaler/LibraryCache.h
trunk/DScaler/DScaler/MT2032.cpp
trunk/DScaler/DScaler/MT2050.cpp
trunk/DScaler/DScaler/MixerDev.cpp
trunk/DScaler/DScaler/MixerDevClasses.cpp
trunk/DScaler/DScaler/OutReso.cpp
trunk/DScaler/DScaler/ProgramList.cpp
trunk/DScaler/DScaler/Providers.cpp
trunk/DScaler/DScaler/Providers.h
trunk/DScaler/DScaler/SAA7134Card_Tuner.cpp
trunk/DScaler/DScaler/SAA7134Provider.cpp
trunk/DScaler/DScaler/SAA7134Source.cpp
trunk/DScaler/DScaler/SAA7134Source_UI.cpp
trunk/DScaler/DScaler/ScheduledRecording.cpp
trunk/DScaler/DScaler/Setting.cpp
trunk/DScaler/DScaler/Setting.h
trunk/DScaler/DScaler/Settings.cpp
trunk/DScaler/DScaler/SettingsMaster.cpp
trunk/DScaler/DScaler/SmartPtr.h
trunk/DScaler/DScaler/Source.cpp
trunk/DScaler/DScaler/TDA8275.cpp
trunk/DScaler/DScaler/TimeShift.cpp
trunk/DScaler/DScaler/ToolbarWindow.cpp
trunk/DScaler/DScaler/TreeSettingsDlg.cpp
trunk/DScaler/DScaler/TreeSettingsGeneric.cpp
trunk/DScaler/DScaler/VTDecoder.cpp
trunk/DScaler/DScaler/WindowBorder.cpp
trunk/DScaler/DScaler/dshowsource/DSSourceBase.cpp
trunk/DScaler/DScaler/dshowsource/DSTVTuner.cpp
trunk/DScaler/DScaler/events.cpp
trunk/DScaler/DScaler/tinyxml.cpp
trunk/DScaler/DScaler/tinyxml.h
trunk/DScaler/DScaler/xmltv_timestamp.cpp
Modified: trunk/DSRend/DSRend.dsp
===================================================================
--- trunk/DSRend/DSRend.dsp 2009-05-08 17:02:47 UTC (rev 4593)
+++ trunk/DSRend/DSRend.dsp 2009-05-09 11:54:34 UTC (rev 4594)
@@ -54,8 +54,8 @@
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib strmiids.lib version.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"..\DScaler\Debug/DSRend.dll" /pdbtype:sept
# Begin Custom Build - Performing registration
OutDir=.\Debug
-TargetPath=\Programering\prj\deinterlace\DScaler\Debug\DSRend.dll
-InputPath=\Programering\prj\deinterlace\DScaler\Debug\DSRend.dll
+TargetPath=\Source\deinterlace\DScaler\Debug\DSRend.dll
+InputPath=\Source\deinterlace\DScaler\Debug\DSRend.dll
SOURCE="$(InputPath)"
"$(OutDir)\regsvr32.trg" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
@@ -90,8 +90,8 @@
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib strmiids.lib version.lib /nologo /subsystem:windows /dll /machine:I386 /out:"..\DScaler\Release/DSRend.dll"
# Begin Custom Build - Performing registration
OutDir=.\Release
-TargetPath=\Programering\prj\deinterlace\DScaler\Release\DSRend.dll
-InputPath=\Programering\prj\deinterlace\DScaler\Release\DSRend.dll
+TargetPath=\Source\deinterlace\DScaler\Release\DSRend.dll
+InputPath=\Source\deinterlace\DScaler\Release\DSRend.dll
SOURCE="$(InputPath)"
"$(OutDir)\regsvr32.trg" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
@@ -309,6 +309,13 @@
# End Group
# End Target
# End Project
+# Section DSRend : {03014021-60FF-0321-FF40-0103FF6825E3}
+# 1:30:IDS_DOCSTRINGDSRendQualityPage:105
+# 1:21:IDD_DSRENDQUALITYPAGE:107
+# 1:26:IDS_TITLEDSRendQualityPage:103
+# 1:29:IDS_HELPFILEDSRendQualityPage:104
+# 1:21:IDR_DSRENDQUALITYPAGE:106
+# End Section
# Section DSRend : {69562074-7573-6C61-2053-747564696F5C}
# 1:22:IDS_TITLECSettingsPage:108
# 1:17:IDR_CSETTINGSPAGE:111
@@ -316,13 +323,6 @@
# 1:26:IDS_DOCSTRINGCSettingsPage:110
# 1:17:IDD_CSETTINGSPAGE:112
# End Section
-# Section DSRend : {03014021-60FF-0321-FF40-0103FF6825E3}
-# 1:30:IDS_DOCSTRINGDSRendQualityPage:105
-# 1:21:IDD_DSRENDQUALITYPAGE:107
-# 1:26:IDS_TITLEDSRendQualityPage:103
-# 1:29:IDS_HELPFILEDSRendQualityPage:104
-# 1:21:IDR_DSRENDQUALITYPAGE:106
-# End Section
# Section DSRend : {00700000-0000-0000-0000-000077088800}
# 1:28:IDS_DOCSTRINGDSRendAboutPage:115
# 1:19:IDD_DSRENDABOUTPAGE:117
Modified: trunk/DScaler/DScaler/AspectFilters.cpp
===================================================================
--- trunk/DScaler/DScaler/AspectFilters.cpp 2009-05-08 17:02:47 UTC (rev 4593)
+++ trunk/DScaler/DScaler/AspectFilters.cpp 2009-05-09 11:54:34 UTC (rev 4594)
@@ -175,14 +175,14 @@
// This filter orbits the source image using independent X and Y timers.
// It is assumed that bouncing is enabled if this filter is in the chain.
// The bounce comes out of the m_Overscan (the m_Overscan filter performs a sanity check to ensure the m_Overscan is of appropriate size.
-COrbitAspectFilter::COrbitAspectFilter(time_t OrbitPeriodX, time_t OrbitPeriodY, long OrbitSize)
+COrbitAspectFilter::COrbitAspectFilter(time_t OrbitPeriodX, time_t OrbitPeriodY, long OrbitSize) :
+ m_pXOrbitBouncer(new CPeriodBouncer(AspectSettings.BounceStartTime,OrbitPeriodX,OrbitSize,-OrbitSize/2.0)),
+ m_pYOrbitBouncer(new CPeriodBouncer(AspectSettings.BounceStartTime,OrbitPeriodY,OrbitSize,-OrbitSize/2.0))
{
if (AspectSettings.BounceStartTime == 0)
{
time(&AspectSettings.BounceStartTime);
}
- m_pXOrbitBouncer = new CPeriodBouncer(AspectSettings.BounceStartTime,OrbitPeriodX,OrbitSize,-OrbitSize/2.0);
- m_pYOrbitBouncer = new CPeriodBouncer(AspectSettings.BounceStartTime,OrbitPeriodY,OrbitSize,-OrbitSize/2.0);
}
void COrbitAspectFilter::adjustAspect(CAspectRectangles &ar, BOOL& RequestRerun)
@@ -201,18 +201,18 @@
LOG(2,_T("m_pXOrbitBouncer = %lf, m_pYOrbitBouncer = %lf"),m_pXOrbitBouncer->position(), m_pYOrbitBouncer->position());
}
-CBounceDestinationAspectFilter::CBounceDestinationAspectFilter(time_t period)
+CBounceDestinationAspectFilter::CBounceDestinationAspectFilter(time_t period) :
+ m_pBouncer(new CPeriodBouncer(
+ AspectSettings.BounceStartTime, period,
+ // BounceAmplitude ranges from 0 to 100, we want 0 to 2.
+ 2.0 * (double)AspectSettings.BounceAmplitude / 100.0,
+ // BounceAmplitude ranges from 0 to 100, we want 0 to -1.
+ -1.0 * (double)AspectSettings.BounceAmplitude / 100.0))
{
if (AspectSettings.BounceStartTime == 0)
{
time(&AspectSettings.BounceStartTime);
}
- m_pBouncer = new CPeriodBouncer(
- AspectSettings.BounceStartTime, period,
- // BounceAmplitude ranges from 0 to 100, we want 0 to 2.
- 2.0 * (double)AspectSettings.BounceAmplitude / 100.0,
- // BounceAmplitude ranges from 0 to 100, we want 0 to -1.
- -1.0 * (double)AspectSettings.BounceAmplitude / 100.0);
}
void CBounceDestinationAspectFilter::adjustAspect(CAspectRectangles &ar, BOOL& RequestRerun)
Modified: trunk/DScaler/DScaler/BT848Card.cpp
===================================================================
--- trunk/DScaler/DScaler/BT848Card.cpp 2009-05-08 17:02:47 UTC (rev 4593)
+++ trunk/DScaler/DScaler/BT848Card.cpp 2009-05-09 11:54:34 UTC (rev 4594)
@@ -882,16 +882,16 @@
case WM_INITDIALOG:
pThis = (CBT848Card*)lParam;
SetDlgItemText(hDlg, IDC_BT_CHIP_TYPE, pThis->GetChipType().c_str());
- _stprintf_s(szVendorId, 9, _T("%04X"), pThis->GetVendorId());
+ _sntprintf(szVendorId, 9, _T("%04X"), pThis->GetVendorId());
SetDlgItemText(hDlg, IDC_BT_VENDOR_ID, szVendorId);
- _stprintf_s(szDeviceId, 9, _T("%04X"), pThis->GetDeviceId());
+ _sntprintf(szDeviceId, 9, _T("%04X"), pThis->GetDeviceId());
SetDlgItemText(hDlg, IDC_BT_DEVICE_ID, szDeviceId);
SetDlgItemText(hDlg, IDC_TUNER_TYPE, pThis->GetTunerType().c_str());
SetDlgItemText(hDlg, IDC_AUDIO_DECODER_TYPE, _T("")); // FIXME pThis->GetAudioDecoderType());
dwCardId = pThis->GetSubSystemId();
if(dwCardId != 0 && dwCardId != 0xffffffff)
{
- _stprintf_s(szCardId, 9, _T("%8X"), dwCardId);
+ _sntprintf(szCardId, 9, _T("%8X"), dwCardId);
}
SetDlgItemText(hDlg, IDC_AUTODECTECTID, szCardId);
return TRUE;
@@ -1153,7 +1153,7 @@
AddRegister(BT848_GPIO_DATA);
AddRegister(BT848_GPIO_DATA_HIBYTE);
AddRegister(BT848_TBLG);
- if(pThis->m_SAA7118)
+ if(pThis->m_SAA7118.IsValid())
{
for(int i(0); i < 0xFF; ++i)
{
@@ -1195,7 +1195,7 @@
}
else
{
- if(pThis->m_SAA7118)
+ if(pThis->m_SAA7118.IsValid())
{
pThis->m_SAA7118->SetRegister((BYTE)(dwAddress - 0x1000), RegValue);
}
@@ -1215,7 +1215,7 @@
}
else
{
- if(pThis->m_SAA7118)
+ if(pThis->m_SAA7118.IsValid())
{
RegValue = pThis->m_SAA7118->GetRegister((BYTE)(dwAddress - 0x1000));
}
Modified: trunk/DScaler/DScaler/BT848Card_Atlas.cpp
===================================================================
--- trunk/DScaler/DScaler/BT848Card_Atlas.cpp 2009-05-08 17:02:47 UTC (rev 4593)
+++ trunk/DScaler/DScaler/BT848Card_Atlas.cpp 2009-05-09 11:54:34 UTC (rev 4594)
@@ -63,7 +63,7 @@
{
m_AD9882 = new CAD9882();
- m_AD9882->SetI2CBus(m_I2CBus);
+ m_AD9882->SetI2CBus(m_I2CBus.GetRawPointer());
// start with AD9882 disabled
m_AD9882->Suspend();
Modified: trunk/DScaler/DScaler/BT848Card_Audio.cpp
===================================================================
--- trunk/DScaler/DScaler/BT848Card_Audio.cpp 2009-05-08 17:02:47 UTC (rev 4593)
+++ trunk/DScaler/DScaler/BT848Card_Audio.cpp 2009-05-09 11:54:34 UTC (rev 4594)
@@ -64,7 +64,7 @@
|| GetCardSetup()->AudioDecoderType == CAudioDecoder::AUDIODECODERTYPE_TDA9873))
{
SmartPtr<CTDA9873AudioDecoder> TDADecoder = new CTDA9873AudioDecoder();
- TDADecoder->SetI2CBus(m_I2CBus);
+ TDADecoder->SetI2CBus(m_I2CBus.GetRawPointer());
if(TDADecoder->Initialize())
{
m_AudioDecoder = TDADecoder;
@@ -81,7 +81,7 @@
{
SmartPtr<CMSP34x0AudioControls> MSPControls = new CMSP34x0AudioControls();
- MSPControls->SetI2CBus(m_I2CBus);
+ MSPControls->SetI2CBus(m_I2CBus.GetRawPointer());
MSPControls->Reset();
::Sleep(4);
@@ -96,7 +96,7 @@
// need to create two so that we can delete all objects properly
SmartPtr<CMSP34x0AudioDecoder> MSPDecoder = new CMSP34x0AudioDecoder();
MSPDecoder->SetUseInputPin1(UsePin1);
- MSPDecoder->SetI2CBus(m_I2CBus);
+ MSPDecoder->SetI2CBus(m_I2CBus.GetRawPointer());
m_AudioDecoder = MSPDecoder;
@@ -115,7 +115,7 @@
// TDA9875 autodetect
SmartPtr<CTDA9875AudioControls> TDA9875Controls = new CTDA9875AudioControls();
- TDA9875Controls->SetI2CBus(m_I2CBus);
+ TDA9875Controls->SetI2CBus(m_I2CBus.GetRawPointer());
TDA9875Controls->Reset();
::Sleep(4);
@@ -126,9 +126,9 @@
{
m_AudioControls = TDA9875Controls;
- SmartPtr<CTDA9875AudioDecoder> TDA9875Decoder = new CTDA9875AudioDecoder(TDA9875Controls);
+ SmartPtr<CTDA9875AudioDecoder> TDA9875Decoder(new CTDA9875AudioDecoder(TDA9875Controls.GetRawPointer()));
TDA9875Decoder->SetUseInputPin1(UsePin1);
- TDA9875Decoder->SetI2CBus(m_I2CBus);
+ TDA9875Decoder->SetI2CBus(m_I2CBus.GetRawPointer());
m_AudioDecoder = TDA9875Decoder; //TDA9875Decoder;
@@ -147,16 +147,16 @@
(GetCardSetup()->AudioDecoderType == CAudioDecoder::AUDIODECODERTYPE_DETECT
|| GetCardSetup()->AudioDecoderType == CAudioDecoder::AUDIODECODERTYPE_TDA9874))
{
- SmartPtr<CTDA9874> TDADecoder = new CTDA9874();
- TDADecoder->SetI2CBus(m_I2CBus);
+ SmartPtr<CTDA9874> TDADecoder(new CTDA9874());
+ TDADecoder->SetI2CBus(m_I2CBus.GetRawPointer());
int dic, sic;
BOOL isPresent = TDADecoder->IsDevicePresent(dic, sic);
if(isPresent)
{
- SmartPtr<CTDA9874AudioDecoder> TDA9874Decoder = new CTDA9874AudioDecoder();
- TDA9874Decoder->SetI2CBus(m_I2CBus);
+ SmartPtr<CTDA9874AudioDecoder> TDA9874Decoder(new CTDA9874AudioDecoder());
+ TDA9874Decoder->SetI2CBus(m_I2CBus.GetRawPointer());
TDA9874Decoder->Initialize();
m_AudioDecoder = TDA9874Decoder; //TDA9874Decoder;
m_AudioControls = new CAudioControls();
@@ -164,7 +164,7 @@
// need to switch unmute from PIC one time only
// used only for PV951 (Hercules SmartTV)
CPIC16C54 pic = CPIC16C54();
- pic.SetI2CBus(m_I2CBus);
+ pic.SetI2CBus(m_I2CBus.GetRawPointer());
BOOL picAlive = pic.IsDevicePresent();
tostringstream oss;
@@ -501,7 +501,7 @@
BOOL CBT848Card::GetHasUseInputPin1()
{
SmartPtr<CMSP34x0AudioDecoder> MSP34x0AudioDecoder(m_AudioDecoder);
- if(MSP34x0AudioDecoder)
+ if(MSP34x0AudioDecoder.IsValid())
{
return TRUE;
}
@@ -511,7 +511,7 @@
BOOL CBT848Card::GetUseInputPin1()
{
SmartPtr<CMSP34x0AudioDecoder> MSP34x0AudioDecoder(m_AudioDecoder);
- if(MSP34x0AudioDecoder)
+ if(MSP34x0AudioDecoder.IsValid())
{
return MSP34x0AudioDecoder->GetUseInputPin1();
}
@@ -522,11 +522,11 @@
{
SmartPtr<CMSP34x0AudioDecoder> MSP34x0AudioDecoder(m_AudioDecoder);
SmartPtr<CTDA9875AudioDecoder> TDA9875AudioDecoder(m_AudioDecoder);
- if(MSP34x0AudioDecoder)
+ if(MSP34x0AudioDecoder.IsValid())
{
MSP34x0AudioDecoder->SetUseInputPin1(AValue);
}
- else if (TDA9875AudioDecoder)
+ else if (TDA9875AudioDecoder.IsValid())
{
TDA9875AudioDecoder->SetUseInputPin1(AValue);
}
Modified: trunk/DScaler/DScaler/BT848Card_PMS.cpp
===================================================================
--- trunk/DScaler/DScaler/BT848Card_PMS.cpp 2009-05-08 17:02:47 UTC (rev 4593)
+++ trunk/DScaler/DScaler/BT848Card_PMS.cpp 2009-05-09 11:54:34 UTC (rev 4594)
@@ -73,7 +73,7 @@
m_SAA7118 = new CSAA7118();
- m_SAA7118->SetI2CBus(m_I2CBus);
+ m_SAA7118->SetI2CBus(m_I2CBus.GetRawPointer());
#ifdef _DEBUG
if(m_SAA7118->GetVersion() > 0)
Modified: trunk/DScaler/DScaler/BT848Card_Tuner.cpp
===================================================================
--- trunk/DScaler/DScaler/BT848Card_Tuner.cpp 2009-05-08 17:02:47 UTC (rev 4593)
+++ trunk/DScaler/DScaler/BT848Card_Tuner.cpp 2009-05-09 11:54:34 UTC (rev 4594)
@@ -145,9 +145,9 @@
// Detect and attach IF demodulator to the tuner
// or delete the demodulator if the chip doesn't exist.
- if (pExternalIFDemodulator)
+ if (pExternalIFDemodulator.IsValid())
{
- if (pExternalIFDemodulator->SetDetectedI2CAddress(m_I2CBus))
+ if (pExternalIFDemodulator->SetDetectedI2CAddress(m_I2CBus.GetRawPointer()))
{
m_Tuner->AttachIFDem(pExternalIFDemodulator);
pExternalIFDemodulator->Init(TRUE, videoFormat);
@@ -164,12 +164,12 @@
BOOL bFoundTuner = FALSE;
// Scan the I2C bus addresses 0xC0 - 0xCF for tuners.
- BYTE test = IsTEA5767PresentAtC0(m_I2CBus) ? 0xC2 : 0xC0;
+ BYTE test = IsTEA5767PresentAtC0(m_I2CBus.GetRawPointer()) ? 0xC2 : 0xC0;
for ( ; test < 0xCF; test += 0x02)
{
if (m_I2CBus->Write(&test, sizeof(test)))
{
- m_Tuner->SetI2CBus(m_I2CBus, test>>1);
+ m_Tuner->SetI2CBus(m_I2CBus.GetRawPointer(), test>>1);
// Initialize the tuner.
if (m_Tuner->InitializeTuner())
@@ -185,7 +185,7 @@
}
}
- if (pExternalIFDemodulator)
+ if (pExternalIFDemodulator.IsValid())
{
//End initialization
pExternalIFDemodulator->Init(FALSE, videoFormat);
Modified: trunk/DScaler/DScaler/BT848Provider.cpp
===================================================================
--- trunk/DScaler/DScaler/BT848Provider.cpp 2009-05-08 17:02:47 UTC (rev 4593)
+++ trunk/DScaler/DScaler/BT848Provider.cpp 2009-05-09 11:54:34 UTC (rev 4594)
@@ -88,7 +88,7 @@
IsMemoryInitialized = TRUE;
}
- _stprintf_s(szSection, 12, _T("%s%d"), BT848Chips[i].szName, CardsFound + 1);
+ _sntprintf(szSection, 12, _T("%s%d"), BT848Chips[i].szName, CardsFound + 1);
SmartPtr<CBT848Source> pNewSource = CreateCorrectSource(
pHardwareDriver,
szSection,
@@ -98,7 +98,7 @@
SubSystemId,
BT848Chips[i].szName
);
- if(pNewSource)
+ if(pNewSource.IsValid())
{
m_BT848Sources.push_back(pNewSource);
}
@@ -142,7 +142,7 @@
{
try
{
- m_RiscDMAMem = new CContigMemory(pHardwareDriver, 83968);
+ m_RiscDMAMem = new CContigMemory(pHardwareDriver.GetRawPointer(), 83968);
}
catch(...)
{
@@ -154,7 +154,7 @@
{
for (int i(0); i < 5; i++)
{
- m_DisplayDMAMem[i] = new CUserMemory(pHardwareDriver, 1024 * 768 * 2);
+ m_DisplayDMAMem[i] = new CUserMemory(pHardwareDriver.GetRawPointer(), 1024 * 768 * 2);
}
}
catch(...)
@@ -167,7 +167,7 @@
{
for (int i(0); i < 5; i++)
{
- m_VBIDMAMem[i] = new CUserMemory(pHardwareDriver, 2048 * 19 * 2);
+ m_VBIDMAMem[i] = new CUserMemory(pHardwareDriver.GetRawPointer(), 2048 * 19 * 2);
}
}
catch(...)
Modified: trunk/DScaler/DScaler/BT848Source.cpp
===================================================================
--- trunk/DScaler/DScaler/BT848Source.cpp 2009-05-08 17:02:47 UTC (rev 4593)
+++ trunk/DScaler/DScaler/BT848Source.cpp 2009-05-09 11:54:34 UTC (rev 4594)
@@ -1849,7 +1849,7 @@
{
// be a bit defensive here to avoid a possible
// crash
- if(m_pBT848Card->GetTuner())
+ if(m_pBT848Card->GetTuner().IsValid())
{
eVideoFormat videoFormat = m_pBT848Card->GetTuner()->GetDefaultVideoFormat();
m_VideoFormat->ChangeDefault(videoFormat);
Modified: trunk/DScaler/DScaler/BT848Source_UI.cpp
===================================================================
--- trunk/DScaler/DScaler/BT848Source_UI.cpp 2009-05-08 17:02:47 UTC (rev 4593)
+++ trunk/DScaler/DScaler/BT848Source_UI.cpp 2009-05-09 11:54:34 UTC (rev 4594)
@@ -706,7 +706,7 @@
}
}
- pCard = pThis->GetBT848Card();
+ pCard = pThis->GetBT848Card().GetRawPointer();
SetDlgItemText(hDlg, IDC_BT_CHIP_TYPE, pCard->GetChipType().c_str());
_stprintf(szVendorId,_T("%04X"), pCard->GetVendorId());
SetDlgItemText(hDlg, IDC_BT_VENDOR_ID, szVendorId);
@@ -1198,7 +1198,7 @@
break;
case IDM_HWINFO:
- DialogBoxParam(hResourceInst, MAKEINTRESOURCE(IDD_HWINFO), hWnd, CBT848Card::ChipSettingProc, (LPARAM)(CBT848Card*)m_pBT848Card);
+ DialogBoxParam(hResourceInst, MAKEINTRESOURCE(IDD_HWINFO), hWnd, CBT848Card::ChipSettingProc, (LPARAM)(CBT848Card*)m_pBT848Card.GetRawPointer());
break;
case IDM_AUDIOSETTINGS:
Modified: trunk/DScaler/DScaler/Bitmap.cpp
===================================================================
--- trunk/DScaler/DScaler/Bitmap.cpp 2009-05-08 17:02:47 UTC (rev 4593)
+++ trunk/DScaler/DScaler/Bitmap.cpp 2009-05-09 11:54:34 UTC (rev 4594)
@@ -61,7 +61,7 @@
int CBitmapHolder::Width(int State)
{
if (m_States.size() <= State) { return 0; }
- if(m_States[State])
+ if(m_States[State].IsValid())
{
return m_States[State]->m_BmpWidth;
}
@@ -74,7 +74,7 @@
int CBitmapHolder::Height(int State)
{
if (m_States.size()<=State) { return 0; }
- if(m_States[State])
+ if(m_States[State].IsValid())
{
return m_States[State]->m_BmpHeight;
}
@@ -97,7 +97,7 @@
{
if ((State>=0) && (State < m_States.size()))
{
- if(m_States[State])
+ if(m_States[State].IsValid())
{
return m_States[State]->m_hBmp;
}
@@ -660,9 +660,8 @@
hBmpMask = CBitmapHolder::BitmapCopyPieceRGB(hdestDC, hsrcDC, &rc);
}
- SmartPtr<CBitmapState>& BitmapState( (*it).second );
- BitmapState = new CBitmapState(hBmp, hBmpMask);
- BitmapState->m_ExtraInfo = szExtra;
+ (*it).second = SmartPtr<CBitmapState>(new CBitmapState(hBmp, hBmpMask));
+ (*it).second->m_ExtraInfo = szExtra;
Result = 0;
}
else
Modified: trunk/DScaler/DScaler/CX2388xCard_H3D.cpp
===================================================================
--- trunk/DScaler/DScaler/CX2388xCard_H3D.cpp 2009-05-08 17:02:47 UTC (rev 4593)
+++ trunk/DScaler/DScaler/CX2388xCard_H3D.cpp 2009-05-09 11:54:34 UTC (rev 4594)
@@ -52,7 +52,7 @@
{
m_SAA7118 = new CSAA7118();
- m_SAA7118->SetI2CBus(m_I2CBus);
+ m_SAA7118->SetI2CBus(m_I2CBus.GetRawPointer());
if(m_SAA7118->GetVersion() > 0)
{
@@ -484,7 +484,7 @@
{
// had better check that we've been initilaized here as
// this is a public function
- if(m_SAA7118)
+ if(m_SAA7118.IsValid())
{
// get existing sharpness and set luma comb filter
BYTE LuminaceControl = m_SAA7118->GetRegister(0x09) & 0xF0;
Modified: trunk/DScaler/DScaler/CX2388xCard_Tuner.cpp
===================================================================
--- trunk/DScaler/DScaler/CX2388xCard_Tuner.cpp 2009-05-08 17:02:47 UTC (rev 4593)
+++ trunk/DScaler/DScaler/CX2388xCard_Tuner.cpp 2009-05-09 11:54:34 UTC (rev 4594)
@@ -41,7 +41,7 @@
BOOL CCX2388xCard::InitTuner(eTunerId tunerId)
{
// clean up if we get called twice
- if(m_Tuner)
+ if(m_Tuner.IsValid())
{
m_Tuner = 0L;
}
@@ -96,7 +96,7 @@
if (tunerId == TUNER_TDA8275)
{
// Have a TDA8290 object detected and created.
- pExternalIFDemodulator = CTDA8290::CreateDetectedTDA8290(m_I2CBus);
+ pExternalIFDemodulator = CTDA8290::CreateDetectedTDA8290(m_I2CBus.GetRawPointer());
}
if (!pExternalIFDemodulator)
@@ -105,10 +105,10 @@
if (m_CX2388xCards[m_CardType].bUseTDA9887)
{
// Have a TDA9887 object detected and created.
- SmartPtr<CTDA9887Ex> pTDA9887 = CTDA9887Ex::CreateDetectedTDA9887Ex(m_I2CBus);
+ SmartPtr<CTDA9887Ex> pTDA9887 = CTDA9887Ex::CreateDetectedTDA9887Ex(m_I2CBus.GetRawPointer());
// If a TDA9887 was found.
- if (pTDA9887)
+ if (pTDA9887.IsValid())
{
// Set card specific modes that were parsed from CX2388xCards.ini.
size_t count = m_CX2388xCards[m_CardType].tda9887Modes.size();
@@ -125,7 +125,7 @@
eVideoFormat videoFormat = m_Tuner->GetDefaultVideoFormat();
- if (pExternalIFDemodulator)
+ if (pExternalIFDemodulator.IsValid())
{
// Attach the IF demodulator to the tuner.
m_Tuner->AttachIFDem(pExternalIFDemodulator);
@@ -137,12 +137,12 @@
BOOL bFoundTuner = FALSE;
// Scan the I2C bus addresses 0xC0 - 0xCF for tuners.
- BYTE test = IsTEA5767PresentAtC0(m_I2CBus) ? 0xC2 : 0xC0;
+ BYTE test = IsTEA5767PresentAtC0(m_I2CBus.GetRawPointer()) ? 0xC2 : 0xC0;
for ( ; test < 0xCF; test += 0x02)
{
if (m_I2CBus->Write(&test, sizeof(test)))
{
- m_Tuner->SetI2CBus(m_I2CBus, test>>1);
+ m_Tuner->SetI2CBus(m_I2CBus.GetRawPointer(), test>>1);
// Initialize the tuner.
if (m_Tuner->InitializeTuner())
@@ -158,7 +158,7 @@
}
}
- if (pExternalIFDemodulator)
+ if (pExternalIFDemodulator.IsValid())
{
//End initialization
pExternalIFDemodulator->Init(FALSE, videoFormat);
Modified: trunk/DScaler/DScaler/CX2388xProvider.cpp
===================================================================
--- trunk/DScaler/DScaler/CX2388xProvider.cpp 2009-05-08 17:02:47 UTC (rev 4593)
+++ trunk/DScaler/DScaler/CX2388xProvider.cpp 2009-05-09 11:54:34 UTC (rev 4594)
@@ -67,7 +67,7 @@
CardsFound,
SubSystemId
);
- if(pNewSource)
+ if(pNewSource.IsValid())
{
m_Sources.push_back(pNewSource);
++CardsFound;
Modified: trunk/DScaler/DScaler/CX2388xSource.cpp
===================================================================
--- trunk/DScaler/DScaler/CX2388xSource.cpp 2009-05-08 17:02:47 UTC (rev 4593)
+++ trunk/DScaler/DScaler/CX2388xSource.cpp 2009-05-09 11:54:34 UTC (rev 4594)
@@ -1562,7 +1562,7 @@
{
// be a bit defensive here to avoid a possible
// crash
- if(m_pCard->GetTuner())
+ if(m_pCard->GetTuner().IsValid())
{
eVideoFormat videoFormat = m_pCard->GetTuner()->GetDefaultVideoFormat();
m_VideoFormat->ChangeDefault(videoFormat);
Modified: trunk/DScaler/DScaler/CX2388xSource_UI.cpp
===================================================================
--- trunk/DScaler/DScaler/CX2388xSource_UI.cpp 2009-05-08 17:02:47 UTC (rev 4593)
+++ trunk/DScaler/DScaler/CX2388xSource_UI.cpp 2009-05-09 11:54:34 UTC (rev 4594)
@@ -100,7 +100,7 @@
}
}
- pCard = pThis->GetCard();
+ pCard = pThis->GetCard().GetRawPointer();
SetDlgItemText(hDlg, IDC_BT_CHIP_TYPE, _T("CX2388x"));
_stprintf(szVendorId,_T("%04X"), pCard->GetVendorId());
SetDlgItemText(hDlg, IDC_BT_VENDOR_ID, szVendorId);
@@ -330,7 +330,7 @@
break;
case IDM_HWINFO:
- DialogBoxParam(hResourceInst, MAKEINTRESOURCE(IDD_HWINFO), hWnd, CCX2388xCard::ChipSettingProc, (LPARAM)(CCX2388xCard*)m_pCard);
+ DialogBoxParam(hResourceInst, MAKEINTRESOURCE(IDD_HWINFO), hWnd, CCX2388xCard::ChipSettingProc, (LPARAM)(CCX2388xCard*)m_pCard.GetRawPointer());
break;
case IDM_SOURCE_INPUT1:
Modified: trunk/DScaler/DScaler/Channels.cpp
===================================================================
--- trunk/DScaler/DScaler/Channels.cpp 2009-05-08 17:02:47 UTC (rev 4593)
+++ trunk/DScaler/DScaler/Channels.cpp 2009-05-09 11:54:34 UTC (rev 4594)
@@ -191,7 +191,7 @@
void CChannelList::AddChannel(SmartPtr<CChannel> pChannel)
{
- if (pChannel)
+ if (pChannel.IsValid())
{
m_Channels.push_back(pChannel);
UpdateFields();
@@ -567,7 +567,7 @@
{
_ASSERTE(index >= 0);
_ASSERTE(index < m_Countries.size());
- return m_Countries[index];
+ return m_Countries[index].GetRawPointer();
}
//That is an utility function that was in ProgramList.cpp
@@ -624,7 +624,7 @@
}
if(eol_ptr != NULL)
{
- channelName.clear();
+ channelName = _T("");
channelName = eol_ptr;
*eol_ptr = '\0';
}
@@ -634,7 +634,7 @@
}
if(((Pos = _tcschr(line, '[')) != 0) && ((Pos1 = _tcsrchr(line, ']')) != 0) && Pos1 > Pos)
{
- if(NewCountry)
+ if(NewCountry.IsValid())
{
m_Countries.push_back(NewCountry);
}
@@ -701,7 +701,7 @@
}
}
}
- if(NewCountry)
+ if(NewCountry.IsValid())
{
m_Countries.push_back(NewCountry);
}
Modified: trunk/DScaler/DScaler/Channels.h
===================================================================
--- trunk/DScaler/DScaler/Channels.h 2009-05-08 17:02:47 UTC (rev 4593)
+++ trunk/DScaler/DScaler/Channels.h 2009-05-09 11:54:34 UTC (rev 4594)
@@ -181,7 +181,7 @@
BOOL ReadASCIIImpl(FILE*);
//could be a map too..would be better for lookups
- typedef std::vector<SmartPtr<CCountryChannels>> Countries;
+ typedef std::vector< SmartPtr<CCountryChannels> > Countries;
Countries m_Countries;
};
Modified: trunk/DScaler/DScaler/DScaler.cpp
===================================================================
--- trunk/DScaler/DScaler/DScaler.cpp 2009-05-08 17:02:47 UTC (rev 4593)
+++ trunk/DScaler/DScaler/DScaler.cpp 2009-05-09 11:54:34 UTC (rev 4594)
@@ -1415,7 +1415,7 @@
if(bIsFullScreen == TRUE)
{
- if (WithToolbar == FALSE && ToolbarControl)
+ if (WithToolbar == FALSE && ToolbarControl.IsValid())
{
ToolbarControl->AdjustArea(lpRect, 1);
}
@@ -1430,12 +1430,12 @@
lpRect->bottom -= StatusBar_Height();
}
- if (WindowBorder && WindowBorder->Visible())
+ if (WindowBorder.IsValid() && WindowBorder->Visible())
{
WindowBorder->AdjustArea(lpRect,1);
}
- if (ToolbarControl)
+ if (ToolbarControl.IsValid())
{
ToolbarControl->AdjustArea(lpRect, 1);
}
@@ -1445,12 +1445,12 @@
void AddDisplayAreaRect(HWND hWnd, LPRECT lpRect)
{
- if (ToolbarControl)
+ if (ToolbarControl.IsValid())
{
ToolbarControl->AdjustArea(lpRect, 0);
}
- if ((WindowBorder) && WindowBorder->Visible())
+ if (WindowBorder.IsValid() && WindowBorder->Visible())
{
WindowBorder->AdjustArea(lpRect,0);
}
@@ -1587,7 +1587,7 @@
{
if (!WindowBorder)
{
- if (!szSkinName)
+ if (!szSkinName.IsValid())
{
//Don't make the windowborder unless it is necessary
return;
@@ -1595,7 +1595,7 @@
WindowBorder = new CWindowBorder(hWnd, hDScalerInst, BorderGetClientRect);
}
- if (WindowBorder && !szSkinName)
+ if (WindowBorder.IsValid() && !szSkinName.IsValid())
{
WindowBorder->ClearSkin();
}
@@ -1710,7 +1710,7 @@
}
}
- CheckMenuItemBool(hMenu, IDM_SKIN_NONE, ((vSkinNameList.size()==0) || !szSkinName));
+ CheckMenuItemBool(hMenu, IDM_SKIN_NONE, ((vSkinNameList.size()==0) || !szSkinName.IsValid()));
int Found = 0;
if(szSkinName)
@@ -3055,7 +3055,7 @@
OSD_Redraw(hDC, &Rect);
- if (!bIsFullScreen && (WindowBorder) && WindowBorder->Visible())
+ if (!bIsFullScreen && WindowBorder.IsValid() && WindowBorder->Visible())
{
WindowBorder->Paint(hWnd, hDC, &Rect);
}
@@ -3206,7 +3206,7 @@
szSkinName.clear();
Skin_SetMenu(hMenu, TRUE);
SetWindowBorder(hWnd, FALSE);
- if (ToolbarControl)
+ if (ToolbarControl.IsValid())
{
ToolbarControl->Set(hWnd, (LPCTSTR)szSkinName, bIsFullScreen?1:0);
}
@@ -3258,7 +3258,7 @@
}
Skin_SetMenu(hMenu, TRUE);
SetWindowBorder(hWnd, TRUE);
- if (ToolbarControl)
+ if (ToolbarControl.IsValid())
{
ToolbarControl->Set(hWnd, (LPCTSTR)szSkinName, bIsFullScreen?1:0);
}
@@ -3308,11 +3308,11 @@
{
bDone = ProcessOutResoSelection(hWnd, LOWORD(wParam));
}
- if(!bDone && pCalibration)
+ if(!bDone && pCalibration.IsValid())
{
bDone = pCalibration->ProcessSelection(hWnd, LOWORD(wParam));
}
- if(!bDone && ToolbarControl)
+ if(!bDone && ToolbarControl.IsValid())
{
bDone = ToolbarControl->ProcessToolbar1Selection(hWnd, LOWORD(wParam));
if (bDone)
@@ -3343,7 +3343,7 @@
// Updates the menu checkbox settings
SetMenuAnalog();
- if (ToolbarControl)
+ if (ToolbarControl.IsValid())
{
ToolbarControl->UpdateMenu(hMenu);
}
@@ -3483,7 +3483,7 @@
{
Cursor_VTUpdate(newx, newy);
}
- if (bIsFullScreen && ToolbarControl)
+ if (bIsFullScreen && ToolbarControl.IsValid())
{
POINT Point;
Point.x = x;
@@ -3693,7 +3693,7 @@
if (Cursor_IsOurs() != FALSE)
{
KillTimer(hWnd, TIMER_HIDECURSOR);
- if (ToolbarControl)
+ if (ToolbarControl.IsValid())
{
POINT Point;
GetCursorPos(&Point);
@@ -3885,7 +3885,7 @@
OffscreenHDC.EndPaint();
- if (!bIsFullScreen && (WindowBorder) && WindowBorder->Visible())
+ if (!bIsFullScreen && WindowBorder.IsValid() && WindowBorder->Visible())
{
WindowBorder->Paint(hWnd, sPaint.hdc, &sPaint.rcPaint);
}
@@ -3936,7 +3936,7 @@
break;
case UWM_EVENTADDEDTOQUEUE:
- if (EventCollector)
+ if (EventCollector.IsValid())
{
EventCollector->ProcessEvents();
}
@@ -4196,8 +4196,8 @@
{
AddSplashTextLine(_T("Load Skin"));
- SetWindowBorder(hWnd, (bool)szSkinName);
- if (ToolbarControl)
+ SetWindowBorder(hWnd, szSkinName.IsValid());
+ if (ToolbarControl.IsValid())
{
ToolbarControl->Set(hWnd, (LPCTSTR)szSkinName);
}
@@ -4206,7 +4206,7 @@
// We must do two calls, the first one displaying the toolbar
// in order to have the correct toolbar rectangle initialized,
// and the second to hide the toolbar if in full scrren mode
- if (ToolbarControl)
+ if (ToolbarControl.IsValid())
{
ToolbarControl->Set(hWnd, _T(""), bIsFullScreen?1:0);
}
@@ -4239,7 +4239,7 @@
VT_UpdateMenu(hMenu);
OutReso_UpdateMenu(hMenu);
SetMenuAnalog();
- if (ToolbarControl)
+ if (ToolbarControl.IsValid())
{
ToolbarControl->UpdateMenu(hMenu);
}
@@ -4469,7 +4469,7 @@
try
{
LOG(1, _T("Try free skinned border"));
- if (WindowBorder)
+ if (WindowBorder.IsValid())
{
WindowBorder = 0L;
}
@@ -4479,14 +4479,14 @@
try
{
LOG(1, _T("Try free toolbars"));
- if (ToolbarControl)
+ if (ToolbarControl.IsValid())
{
ToolbarControl = 0L;
}
}
catch(...) {LOG(1, _T("Error free toolbars"));}
- if(SettingsMaster)
+ if(SettingsMaster.IsValid())
{
try
{
@@ -4664,7 +4664,7 @@
LONG OnSize(HWND hWnd, UINT wParam, LONG lParam)
{
StatusBar_Adjust(hWnd);
- if (ToolbarControl)
+ if (ToolbarControl.IsValid())
{
ToolbarControl->Adjust(hWnd, FALSE, TRUE);
}
@@ -4784,7 +4784,7 @@
Providers_SetMenu(hMenu);
TimeShiftOnSetMenu(hMenu);
- if(pCalibration)
+ if(pCalibration.IsValid())
{
pCalibration->SetMenu(hMenu);
}
@@ -5185,7 +5185,7 @@
}
else
{
- if ((WindowBorder) && WindowBorder->Visible())
+ if (WindowBorder.IsValid() && WindowBorder->Visible())
{
SetWindowLong(hWnd, GWL_STYLE, WS_POPUP | WS_VISIBLE | (IsWindowEnabled(hWnd) ? 0 : WS_DISABLED));
}
@@ -5196,7 +5196,7 @@
SetMenu(hWnd, NULL);
}
StatusBar_ShowWindow(bDisplayStatusBar);
- if (ToolbarControl)
+ if (ToolbarControl.IsValid())
{
ToolbarControl->Adjust(hWnd, FALSE, FALSE);
}
@@ -5215,7 +5215,7 @@
HRGN UpdateWindowRegion(HWND hWnd, BOOL bUpdateWindowState)
{
- if (!bIsFullScreen && (WindowBorder) && WindowBorder->Visible() && !bShowMenu)
+ if (!bIsFullScreen && WindowBorder.IsValid() && WindowBorder->Visible() && !bShowMenu)
{
RECT rcExtra;
if (IsStatusBarVisible())
@@ -5263,7 +5263,7 @@
BOOL IsToolBarVisible()
{
- return (ToolbarControl && ToolbarControl->Visible());
+ return (ToolbarControl.IsValid() && ToolbarControl->Visible());
}
///////////////////////////////////////////////////////////////////////////////
@@ -5689,20 +5689,20 @@
KillTimer(hWnd, TIMER_STATUS);
OutReso_Change(hWnd, hPSWnd, FALSE, TRUE, NULL, FALSE);
}
- if (WindowBorder)
+ if (WindowBorder.IsValid())
{
if (bIsFullScreen && WindowBorder->Visible())
{
WindowBorder->Hide();
}
- else if (!bIsFullScreen && !szSkinName)
+ else if (!bIsFullScreen && !szSkinName.IsValid())
{
WindowBorder->Show();
}
}
- if (ToolbarControl)
+ if (ToolbarControl.IsValid())
{
- ToolbarControl->Set(hWnd, NULL, 0, 1);
+ ToolbarControl->Set(hWnd, _T(""), 0, 1);
}
Cursor_UpdateVisibility();
@@ -5713,9 +5713,9 @@
// We must do two calls, the first one displaying the toolbar
// in order to have the correct toolbar rectangle initialized,
// and the second to hide the toolbar if in full scrren mode
- if (ToolbarControl)
+ if (ToolbarControl.IsValid())
{
- ToolbarControl->Set(hWnd, NULL, bIsFullScreen?1:0, 1);
+ ToolbarControl->Set(hWnd, _T(""), bIsFullScreen?1:0, 1);
}
if (IsToolBarVisible())
{
@@ -5788,7 +5788,7 @@
{
KillTimer(hWnd, TIMER_STATUS);
}
- if (ToolbarControl)
+ if (ToolbarControl.IsValid())
{
ToolbarControl->Adjust(hWnd, TRUE, FALSE);
}
Modified: trunk/DScaler/DScaler/DScaler.dsp
===================================================================
--- trunk/DScaler/DScaler/DScaler.dsp 2009-05-08 17:02:47 UTC (rev 4593)
+++ trunk/DScaler/DScaler/DScaler.dsp 2009-05-09 11:54:34 UTC (rev 4594)
@@ -44,7 +44,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /G6 /W3 /Gm /GX /Zi /Od /I "..\driver\include\\" /D "_DEBUG" /D "_WINDOWS" /D "WIN32" /D "_MBCS" /FR /YX /FD /c
-# ADD CPP /nologo /G6 /MTd /W3 /GR /GX /ZI /Od /Op /I "..\api" /I ".\\" /D "_DEBUG" /D "_WINDOWS" /D "WIN32" /D "_MBCS" /D "_WIN32_DCOM" /FR /Yu"stdafx.h" /FD /c
+# ADD CPP /nologo /G6 /MTd /W3 /GR /GX /ZI /Od /Op /I "..\api" /I ".\\" /D "_DEBUG" /D "_WINDOWS" /D "WIN32" /D "_MBCS" /D "_WIN32_DCOM" /D "WANT_CX2388X_SUPPORT" /D "WANT_DSHOW_SUPPORT" /D "WANT_SAA713X_SUPPORT" /D "WANT_BT8X8_SUPPORT" /FR /Yu"stdafx.h" /FD /c
# ADD BASE MTL /D "_DEBUG" /mktyplib203 /win32
# SUBTRACT BASE MTL /nologo
# ADD MTL /D "_DEBUG" /mktyplib203 /win32
@@ -59,7 +59,7 @@
LINK32=link.exe
# ADD BASE LINK32 ddraw.lib dxguid.lib kernel32.lib user32.lib gdi32.lib advapi32.lib winmm.lib comdlg32.lib ..\driver\bin\DScalerdrv.lib /nologo /subsystem:windows /profile /debug /machine:I386 /out:".\DScaler.exe"
# SUBTRACT BASE LINK32 /map /nodefaultlib
-# ADD LINK32 libtiff.lib libjpeg.lib ddraw.lib dxguid.lib winmm.lib COMCTL32.LIB version.lib htmlhelp.lib vfw32.lib strmiids.lib quartz.lib setupapi.lib /nologo /stack:0x4000,0x4000 /subsystem:windows /pdb:none /map:"..\Debug/DScaler.map" /debug /machine:I386 /out:"..\Debug\DScaler.exe" /libpath:"..\ThirdParty\LibTiff\\" /libpath:"..\ThirdParty\LibJpeg\\"
+# ADD LINK32 bufferoverflowU.lib GDI32.lib User32.lib Kernel32.lib shell32.lib Comdlg32.lib libtiff.lib libjpeg.lib ddraw.lib dxguid.lib winmm.lib COMCTL32.LIB version.lib htmlhelp.lib vfw32.lib strmiids.lib quartz.lib setupapi.lib /nologo /stack:0x4000,0x4000 /subsystem:windows /pdb:none /map:"..\Debug/DScaler.map" /debug /machine:I386 /out:"..\Debug\DScaler.exe" /libpath:"..\ThirdParty\LibTiff\\" /libpath:"..\ThirdParty\LibJpeg\\"
# Begin Special Build Tool
ProjDir=.
SOURCE="$(InputPath)"
@@ -83,7 +83,7 @@
# PROP Target_Dir ""
# ADD BASE CPP /nologo /G6 /MT /W3 /Gi /Ot /I "..\driver\include\\" /D "NDEBUG" /D "_WINDOWS" /D "WIN32" /D "_MBCS" /YX /FD /c
# SUBTRACT BASE CPP /Fr
-# ADD CPP /nologo /G6 /MT /W3 /Gi /GR /GX /Ot /Ow /Oi /Op /Ob1 /Gf /Gy /I "..\api" /I ".\\" /D "NDEBUG" /D "_WINDOWS" /D "WIN32" /D "_MBCS" /D "_WIN32_DCOM" /FAcs /Fr /Yu"stdafx.h" /FD /c
+# ADD CPP /nologo /G6 /MT /W3 /Gi /GR /GX /Ot /Ow /Oi /Op /Ob1 /Gf /Gy /I "..\api" /I ".\\" /D "NDEBUG" /D "_WINDOWS" /D "WIN32" /D "_MBCS" /D "_WIN32_DCOM" /D "TIXML_USE_STL" /D "WANT_CX2388X_SUPPORT" /D "WANT_DSHOW_SUPPORT" /D "WANT_SAA713X_SUPPORT" /D "WANT_BT8X8_SUPPORT" /FAcs /Fr /Yu"stdafx.h" /FD /c
# SUBTRACT CPP /Ox /Og
# ADD BASE MTL /D "NDEBUG" /mktyplib203 /win32
# SUBTRACT BASE MTL /nologo
@@ -99,7 +99,7 @@
LINK32=link.exe
# ADD BASE LINK32 ddraw.lib dxguid.lib kernel32.lib user32.lib gdi32.lib advapi32.lib winmm.lib comdlg32.lib ..\driver\bin\hwiodrv.lib /nologo /subsystem:windows /incremental:yes /machine:I386
# SUBTRACT BASE LINK32 /profile /map /debug /nodefaultlib
-# ADD LINK32 COMMODE.OBJ libtiff.lib libjpeg.lib ddraw.lib dxguid.lib winmm.lib COMCTL32.LIB version.lib htmlhelp.lib vfw32.lib strmiids.lib quartz.lib setupapi.lib d3d9.lib /nologo /subsystem:windows /pdb:none /map:"..\Release/DScaler.map" /machine:I386 /out:"..\Release\DScaler.exe" /libpath:"..\ThirdParty\LibTiff\\" /libpath:"..\ThirdParty\LibJpeg\\"
+# ADD LINK32 bufferoverflowU.lib GDI32.lib User32.lib Kernel32.lib shell32.lib Comdlg32.lib COMMODE.OBJ libtiff.lib libjpeg.lib ddraw.lib dxguid.lib winmm.lib COMCTL32.LIB version.lib htmlhelp.lib vfw32.lib strmiids.lib quartz.lib setupapi.lib d3d9.lib /nologo /subsystem:windows /pdb:none /map:"..\Release/DScaler.map" /machine:I386 /out:"..\Release\DScaler.exe" /libpath:"..\ThirdParty\LibTiff\\" /libpath:"..\ThirdParty\LibJpeg\\"
# Begin Special Build Tool
ProjDir=.
SOURCE="$(InputPath)"
@@ -238,6 +238,10 @@
# End Source File
# Begin Source File
+SOURCE=.\BuildNum.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\Calibration.cpp
# End Source File
# Begin Source File
@@ -336,6 +340,14 @@
# End Source File
# Begin Source File
+SOURCE=.\DScalerUtils.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\DSDialog.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\dshowsource\DSFileSource.cpp
# End Source File
# Begin Source File
@@ -512,10 +524,18 @@
# End Source File
# Begin Source File
+SOURCE=.\LibraryCache.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\MixerDev.cpp
# End Source File
# Begin Source File
+SOURCE=.\MixerDevClasses.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\MSP34x0.cpp
# End Source File
# Begin Source File
@@ -548,6 +568,10 @@
# End Source File
# Begin Source File
+SOURCE=.\MultiMon.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\OpenDlg.cpp
# End Source File
# Begin Source File
@@ -580,6 +604,10 @@
# End Source File
# Begin Source File
+SOURCE=.\PathHelpers.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\Pattern.cpp
# End Source File
# Begin Source File
@@ -726,7 +754,7 @@
# End Source File
# Begin Source File
-SOURCE=.\SubItemCheckboxListCtrl.cpp
+SOURCE=.\StringHelpers.cpp
# End Source File
# Begin Source File
@@ -962,6 +990,10 @@
# End Source File
# Begin Source File
+SOURCE=.\avi_internal.h
+# End Source File
+# Begin Source File
+
SOURCE=.\dshowsource\BaseCrossbar.h
# End Source File
# Begin Source File
@@ -1126,6 +1158,10 @@
# End Source File
# Begin Source File
+SOURCE=.\DSDialog.h
+# End Source File
+# Begin Source File
+
SOURCE=.\dshowsource\DSFileSource.h
# End Source File
# Begin Source File
@@ -1186,6 +1222,10 @@
# End Source File
# Begin Source File
+SOURCE=.\DynamicFunction.h
+# End Source File
+# Begin Source File
+
SOURCE=.\EPG.h
# End Source File
# Begin Source File
@@ -1290,6 +1330,10 @@
# End Source File
# Begin Source File
+SOURCE=.\LibraryCache.h
+# End Source File
+# Begin Source File
+
SOURCE=.\list.h
# End Source File
# Begin Source File
@@ -1298,6 +1342,10 @@
# End Source File
# Begin Source File
+SOURCE=.\MixerDevClasses.h
+# End Source File
+# Begin Source File
+
SOURCE=.\MSP34x0.h
# End Source File
# Begin Source File
@@ -1366,6 +1414,10 @@
# End Source File
# Begin Source File
+SOURCE=.\PathHelpers.h
+# End Source File
+# Begin Source File
+
SOURCE=.\Pattern.h
# End Source File
# Begin Source File
@@ -1502,6 +1554,14 @@
# End Source File
# Begin Source File
+SOURCE=.\SmartHandle.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\SmartPtr.h
+# End Source File
+# Begin Source File
+
SOURCE=.\SoundChannel.h
# End Source File
# Begin Source File
@@ -1534,6 +1594,10 @@
# End Source File
# Begin Source File
+SOURCE=.\StringHelpers.h
+# End Source File
+# Begin Source File
+
SOURCE=.\SubItemCheckboxListCtrl.h
# End Source File
# Begin Source File
@@ -1771,11 +1835,6 @@
# End Group
# End Target
# End Project
-# Section DScaler : {7BF80981-BF32-101A-8BBB-00AA00300CAB}
-# 2:5:Class:CPicture
-# 2:10:HeaderFile:picture.h
-# 2:8:ImplFile:picture.cpp
-# End Section
# Section DScaler : {F08DF954-8592-11D1-B16A-00C0F0283628}
# 2:21:DefaultSinkHeaderFile:slider.h
# 2:16:DefaultSinkClass:CSlider
@@ -1785,3 +1844,8 @@
# 2:10:HeaderFile:slider.h
# 2:8:ImplFile:slider.cpp
# End Section
+# Section DScaler : {7BF80981-BF32-101A-8BBB-00AA00300CAB}
+# 2:5:Class:CPicture
+# 2:10:HeaderFile:picture.h
+# 2:8:ImplFile:picture.cpp
+# End Section
Modified: trunk/DScaler/DScaler/DScaler2005.vcproj
===================================================================
--- trunk/DScaler/DScaler/DScaler2005.vcproj 2009-05-08 17:02:47 UTC (rev 4593)
+++ trunk/DScaler/DScaler/DScaler2005.vcproj 2009-05-09 11:54:34 UTC (rev 4594)
@@ -457,7 +457,6 @@
>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BrowseInformation="1"
@@ -504,7 +503,6 @@
>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BrowseInformation="1"
@@ -551,7 +549,6 @@
>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BrowseInformation="1"
@@ -598,7 +595,6 @@
>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BrowseInformation="1"
@@ -645,7 +641,6 @@
>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BrowseInformation="1"
@@ -692,7 +687,6 @@
>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BrowseInformation="1"
@@ -739,7 +733,6 @@
>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BrowseInformation="1"
@@ -786,7 +779,6 @@
>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BrowseInformation="1"
@@ -853,7 +845,6 @@
>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BrowseInformation="1"
@@ -900,7 +891,6 @@
>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BrowseInformation="1"
@@ -947,7 +937,6 @@
>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BrowseInformation="1"
@@ -998,7 +987,6 @@
>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BrowseInformation="1"
@@ -1045,7 +1033,6 @@
>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BrowseInformation="1"
@@ -1096,7 +1083,6 @@
>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BrowseInformation="1"
@@ -1143,7 +1129,6 @@
>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BrowseInformation="1"
@@ -1190,7 +1175,6 @@
>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BrowseInformation="1"
@@ -1237,7 +1221,6 @@
>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BrowseInformation="1"
@@ -1284,7 +1267,6 @@
>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BrowseInformation="1"
@@ -1331,7 +1313,6 @@
>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BrowseInformation="1"
@@ -1378,7 +1359,6 @@
>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BrowseInformation="1"
@@ -1425,7 +1405,6 @@
>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BrowseInformation="1"
@@ -1472,7 +1451,6 @@
>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BrowseInformation="1"
@@ -1523,7 +1501,6 @@
>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BrowseInformation="1"
@@ -1570,7 +1547,6 @@
>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BrowseInformation="1"
@@ -1617,7 +1593,6 @@
>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BrowseInformation="1"
@@ -1664,7 +1639,6 @@
>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BrowseInformation="1"
@@ -1711,7 +1685,6 @@
>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BrowseInformation="1"
@@ -1758,7 +1731,6 @@
>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BrowseInformation="1"
@@ -1805,7 +1777,6 @@
>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BrowseInformation="1"
@@ -1852,7 +1823,6 @@
>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BrowseInformation="1"
@@ -1899,7 +1869,6 @@
>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BrowseInformation="1"
@@ -1950,7 +1919,6 @@
>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BrowseInformation="1"
@@ -1997,7 +1965,6 @@
>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BrowseInformation="1"
@@ -2044,7 +2011,6 @@
>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BrowseInformation="1"
@@ -2091,7 +2057,6 @@
>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BrowseInformation="1"
@@ -2138,7 +2103,6 @@
>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BrowseInformation="1"
@@ -2189,7 +2153,6 @@
>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BrowseInformation="1"
@@ -2282,7 +2245,6 @@
>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BrowseInformation="1"
@@ -2329,7 +2291,6 @@
>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BrowseInformation="1"
@@ -2376,7 +2337,6 @@
>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BrowseInformation="1"
@@ -2469,7 +2429,6 @@
>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BrowseInformation="1"
@@ -2528,7 +2487,6 @@
>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BrowseInformation="1"
@@ -2575,7 +2533,6 @@
>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BrowseInformation="1"
@@ -2622,7 +2579,6 @@
>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BrowseInformation="1"
@@ -2669,7 +2625,6 @@
>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BrowseInformation="1"
@@ -2716,7 +2671,6 @@
>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BrowseInformation="1"
@@ -2763,7 +2717,6 @@
>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BrowseInformation="1"
@@ -2810,7 +2763,6 @@
>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BrowseInformation="1"
@@ -2857,7 +2809,6 @@
>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BrowseInformation="1"
@@ -2904,7 +2855,6 @@
>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BrowseInformation="1"
@@ -2951,7 +2901,6 @@
>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BrowseInformation="1"
@@ -2998,7 +2947,6 @@
>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BrowseInformation="1"
@@ -3045,7 +2993,6 @@
>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BrowseInformation="1"
@@ -3092,7 +3039,6 @@
>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BrowseInformation="1"
@@ -3139,7 +3085,6 @@
>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BrowseInformation="1"
@@ -3282,7 +3227,6 @@
>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BrowseInformation="1"
@@ -3329,7 +3273,6 @@
>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BrowseInformation="1"
@@ -3376,7 +3319,6 @@
>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BrowseInformation="1"
@@ -3423,7 +3365,6 @@
>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BrowseInformation="1"
@@ -3470,7 +3411,6 @@
>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BrowseInformation="1"
@@ -3557,7 +3497,6 @@
>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BrowseInformation="1"
@@ -3604,7 +3543,6 @@
>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BrowseInformation="1"
@@ -3651,7 +3589,6 @@
>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BrowseInformation="1"
@@ -3698,7 +3635,6 @@
>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BrowseInformation="1"
@@ -3745,7 +3681,6 @@
>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BrowseInformation="1"
@@ -3792,7 +3727,6 @@
>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BrowseInformation="1"
@@ -3839,7 +3773,6 @@
>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
A...
[truncated message content] |