ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ugh, oops

This commit is contained in:
adelikat 2014-08-17 16:00:46 +00:00
parent 602b47deba
commit 95bdfaba42
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
BizHawk.Client.Common/Global.cs
View File

@ -28,6 +28,7 @@ namespace BizHawk.Client.Common
//the movie will be spliced inbetween these if it is present //the movie will be spliced inbetween these if it is present
public static CopyControllerAdapter MovieInputSourceAdapter = new CopyControllerAdapter(); public static CopyControllerAdapter MovieInputSourceAdapter = new CopyControllerAdapter();
public static CopyControllerAdapter MovieOutputHardpoint = new CopyControllerAdapter(); public static CopyControllerAdapter MovieOutputHardpoint = new CopyControllerAdapter();
public static MultitrackRewiringControllerAdapter MultitrackRewiringAdapter = new MultitrackRewiringControllerAdapter();
//dont take my word for it, since the final word is actually in RewireInputChain, but here is a guide... //dont take my word for it, since the final word is actually in RewireInputChain, but here is a guide...
//user -> Input -> ActiveController -> UDLR -> StickyXORPlayerInputAdapter -> TurboAdapter(TBD) -> Lua(?TBD?) -> .. //user -> Input -> ActiveController -> UDLR -> StickyXORPlayerInputAdapter -> TurboAdapter(TBD) -> Lua(?TBD?) -> ..

4
BizHawk.Client.Common/inputAdapters/InputManager.cs
View File

@ -16,8 +16,8 @@ namespace BizHawk.Client.Common
Global.StickyXORAdapter.Source = Global.UD_LR_ControllerAdapter; Global.StickyXORAdapter.Source = Global.UD_LR_ControllerAdapter;
Global.AutofireStickyXORAdapter.Source = Global.StickyXORAdapter; Global.AutofireStickyXORAdapter.Source = Global.StickyXORAdapter;
Global.MovieSession.MultiTrack.MultitrackRewiringAdapter.Source = Global.AutofireStickyXORAdapter; Global.MultitrackRewiringAdapter.Source = Global.AutofireStickyXORAdapter;
Global.MovieInputSourceAdapter.Source = Global.MovieSession.MultiTrack.MultitrackRewiringAdapter; Global.MovieInputSourceAdapter.Source = Global.MultitrackRewiringAdapter;
Global.ControllerOutput.Source = Global.MovieOutputHardpoint; Global.ControllerOutput.Source = Global.MovieOutputHardpoint;
Global.Emulator.Controller = Global.ControllerOutput; Global.Emulator.Controller = Global.ControllerOutput;

4
BizHawk.Client.Common/movie/MovieSession.cs
View File

@ -138,7 +138,7 @@ namespace BizHawk.Client.Common
MovieControllerAdapter.LatchFromSource(input); MovieControllerAdapter.LatchFromSource(input);
if (MultiTrack.IsActive) if (MultiTrack.IsActive)
{ {
MultiTrack.MultitrackRewiringAdapter.Source = MovieControllerAdapter; Global.MultitrackRewiringAdapter.Source = MovieControllerAdapter;
} }
} }
else else
@ -275,7 +275,7 @@ namespace BizHawk.Client.Common
{ {
if (MultiTrack.IsActive) if (MultiTrack.IsActive)
{ {
LatchMultitrackPlayerInput(Global.MovieInputSourceAdapter, MultiTrack.MultitrackRewiringAdapter); LatchMultitrackPlayerInput(Global.MovieInputSourceAdapter, Global.MultitrackRewiringAdapter);
} }
else else
{ {

6
BizHawk.Client.Common/movie/MultitrackRecording.cs
View File

@ -1,4 +1,5 @@
using BizHawk.Emulation.Common; using System.Collections.Generic;
using BizHawk.Emulation.Common;
namespace BizHawk.Client.Common namespace BizHawk.Client.Common
{ {
@ -9,8 +10,6 @@ namespace BizHawk.Client.Common
Restart(); Restart();
} }
public MultitrackRewiringControllerAdapter MultitrackRewiringAdapter { get; private set; }
public bool IsActive { get; set; } public bool IsActive { get; set; }
public int CurrentPlayer{ get; set; } public int CurrentPlayer{ get; set; }
public bool RecordAll { get; set; } public bool RecordAll { get; set; }
@ -46,7 +45,6 @@ namespace BizHawk.Client.Common
IsActive = false; IsActive = false;
CurrentPlayer = 0; CurrentPlayer = 0;
RecordAll = false; RecordAll = false;
MultitrackRewiringAdapter = new MultitrackRewiringControllerAdapter();
} }
public void SelectAll() public void SelectAll()