Merge upstream and stash
This commit is contained in:
@@ -309,7 +309,7 @@ Procedure EnsureFFmpeg(Event)
|
||||
Debug(res2)
|
||||
If res = -1 Or res2 = -1
|
||||
Debug("Doesn't exist, trying to download")
|
||||
result = MessageRequester("Error", ~"FFmpeg couldn't be found. Download it automatically?\nA small 7zip executable will be downloaded alongside it to extract the 7z archive.\n\nIt will be saved to\n" + ffpath$, #PB_MessageRequester_Warning | #PB_MessageRequester_YesNo)
|
||||
result = MessageRequester("Error", ~"FFmpeg couldn't be found, but is required for this program to work. Download it automatically?\nA small 7zip executable will be downloaded alongside it to extract the 7z archive.\n\nIt will be saved to\n" + ffpath$, #PB_MessageRequester_Warning | #PB_MessageRequester_YesNo)
|
||||
RemoveFFmpeg(-1)
|
||||
If result = #PB_MessageRequester_No
|
||||
ProcedureReturn #False
|
||||
@@ -333,6 +333,7 @@ Procedure EnsureFFmpeg(Event)
|
||||
SetGadgetText(download_text, "Please wait for 7zip to finish extracting.")
|
||||
args$ = "e ffmpeg.7z ffmpeg.exe ffprobe.exe -r"
|
||||
sevenzzip = RunProgram(ffpath$ + "7zr.exe", args$, ffpath$, #PB_Program_Wait)
|
||||
Debug(sevenzip)
|
||||
Output$ = ""
|
||||
Error$ = ""
|
||||
If sevenzip
|
||||
@@ -1003,6 +1004,9 @@ SaveConfigFile(ConfigFile)
|
||||
If GetConfigValue("autoCheckUpdate", "0") = "1"
|
||||
CheckUpdate(-1)
|
||||
EndIf
|
||||
|
||||
EnsureFFmpeg(-1)
|
||||
|
||||
;GetResolution()
|
||||
;GetDuration()
|
||||
; The main event loop as usual
|
||||
@@ -1017,7 +1021,8 @@ Repeat
|
||||
|
||||
Until Event = #PB_Event_CloseWindow ; Quit on any window close
|
||||
; IDE Options = PureBasic 6.20 (Windows - x64)
|
||||
; CursorPosition = 2
|
||||
; Folding = Beug0
|
||||
; CursorPosition = 335
|
||||
; FirstLine = 219
|
||||
; Folding = he+g0
|
||||
; EnableXP
|
||||
; DPIAware
|
||||
@@ -7,7 +7,7 @@
|
||||
<section name="data">
|
||||
<explorer view="C:\ProgramData\PureBasic\Examples\" pattern="0"/>
|
||||
<log show="1"/>
|
||||
<lastopen date="2025-12-23 02:34" user="Ditin2" host="CYBERMOON"/>
|
||||
<lastopen date="2026-02-06 02:44" user="Ditin2" host="DESKTOP-SVLCQ1M"/>
|
||||
</section>
|
||||
<section name="files">
|
||||
<file name="ReencodeFfmpeg.pb">
|
||||
|
||||
Reference in New Issue
Block a user