-moved SyncClock to renderer\SyncClock dir

-cleaned up the solution file

git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@1890 10f7b99b-c216-0410-bff0-8a66a9350fd8

11 files changed, 28 insertions, 28 deletions

diff --git a/src/filters/renderer/misc/SyncClock/Interfaces.h b/src/filters/renderer/SyncClock/Interfaces.h
index a4bff0b25..a4bff0b25 100644
--- a/src/filters/renderer/misc/SyncClock/Interfaces.h
+++ b/src/filters/renderer/SyncClock/Interfaces.h
diff --git a/src/filters/renderer/misc/SyncClock/SyncClock.cpp b/src/filters/renderer/SyncClock/SyncClock.cpp
index 7dc89867f..51743b592 100644
--- a/src/filters/renderer/misc/SyncClock/SyncClock.cpp
+++ b/src/filters/renderer/SyncClock/SyncClock.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"

 #include <initguid.h>

 #include "SyncClock.h"

-#include "../../../../DSUtil/DSUtil.h"

+#include "../../../DSUtil/DSUtil.h"

 #include <moreuuids.h>

 

 #pragma warning(disable:4355)

diff --git a/src/filters/renderer/misc/SyncClock/SyncClock.def b/src/filters/renderer/SyncClock/SyncClock.def
index 8f4ecfc90..8f4ecfc90 100644
--- a/src/filters/renderer/misc/SyncClock/SyncClock.def
+++ b/src/filters/renderer/SyncClock/SyncClock.def
diff --git a/src/filters/renderer/misc/SyncClock/SyncClock.h b/src/filters/renderer/SyncClock/SyncClock.h
index 54bef1292..54bef1292 100644
--- a/src/filters/renderer/misc/SyncClock/SyncClock.h
+++ b/src/filters/renderer/SyncClock/SyncClock.h
diff --git a/src/filters/renderer/misc/SyncClock/SyncClock.rc b/src/filters/renderer/SyncClock/SyncClock.rc
index 65808ae2d..65808ae2d 100644
--- a/src/filters/renderer/misc/SyncClock/SyncClock.rc
+++ b/src/filters/renderer/SyncClock/SyncClock.rc
diff --git a/src/filters/renderer/misc/SyncClock/SyncClock.vcproj b/src/filters/renderer/SyncClock/SyncClock.vcproj
index 6ce994701..cef1fa3c8 100644
--- a/src/filters/renderer/misc/SyncClock/SyncClock.vcproj
+++ b/src/filters/renderer/SyncClock/SyncClock.vcproj
@@ -4,7 +4,7 @@
 	Version="9,00"

 	Name="SyncClock"

 	ProjectGUID="{0B63409D-674D-47F8-A84E-87DBB7783189}"

-	RootNamespace="Metronome"

+	RootNamespace="SyncClock"

 	Keyword="Win32Proj"

 	TargetFrameworkVersion="131072"

 	>

@@ -24,7 +24,7 @@
 			OutputDirectory="$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

-			InheritedPropertySheets="..\..\..\..\common.vsprops;..\..\..\..\debug.vsprops"

+			InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\debug.vsprops"

 			UseOfMFC="1"

 			CharacterSet="1"

 			>

@@ -46,7 +46,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\..\include;..\..\..\BaseClasses"

+				AdditionalIncludeDirectories="..\..\..\..\include;..\..\BaseClasses"

 				PreprocessorDefinitions="WIN32;_DEBUG;_USRDLL"

 				MinimalRebuild="false"

 				BasicRuntimeChecks="3"

@@ -68,7 +68,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\..\..\lib\$(ProjectName)DU.lib"

+				OutputFile="..\..\..\..\lib\$(ProjectName)DU.lib"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -91,7 +91,7 @@
 			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

 			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\..\..\..\common.vsprops;..\..\..\..\debug.vsprops"

+			InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\debug.vsprops"

 			CharacterSet="1"

 			>

 			<Tool

@@ -113,7 +113,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\..\include;..\..\..\BaseClasses"

+				AdditionalIncludeDirectories="..\..\..\..\include;..\..\BaseClasses"

 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;METRONOME_EXPORTS"

 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

@@ -173,7 +173,7 @@
 			OutputDirectory="$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

-			InheritedPropertySheets="..\..\..\..\common.vsprops;..\..\..\..\release.vsprops"

+			InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"

 			UseOfMFC="1"

 			CharacterSet="1"

 			>

@@ -195,7 +195,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="2"

-				AdditionalIncludeDirectories="..\..\..\..\..\include;..\..\..\BaseClasses"

+				AdditionalIncludeDirectories="..\..\..\..\include;..\..\BaseClasses"

 				PreprocessorDefinitions="WIN32;NDEBUG;_USRDLL"

 				StringPooling="true"

 				RuntimeLibrary="0"

@@ -219,7 +219,7 @@
 			<Tool

 				Name="VCLibrarianTool"

 				AdditionalOptions="/IGNORE:4221"

-				OutputFile="..\..\..\..\..\lib\$(ProjectName)RU.lib"

+				OutputFile="..\..\..\..\lib\$(ProjectName)RU.lib"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -242,7 +242,7 @@
 			OutputDirectory="$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="2"

-			InheritedPropertySheets="..\..\..\..\common.vsprops;..\..\..\..\release.vsprops"

+			InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"

 			UseOfMFC="1"

 			CharacterSet="1"

 			>

@@ -265,7 +265,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="2"

-				AdditionalIncludeDirectories="..\..\..\..\..\include;..\..\..\BaseClasses"

+				AdditionalIncludeDirectories="..\..\..\..\include;..\..\BaseClasses"

 				PreprocessorDefinitions="REGISTER_FILTER;WIN32;NDEBUG;_USRDLL"

 				RuntimeLibrary="0"

 				EnableEnhancedInstructionSet="0"

@@ -325,7 +325,7 @@
 			OutputDirectory="$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

-			InheritedPropertySheets="..\..\..\..\common.vsprops;..\..\..\..\release.vsprops"

+			InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"

 			UseOfMFC="1"

 			CharacterSet="1"

 			>

@@ -347,7 +347,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="2"

-				AdditionalIncludeDirectories="..\..\..\..\..\include;..\..\..\BaseClasses"

+				AdditionalIncludeDirectories="..\..\..\..\include;..\..\BaseClasses"

 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"

 				StringPooling="true"

 				RuntimeLibrary="0"

@@ -370,7 +370,7 @@
 			<Tool

 				Name="VCLibrarianTool"

 				AdditionalOptions="/IGNORE:4221"

-				OutputFile="..\..\..\..\..\lib\$(ProjectName)RU.lib"

+				OutputFile="..\..\..\..\lib\$(ProjectName)RU.lib"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -393,7 +393,7 @@
 			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

 			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

 			ConfigurationType="4"

-			InheritedPropertySheets="..\..\..\..\common.vsprops;..\..\..\..\release.vsprops"

+			InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"

 			UseOfMFC="1"

 			CharacterSet="1"

 			>

@@ -416,7 +416,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="2"

-				AdditionalIncludeDirectories="..\..\..\..\..\include;..\..\..\BaseClasses"

+				AdditionalIncludeDirectories="..\..\..\..\include;..\..\BaseClasses"

 				PreprocessorDefinitions="WIN32;NDEBUG;_USRDLL"

 				RuntimeLibrary="0"

 				UsePrecompiledHeader="0"

@@ -459,7 +459,7 @@
 			OutputDirectory="$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

-			InheritedPropertySheets="..\..\..\..\common.vsprops;..\..\..\..\release.vsprops"

+			InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\release.vsprops"

 			UseOfMFC="1"

 			CharacterSet="1"

 			>

@@ -485,7 +485,7 @@
 				EnableIntrinsicFunctions="false"

 				FavorSizeOrSpeed="0"

 				OmitFramePointers="false"

-				AdditionalIncludeDirectories="..\..\..\..\..\include;..\..\..\BaseClasses"

+				AdditionalIncludeDirectories="..\..\..\..\include;..\..\BaseClasses"

 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"

 				StringPooling="false"

 				BasicRuntimeChecks="3"

@@ -508,7 +508,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\..\..\lib\$(ProjectName)DU.lib"

+				OutputFile="..\..\..\..\lib\$(ProjectName)DU.lib"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -531,7 +531,7 @@
 			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

 			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

 			ConfigurationType="4"

-			InheritedPropertySheets="..\..\..\..\common.vsprops;..\..\..\..\debug.vsprops"

+			InheritedPropertySheets="..\..\..\common.vsprops;..\..\..\debug.vsprops"

 			UseOfMFC="1"

 			CharacterSet="1"

 			>

@@ -554,7 +554,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\..\include;..\..\..\BaseClasses"

+				AdditionalIncludeDirectories="..\..\..\..\include;..\..\BaseClasses"

 				PreprocessorDefinitions="WIN32;NDEBUG;_USRDLL"

 				RuntimeLibrary="1"

 				UsePrecompiledHeader="0"

diff --git a/src/filters/renderer/misc/SyncClock/resource.h b/src/filters/renderer/SyncClock/resource.h
index 840f23225..840f23225 100644
--- a/src/filters/renderer/misc/SyncClock/resource.h
+++ b/src/filters/renderer/SyncClock/resource.h
diff --git a/src/filters/renderer/misc/SyncClock/stdafx.cpp b/src/filters/renderer/SyncClock/stdafx.cpp
index 8905f2db5..8905f2db5 100644
--- a/src/filters/renderer/misc/SyncClock/stdafx.cpp
+++ b/src/filters/renderer/SyncClock/stdafx.cpp
diff --git a/src/filters/renderer/misc/SyncClock/stdafx.h b/src/filters/renderer/SyncClock/stdafx.h
index 660dcca30..c35359c38 100644
--- a/src/filters/renderer/misc/SyncClock/stdafx.h
+++ b/src/filters/renderer/SyncClock/stdafx.h
@@ -25,7 +25,7 @@
 //

 

 #pragma once

-#include "../../../../DSUtil/SharedInclude.h"

+#include "../../../DSUtil/SharedInclude.h"

 

 #define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers

 #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS	// some CString constructors will be explicit

diff --git a/src/filters/renderer/VideoRenderers/SyncRenderer.cpp b/src/filters/renderer/VideoRenderers/SyncRenderer.cpp
index 5af870a4a..9ff989588 100644
--- a/src/filters/renderer/VideoRenderers/SyncRenderer.cpp
+++ b/src/filters/renderer/VideoRenderers/SyncRenderer.cpp
@@ -22,11 +22,11 @@
 */

 

 #include "stdafx.h"

-#include "../../filters/renderer/misc/SyncClock/Interfaces.h"

+#include "../SyncClock/Interfaces.h"

 #include <atlbase.h>

 #include <atlcoll.h>

-#include "../apps/mplayerc/resource.h"

-#include "../DSUtil/DSUtil.h"

+#include "../../../apps/mplayerc/resource.h"

+#include "../../../DSUtil/DSUtil.h"

 #include <strsafe.h> // Required in CGenlock

 #include <Videoacc.h>

 #include <initguid.h>

@@ -37,7 +37,7 @@
 #include <mfapi.h>

 #include <Mferror.h>

 #include <vector>

-#include "../SubPic/DX9SubPic.h"

+#include "../../../SubPic/DX9SubPic.h"

 #include <moreuuids.h>

 #include "MacrovisionKicker.h"

 #include "IPinHook.h"

diff --git a/src/filters/renderer/VideoRenderers/VideoRenderers.vcproj b/src/filters/renderer/VideoRenderers/VideoRenderers.vcproj
index 86ea743ac..d995ea5e6 100644
--- a/src/filters/renderer/VideoRenderers/VideoRenderers.vcproj
+++ b/src/filters/renderer/VideoRenderers/VideoRenderers.vcproj
@@ -4,7 +4,7 @@
 	Version="9,00"

 	Name="VideoRenderers"

 	ProjectGUID="{FB565A7A-50DC-4A0D-852D-5E7F74DAB82C}"

-	RootNamespace="mplayerc"

+	RootNamespace="VideoRenderers"

 	Keyword="MFCProj"

 	TargetFrameworkVersion="131072"

 	>