diff options
9 files changed, 470 insertions, 23 deletions
diff --git a/project/VS2010Express/XBMC for Windows.sln b/project/VS2010Express/XBMC for Windows.sln index 22bc86391f..798e0b7bf4 100644 --- a/project/VS2010Express/XBMC for Windows.sln +++ b/project/VS2010Express/XBMC for Windows.sln @@ -1,5 +1,5 @@ Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 +# Visual C++ Express 2010 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XBMC", "XBMC.vcxproj", "{3A68081D-E8F9-4523-9436-530DE9E5530A}" ProjectSection(ProjectDependencies) = postProject {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7} = {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7} @@ -82,6 +82,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest", "..\..\lib\gtest\ms EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libXBMC_codec", "..\..\lib\addons\library.xbmc.codec\project\VS2010Express\libXBMC_codec.vcxproj", "{F8F1290B-1188-4810-86C9-88178A31D2AF}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "visVortex", "..\..\xbmc\visualizations\Vortex\Vortex\Vortex.vcxproj", "{AFF288D5-8A77-4817-8DD9-364E183CDBF8}" + ProjectSection(ProjectDependencies) = postProject + {034B1D02-CA92-455D-8866-DB95BEE49C10} = {034B1D02-CA92-455D-8866-DB95BEE49C10} + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug (DirectX)|Win32 = Debug (DirectX)|Win32 @@ -460,6 +465,16 @@ Global {F8F1290B-1188-4810-86C9-88178A31D2AF}.Release (DirectX)|Win32.Build.0 = Release|Win32 {F8F1290B-1188-4810-86C9-88178A31D2AF}.Release (OpenGL)|Win32.ActiveCfg = Release|Win32 {F8F1290B-1188-4810-86C9-88178A31D2AF}.Release (OpenGL)|Win32.Build.0 = Release|Win32 + {AFF288D5-8A77-4817-8DD9-364E183CDBF8}.Debug (DirectX)|Win32.ActiveCfg = Debug|Win32 + {AFF288D5-8A77-4817-8DD9-364E183CDBF8}.Debug (DirectX)|Win32.Build.0 = Debug|Win32 + {AFF288D5-8A77-4817-8DD9-364E183CDBF8}.Debug (OpenGL)|Win32.ActiveCfg = Debug|Win32 + {AFF288D5-8A77-4817-8DD9-364E183CDBF8}.Debug (OpenGL)|Win32.Build.0 = Debug|Win32 + {AFF288D5-8A77-4817-8DD9-364E183CDBF8}.Debug Testsuite|Win32.ActiveCfg = Debug|Win32 + {AFF288D5-8A77-4817-8DD9-364E183CDBF8}.Debug Testsuite|Win32.Build.0 = Debug|Win32 + {AFF288D5-8A77-4817-8DD9-364E183CDBF8}.Release (DirectX)|Win32.ActiveCfg = Release|Win32 + {AFF288D5-8A77-4817-8DD9-364E183CDBF8}.Release (DirectX)|Win32.Build.0 = Release|Win32 + {AFF288D5-8A77-4817-8DD9-364E183CDBF8}.Release (OpenGL)|Win32.ActiveCfg = Release|Win32 + {AFF288D5-8A77-4817-8DD9-364E183CDBF8}.Release (OpenGL)|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/xbmc/visualizations/Vortex/Vortex/Vortex.sln b/xbmc/visualizations/Vortex/Vortex/Vortex.sln new file mode 100644 index 0000000000..875f4c61d8 --- /dev/null +++ b/xbmc/visualizations/Vortex/Vortex/Vortex.sln @@ -0,0 +1,20 @@ + +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual C++ Express 2010 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Vortex", "Vortex.vcxproj", "{AFF288D5-8A77-4817-8DD9-364E183CDBF8}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {AFF288D5-8A77-4817-8DD9-364E183CDBF8}.Debug|Win32.ActiveCfg = Debug|Win32 + {AFF288D5-8A77-4817-8DD9-364E183CDBF8}.Debug|Win32.Build.0 = Debug|Win32 + {AFF288D5-8A77-4817-8DD9-364E183CDBF8}.Release|Win32.ActiveCfg = Release|Win32 + {AFF288D5-8A77-4817-8DD9-364E183CDBF8}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/xbmc/visualizations/Vortex/Vortex/Vortex.vcxproj b/xbmc/visualizations/Vortex/Vortex/Vortex.vcxproj new file mode 100644 index 0000000000..e588c3c4e4 --- /dev/null +++ b/xbmc/visualizations/Vortex/Vortex/Vortex.vcxproj @@ -0,0 +1,167 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{AFF288D5-8A77-4817-8DD9-364E183CDBF8}</ProjectGuid> + <Keyword>Win32Proj</Keyword> + <RootNamespace>Vortex</RootNamespace> + <ProjectName>visVortex</ProjectName> + </PropertyGroup> + <Import Project="$(SolutionDir)\XBMC.core-defaults.props" /> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>DynamicLibrary</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>DynamicLibrary</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="$(SolutionDir)\XBMC.defaults.props" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="$(SolutionDir)\XBMC.defaults.props" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LinkIncremental>true</LinkIncremental> + <IncludePath>$(DXSDK_DIR)Include;$(IncludePath)</IncludePath> + <LibraryPath>$(DXSDK_DIR)Lib\x86;$(LibraryPath)</LibraryPath> + <OutDir>$(SolutionDir)libs\$(TargetName)\$(Configuration)\</OutDir> + <IntDir>$(SolutionDir)objs\$(TargetName)\$(Configuration)\</IntDir> + <TargetName>Vortex_win32dx</TargetName> + <TargetExt>.vis</TargetExt> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <LinkIncremental>false</LinkIncremental> + <IncludePath>$(DXSDK_DIR)Include;$(IncludePath)</IncludePath> + <LibraryPath>$(DXSDK_DIR)Lib\x86;$(LibraryPath)</LibraryPath> + <OutDir>$(SolutionDir)libs\$(TargetName)\$(Configuration)\</OutDir> + <IntDir>$(SolutionDir)objs\$(TargetName)\$(Configuration)\</IntDir> + <TargetName>Vortex_win32dx</TargetName> + <TargetExt>.vis</TargetExt> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <PreprocessorDefinitions>_USRDLL;VORTEX_EXPORTS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>..\VortexVis\core;..\VortexVis\effects;..\angelscript\angelscript\include;..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + </ClCompile> + <Link> + <AdditionalDependencies>D3dx9.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies> + <IgnoreSpecificDefaultLibraries>libcmtd</IgnoreSpecificDefaultLibraries> + </Link> + <PostBuildEvent> + <Command>copy "$(TargetPath)" "$(SolutionDir)..\..\addons\visualization.vortex\$(TargetFileName)"</Command> + </PostBuildEvent> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <PreprocessorDefinitions>_USRDLL;VORTEX_EXPORTS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>..\VortexVis\core;..\VortexVis\effects;..\angelscript\angelscript\include;..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + </ClCompile> + <Link> + <AdditionalDependencies>D3dx9.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies> + </Link> + <PostBuildEvent> + <Command>copy "$(TargetPath)" "$(SolutionDir)..\..\addons\visualization.vortex\$(TargetFileName)"</Command> + </PostBuildEvent> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="..\angelscript\add_on\scriptstring\scriptstring.cpp" /> + <ClCompile Include="..\angelscript\add_on\scriptstring\scriptstring_utils.cpp" /> + <ClCompile Include="..\angelscript\angelscript\source\as_arrayobject.cpp" /> + <ClCompile Include="..\angelscript\angelscript\source\as_atomic.cpp" /> + <ClCompile Include="..\angelscript\angelscript\source\as_builder.cpp" /> + <ClCompile Include="..\angelscript\angelscript\source\as_bytecode.cpp" /> + <ClCompile Include="..\angelscript\angelscript\source\as_callfunc.cpp" /> + <ClCompile Include="..\angelscript\angelscript\source\as_callfunc_arm.cpp" /> + <ClCompile Include="..\angelscript\angelscript\source\as_callfunc_mips.cpp" /> + <ClCompile Include="..\angelscript\angelscript\source\as_callfunc_ppc.cpp" /> + <ClCompile Include="..\angelscript\angelscript\source\as_callfunc_ppc_64.cpp" /> + <ClCompile Include="..\angelscript\angelscript\source\as_callfunc_sh4.cpp" /> + <ClCompile Include="..\angelscript\angelscript\source\as_callfunc_x64_gcc.cpp" /> + <ClCompile Include="..\angelscript\angelscript\source\as_callfunc_x86.cpp" /> + <ClCompile Include="..\angelscript\angelscript\source\as_callfunc_xenon.cpp" /> + <ClCompile Include="..\angelscript\angelscript\source\as_compiler.cpp" /> + <ClCompile Include="..\angelscript\angelscript\source\as_configgroup.cpp" /> + <ClCompile Include="..\angelscript\angelscript\source\as_context.cpp" /> + <ClCompile Include="..\angelscript\angelscript\source\as_datatype.cpp" /> + <ClCompile Include="..\angelscript\angelscript\source\as_gc.cpp" /> + <ClCompile Include="..\angelscript\angelscript\source\as_generic.cpp" /> + <ClCompile Include="..\angelscript\angelscript\source\as_globalproperty.cpp" /> + <ClCompile Include="..\angelscript\angelscript\source\as_memory.cpp" /> + <ClCompile Include="..\angelscript\angelscript\source\as_module.cpp" /> + <ClCompile Include="..\angelscript\angelscript\source\as_objecttype.cpp" /> + <ClCompile Include="..\angelscript\angelscript\source\as_outputbuffer.cpp" /> + <ClCompile Include="..\angelscript\angelscript\source\as_parser.cpp" /> + <ClCompile Include="..\angelscript\angelscript\source\as_restore.cpp" /> + <ClCompile Include="..\angelscript\angelscript\source\as_scriptcode.cpp" /> + <ClCompile Include="..\angelscript\angelscript\source\as_scriptengine.cpp" /> + <ClCompile Include="..\angelscript\angelscript\source\as_scriptfunction.cpp" /> + <ClCompile Include="..\angelscript\angelscript\source\as_scriptnode.cpp" /> + <ClCompile Include="..\angelscript\angelscript\source\as_scriptobject.cpp" /> + <ClCompile Include="..\angelscript\angelscript\source\as_string.cpp" /> + <ClCompile Include="..\angelscript\angelscript\source\as_string_util.cpp" /> + <ClCompile Include="..\angelscript\angelscript\source\as_thread.cpp" /> + <ClCompile Include="..\angelscript\angelscript\source\as_tokenizer.cpp" /> + <ClCompile Include="..\angelscript\angelscript\source\as_typeinfo.cpp" /> + <ClCompile Include="..\angelscript\angelscript\source\as_variablescope.cpp" /> + <ClCompile Include="..\VortexVis\Core\DebugConsole.cpp" /> + <ClCompile Include="..\VortexVis\Core\EffectBase.cpp" /> + <ClCompile Include="..\VortexVis\Core\fft.cpp" /> + <ClCompile Include="..\VortexVis\Core\Mesh.cpp" /> + <ClCompile Include="..\VortexVis\Core\Preset.cpp" /> + <ClCompile Include="..\VortexVis\Core\Renderer.cpp" /> + <ClCompile Include="..\VortexVis\Core\Shader.cpp" /> + <ClCompile Include="..\VortexVis\Core\Texture.cpp" /> + <ClCompile Include="..\VortexVis\Core\Vortex.cpp" /> + <ClCompile Include="..\VortexVis\Core\XmlDocument.cpp" /> + <ClCompile Include="..\VortexVis\Effects\Map.cpp" /> + <ClCompile Include="..\VortexVis\Effects\Tunnel.cpp" /> + <ClCompile Include="..\VortexVis\Effects\VoicePrint.cpp" /> + <ClCompile Include="..\VortexXBMC\VortexXBMC.cpp" /> + </ItemGroup> + <ItemGroup> + <ClInclude Include="..\angelscript\add_on\scriptstring\scriptstring.h" /> + <ClInclude Include="..\VortexVis\Core\DebugConsole.h" /> + <ClInclude Include="..\VortexVis\Core\EffectBase.h" /> + <ClInclude Include="..\VortexVis\Core\fft.h" /> + <ClInclude Include="..\VortexVis\Core\Mesh.h" /> + <ClInclude Include="..\VortexVis\Core\Preset.h" /> + <ClInclude Include="..\VortexVis\Core\Renderer.h" /> + <ClInclude Include="..\VortexVis\Core\Shader.h" /> + <ClInclude Include="..\VortexVis\Core\Texture.h" /> + <ClInclude Include="..\VortexVis\Core\Vortex.h" /> + <ClInclude Include="..\VortexVis\Core\XBMCTypes.h" /> + <ClInclude Include="..\VortexVis\Core\XmlDocument.h" /> + <ClInclude Include="..\VortexVis\Effects\Map.h" /> + <ClInclude Include="..\VortexVis\Effects\Tunnel.h" /> + <ClInclude Include="..\VortexVis\Effects\VoicePrint.h" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\..\..\..\project\VS2010Express\XbmcThreads.vcxproj"> + <Project>{034b1d02-ca92-455d-8866-db95bee49c10}</Project> + </ProjectReference> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project>
\ No newline at end of file diff --git a/xbmc/visualizations/Vortex/Vortex/Vortex.vcxproj.filters b/xbmc/visualizations/Vortex/Vortex/Vortex.vcxproj.filters new file mode 100644 index 0000000000..df6200c695 --- /dev/null +++ b/xbmc/visualizations/Vortex/Vortex/Vortex.vcxproj.filters @@ -0,0 +1,240 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <Filter Include="Source Files"> + <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier> + <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions> + </Filter> + <Filter Include="Header Files"> + <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier> + <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions> + </Filter> + <Filter Include="Resource Files"> + <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier> + <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions> + </Filter> + <Filter Include="Source Files\Core"> + <UniqueIdentifier>{1ac7feaf-f9b1-425f-b8ae-e5a5f73a6f72}</UniqueIdentifier> + </Filter> + <Filter Include="Source Files\Effects"> + <UniqueIdentifier>{4fd0c1de-bcdb-4784-8573-45d524da87b8}</UniqueIdentifier> + </Filter> + <Filter Include="Source Files\angelscript"> + <UniqueIdentifier>{bd0ab410-dc08-46fb-b294-1f3e5ef4f12a}</UniqueIdentifier> + </Filter> + <Filter Include="Source Files\angelscript\source"> + <UniqueIdentifier>{77d1bd1e-c934-4594-966f-a5773f491581}</UniqueIdentifier> + </Filter> + <Filter Include="Source Files\angelscript\add_on"> + <UniqueIdentifier>{98e8d217-f32e-4eec-87cd-05369f120e4a}</UniqueIdentifier> + </Filter> + </ItemGroup> + <ItemGroup> + <ClCompile Include="..\VortexXBMC\VortexXBMC.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\VortexVis\Core\DebugConsole.cpp"> + <Filter>Source Files\Core</Filter> + </ClCompile> + <ClCompile Include="..\VortexVis\Core\EffectBase.cpp"> + <Filter>Source Files\Core</Filter> + </ClCompile> + <ClCompile Include="..\VortexVis\Core\fft.cpp"> + <Filter>Source Files\Core</Filter> + </ClCompile> + <ClCompile Include="..\VortexVis\Core\Mesh.cpp"> + <Filter>Source Files\Core</Filter> + </ClCompile> + <ClCompile Include="..\VortexVis\Core\Preset.cpp"> + <Filter>Source Files\Core</Filter> + </ClCompile> + <ClCompile Include="..\VortexVis\Core\Renderer.cpp"> + <Filter>Source Files\Core</Filter> + </ClCompile> + <ClCompile Include="..\VortexVis\Core\Shader.cpp"> + <Filter>Source Files\Core</Filter> + </ClCompile> + <ClCompile Include="..\VortexVis\Core\Texture.cpp"> + <Filter>Source Files\Core</Filter> + </ClCompile> + <ClCompile Include="..\VortexVis\Core\Vortex.cpp"> + <Filter>Source Files\Core</Filter> + </ClCompile> + <ClCompile Include="..\VortexVis\Core\XmlDocument.cpp"> + <Filter>Source Files\Core</Filter> + </ClCompile> + <ClCompile Include="..\angelscript\angelscript\source\as_arrayobject.cpp"> + <Filter>Source Files\angelscript\source</Filter> + </ClCompile> + <ClCompile Include="..\angelscript\angelscript\source\as_variablescope.cpp"> + <Filter>Source Files\angelscript\source</Filter> + </ClCompile> + <ClCompile Include="..\angelscript\angelscript\source\as_atomic.cpp"> + <Filter>Source Files\angelscript\source</Filter> + </ClCompile> + <ClCompile Include="..\angelscript\angelscript\source\as_builder.cpp"> + <Filter>Source Files\angelscript\source</Filter> + </ClCompile> + <ClCompile Include="..\angelscript\angelscript\source\as_bytecode.cpp"> + <Filter>Source Files\angelscript\source</Filter> + </ClCompile> + <ClCompile Include="..\angelscript\angelscript\source\as_callfunc.cpp"> + <Filter>Source Files\angelscript\source</Filter> + </ClCompile> + <ClCompile Include="..\angelscript\angelscript\source\as_callfunc_arm.cpp"> + <Filter>Source Files\angelscript\source</Filter> + </ClCompile> + <ClCompile Include="..\angelscript\angelscript\source\as_callfunc_mips.cpp"> + <Filter>Source Files\angelscript\source</Filter> + </ClCompile> + <ClCompile Include="..\angelscript\angelscript\source\as_callfunc_ppc.cpp"> + <Filter>Source Files\angelscript\source</Filter> + </ClCompile> + <ClCompile Include="..\angelscript\angelscript\source\as_callfunc_ppc_64.cpp"> + <Filter>Source Files\angelscript\source</Filter> + </ClCompile> + <ClCompile Include="..\angelscript\angelscript\source\as_callfunc_sh4.cpp"> + <Filter>Source Files\angelscript\source</Filter> + </ClCompile> + <ClCompile Include="..\angelscript\angelscript\source\as_callfunc_x64_gcc.cpp"> + <Filter>Source Files\angelscript\source</Filter> + </ClCompile> + <ClCompile Include="..\angelscript\angelscript\source\as_callfunc_x86.cpp"> + <Filter>Source Files\angelscript\source</Filter> + </ClCompile> + <ClCompile Include="..\angelscript\angelscript\source\as_callfunc_xenon.cpp"> + <Filter>Source Files\angelscript\source</Filter> + </ClCompile> + <ClCompile Include="..\angelscript\angelscript\source\as_compiler.cpp"> + <Filter>Source Files\angelscript\source</Filter> + </ClCompile> + <ClCompile Include="..\angelscript\angelscript\source\as_configgroup.cpp"> + <Filter>Source Files\angelscript\source</Filter> + </ClCompile> + <ClCompile Include="..\angelscript\angelscript\source\as_context.cpp"> + <Filter>Source Files\angelscript\source</Filter> + </ClCompile> + <ClCompile Include="..\angelscript\angelscript\source\as_datatype.cpp"> + <Filter>Source Files\angelscript\source</Filter> + </ClCompile> + <ClCompile Include="..\angelscript\angelscript\source\as_gc.cpp"> + <Filter>Source Files\angelscript\source</Filter> + </ClCompile> + <ClCompile Include="..\angelscript\angelscript\source\as_generic.cpp"> + <Filter>Source Files\angelscript\source</Filter> + </ClCompile> + <ClCompile Include="..\angelscript\angelscript\source\as_globalproperty.cpp"> + <Filter>Source Files\angelscript\source</Filter> + </ClCompile> + <ClCompile Include="..\angelscript\angelscript\source\as_memory.cpp"> + <Filter>Source Files\angelscript\source</Filter> + </ClCompile> + <ClCompile Include="..\angelscript\angelscript\source\as_module.cpp"> + <Filter>Source Files\angelscript\source</Filter> + </ClCompile> + <ClCompile Include="..\angelscript\angelscript\source\as_objecttype.cpp"> + <Filter>Source Files\angelscript\source</Filter> + </ClCompile> + <ClCompile Include="..\angelscript\angelscript\source\as_outputbuffer.cpp"> + <Filter>Source Files\angelscript\source</Filter> + </ClCompile> + <ClCompile Include="..\angelscript\angelscript\source\as_parser.cpp"> + <Filter>Source Files\angelscript\source</Filter> + </ClCompile> + <ClCompile Include="..\angelscript\angelscript\source\as_restore.cpp"> + <Filter>Source Files\angelscript\source</Filter> + </ClCompile> + <ClCompile Include="..\angelscript\angelscript\source\as_scriptcode.cpp"> + <Filter>Source Files\angelscript\source</Filter> + </ClCompile> + <ClCompile Include="..\angelscript\angelscript\source\as_scriptengine.cpp"> + <Filter>Source Files\angelscript\source</Filter> + </ClCompile> + <ClCompile Include="..\angelscript\angelscript\source\as_scriptfunction.cpp"> + <Filter>Source Files\angelscript\source</Filter> + </ClCompile> + <ClCompile Include="..\angelscript\angelscript\source\as_scriptnode.cpp"> + <Filter>Source Files\angelscript\source</Filter> + </ClCompile> + <ClCompile Include="..\angelscript\angelscript\source\as_scriptobject.cpp"> + <Filter>Source Files\angelscript\source</Filter> + </ClCompile> + <ClCompile Include="..\angelscript\angelscript\source\as_string.cpp"> + <Filter>Source Files\angelscript\source</Filter> + </ClCompile> + <ClCompile Include="..\angelscript\angelscript\source\as_string_util.cpp"> + <Filter>Source Files\angelscript\source</Filter> + </ClCompile> + <ClCompile Include="..\angelscript\angelscript\source\as_thread.cpp"> + <Filter>Source Files\angelscript\source</Filter> + </ClCompile> + <ClCompile Include="..\angelscript\angelscript\source\as_tokenizer.cpp"> + <Filter>Source Files\angelscript\source</Filter> + </ClCompile> + <ClCompile Include="..\angelscript\angelscript\source\as_typeinfo.cpp"> + <Filter>Source Files\angelscript\source</Filter> + </ClCompile> + <ClCompile Include="..\angelscript\add_on\scriptstring\scriptstring.cpp"> + <Filter>Source Files\angelscript\add_on</Filter> + </ClCompile> + <ClCompile Include="..\angelscript\add_on\scriptstring\scriptstring_utils.cpp"> + <Filter>Source Files\angelscript\add_on</Filter> + </ClCompile> + <ClCompile Include="..\VortexVis\Effects\Map.cpp"> + <Filter>Source Files\Effects</Filter> + </ClCompile> + <ClCompile Include="..\VortexVis\Effects\Tunnel.cpp"> + <Filter>Source Files\Effects</Filter> + </ClCompile> + <ClCompile Include="..\VortexVis\Effects\VoicePrint.cpp"> + <Filter>Source Files\Effects</Filter> + </ClCompile> + </ItemGroup> + <ItemGroup> + <ClInclude Include="..\VortexVis\Core\DebugConsole.h"> + <Filter>Source Files\Core</Filter> + </ClInclude> + <ClInclude Include="..\VortexVis\Core\EffectBase.h"> + <Filter>Source Files\Core</Filter> + </ClInclude> + <ClInclude Include="..\VortexVis\Core\fft.h"> + <Filter>Source Files\Core</Filter> + </ClInclude> + <ClInclude Include="..\VortexVis\Core\Mesh.h"> + <Filter>Source Files\Core</Filter> + </ClInclude> + <ClInclude Include="..\VortexVis\Core\Preset.h"> + <Filter>Source Files\Core</Filter> + </ClInclude> + <ClInclude Include="..\VortexVis\Core\Renderer.h"> + <Filter>Source Files\Core</Filter> + </ClInclude> + <ClInclude Include="..\VortexVis\Core\Shader.h"> + <Filter>Source Files\Core</Filter> + </ClInclude> + <ClInclude Include="..\VortexVis\Core\Texture.h"> + <Filter>Source Files\Core</Filter> + </ClInclude> + <ClInclude Include="..\VortexVis\Core\Vortex.h"> + <Filter>Source Files\Core</Filter> + </ClInclude> + <ClInclude Include="..\VortexVis\Core\XBMCTypes.h"> + <Filter>Source Files\Core</Filter> + </ClInclude> + <ClInclude Include="..\VortexVis\Core\XmlDocument.h"> + <Filter>Source Files\Core</Filter> + </ClInclude> + <ClInclude Include="..\angelscript\add_on\scriptstring\scriptstring.h"> + <Filter>Source Files\angelscript\add_on</Filter> + </ClInclude> + <ClInclude Include="..\VortexVis\Effects\Map.h"> + <Filter>Source Files\Effects</Filter> + </ClInclude> + <ClInclude Include="..\VortexVis\Effects\Tunnel.h"> + <Filter>Source Files\Effects</Filter> + </ClInclude> + <ClInclude Include="..\VortexVis\Effects\VoicePrint.h"> + <Filter>Source Files\Effects</Filter> + </ClInclude> + </ItemGroup> +</Project>
\ No newline at end of file diff --git a/xbmc/visualizations/Vortex/VortexVis/Core/Shader.h b/xbmc/visualizations/Vortex/VortexVis/Core/Shader.h index e02b655fde..423a1c8e88 100644 --- a/xbmc/visualizations/Vortex/VortexVis/Core/Shader.h +++ b/xbmc/visualizations/Vortex/VortexVis/Core/Shader.h @@ -21,7 +21,7 @@ #define _SHADER_H_ #include <vector> -#include "d3dx9.h" +#include <d3dx9.h> #include "Renderer.h" enum EShaderType diff --git a/xbmc/visualizations/Vortex/VortexVis/Core/Vortex.cpp b/xbmc/visualizations/Vortex/VortexVis/Core/Vortex.cpp index 682724e35d..f2189a6d40 100644 --- a/xbmc/visualizations/Vortex/VortexVis/Core/Vortex.cpp +++ b/xbmc/visualizations/Vortex/VortexVis/Core/Vortex.cpp @@ -95,10 +95,10 @@ public: char Rating; }; -char g_TexturePath[ 512 ] = "special://xbmc//addons/visualization.vortex//Textures//"; -char g_PresetPath[ 512 ] = "special://xbmc//addons/visualization.vortex//Presets//"; -char g_TransitionPath[ 512 ] = "special://xbmc//addons/visualization.vortex//Transitions//"; -char g_AnnouncePath[ 512 ] = "special://xbmc//addons/visualization.vortex//Announcements//"; +char g_TexturePath[ 512 ] = "special://xbmc/addons/visualization.vortex/resources/Textures/"; +char g_PresetPath[ 512 ] = "special://xbmc/addons/visualization.vortex/resources/Presets/"; +char g_TransitionPath[ 512 ] = "special://xbmc//addons/visualization.vortex/resources/Transitions/"; +char g_AnnouncePath[ 512 ] = "special://xbmc/addons/visualization.vortex/resources/Announcements/"; class FileHolder { @@ -359,7 +359,7 @@ void Vortex::Init( LPDIRECT3DDEVICE9 pD3DDevice, int iPosX, int iPosY, int iWidt g_AnnouncePreset.Init(m_pScriptEngine, "ANNOUNCE"); g_AnnouncePreset.m_presetId = 3; - if ( CSettings::Get().PresetLocked ) + if ( GetUserSettings().PresetLocked ) { // Check that the preset locked in the settings file is still valid if ( g_currPresetId >= g_PresetFiles.NumFiles() || g_currPresetId < 0 ) @@ -367,7 +367,7 @@ void Vortex::Init( LPDIRECT3DDEVICE9 pD3DDevice, int iPosX, int iPosY, int iWidt g_currPresetId = GetRandomPreset(); } } - else if ( CSettings::Get().RandomPresetsEnabled ) + else if ( GetUserSettings().RandomPresetsEnabled ) { g_currPresetId = GetRandomPreset(); } @@ -379,7 +379,7 @@ void Vortex::Init( LPDIRECT3DDEVICE9 pD3DDevice, int iPosX, int iPosY, int iWidt char filename[ 256 ]; sprintf( filename, "%s%s", g_PresetPath, g_PresetFiles.GetFilename( g_currPresetId ) ); g_presets[ 0 ]->Begin( filename ); - g_mainCounter = CSettings::Get().TimeBetweenPresets + ((rand() % 100) / 100.0f) * CSettings::Get().TimeBetweenPresetsRand; + g_mainCounter = GetUserSettings().TimeBetweenPresets + ((rand() % 100) / 100.0f) * GetUserSettings().TimeBetweenPresetsRand; g_currentState = STATE_RENDER_PRESET; } @@ -479,7 +479,7 @@ float g_middle; float g_timePass; bool g_finished; -void Vortex::AudioData( const short* pAudioData, int iAudioDataLength, float* pFreq, int iFreqDataLength ) +void Vortex::AudioData( const float* pAudioData, int iAudioDataLength, float* pFreq, int iFreqDataLength ) { float tempWave[2][576]; @@ -809,7 +809,7 @@ void Vortex::Render() case STATE_RENDER_PRESET: { // OutputDebugString("STATE = STATE_RENDER_PRESET\n"); - if ( !CSettings::Get().PresetLocked ) + if ( !GetUserSettings().PresetLocked ) { g_mainCounter -= g_timePass; } @@ -821,7 +821,7 @@ void Vortex::Render() if ( g_mainCounter <= 0 ) { // Not in a transition, preset not locked and time for a new preset - if ( CSettings::Get().RandomPresetsEnabled ) + if ( GetUserSettings().RandomPresetsEnabled ) { int nextPreset = GetRandomPreset(); if ( nextPreset == g_currPresetId ) @@ -843,14 +843,14 @@ void Vortex::Render() } g_finished = true; - g_mainCounter = CSettings::Get().TimeBetweenPresets + ((rand() % 100) / 100.0f) * CSettings::Get().TimeBetweenPresetsRand; + g_mainCounter = GetUserSettings().TimeBetweenPresets + ((rand() % 100) / 100.0f) * GetUserSettings().TimeBetweenPresetsRand; // Load preset sprintf(filename, "%s%s", g_PresetPath, g_PresetFiles.GetFilename( g_currPresetId ) ); if ( g_presets[ 1 ]->Begin( filename ) == true ) { // Load and begin transition - if ( CSettings::Get().TransitionsEnabled && g_TransitionFiles.NumFiles() != 0 ) + if ( GetUserSettings().TransitionsEnabled && g_TransitionFiles.NumFiles() != 0 ) { g_transitionId = ( g_transitionId + 1 ) % g_TransitionFiles.NumFiles(); sprintf( filename, "%s%s", g_TransitionPath, g_TransitionFiles.GetFilename( g_transitionId ) ); @@ -880,7 +880,7 @@ void Vortex::Render() // OutputDebugString("STATE = STATE_TRANSITION\n"); if (g_finished) { - g_mainCounter = CSettings::Get().TimeBetweenPresets + ((rand() % 100) / 100.0f) * CSettings::Get().TimeBetweenPresetsRand; + g_mainCounter = GetUserSettings().TimeBetweenPresets + ((rand() % 100) / 100.0f) * GetUserSettings().TimeBetweenPresetsRand; SwapPresets(); g_finished = false; @@ -913,7 +913,7 @@ void Vortex::Render() // Renderer::Rect( -1.0, -1.0, 1.0, 1.0, 0xff000000 ); /* - if ( CSettings::Get().ShowAudioAnalysis ) + if ( GetUserSettings().ShowAudioAnalysis ) { FLOAT BAR_WIDTH = 1.0f / 128; / * @@ -994,12 +994,12 @@ void Vortex::Render() } */ - if( CSettings::Get().ShowDebugConsole ) + if( GetUserSettings().ShowDebugConsole ) { DebugConsole::Render(); } - if( CSettings::Get().ShowFPS ) + if( GetUserSettings().ShowFPS ) { char FrameRate[256]; sprintf_s(FrameRate, 256, "FPS = %0.02f\n", fFPS ); diff --git a/xbmc/visualizations/Vortex/VortexVis/Core/Vortex.h b/xbmc/visualizations/Vortex/VortexVis/Core/Vortex.h index e5156723d9..83912ac784 100644 --- a/xbmc/visualizations/Vortex/VortexVis/Core/Vortex.h +++ b/xbmc/visualizations/Vortex/VortexVis/Core/Vortex.h @@ -57,7 +57,7 @@ public: void Init( LPDIRECT3DDEVICE9 pD3DDevice, int iPosX, int iPosY, int iWidth, int iHeight, float fPixelRatio ); void Start( int iChannels, int iSamplesPerSec, int iBitsPerSample, const char* szSongName ); void Shutdown(); - void AudioData( const short* pAudioData, int iAudioDataLength, float* pFreq, int iFreqDataLength ); + void AudioData( const float* pAudioData, int iAudioDataLength, float* pFreq, int iFreqDataLength ); void Render(); void UpdateTrack( VisTrack* pVisTrack ); void UpdateAlbumArt( char* artFilename ); diff --git a/xbmc/visualizations/Vortex/VortexXBMC/VortexXBMC.cpp b/xbmc/visualizations/Vortex/VortexXBMC/VortexXBMC.cpp index 0834774687..aedf17f8d5 100644 --- a/xbmc/visualizations/Vortex/VortexXBMC/VortexXBMC.cpp +++ b/xbmc/visualizations/Vortex/VortexXBMC/VortexXBMC.cpp @@ -29,7 +29,7 @@ Vortex* g_Vortex = NULL; // settings vector -StructSetting** g_structSettings; +//StructSetting** g_structSettings; extern "C" ADDON_STATUS ADDON_Create(void* hdl, void* props) { @@ -41,7 +41,7 @@ extern "C" ADDON_STATUS ADDON_Create(void* hdl, void* props) g_Vortex = new Vortex; g_Vortex->Init( ( LPDIRECT3DDEVICE9 )visprops->device, visprops->x, visprops->y, visprops->width, visprops->height, visprops->pixelRatio ); - return ADDON_STATUS_NEED_SETTINGS; + return ADDON_STATUS_NEED_SAVEDSETTINGS; } extern "C" void Start( int iChannels, int iSamplesPerSec, int iBitsPerSample, const char* szSongName ) @@ -59,7 +59,7 @@ extern "C" void ADDON_Stop() } } -extern "C" void AudioData(const short* pAudioData, int iAudioDataLength, float *pFreqData, int iFreqDataLength) +extern "C" void AudioData(const float* pAudioData, int iAudioDataLength, float *pFreqData, int iFreqDataLength) { g_Vortex->AudioData( pAudioData, iAudioDataLength, pFreqData, iFreqDataLength ); } @@ -151,7 +151,7 @@ extern "C" bool IsLocked() //----------------------------------------------------------------------------- extern "C" void ADDON_Destroy() { - Stop(); + ADDON_Stop(); } //-- HasSettings -------------------------------------------------------------- @@ -225,6 +225,10 @@ extern "C" ADDON_STATUS ADDON_SetSetting(const char* id, const void* value) { userSettings.ShowAudioAnalysis = *(bool*)value == 1; } + else if (strcmpi(id, "LockPreset") == 0) + { + userSettings.PresetLocked = *(bool*)value == 1; + } else return ADDON_STATUS_UNKNOWN; diff --git a/xbmc/visualizations/Vortex/angelscript/angelscript/source/as_atomic.cpp b/xbmc/visualizations/Vortex/angelscript/angelscript/source/as_atomic.cpp index da6da7dc76..7c3469e927 100644 --- a/xbmc/visualizations/Vortex/angelscript/angelscript/source/as_atomic.cpp +++ b/xbmc/visualizations/Vortex/angelscript/angelscript/source/as_atomic.cpp @@ -35,6 +35,7 @@ // #include "as_atomic.h" +#include "threads/Atomics.h" BEGIN_AS_NAMESPACE |