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

Movie MultitrackRewiringControlllerAdapter to a property in the Multitrack object

This commit is contained in:
adelikat 2014-08-17 15:11:04 +00:00
parent 0a608edd07
commit 71a564b1cf
4 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,12 +15,6 @@ namespace BizHawk.Client.Common
public static FirmwareManager FirmwareManager; public static FirmwareManager FirmwareManager;
public static Rewinder Rewinder; public static Rewinder Rewinder;
//Movie
/// <summary>
/// the global MovieSession can use this to deal with multitrack player remapping (should this be here? maybe it should be in MovieSession)
/// </summary>
public static MultitrackRewiringControllerAdapter MultitrackRewiringControllerAdapter = new MultitrackRewiringControllerAdapter();
public static MovieSession MovieSession = new MovieSession(); public static MovieSession MovieSession = new MovieSession();
/// <summary> /// <summary>

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.MultitrackRewiringControllerAdapter.Source = Global.AutofireStickyXORAdapter; Global.MovieSession.MultiTrack.MultitrackRewiringAdapter.Source = Global.AutofireStickyXORAdapter;
Global.MovieInputSourceAdapter.Source = Global.MultitrackRewiringControllerAdapter; Global.MovieInputSourceAdapter.Source = Global.MovieSession.MultiTrack.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)
{ {
Global.MultitrackRewiringControllerAdapter.Source = MovieControllerAdapter; MultiTrack.MultitrackRewiringAdapter.Source = MovieControllerAdapter;
} }
} }
else else
@ -275,7 +275,7 @@ namespace BizHawk.Client.Common
{ {
if (MultiTrack.IsActive) if (MultiTrack.IsActive)
{ {
LatchMultitrackPlayerInput(Global.MovieInputSourceAdapter, Global.MultitrackRewiringControllerAdapter); LatchMultitrackPlayerInput(Global.MovieInputSourceAdapter, MultiTrack.MultitrackRewiringAdapter);
} }
else else
{ {

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

@ -2,6 +2,13 @@
{ {
public class MultitrackRecorder public class MultitrackRecorder
{ {
public MultitrackRecorder()
{
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; }
@ -37,6 +44,7 @@
IsActive = false; IsActive = false;
CurrentPlayer = 0; CurrentPlayer = 0;
RecordAll = false; RecordAll = false;
MultitrackRewiringAdapter = new MultitrackRewiringControllerAdapter();
} }
public void SelectAll() public void SelectAll()