1.1.0 beta 8 release

mjrgh · Sep 25, 2024 · a31cdbf · a31cdbf
1 parent 4d5014e
commit a31cdbf
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 51 deletions.
diff --git a/FfmpegManifestUpdater/FfmpegManifestUpdater.cpp b/FfmpegManifestUpdater/FfmpegManifestUpdater.cpp
diff --git a/Notes/Release Checklist.txt b/Notes/Release Checklist.txt
@@ -22,13 +22,6 @@ PinballY Release Checklist
     Third Party Licenses.txt
     Help\*
 
-  Note: the "Min" versions are deprecated, since it was too difficult
-  to figure out whether you needed the full or Min version.  The build
-  script still builds them, but I no longer upload them.  For reference,
-  the Min files are:
-    Builds\PinballY-Min-xxxxxx.zip  [do not upload]
-    Builds\PinballY-64bit-Min-xxxxxx.zip  [do not upload]
-
 - git commit -a -m "check-in message"
 
 - git push

diff --git a/PinballY/VersionInfo.h b/PinballY/VersionInfo.h
@@ -17,7 +17,7 @@
 //
 #define PINBALLY_VERSION            "1.1.0"
 #define PINBALLY_RELEASE_STATUS     STATUS_BETA
-#define PINBALLY_PRERELEASE_SEQNO   8
+#define PINBALLY_PRERELEASE_SEQNO   9
 #define PINBALLY_COPYRIGHT_OWNERS   "Michael J Roberts"
 #define PINBALLY_FORK_ID            ""
 

diff --git a/VersionHistory.txt b/VersionHistory.txt
@@ -1,7 +1,7 @@
 PinballY Update History
 
 
-TBD (1.1.0 Beta 9)
+09-25-2024 (1.1.0 Beta 9)
 
 * The Media Capture FFMPEG options now let you fully customize the
 FFMPEG command line for each capture.  Refer to the Help section for
@@ -11,21 +11,25 @@ allows capture from full-screen-exclusive windows.
 The new capture options required some rework of the way the FFMPEG
 command lines are generated, so it's possible that existing capture
 setups might encounter FFMPEG errors as a result of differences in the
-new command line construction procedure.  I tested numerous scenarios to
-make sure that all the defaults work like before, but there are enough
-combinations that it's hard to catch them all.  If you encounter any
-problems with captures that worked before but get FFMPEG errors now, the
-log file should help isolate the problem.  Make sure that the "Media
-Capture" box is check-marked in the Log File options, and make a
-snapshot of your PinballY.log file showing the error message from
-FFMPEG, along any non-default options in your capture setup.
-
-* Added a new Javascript event, "precapture", that fires when media
-capture is about to start.  The event receives the capture parameters,
-including the ffmpeg command line that PinballY constructed, and has the
-ability to rewrite the command line as desired.  This makes it possible
-to customize the ffmpeg settings in more complex ways than are possible
-through the option settings.
+new command construction procedure.  I think the rework will actually
+improve the reliability of the command construction, but any change to
+working code can cause short-term disruption, especially with something
+as complex as capture, which has many possible combinations of options
+and cases.  If you encounter any problems with captures that worked
+before but get FFMPEG errors now, the log file should help isolate the
+problem.  Make sure that the "Media Capture" box is check-marked in the
+Log File options, and make a snapshot of your PinballY.log file showing
+the error message from FFMPEG, along any non-default options in your
+capture setup.
+
+* A new Javascript event, "precapture", fires when media capture is
+about to start.  The event receives the capture parameters, including
+the ffmpeg command line that PinballY constructed, and has the ability
+to rewrite the command line as desired.  This makes it possible to
+customize the ffmpeg invocation in even more complex ways than are
+possible through the option settings.  Since the event can completely
+rewrite the command line, it has access to everything that FFMPEG can
+do.
 
 
 09-21-2024 (1.1.0 Beta 8)

diff --git a/VersionInfoUpdater/BuildNumber.txt b/VersionInfoUpdater/BuildNumber.txt
@@ -1 +1 @@
-10080
+10081
diff --git a/ffmpeg64/ffmpeg.exe b/ffmpeg64/ffmpeg.exe
diff --git a/ffmpeg64/ffmpeg.manifest b/ffmpeg64/ffmpeg.manifest
@@ -1,22 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
-<asmv1:assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <assemblyIdentity version="1.0.0.0" name="FFMPEG"/>
-  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
-    <security>
-      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
-        <requestedExecutionLevel level="asInvoker" uiAccess="false" />
-      </requestedPrivileges>
-    </security>
-  </trustInfo>
-  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
-    <application>
-      <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
-    </application>
-  </compatibility>
-  <asmv3:application xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
-    <asmv3:windowsSettings
-         xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
-      <dpiAware>True/PM</dpiAware>
-    </asmv3:windowsSettings>
-  </asmv3:application>
-</asmv1:assembly>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
+  <asmv3:application>
+    <asmv3:windowsSettings>
+      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true/pm</dpiAware>
+      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2</dpiAwareness>
+    </asmv3:windowsSettings>
+  </asmv3:application>
+</assembly>
diff --git a/release.bat b/release.bat
@@ -35,7 +35,9 @@ set ReleaseZipMin64=Builds\PinballY-64bit-Min-%ReleaseDate%.zip
 
 rem  Make sure our custom FFMPEG manifests are in place
 release\FfmpegManifestUpdater ffmpeg\ffmpeg.exe
+if errorlevel 1 goto EOF
 release\FfmpegManifestUpdater ffmpeg64\ffmpeg.exe
+if errorlevel 1 goto EOF
 
 
 rem  Build the full ZIP.  Note that this includes BOTH the "Full"
@@ -57,8 +59,8 @@ move 7-zip\7z.dll 7-zip\x86
 
 rem  Build the "Min" ZIP
 if exist %ReleaseZipMin% del %ReleaseZipMin%
-for /f "delims=" %%i in (ReleaseManifestExe32.txt) do zip %ReleaseZipMin% %%i
-for /f "delims=" %%i in (ReleaseManifestBase.txt) do zip %ReleaseZipMin% %%i
+rem for /f "delims=" %%i in (ReleaseManifestExe32.txt) do zip %ReleaseZipMin% %%i
+rem for /f "delims=" %%i in (ReleaseManifestBase.txt) do zip %ReleaseZipMin% %%i
 
 
 rem  Rename the .\ffmpeg64 folder to plain .\ffmpeg for the ZIP build
@@ -84,8 +86,8 @@ move ffmpeg32 ffmpeg
 
 rem  Build the "Min" 64-bit ZIP
 if exist %ReleaseZipMin64% del %ReleaseZipMin64%
-for /f "delims=" %%i in (ReleaseManifestExe64.txt) do zip %ReleaseZipMin64% %%i
-for /f "delims=" %%i in (ReleaseManifestBase.txt) do zip %ReleaseZipMin64% %%i
+rem for /f "delims=" %%i in (ReleaseManifestExe64.txt) do zip %ReleaseZipMin64% %%i
+rem for /f "delims=" %%i in (ReleaseManifestBase.txt) do zip %ReleaseZipMin64% %%i
 
 
 rem  Copy the MSI installers
@@ -98,3 +100,5 @@ copy /y VersionHistory.txt Builds\*.*
 
 rem  Remove the temporary release folder
 rmdir /q /s release_temp
+
+:EOF