Skip to content

Commit 9a9639a

Browse files
ThoNohTnotr1ch
authored andcommitted
Added the project scenesw: The OBS Scene Switcher.
Includes changes to rundir: - Copying the dll file. - English locale. Includes scenesw in the installer.
1 parent 88b1ebc commit 9a9639a

18 files changed

+1376
-0
lines changed

OBS-All.sln

+13
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ObsNvenc", "ObsNvenc\ObsNve
5959
EndProject
6060
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libMinHook", "minhook\build\libMinHook.vcxproj", "{65021938-D251-46FA-BC3D-85C385D4C06D}"
6161
EndProject
62+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scenesw", "scenesw\scenesw.vcxproj", "{6AC307E3-7D59-4DB2-944F-961E299F063A}"
63+
ProjectSection(ProjectDependencies) = postProject
64+
{11A35235-DD48-41E2-8F40-825C78024BC0} = {11A35235-DD48-41E2-8F40-825C78024BC0}
65+
EndProjectSection
66+
EndProject
6267
Global
6368
GlobalSection(SolutionConfigurationPlatforms) = preSolution
6469
Debug|Win32 = Debug|Win32
@@ -187,6 +192,14 @@ Global
187192
{65021938-D251-46FA-BC3D-85C385D4C06D}.Release|Win32.Build.0 = Release|Win32
188193
{65021938-D251-46FA-BC3D-85C385D4C06D}.Release|x64.ActiveCfg = Release|x64
189194
{65021938-D251-46FA-BC3D-85C385D4C06D}.Release|x64.Build.0 = Release|x64
195+
{6AC307E3-7D59-4DB2-944F-961E299F063A}.Debug|Win32.ActiveCfg = Debug|Win32
196+
{6AC307E3-7D59-4DB2-944F-961E299F063A}.Debug|Win32.Build.0 = Debug|Win32
197+
{6AC307E3-7D59-4DB2-944F-961E299F063A}.Debug|x64.ActiveCfg = Debug|x64
198+
{6AC307E3-7D59-4DB2-944F-961E299F063A}.Debug|x64.Build.0 = Debug|x64
199+
{6AC307E3-7D59-4DB2-944F-961E299F063A}.Release|Win32.ActiveCfg = Release|Win32
200+
{6AC307E3-7D59-4DB2-944F-961E299F063A}.Release|Win32.Build.0 = Release|Win32
201+
{6AC307E3-7D59-4DB2-944F-961E299F063A}.Release|x64.ActiveCfg = Release|x64
202+
{6AC307E3-7D59-4DB2-944F-961E299F063A}.Release|x64.Build.0 = Release|x64
190203
EndGlobalSection
191204
GlobalSection(SolutionProperties) = preSolution
192205
HideSolutionNode = FALSE

installer/generate_binaries.bat

+19
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ mkdir 32bit\plugins\DShowPlugin\shaders
99
mkdir 32bit\plugins\GraphicsCapture
1010
mkdir 32bit\plugins\PSVPlugin
1111
mkdir 32bit\plugins\PSVPlugin\locale
12+
mkdir 32bit\plugins\scenesw
13+
mkdir 32bit\plugins\scenesw\locale
1214

1315
mkdir 64bit
1416
mkdir 64bit\locale
@@ -20,6 +22,8 @@ mkdir 64bit\plugins\DShowPlugin\shaders
2022
mkdir 64bit\plugins\GraphicsCapture
2123
mkdir 64bit\plugins\PSVPlugin
2224
mkdir 64bit\plugins\PSVPlugin\locale
25+
mkdir 64bit\plugins\scenesw
26+
mkdir 64bit\plugins\scenesw\locale
2327

2428
mkdir pdbs
2529
mkdir pdbs\32bit
@@ -35,9 +39,11 @@ copy ..\rundir\shaders\*.?Shader .\32bit\shaders\
3539
copy ..\dshowplugin\release\dshowplugin.dll .\32bit\plugins
3640
copy ..\noisegate\release\noisegate.dll .\32bit\plugins
3741
copy ..\psvplugin\release\psvplugin.dll .\32bit\plugins
42+
copy ..\scenesw\release\scenesw.dll .\32bit\plugins
3843
copy ..\rundir\plugins\dshowplugin\locale\*.txt .\32bit\plugins\dshowplugin\locale\
3944
copy ..\rundir\plugins\dshowplugin\shaders\*.?Shader .\32bit\plugins\dshowplugin\shaders\
4045
copy ..\rundir\plugins\psvplugin\locale\*.txt .\32bit\plugins\psvplugin\locale\
46+
copy ..\rundir\plugins\scenesw\locale\*.txt .\32bit\plugins\scenesw\locale\
4147
copy ..\graphicscapture\release\graphicscapture.dll .\32bit\plugins
4248
copy ..\graphicscapture\graphicscapturehook\release\graphicscapturehook.dll .\32bit\plugins\graphicscapture
4349
copy ..\graphicscapture\graphicscapturehook\x64\release\graphicscapturehook64.dll .\32bit\plugins\graphicscapture
@@ -58,9 +64,11 @@ copy ..\rundir\shaders\*.?Shader .\64bit\shaders\
5864
copy ..\dshowplugin\x64\release\dshowplugin.dll .\64bit\plugins
5965
copy ..\noisegate\x64\release\noisegate.dll .\64bit\plugins
6066
copy ..\psvplugin\x64\release\psvplugin.dll .\64bit\plugins
67+
copy ..\scenesw\x64\release\scenesw.dll .\64bit\plugins
6168
copy ..\rundir\plugins\dshowplugin\locale\*.txt .\64bit\plugins\dshowplugin\locale\
6269
copy ..\rundir\plugins\dshowplugin\shaders\*.?Shader .\64bit\plugins\dshowplugin\shaders\
6370
copy ..\rundir\plugins\psvplugin\locale\*.txt .\64bit\plugins\psvplugin\locale\
71+
copy ..\rundir\plugins\scenesw\locale\*.txt .\64bit\plugins\scenesw\locale\
6472
copy ..\graphicscapture\x64\release\graphicscapture.dll .\64bit\plugins
6573
copy ..\graphicscapture\graphicscapturehook\release\graphicscapturehook.dll .\64bit\plugins\graphicscapture
6674
copy ..\graphicscapture\graphicscapturehook\x64\release\graphicscapturehook64.dll .\64bit\plugins\graphicscapture
@@ -97,6 +105,11 @@ mkdir upload\PSVPlugin\32bit
97105
mkdir upload\PSVPlugin\32bit\PSVPlugin\locale
98106
mkdir upload\PSVPlugin\64bit
99107
mkdir upload\PSVPlugin\64bit\PSVPlugin\locale
108+
mkdir upload\scenesw
109+
mkdir upload\scenesw\32bit
110+
mkdir upload\scenesw\32bit\scenesw\locale
111+
mkdir upload\scenesw\64bit
112+
mkdir upload\scenesw\64bit\scenesw\locale
100113
mkdir upload\OBS
101114
mkdir upload\OBS\32bit
102115
mkdir upload\OBS\64bit
@@ -133,6 +146,12 @@ copy 32bit\plugins\psvplugin\locale\*.txt .\upload\PSVPlugin\32bit\PSVPlugin\loc
133146
copy 64bit\plugins\psvplugin.dll .\upload\PSVPlugin\64bit\
134147
copy 64bit\plugins\psvplugin\locale\*.txt .\upload\PSVPlugin\64bit\PSVPlugin\locale\
135148

149+
copy 32bit\plugins\scenesw.dll .\upload\scenesw\32bit\
150+
copy 32bit\plugins\scenesw\locale\*.txt .\upload\scenesw\32bit\scenesw\locale\
151+
152+
copy 64bit\plugins\scenesw.dll .\upload\scenesw\64bit\
153+
copy 64bit\plugins\scenesw\locale\*.txt .\upload\scenesw\64bit\scenesw\locale\
154+
136155
copy 32bit\obs.exe .\upload\OBS\32bit\
137156
copy 32bit\obsapi.dll .\upload\OBS\32bit\
138157
copy 32bit\*.pdb .\upload\OBS\32bit\

installer/generate_binaries_test.bat

+10
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ mkdir 32bit\plugins\DShowPlugin\shaders
99
mkdir 32bit\plugins\GraphicsCapture
1010
mkdir 32bit\plugins\PSVPlugin
1111
mkdir 32bit\plugins\PSVPlugin\locale
12+
mkdir 32bit\plugins\scenesw
13+
mkdir 32bit\plugins\scenesw\locale
1214

1315
mkdir 64bit
1416
mkdir 64bit\locale
@@ -20,6 +22,8 @@ mkdir 64bit\plugins\DShowPlugin\shaders
2022
mkdir 64bit\plugins\GraphicsCapture
2123
mkdir 64bit\plugins\PSVPlugin
2224
mkdir 64bit\plugins\PSVPlugin\locale
25+
mkdir 64bit\plugins\scenesw
26+
mkdir 64bit\plugins\scenesw\locale
2327

2428
copy ..\release\obs.exe .\32bit\
2529
copy ..\obsapi\release\obsapi.dll .\32bit\
@@ -30,14 +34,17 @@ copy ..\rundir\pdb32\DShowPlugin.pdb .\32bit\plugins\
3034
copy ..\rundir\pdb32\GraphicsCapture.pdb .\32bit\plugins\
3135
copy ..\rundir\pdb32\NoiseGate.pdb .\32bit\plugins\
3236
copy ..\rundir\pdb32\PSVPlugin.pdb .\32bit\plugins\
37+
copy ..\rundir\pdb32\scenesw.pdb .\32bit\plugins\
3338
copy ..\rundir\locale\*.txt .\32bit\locale\
3439
copy ..\rundir\shaders\*.?Shader .\32bit\shaders\
3540
copy ..\dshowplugin\release\dshowplugin.dll .\32bit\plugins
3641
copy ..\noisegate\release\noisegate.dll .\32bit\plugins
3742
copy ..\psvplugin\release\psvplugin.dll .\32bit\plugins
43+
copy ..\scenesw\release\scenesw.dll .\32bit\plugins
3844
copy ..\rundir\plugins\dshowplugin\locale\*.txt .\32bit\plugins\dshowplugin\locale\
3945
copy ..\rundir\plugins\dshowplugin\shaders\*.?Shader .\32bit\plugins\dshowplugin\shaders\
4046
copy ..\rundir\plugins\psvplugin\locale\*.txt .\32bit\plugins\psvplugin\locale\
47+
copy ..\rundir\plugins\scenesw\locale\*.txt .\32bit\plugins\scenesw\locale\
4148
copy ..\graphicscapture\release\graphicscapture.dll .\32bit\plugins
4249
copy ..\graphicscapture\graphicscapturehook\release\graphicscapturehook.dll .\32bit\plugins\graphicscapture
4350
copy ..\graphicscapture\graphicscapturehook\x64\release\graphicscapturehook64.dll .\32bit\plugins\graphicscapture
@@ -57,14 +64,17 @@ copy ..\rundir\pdb64\DShowPlugin.pdb .\64bit\plugins\
5764
copy ..\rundir\pdb64\GraphicsCapture.pdb .\64bit\plugins\
5865
copy ..\rundir\pdb64\NoiseGate.pdb .\64bit\plugins\
5966
copy ..\rundir\pdb64\PSVPlugin.pdb .\64bit\plugins\
67+
copy ..\rundir\pdb64\scenesw.pdb .\64bit\plugins\
6068
copy ..\rundir\locale\*.txt .\64bit\locale\
6169
copy ..\rundir\shaders\*.?Shader .\64bit\shaders\
6270
copy ..\dshowplugin\x64\release\dshowplugin.dll .\64bit\plugins
6371
copy ..\noisegate\x64\release\noisegate.dll .\64bit\plugins
6472
copy ..\psvplugin\x64\release\psvplugin.dll .\64bit\plugins
73+
copy ..\scenesw\x64\release\scenesw.dll .\64bit\plugins
6574
copy ..\rundir\plugins\dshowplugin\locale\*.txt .\64bit\plugins\dshowplugin\locale\
6675
copy ..\rundir\plugins\dshowplugin\shaders\*.?Shader .\64bit\plugins\dshowplugin\shaders\
6776
copy ..\rundir\plugins\psvplugin\locale\*.txt .\64bit\plugins\psvplugin\locale\
77+
copy ..\rundir\plugins\scenesw\locale\*.txt .\64bit\plugins\scenesw\locale\
6878
copy ..\graphicscapture\x64\release\graphicscapture.dll .\64bit\plugins
6979
copy ..\graphicscapture\graphicscapturehook\release\graphicscapturehook.dll .\64bit\plugins\graphicscapture
7080
copy ..\graphicscapture\graphicscapturehook\x64\release\graphicscapturehook64.dll .\64bit\plugins\graphicscapture

installer/installer.nsi

+14
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,9 @@ Section "Open Broadcaster Software" Section1
155155
File "32bit\plugins\PSVPlugin.dll"
156156
SetOutPath "$PROGRAMFILES32\OBS\plugins\PSVPlugin\locale\"
157157
File "32bit\plugins\PSVPlugin\locale\*.txt"
158+
File "32bit\plugins\scenesw.dll"
159+
SetOutPath "$PROGRAMFILES32\OBS\plugins\scenesw\locale\"
160+
File "32bit\plugins\scenesw\locale\*.txt"
158161
SetOutPath "$PROGRAMFILES32\OBS\plugins\DShowPlugin\locale\"
159162
File "32bit\plugins\DShowPlugin\locale\*.txt"
160163
SetOutPath "$PROGRAMFILES32\OBS\plugins\DShowPlugin\shaders\"
@@ -193,6 +196,9 @@ Section "Open Broadcaster Software" Section1
193196
File "64bit\plugins\PSVPlugin.dll"
194197
SetOutPath "$PROGRAMFILES64\OBS\plugins\PSVPlugin\locale\"
195198
File "64bit\plugins\PSVPlugin\locale\*.txt"
199+
File "64bit\plugins\scenesw.dll"
200+
SetOutPath "$PROGRAMFILES64\OBS\plugins\scenesw\locale\"
201+
File "64bit\plugins\scenesw\locale\*.txt"
196202
SetOutPath "$PROGRAMFILES64\OBS\plugins\DShowPlugin\locale\"
197203
File "64bit\plugins\DShowPlugin\locale\*.txt"
198204
SetOutPath "$PROGRAMFILES64\OBS\plugins\DShowPlugin\shaders\"
@@ -280,6 +286,8 @@ Section "un.OBS Program Files"
280286
Delete "$PROGRAMFILES32\OBS\plugins\NoiseGate.dll"
281287
Delete "$PROGRAMFILES32\OBS\plugins\PSVPlugin.dll"
282288
Delete "$PROGRAMFILES32\OBS\plugins\PSVPlugin\locale\*.txt"
289+
Delete "$PROGRAMFILES32\OBS\plugins\scenesw.dll"
290+
Delete "$PROGRAMFILES32\OBS\plugins\scenesw\locale\*.txt"
283291
Delete "$PROGRAMFILES32\OBS\plugins\DShowPlugin\locale\*.txt"
284292
Delete "$PROGRAMFILES32\OBS\plugins\DShowPlugin\shaders\*.?Shader"
285293
Delete "$PROGRAMFILES32\OBS\plugins\GraphicsCapture\*.dll"
@@ -301,6 +309,8 @@ Section "un.OBS Program Files"
301309
Delete "$PROGRAMFILES64\OBS\plugins\NoiseGate.dll"
302310
Delete "$PROGRAMFILES64\OBS\plugins\PSVPlugin.dll"
303311
Delete "$PROGRAMFILES64\OBS\plugins\PSVPlugin\locale\*.txt"
312+
Delete "$PROGRAMFILES64\OBS\plugins\scenesw.dll"
313+
Delete "$PROGRAMFILES64\OBS\plugins\scenesw\locale\*.txt"
304314
Delete "$PROGRAMFILES64\OBS\plugins\DShowPlugin\locale\*.txt"
305315
Delete "$PROGRAMFILES64\OBS\plugins\DShowPlugin\shaders\*.?Shader"
306316
Delete "$PROGRAMFILES64\OBS\plugins\GraphicsCapture\*.dll"
@@ -315,6 +325,8 @@ Section "un.OBS Program Files"
315325
RMDir "$PROGRAMFILES32\OBS\plugins\DShowPlugin\"
316326
RMDir "$PROGRAMFILES32\OBS\plugins\PSVPlugin\locale\"
317327
RMDir "$PROGRAMFILES32\OBS\plugins\PSVPlugin\"
328+
RMDir "$PROGRAMFILES32\OBS\plugins\scenesw\locale\"
329+
RMDir "$PROGRAMFILES32\OBS\plugins\scenesw\"
318330
RMDir "$PROGRAMFILES32\OBS\plugins"
319331
RMDir "$PROGRAMFILES32\OBS\locale"
320332
RMDir "$PROGRAMFILES32\OBS\shaders"
@@ -325,6 +337,8 @@ Section "un.OBS Program Files"
325337
RMDir "$PROGRAMFILES64\OBS\plugins\DShowPlugin\"
326338
RMDir "$PROGRAMFILES64\OBS\plugins\PSVPlugin\locale\"
327339
RMDir "$PROGRAMFILES64\OBS\plugins\PSVPlugin\"
340+
RMDir "$PROGRAMFILES64\OBS\plugins\scenesw\locale\"
341+
RMDir "$PROGRAMFILES64\OBS\plugins\scenesw\"
328342
RMDir "$PROGRAMFILES64\OBS\plugins"
329343
RMDir "$PROGRAMFILES64\OBS\locale"
330344
RMDir "$PROGRAMFILES64\OBS\shaders"

rundir/copydebug.bat

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ copy ..\graphicscapture\graphicscapturehook\debug\graphicscapturehook.dll .\plug
77
copy ..\graphicscapture\graphicscapturehook\x64\debug\graphicscapturehook64.dll .\plugins\graphicscapture
88
copy ..\noisegate\debug\noisegate.dll .\plugins
99
copy ..\psvplugin\debug\psvplugin.dll .\plugins
10+
copy ..\scenesw\debug\scenesw.dll .\plugins
1011
copy ..\x264\libs\32bit\libx264-142.dll .\
1112
copy ..\injectHelper\Release\injectHelper.exe .\plugins\graphicscapture
1213
copy ..\injectHelper\x64\Release\injectHelper64.exe .\plugins\graphicscapture

rundir/copydebug64.bat

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ copy ..\graphicscapture\graphicscapturehook\debug\graphicscapturehook.dll .\plug
77
copy ..\graphicscapture\graphicscapturehook\x64\debug\graphicscapturehook64.dll .\plugins\graphicscapture
88
copy ..\noisegate\x64\debug\noisegate.dll .\plugins
99
copy ..\psvplugin\x64\debug\psvplugin.dll .\plugins
10+
copy ..\scenesw\x64\debug\scenesw.dll .\plugins
1011
copy ..\x264\libs\64bit\libx264-142.dll .\
1112
copy ..\injectHelper\Release\injectHelper.exe .\plugins\graphicscapture
1213
copy ..\injectHelper\x64\Release\injectHelper64.exe .\plugins\graphicscapture

rundir/copyrelease.bat

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ copy ..\graphicscapture\graphicscapturehook\release\graphicscapturehook.dll .\pl
77
copy ..\graphicscapture\graphicscapturehook\x64\release\graphicscapturehook64.dll .\plugins\graphicscapture
88
copy ..\noisegate\release\noisegate.dll .\plugins
99
copy ..\psvplugin\release\psvplugin.dll .\plugins
10+
copy ..\scenesw\release\scenesw.dll .\plugins
1011
copy ..\x264\libs\32bit\libx264-142.dll .\
1112
copy ..\injectHelper\Release\injectHelper.exe .\plugins\graphicscapture
1213
copy ..\injectHelper\x64\Release\injectHelper64.exe .\plugins\graphicscapture

rundir/copyrelease64.bat

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ copy ..\graphicscapture\graphicscapturehook\release\graphicscapturehook.dll .\pl
77
copy ..\graphicscapture\graphicscapturehook\x64\release\graphicscapturehook64.dll .\plugins\graphicscapture
88
copy ..\noisegate\x64\release\noisegate.dll .\plugins
99
copy ..\psvplugin\x64\release\psvplugin.dll .\plugins
10+
copy ..\scenesw\x64\release\scenesw.dll .\plugins
1011
copy ..\x264\libs\64bit\libx264-142.dll .\
1112
copy ..\injectHelper\Release\injectHelper.exe .\plugins\graphicscapture
1213
copy ..\injectHelper\x64\Release\injectHelper64.exe .\plugins\graphicscapture

rundir/plugins/scenesw/locale/en.txt

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
Settings.MainWndTitle="Window title to check for:"
2+
Settings.MainWndScene="Scene to switch to on window title:"
3+
Settings.WindowTitle="Window Title"
4+
Settings.Scene="Scene"
5+
Settings.MatchExact="Match exact window name"
6+
Settings.SetToggleHotkey="Set a hotkey to toggle Scene Switcher:"
7+
Settings.NoMatch="When no window title matches"
8+
Settings.SwitchTo="switch to:"
9+
Settings.DontSwitch="don't switch"
10+
Settings.ClearHotkey="Clear Hotkey"
11+
Settings.Up="Up"
12+
Settings.Down="Down"
13+
Settings.Add="Add"
14+
Settings.Remove="Remove"
15+
Settings.CheckEvery="Check active window title every"
16+
Settings.Milliseconds="milliseconds."
17+
Settings.PluginIs="Plugin is"
18+
Settings.Running="running"
19+
Settings.NotRunning="not running"
20+
Settings.Start="Start"
21+
Settings.Stop="Stop"
22+
Settings.StartLaunch="Start at launch if possible"
23+
24+
Plugin.Description="Simple scene switcher. It will switch between several scenes according to your active window.\n\nThe settings can be found in the OBS settings window."
25+
Plugin.Name="OBS Scene switcher"
26+
Plugin.SettingsName="Scene Switcher"

0 commit comments

Comments
 (0)