diff options
-rw-r--r-- | src/apps/mplayerc/MainFrm.cpp | 2 | ||||
-rw-r--r-- | src/apps/mplayerc/mpcresources/mplayerc.ua.rc | bin | 322446 -> 322620 bytes | |||
-rw-r--r-- | src/apps/mplayerc/res/mpc-hc.exe.manifest.conf | 74 | ||||
-rw-r--r-- | src/apps/mplayerc/res/mpc-hc.exe.manifest.template | 75 | ||||
-rw-r--r-- | src/filters/parser/AviSplitter/AviSplitter.vcproj | 16 | ||||
-rw-r--r-- | src/filters/transform/MPCVideoDec/ffmpeg/gccbuild.bat | 2 |
6 files changed, 92 insertions, 77 deletions
diff --git a/src/apps/mplayerc/MainFrm.cpp b/src/apps/mplayerc/MainFrm.cpp index 940a93493..d2969d186 100644 --- a/src/apps/mplayerc/MainFrm.cpp +++ b/src/apps/mplayerc/MainFrm.cpp @@ -11054,7 +11054,7 @@ bool CMainFrame::OpenMediaPrivate(CAutoPtr<OpenMediaData> pOMD) PostMessage(WM_COMMAND, ID_PLAY_PAUSE);
- if(!(AfxGetAppSettings().nCLSwitches&CLSW_OPEN))
+ if(!(AfxGetAppSettings().nCLSwitches&CLSW_OPEN) && (AfxGetAppSettings().nLoops > 0))
PostMessage(WM_COMMAND, ID_PLAY_PLAY);
// Casimir666 : audio selection should be done before running the graph to prevent an
diff --git a/src/apps/mplayerc/mpcresources/mplayerc.ua.rc b/src/apps/mplayerc/mpcresources/mplayerc.ua.rc Binary files differindex 42e9d2264..a7d40cbed 100644 --- a/src/apps/mplayerc/mpcresources/mplayerc.ua.rc +++ b/src/apps/mplayerc/mpcresources/mplayerc.ua.rc diff --git a/src/apps/mplayerc/res/mpc-hc.exe.manifest.conf b/src/apps/mplayerc/res/mpc-hc.exe.manifest.conf index 48e61fe44..d201c1c69 100644 --- a/src/apps/mplayerc/res/mpc-hc.exe.manifest.conf +++ b/src/apps/mplayerc/res/mpc-hc.exe.manifest.conf @@ -1,41 +1,41 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-<assemblyIdentity
- version="1.3.$WCREV$.0"
- processorArchitecture="*"
- name="Media Player Classic Home Cinema"
- type="win32"
-/>
-<description>Media Player Classic Home Cinema</description>
-<dependency>
- <dependentAssembly>
- <assemblyIdentity
- type="win32"
- name="Microsoft.Windows.Common-Controls"
- version="6.0.0.0"
- processorArchitecture="*"
- publicKeyToken="6595b64144ccf1df"
- language="*"
- />
- </dependentAssembly>
-</dependency>
-<!-- Identify the application security requirements -->
-<trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
- <security>
- <requestedPrivileges>
- <requestedExecutionLevel
- level="asInvoker"
- uiAccess="false"
+ <assemblyIdentity
+ version="1.3.$WCREV$.0"
+ processorArchitecture="*"
+ name="Media Player Classic Home Cinema"
+ type="win32"
+ />
+ <description>Media Player Classic Home Cinema</description>
+ <dependency>
+ <dependentAssembly>
+ <assemblyIdentity
+ type="win32"
+ name="Microsoft.Windows.Common-Controls"
+ version="6.0.0.0"
+ processorArchitecture="*"
+ publicKeyToken="6595b64144ccf1df"
+ language="*"
/>
- </requestedPrivileges>
- </security>
-</trustInfo>
-<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
- <application>
- <!--The ID below indicates application support for Windows Vista -->
- <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
- <!--The ID below indicates application support for Windows 7 -->
- <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
- </application>
-</compatibility>
+ </dependentAssembly>
+ </dependency>
+ <!-- Identify the application security requirements -->
+ <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+ <security>
+ <requestedPrivileges>
+ <requestedExecutionLevel
+ level="asInvoker"
+ uiAccess="false"
+ />
+ </requestedPrivileges>
+ </security>
+ </trustInfo>
+ <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+ <application>
+ <!--The ID below indicates application support for Windows Vista -->
+ <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
+ <!--The ID below indicates application support for Windows 7 -->
+ <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+ </application>
+ </compatibility>
</assembly>
diff --git a/src/apps/mplayerc/res/mpc-hc.exe.manifest.template b/src/apps/mplayerc/res/mpc-hc.exe.manifest.template index 1f0fe5513..e143a67cc 100644 --- a/src/apps/mplayerc/res/mpc-hc.exe.manifest.template +++ b/src/apps/mplayerc/res/mpc-hc.exe.manifest.template @@ -1,42 +1,41 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-<assemblyIdentity
- version="1.3.0.0"
- processorArchitecture="*"
- name="Media Player Classic Home Cinema"
- type="win32"
-/>
-<description>Media Player Classic Home Cinema</description>
-<dependency>
- <dependentAssembly>
- <assemblyIdentity
- type="win32"
- name="Microsoft.Windows.Common-Controls"
- version="6.0.0.0"
- processorArchitecture="*"
- publicKeyToken="6595b64144ccf1df"
- language="*"
- />
- </dependentAssembly>
-</dependency>
-<!-- Identify the application security requirements -->
-<trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
- <security>
- <requestedPrivileges>
- <requestedExecutionLevel
- level="asInvoker"
- uiAccess="false"
+ <assemblyIdentity
+ version="1.3.0.0"
+ processorArchitecture="*"
+ name="Media Player Classic Home Cinema"
+ type="win32"
+ />
+ <description>Media Player Classic Home Cinema</description>
+ <dependency>
+ <dependentAssembly>
+ <assemblyIdentity
+ type="win32"
+ name="Microsoft.Windows.Common-Controls"
+ version="6.0.0.0"
+ processorArchitecture="*"
+ publicKeyToken="6595b64144ccf1df"
+ language="*"
/>
- </requestedPrivileges>
- </security>
-</trustInfo>
-<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
- <application>
- <!--The ID below indicates application support for Windows Vista -->
- <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
- <!--The ID below indicates application support for Windows 7 -->
- <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
- </application>
-</compatibility>
-
+ </dependentAssembly>
+ </dependency>
+ <!-- Identify the application security requirements -->
+ <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+ <security>
+ <requestedPrivileges>
+ <requestedExecutionLevel
+ level="asInvoker"
+ uiAccess="false"
+ />
+ </requestedPrivileges>
+ </security>
+ </trustInfo>
+ <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+ <application>
+ <!--The ID below indicates application support for Windows Vista -->
+ <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
+ <!--The ID below indicates application support for Windows 7 -->
+ <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+ </application>
+ </compatibility>
</assembly>
diff --git a/src/filters/parser/AviSplitter/AviSplitter.vcproj b/src/filters/parser/AviSplitter/AviSplitter.vcproj index b68f4df7d..d3b984a65 100644 --- a/src/filters/parser/AviSplitter/AviSplitter.vcproj +++ b/src/filters/parser/AviSplitter/AviSplitter.vcproj @@ -710,6 +710,22 @@ Name="VCResourceCompilerTool"
/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ </FileConfiguration>
</File>
</Filter>
</Files>
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/gccbuild.bat b/src/filters/transform/MPCVideoDec/ffmpeg/gccbuild.bat index 9493f3c07..8256a27d6 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/gccbuild.bat +++ b/src/filters/transform/MPCVideoDec/ffmpeg/gccbuild.bat @@ -1,5 +1,5 @@ @echo off
-if NOT "x%MINGW32%" == "x" goto VarOk
+if NOT "x%MINGW32%" == "x" goto Var1Ok
echo "ERROR : please define MINGW32 (and/or MSYS) environment variable(s)"
exit 1005
|