Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update obs-vkcapture to obs-gamecapture #562

Merged
merged 2 commits into from
Aug 30, 2022
Merged

update obs-vkcapture to obs-gamecapture #562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b77a939
update obs-vkcapture to obs-gamecapture
zany130 Aug 29, 2022
b3c0988
Update Lang files and some missing variables
zany130 Aug 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lang/chinese.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -942,5 +942,5 @@ GUI_USE_WDIB="Enable Discord Rich Presence"
DESC_USE_WDIB="Enable Discord Rich Presence via wine-discord-ipc-bridge"
GUI_WAITFORCUSTOMCMD="Wait for custom command"
DESC_WAITFORCUSTOMCMD="Wait X seconds after having started the custom program before continuing with the game launch. 1 is only wait for the custom program pid"
GUI_USEOBSVKC="Enable obs-vkcapture"
DESC_USEOBSVKC="Start the game through obs-vkcapture"
GUI_USEOBSCAP="Enable obs-gamecapture"
DESC_USEOBSCAP="Start the game through obs-gamecapture"
4 changes: 2 additions & 2 deletions lang/dutch.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -942,5 +942,5 @@ GUI_USE_WDIB="Enable Discord Rich Presence"
DESC_USE_WDIB="Enable Discord Rich Presence via wine-discord-ipc-bridge"
GUI_WAITFORCUSTOMCMD="Wait for custom command"
DESC_WAITFORCUSTOMCMD="Wait X seconds after having started the custom program before continuing with the game launch. 1 is only wait for the custom program pid"
GUI_USEOBSVKC="Enable obs-vkcapture"
DESC_USEOBSVKC="Start the game through obs-vkcapture"
GUI_USEOBSCAP="Enable obs-gamecapture"
DESC_USEOBSCAP="Start the game through obs-gamecapture"
4 changes: 2 additions & 2 deletions lang/english.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -942,5 +942,5 @@ GUI_USE_WDIB="Enable Discord Rich Presence"
DESC_USE_WDIB="Enable Discord Rich Presence via wine-discord-ipc-bridge"
GUI_WAITFORCUSTOMCMD="Wait for custom command"
DESC_WAITFORCUSTOMCMD="Wait X seconds after having started the custom program before continuing with the game launch. 1 is only wait for the custom program pid"
GUI_USEOBSVKC="Enable obs-vkcapture"
DESC_USEOBSVKC="Start the game through obs-vkcapture"
GUI_USEOBSCAP="Enable obs-gamecapture"
DESC_USEOBSCAP="Start the game through obs-gamecapture"
4 changes: 2 additions & 2 deletions lang/englishUK.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -942,5 +942,5 @@ GUI_USE_WDIB="Enable Discord Rich Presence"
DESC_USE_WDIB="Enable Discord Rich Presence via wine-discord-ipc-bridge"
GUI_WAITFORCUSTOMCMD="Wait for custom command"
DESC_WAITFORCUSTOMCMD="Wait X seconds after having started the custom program before continuing with the game launch. 1 is only wait for the custom program pid"
GUI_USEOBSVKC="Enable obs-vkcapture"
DESC_USEOBSVKC="Start the game through obs-vkcapture"
GUI_USEOBSCAP="Enable obs-gamecapture"
DESC_USEOBSCAP="Start the game through obs-gamecapture"
4 changes: 2 additions & 2 deletions lang/french.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -942,5 +942,5 @@ GUI_USE_WDIB="Enable Discord Rich Presence"
DESC_USE_WDIB="Enable Discord Rich Presence via wine-discord-ipc-bridge"
GUI_WAITFORCUSTOMCMD="Wait for custom command"
DESC_WAITFORCUSTOMCMD="Wait X seconds after having started the custom program before continuing with the game launch. 1 is only wait for the custom program pid"
GUI_USEOBSVKC="Enable obs-vkcapture"
DESC_USEOBSVKC="Start the game through obs-vkcapture"
GUI_USEOBSCAP="Enable obs-gamecapture"
DESC_USEOBSCAP="Start the game through obs-gamecapture"
4 changes: 2 additions & 2 deletions lang/german.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -942,5 +942,5 @@ GUI_USE_WDIB="Verwende Discord Rich Presence"
DESC_USE_WDIB="Verwende Discord Rich Presence mittels wine-discord-ipc-bridge"
GUI_WAITFORCUSTOMCMD="Warte auf custom command"
DESC_WAITFORCUSTOMCMD="Warte X Sekunden nach dem Start des custom commands mit dem Starten des Spiels. Bei 1 nur auf die custom program pid warten"
GUI_USEOBSVKC="Enable obs-vkcapture"
DESC_USEOBSVKC="Start the game through obs-vkcapture"
GUI_USEOBSCAP="Enable obs-gamecapture"
DESC_USEOBSCAP="Start the game through obs-gamecapture"
4 changes: 2 additions & 2 deletions lang/italian.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -942,5 +942,5 @@ GUI_USE_WDIB="Enable Discord Rich Presence"
DESC_USE_WDIB="Enable Discord Rich Presence via wine-discord-ipc-bridge"
GUI_WAITFORCUSTOMCMD="Wait for custom command"
DESC_WAITFORCUSTOMCMD="Wait X seconds after having started the custom program before continuing with the game launch. 1 is only wait for the custom program pid"
GUI_USEOBSVKC="Enable obs-vkcapture"
DESC_USEOBSVKC="Start the game through obs-vkcapture"
GUI_USEOBSCAP="Enable obs-gamecapture"
DESC_USEOBSCAP="Start the game through obs-gamecapture"
4 changes: 2 additions & 2 deletions lang/polish.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -942,5 +942,5 @@ GUI_USE_WDIB="Włącz Discord Rich Presence"
DESC_USE_WDIB="Włącz Discord Rich Presence używając wine-discord-ipc-bridge"
GUI_WAITFORCUSTOMCMD="Czekaj na własne polecenie"
DESC_WAITFORCUSTOMCMD="Czekaj X sekund po rozpoczęciu własnego programu przed kontynuacją uruchomienia nowej gry. 1 tylko czeka na własne PID procesu"
GUI_USEOBSVKC="Włącz obs-vkcapture"
DESC_USEOBSVKC="Rozpocznij grę przez obs-vkcapture"
GUI_USEOBSCAP="Włącz obs-gamecapture"
DESC_USEOBSCAP="Rozpocznij grę przez obs-gamecapture"
4 changes: 2 additions & 2 deletions lang/russian.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -942,5 +942,5 @@ GUI_USE_WDIB="Enable Discord Rich Presence"
DESC_USE_WDIB="Enable Discord Rich Presence via wine-discord-ipc-bridge"
GUI_WAITFORCUSTOMCMD="Wait for custom command"
DESC_WAITFORCUSTOMCMD="Wait X seconds after having started the custom program before continuing with the game launch. 1 is only wait for the custom program pid"
GUI_USEOBSVKC="Enable obs-vkcapture"
DESC_USEOBSVKC="Start the game through obs-vkcapture"
GUI_USEOBSCAP="Enable obs-gamecapture"
DESC_USEOBSCAP="Start the game through obs-gamecapture"
28 changes: 14 additions & 14 deletions steamtinkerlaunch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ PERES="peres"
GDB="gdb"
XDGMIME="xdg-mime"
XDGO="xdg-open"
OBSVKC="obs-vkcapture"
OBSCAP="obs-gamecapture"

CHECKHMD=1
X32D="x32dbg"
Expand Down Expand Up @@ -2620,7 +2620,7 @@ function setDefaultCfgValues {
if [ -z "$USEGAMEMODERUN" ] ; then USEGAMEMODERUN="0"; fi
if [ -z "$USEGAMESCOPE" ] ; then USEGAMESCOPE="0"; fi
if [ -z "$GAMESCOPE_ARGS" ] ; then GAMESCOPE_ARGS="--"; fi
if [ -z "$USEOBSVKC" ] ; then USEOBSVKC="0"; fi
if [ -z "$USEOBSCAP" ] ; then USEOBSCAP="0"; fi
if [ -z "$USEZINK" ] ; then USEZINK="0"; fi
if [ -z "$USEPRIMERUN" ] ; then USEPRIMERUN="0"; fi
if [ -z "$TOGSTEAMWEBHELPER" ] ; then TOGSTEAMWEBHELPER="0"; fi
Expand Down Expand Up @@ -3123,8 +3123,8 @@ function saveCfg {
echo "USEGAMESCOPE=\"$USEGAMESCOPE\""
echo "## $DESC_GAMESCOPE_ARGS"
echo "GAMESCOPE_ARGS=\"$GAMESCOPE_ARGS\""
echo "## $DESC_USEOBSVKC"
echo "USEOBSVKC=\"$USEOBSVKC\""
echo "## $DESC_USEOBSCAP"
echo "USEOBSCAP=\"$USEOBSCAP\""
echo "## $DESC_USEZINK"
echo "USEZINK=\"$USEZINK\""
echo "## $DESC_USEPRIMERUN"
Expand Down Expand Up @@ -4899,7 +4899,7 @@ function AllSettingsEntriesDummyFunction {
--field=" $GUI_USEMANGOHUDSTLCFG!$DESC_USEMANGOHUDSTLCFG ('USEMANGOHUDSTLCFG')":CHK "${USEMANGOHUDSTLCFG/#-/ -}" `#CAT_Tools` `#SUB_Checkbox` `#MENU_GAME` \
--field=" $GUI_USEGAMESCOPE!$DESC_USEGAMESCOPE ('USEGAMESCOPE')":CHK "${USEGAMESCOPE/#-/ -}" `#CAT_Tools` `#SUB_Checkbox` `#MENU_GAME` \
--field=" $GUI_GAMESCOPE_ARGS!$DESC_GAMESCOPE_ARGS ('GAMESCOPE_ARGS')":CBE "${GAMESCOPE_ARGS/#-/ -}!--" `#CAT_Tools` `#MENU_GAME` \
--field=" $GUI_USEOBSVKC!$DESC_USEOBSVKC ('USEOBSVKC')":CHK "${USEOBSVKC/#-/ -}" `#CAT_Tools` `#SUB_Checkbox` `#MENU_GAME` \
--field=" $GUI_USEOBSCAP!$DESC_USEOBSCAP ('USEOBSCAP')":CHK "${USEOBSCAP/#-/ -}" `#CAT_Tools` `#SUB_Checkbox` `#MENU_GAME` \
--field=" $GUI_USEZINK!$DESC_USEZINK ('USEZINK')":CHK "${USEZINK/#-/ -}" `#CAT_Tools` `#SUB_Checkbox` `#MENU_GAME` \
--field=" $GUI_USEPRIMERUN!$DESC_USEPRIMERUN ('USEPRIMERUN')":CHK "${USEPRIMERUN/#-/ -}" `#CAT_Tools` `#SUB_Checkbox` `#MENU_GAME` \
--field=" $GUI_RUN_NYRNA!$DESC_RUN_NYRNA ('RUN_NYRNA')":CHK "${RUN_NYRNA/#-/ -}" `#CAT_Tools` `#SUB_Checkbox` `#MENU_GAME` \
Expand Down Expand Up @@ -13839,7 +13839,7 @@ function checkExtDeps {
checkDep "USESPECIALK" "$SEVZA"
checkDep "RUN_CHEATENGINE" "$SEVZA"
checkDep "USEMANGOAPP" "$MANGOAPP"
checkDep "USEOBSVKC" "$OBSVKC"
checkDep "USEOBSCAP" "$OBSCAP"
}

function setYadBin {
Expand Down Expand Up @@ -16681,10 +16681,10 @@ function setWineCmd {

writelog "INFO" "${FUNCNAME[0]} - Starting game $GN with '$("$RUNWINE" --version)' and waiting for its PID to exit"

# disable USEOBSVKC for wine
if [ "$USEOBSVKC" -eq 1 ]; then
writelog "SKIP" "${FUNCNAME[0]} - Ignoring USEOBSVKC being enabled, because wine is used instead of Proton"
OBSVKC=0
# disable USEOBSCAP for wine
if [ "$USEOBSCAP" -eq 1 ]; then
writelog "SKIP" "${FUNCNAME[0]} - Ignoring USEOBSCAP being enabled, because wine is used instead of Proton"
OBSCAP=0
fi

# start with gamemoderun:
Expand Down Expand Up @@ -16832,8 +16832,8 @@ function launchSteamGame {
GMR="$(command -v "$GAMEMODERUN")"
fi

if [ "$USEOBSVKC" -eq 1 ]; then
OBSC="$(command -v "$OBSVKC")"
if [ "$USEOBSCAP" -eq 1 ]; then
OBSC="$(command -v "$OBSCAP")"
fi

if [ "$USEGAMESCOPE" -eq 1 ]; then
Expand Down Expand Up @@ -16915,8 +16915,8 @@ function launchSteamGame {
if [ "$USEWINE" -eq 0 ]; then
# concatenate final game start command

if [ "$USEOBSVKC" -eq 1 ]; then
writelog "INFO" "${FUNCNAME[0]} - USEOBSVKC is enabled - preparing $OBSVKC command"
if [ "$USEOBSCAP" -eq 1 ]; then
writelog "INFO" "${FUNCNAME[0]} - USEOBSCAP is enabled - preparing $OBSCAP command"
if [ -n "${FINALSTARTCMD[0]}" ]; then
FINALSTARTCMD=("${FINALSTARTCMD[@]}" "$OBSC")
else
Expand Down