New "TAS Input" feature for precise joystick inputs. The feature is still a work in progress, but is functional. Currently overwrites any joystick/keyboard analog inputs and does so for all controllers.

Renamed OnFrame.cpp/h to a more accurate Movie.cpp/h. Made some small changes that may improve movie synchronization.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7620 8ced0084-cf51-0410-be5f-012b33b47a6e

Source/Core/Core/CMakeLists.txt

@@ -11,10 +11,10 @@ set(SRCS	Src/ActionReplay.cpp
 			Src/GeckoCodeConfig.cpp
 			Src/GeckoCode.cpp
 			Src/MemTools.cpp
+			Src/Movie.cpp
 			Src/NetPlay.cpp
 			Src/NetPlayClient.cpp
 			Src/NetPlayServer.cpp
-			Src/OnFrame.cpp
 			Src/PatchEngine.cpp
 			Src/State.cpp
 			Src/stdafx.cpp

Source/Core/Core/Core.vcxproj

@@ -333,10 +333,10 @@
     <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE_Device_usb_kbd.cpp" />
     <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE_WiiMote.cpp" />
     <ClCompile Include="Src\MemTools.cpp" />
+    <ClCompile Include="Src\Movie.cpp" />
     <ClCompile Include="Src\NetPlay.cpp" />
     <ClCompile Include="Src\NetPlayClient.cpp" />
     <ClCompile Include="Src\NetPlayServer.cpp" />
-    <ClCompile Include="Src\OnFrame.cpp" />
     <ClCompile Include="Src\PatchEngine.cpp" />
     <ClCompile Include="Src\DSPEmulator.cpp" />
     <ClCompile Include="Src\PowerPC\Interpreter\Interpreter.cpp" />
@@ -533,8 +533,8 @@
     <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device_usb_kbd.h" />
     <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_WiiMote.h" />
     <ClInclude Include="Src\MemTools.h" />
+    <ClInclude Include="Src\Movie.h" />
     <ClInclude Include="Src\NetPlay.h" />
-    <ClInclude Include="Src\OnFrame.h" />
     <ClInclude Include="Src\PatchEngine.h" />
     <ClInclude Include="Src\DSPEmulator.h" />
     <ClInclude Include="Src\PowerPC\CPUCoreBase.h" />

Source/Core/Core/Core.vcxproj.filters

@@ -8,7 +8,6 @@
     <ClCompile Include="Src\CoreRerecording.cpp" />
     <ClCompile Include="Src\CoreTiming.cpp" />
     <ClCompile Include="Src\MemTools.cpp" />
-    <ClCompile Include="Src\OnFrame.cpp" />
     <ClCompile Include="Src\PatchEngine.cpp" />
     <ClCompile Include="Src\DSPEmulator.cpp" />
     <ClCompile Include="Src\State.cpp" />
@@ -553,6 +552,7 @@
     <ClCompile Include="Src\FifoPlayer\FifoAnalyzer.cpp">
       <Filter>FifoPlayer</Filter>
     </ClCompile>
+    <ClCompile Include="Src\Movie.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Src\ConfigManager.h" />
@@ -562,7 +562,6 @@
     <ClInclude Include="Src\CoreTiming.h" />
     <ClInclude Include="Src\Host.h" />
     <ClInclude Include="Src\MemTools.h" />
-    <ClInclude Include="Src\OnFrame.h" />
     <ClInclude Include="Src\PatchEngine.h" />
     <ClInclude Include="Src\DSPEmulator.h" />
     <ClInclude Include="Src\State.h" />
@@ -1027,6 +1026,7 @@
     <ClInclude Include="Src\FifoPlayer\FifoAnalyzer.h">
       <Filter>FifoPlayer</Filter>
     </ClInclude>
+    <ClInclude Include="Src\Movie.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="CMakeLists.txt" />

Source/Core/Core/Src/Core.cpp

@@ -71,7 +71,7 @@
 #include "LogManager.h"
 
 #include "State.h"
-#include "OnFrame.h"
+#include "Movie.h"
 
 // TODO: ugly, remove
 bool g_aspect_wide;
@@ -261,7 +261,7 @@ void Stop()  // - Hammertime!
 		SConfig::GetInstance().m_SYSCONF->Reload();
 
 	INFO_LOG(CONSOLE, "Stop [Main Thread]\t\t---- Shutdown complete ----");
-	Frame::g_InputCounter = 0;
+	Movie::g_InputCounter = 0;
 	g_bStopping = false;
 }
 
@@ -561,7 +561,7 @@ void VideoThrottle()
 
 	// Update info per second
 	u32 ElapseTime = (u32)Timer.GetTimeDifference();
-	if ((ElapseTime >= 1000 && DrawnVideo > 0) || Frame::g_bFrameStep)
+	if ((ElapseTime >= 1000 && DrawnVideo > 0) || Movie::g_bFrameStep)
 	{
 		SCoreStartupParameter& _CoreParameter = SConfig::GetInstance().m_LocalCoreStartupParameter;
 
@@ -599,8 +599,8 @@ void VideoThrottle()
 
 		#else	// Summary information
 		std::string SFPS;
-		if (Frame::IsPlayingInput() || Frame::IsRecordingInput())
+		if (Movie::IsPlayingInput() || Movie::IsRecordingInput())
-			SFPS = StringFromFormat("VI: %u - Frame: %u - FPS: %u - VPS: %u - SPEED: %u%%", Frame::g_frameCounter, Frame::g_InputCounter, FPS, VPS, Speed);
+			SFPS = StringFromFormat("VI: %u - Frame: %u - FPS: %u - VPS: %u - SPEED: %u%%", Movie::g_frameCounter, Movie::g_InputCounter, FPS, VPS, Speed);
 		else
 			SFPS = StringFromFormat("FPS: %u - VPS: %u - SPEED: %u%%", FPS, VPS, Speed);
 		#endif
@@ -652,7 +652,7 @@ void Callback_VideoCopiedToXFB(bool video_update)
 {
 	if(video_update)
 		Common::AtomicIncrement(DrawnFrame);
-	Frame::FrameUpdate();
+	Movie::FrameUpdate();
 }
 
 // Callback_ISOName: Let the DSP emulator get the game name

Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp

@@ -24,7 +24,7 @@
 #include "../ConfigManager.h"
 #include "MemoryUtil.h"
 #include "FileUtil.h"
-#include "../OnFrame.h"
+#include "../Movie.h"
 
 // We should provide an option to choose from the above, or figure out the checksum (the algo in yagcd seems wrong)
 // so that people can change default language.
@@ -340,7 +340,7 @@ u32 CEXIIPL::GetGCTime()
 
 	// hack in some netplay stuff
 	ltime = NetPlay_GetGCTime();
-	if (Frame::IsRecordingInput() || Frame::IsPlayingInput())
+	if (Movie::IsRecordingInput() || Movie::IsPlayingInput())
 		ltime = 1234567890; // TODO: Should you be able to set a custom time in movies?
 	else if (0 == ltime)
 		ltime = Common::Timer::GetLocalTimeSinceJan1970();

Source/Core/Core/Src/HW/GCPadEmu.cpp

@@ -106,7 +106,9 @@ void GCPad::GetInput(SPADStatus* const pad)
 		// buttons
 		m_buttons->GetState(&pad->button, button_bitmasks);
 
-		// TODO: set analog A/B analog to full or w/e, prolly not needed
+		// set analog A/B analog to full or w/e, prolly not needed
+		if (pad->button & PAD_BUTTON_A) pad->analogA = 0xFF;
+		if (pad->button & PAD_BUTTON_B) pad->analogB = 0xFF;
 
 		// dpad
 		m_dpad->GetState(&pad->button, dpad_bitmasks);

Source/Core/Core/Src/HW/SI.cpp

@@ -19,7 +19,7 @@
 #include "ChunkFile.h"
 #include "../ConfigManager.h"
 #include "../CoreTiming.h"
-#include "../OnFrame.h"
+#include "../Movie.h"
 
 #include "SystemTimers.h"
 #include "ProcessorInterface.h"
@@ -246,9 +246,9 @@ void Init()
 		g_Channel[i].m_InHi.Hex = 0;
 		g_Channel[i].m_InLo.Hex = 0;
 
-		if (Frame::IsUsingPad(i))
+		if (Movie::IsUsingPad(i))
 			AddDevice(SI_GC_CONTROLLER, i);
-		else if (Frame::IsRecordingInput() || Frame::IsPlayingInput())
+		else if (Movie::IsRecordingInput() || Movie::IsPlayingInput())
 			AddDevice(SI_NONE, i);
 		else
 			AddDevice(SConfig::GetInstance().m_SIDevice[i], i);
@@ -622,7 +622,7 @@ void RunSIBuffer()
 int GetTicksToNextSIPoll()
 {
 	// Poll for input at regular intervals (once per frame) when playing or recording a movie
-	if (Frame::IsPlayingInput() || Frame::IsRecordingInput())
+	if (Movie::IsPlayingInput() || Movie::IsRecordingInput())
 	{
 		return SystemTimers::GetTicksPerSecond() / VideoInterface::TargetRefreshRate;
 	}

Source/Core/Core/Src/HW/SI_DeviceGCController.cpp

@@ -27,7 +27,7 @@
 
 #include "GCPad.h"
 
-#include "../OnFrame.h"
+#include "../Movie.h"
 
 #include "../CoreTiming.h"
 #include "SystemTimers.h"
@@ -128,6 +128,7 @@ bool CSIDevice_GCController::GetData(u32& _Hi, u32& _Low)
 	memset(&PadStatus, 0, sizeof(PadStatus));
 
 	Pad::GetStatus(ISIDevice::m_iDeviceNumber, &PadStatus);
+	Movie::CallInputManip(&PadStatus, ISIDevice::m_iDeviceNumber);
 
 	u32 netValues[2];
 	if (NetPlay_GetInput(ISIDevice::m_iDeviceNumber, PadStatus, netValues))
@@ -137,22 +138,19 @@ bool CSIDevice_GCController::GetData(u32& _Hi, u32& _Low)
 		return true;
 	}
 
-	Frame::SetPolledDevice();
+	Movie::SetPolledDevice();
 
-	if(Frame::IsPlayingInput())
+	if(Movie::IsPlayingInput())
 	{
-		Frame::PlayController(&PadStatus, ISIDevice::m_iDeviceNumber);
+		Movie::PlayController(&PadStatus, ISIDevice::m_iDeviceNumber);
 		if(!Core::g_CoreStartupParameter.bWii)
-			Frame::InputUpdate();
+			Movie::InputUpdate();
 	}
-	else 
+	else if(Movie::IsRecordingInput())
 	{
-		if(Frame::IsRecordingInput())
+		Movie::RecordInput(&PadStatus, ISIDevice::m_iDeviceNumber);
-		{
+		if(!Core::g_CoreStartupParameter.bWii)
-			Frame::RecordInput(&PadStatus, ISIDevice::m_iDeviceNumber);
+			Movie::InputUpdate();
-			if(!Core::g_CoreStartupParameter.bWii)
-				Frame::InputUpdate();
-		}
 	}
 
 	// Thankfully changing mode does not change the high bits ;)

Source/Core/Core/Src/HW/Wiimote.cpp

@@ -4,7 +4,7 @@
 #include "Wiimote.h"
 #include "WiimoteReal/WiimoteReal.h"
 #include "WiimoteEmu/WiimoteEmu.h"
-#include "OnFrame.h"
+#include "Movie.h"
 
 #include "ControllerInterface/ControllerInterface.h"
 
@@ -48,8 +48,8 @@ void Initialize(void* const hwnd)
 
 	WiimoteReal::Initialize();
 	
-	if (Frame::IsPlayingInput()) // reload Wiimotes with our settings
+	if (Movie::IsPlayingInput()) // reload Wiimotes with our settings
-		Frame::ChangeWiiPads();
+		Movie::ChangeWiiPads();
 }
 
 // __________________________________________________________________________________________________

Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp

@@ -37,7 +37,7 @@ inline double round(double x) { return (x-floor(x))>0.5 ? ceil(x) : floor(x); }
 
 #include "MatrixMath.h"
 
-#include "../../OnFrame.h"
+#include "../../Movie.h"
 
 namespace WiimoteEmu
 {
@@ -635,9 +635,9 @@ void Wiimote::Update()
 	// figure out what data we need
 	s8 rptf_size = MAX_PAYLOAD;
 
-	Frame::SetPolledDevice();
+	Movie::SetPolledDevice();
 
-	if (!Frame::IsPlayingInput() || !Frame::PlayWiimote(m_index, data, rptf_size))
+	if (!Movie::IsPlayingInput() || !Movie::PlayWiimote(m_index, data, rptf_size))
 	{
 		const ReportFeatures& rptf = reporting_mode_features[m_reporting_mode - WM_REPORT_CORE];
 		rptf_size = rptf.size;
@@ -742,9 +742,9 @@ void Wiimote::Update()
 				}
 			}
 		}
-		if (Frame::IsRecordingInput())
+		if (Movie::IsRecordingInput())
 		{
-			Frame::RecordWiimote(m_index, data, rptf_size);
+			Movie::RecordWiimote(m_index, data, rptf_size);
 		}
 	}
 

Source/Core/Core/Src/Movie.cpp

@@ -15,7 +15,7 @@
 // Official SVN repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
-#include "OnFrame.h"
+#include "Movie.h"
 
 #include "Core.h"
 #include "Thread.h"
@@ -41,7 +41,7 @@
 
 std::mutex cs_frameSkip;
 
-namespace Frame {
+namespace Movie {
 
 bool g_bFrameStep = false;
 bool g_bFrameStop = false;
@@ -65,6 +65,8 @@ std::string tmpStateFilename = "dtm.sav";
 
 std::string g_InputDisplay[4];
 
+ManipFunction mfunc = NULL;
+
 std::string GetInputDisplay()
 {
 	std::string inputDisplay = "";
@@ -451,13 +453,19 @@ void PlayController(SPADStatus *PadStatus, int controllerID)
 	if (!IsPlayingInput() || !IsUsingPad(controllerID) || tmpInput == NULL)
 		return;
 
-	memset(PadStatus, 0, sizeof(SPADStatus));
-
 	if (inputOffset + 8 > tmpLength)
 	{
 		EndPlayInput(!g_bReadOnly);
 		return;
 	}
+
+	// dtm files don't save the mic button or error bit. not sure if they're actually
+	// used, but better safe than sorry
+	bool m = PadStatus->MicButton;
+	signed char e = PadStatus->err;
+	memset(PadStatus, 0, sizeof(SPADStatus));
+	PadStatus->MicButton = m;
+	PadStatus->err = e;
 	
 	memcpy(&g_padState, &(tmpInput[inputOffset]), 8);
 	inputOffset += 8;
@@ -634,4 +642,15 @@ void SaveRecording(const char *filename)
 	else
 		Core::DisplayMessage(StringFromFormat("Failed to save %s", filename).c_str(), 2000);
 }
+
+void SetInputManip(ManipFunction func)
+{
+	mfunc = func;
+}
+
+void CallInputManip(SPADStatus *PadStatus, int controllerID)
+{
+	if (mfunc)
+		(*mfunc)(PadStatus, controllerID);
+}
 };

Source/Core/Core/Src/Movie.h

@@ -15,8 +15,8 @@
 // Official SVN repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
-#ifndef __FRAME_H
+#ifndef __MOVIE_H
-#define __FRAME_H
+#define __MOVIE_H
 
 #include "Common.h"
 #include "FileUtil.h"
@@ -24,9 +24,9 @@
 
 #include <string>
 
-// Per-(video )Frame actions
+// Per-(video )Movie actions
 
-namespace Frame {
+namespace Movie {
 
 // Enumerations and structs
 enum PlayMode {
@@ -125,6 +125,12 @@ void EndPlayInput(bool cont);
 void SaveRecording(const char *filename);
 
 std::string GetInputDisplay();
+
+// Done this way to avoid mixing of core and gui code
+typedef void(*ManipFunction)(SPADStatus *, int);
+
+void SetInputManip(ManipFunction);
+void CallInputManip(SPADStatus *PadStatus, int controllerID);
 };
 
 #endif // __FRAME_H

Source/Core/Core/Src/State.cpp

@@ -22,7 +22,7 @@
 #include "StringUtil.h"
 #include "Thread.h"
 #include "CoreTiming.h"
-#include "OnFrame.h"
+#include "Movie.h"
 #include "HW/Wiimote.h"
 #include "HW/DSP.h"
 #include "HW/HW.h"
@@ -235,9 +235,9 @@ void SaveFileStateCallback(u64 userdata, int cyclesLate)
 	p.SetMode(PointerWrap::MODE_WRITE);
 	DoState(p);
 	
-	if ((Frame::IsRecordingInput() || Frame::IsPlayingInput()) && !Frame::IsRecordingInputFromSaveState())
+	if ((Movie::IsRecordingInput() || Movie::IsPlayingInput()) && !Movie::IsRecordingInputFromSaveState())
-		Frame::SaveRecording((g_current_filename + ".dtm").c_str());
+		Movie::SaveRecording((g_current_filename + ".dtm").c_str());
-	else if (!Frame::IsRecordingInput() && !Frame::IsPlayingInput())
+	else if (!Movie::IsRecordingInput() && !Movie::IsPlayingInput())
 		File::Delete(g_current_filename + ".dtm");
 
 	Core::DisplayMessage("Saving State...", 1000);
@@ -345,9 +345,9 @@ void LoadFileStateCallback(u64 userdata, int cyclesLate)
 			Core::DisplayMessage("Unable to Load : Can't load state from other revisions !", 4000);
 	
 		if (File::Exists(g_current_filename + ".dtm"))
-			Frame::LoadInput((g_current_filename + ".dtm").c_str());
+			Movie::LoadInput((g_current_filename + ".dtm").c_str());
-		else if (!Frame::IsRecordingInputFromSaveState())
+		else if (!Movie::IsRecordingInputFromSaveState())
-			Frame::EndPlayInput(false);
+			Movie::EndPlayInput(false);
 	}
 
 	g_op_in_progress = false;

Source/Core/DolphinWX/CMakeLists.txt

@@ -53,6 +53,7 @@ if(wxWidgets_FOUND)
 				Src/NetWindow.cpp
 				Src/PHackSettings.cpp
 				Src/PatchAddEdit.cpp
+				Src/TASInputDlg.cpp
 				Src/UDPConfigDiag.cpp
 				Src/VideoConfigDiag.cpp
 				Src/WXInputBase.cpp

Source/Core/DolphinWX/Dolphin.vcxproj

@@ -274,6 +274,7 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e /
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
     </ClCompile>
+    <ClCompile Include="Src\TASInputDlg.cpp" />
     <ClCompile Include="Src\UDPConfigDiag.cpp" />
     <ClCompile Include="Src\VideoConfigDiag.cpp" />
     <ClCompile Include="Src\WiimoteConfigDiag.cpp" />
@@ -320,6 +321,7 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e /
     <ClInclude Include="Src\Debugger\RegisterView.h" />
     <ClInclude Include="Src\Debugger\RegisterWindow.h" />
     <ClInclude Include="Src\stdafx.h" />
+    <ClInclude Include="Src\TASInputDlg.h" />
     <ClInclude Include="Src\UDPConfigDiag.h" />
     <ClInclude Include="Src\VideoConfigDiag.h" />
     <ClInclude Include="Src\WiimoteConfigDiag.h" />

Source/Core/DolphinWX/Dolphin.vcxproj.filters

@@ -132,6 +132,9 @@
     <ClCompile Include="Src\FifoPlayerDlg.cpp">
       <Filter>GUI</Filter>
     </ClCompile>
+    <ClCompile Include="Src\TASInputDlg.cpp">
+      <Filter>GUI</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Src\Main.h" />
@@ -258,6 +261,9 @@
     <ClInclude Include="Src\FifoPlayerDlg.h">
       <Filter>GUI</Filter>
     </ClInclude>
+    <ClInclude Include="Src\TASInputDlg.h">
+      <Filter>GUI</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="Src\SConscript" />

Source/Core/DolphinWX/Src/Frame.cpp

@@ -43,6 +43,7 @@
 #include "IPC_HLE/WII_IPC_HLE_Device_usb.h"
 #include "State.h"
 #include "VolumeHandler.h"
+#include "Movie.h"
 
 #include "VideoBackendBase.h"
 
@@ -242,6 +243,7 @@ EVT_MENU(IDM_RECORD, CFrame::OnRecord)
 EVT_MENU(IDM_PLAYRECORD, CFrame::OnPlayRecording)
 EVT_MENU(IDM_RECORDEXPORT, CFrame::OnRecordExport)
 EVT_MENU(IDM_RECORDREADONLY, CFrame::OnRecordReadOnly)
+EVT_MENU(IDM_TASINPUT, CFrame::OnTASInput)
 EVT_MENU(IDM_FRAMESTEP, CFrame::OnFrameStep)
 EVT_MENU(IDM_SCREENSHOT, CFrame::OnScreenshot)
 EVT_MENU(wxID_PREFERENCES, CFrame::OnConfigMain)
@@ -405,6 +407,9 @@ CFrame::CFrame(wxFrame* parent,
 	m_LogWindow->Hide();
 	m_LogWindow->Disable();
 
+	g_TASInputDlg = new TASInputDlg(this);
+	Movie::SetInputManip(TASManipFunction);
+
 	// Setup perspectives
 	if (g_pCodeWindow)
 	{
@@ -850,6 +855,12 @@ int GetCmdForHotkey(unsigned int key)
 	return -1;
 }
 
+void TASManipFunction(SPADStatus *PadStatus, int controllerID)
+{
+	if (main_frame)
+		main_frame->g_TASInputDlg->GetValues(PadStatus, controllerID);
+}
+
 void CFrame::OnKeyDown(wxKeyEvent& event)
 {
 	if(Core::GetState() != Core::CORE_UNINITIALIZED &&

Source/Core/DolphinWX/Src/Frame.h

@@ -33,6 +33,8 @@
 #include "Debugger/CodeWindow.h"
 #include "LogWindow.h"
 #include "LogConfigWindow.h"
+#include "TASInputDlg.h"
+#include "Movie.h"
 #if defined(HAVE_X11) && HAVE_X11
 #include "X11Utils.h"
 #endif
@@ -118,6 +120,7 @@ public:
 	CCodeWindow* g_pCodeWindow;
 	NetPlaySetupDiag* g_NetPlaySetupDiag;
 	wxCheatsWindow* g_CheatsWindow;
+	TASInputDlg* g_TASInputDlg;
 
 	void InitBitmaps();
 	void DoPause();
@@ -293,6 +296,7 @@ private:
 	void OnPlayRecording(wxCommandEvent& event);
 	void OnRecordExport(wxCommandEvent& event);
 	void OnRecordReadOnly(wxCommandEvent& event);
+	void OnTASInput(wxCommandEvent& event);
 	void OnChangeDisc(wxCommandEvent& event);
 	void OnScreenshot(wxCommandEvent& event);
 	void OnActive(wxActivateEvent& event);
@@ -357,5 +361,8 @@ private:
 
 int GetCmdForHotkey(unsigned int key);
 
+// For TASInputDlg
+void TASManipFunction(SPADStatus *PadStatus, int controllerID);
+
 #endif  // __FRAME_H_
 

Source/Core/DolphinWX/Src/FrameTools.cpp

@@ -56,7 +56,7 @@ Core::GetWindowHandle().
 
 #include "ConfigManager.h" // Core
 #include "Core.h"
-#include "OnFrame.h"
+#include "Movie.h"
 #include "HW/CPU.h"
 #include "PowerPC/PowerPC.h"
 #include "HW/DVDInterface.h"
@@ -72,6 +72,7 @@ Core::GetWindowHandle().
 #include "WiimoteConfigDiag.h"
 #include "InputConfigDiag.h"
 #include "HotkeyDlg.h"
+#include "TASInputDlg.h"
 
 #include <wx/datetime.h> // wxWidgets
 
@@ -140,6 +141,7 @@ void CFrame::CreateMenu()
 	emulationMenu->Append(IDM_PLAYRECORD, GetMenuLabel(HK_PLAY_RECORDING));
 	emulationMenu->Append(IDM_RECORDEXPORT, GetMenuLabel(HK_EXPORT_RECORDING));
 	emulationMenu->Append(IDM_RECORDREADONLY, GetMenuLabel(HK_READ_ONLY_MODE), wxEmptyString, wxITEM_CHECK);
+	emulationMenu->Append(IDM_TASINPUT, _("TAS Input"));
 	emulationMenu->Check(IDM_RECORDREADONLY, true);
 	emulationMenu->AppendSeparator();
 	
@@ -692,12 +694,17 @@ void CFrame::DoOpen(bool Boot)
 
 void CFrame::OnRecordReadOnly(wxCommandEvent& event)
 {
-	Frame::SetReadOnly(event.IsChecked());
+	Movie::SetReadOnly(event.IsChecked());
+}
+
+void CFrame::OnTASInput(wxCommandEvent& event)
+{
+	g_TASInputDlg->Show(true);
 }
 
 void CFrame::OnFrameStep(wxCommandEvent& event)
 {
-	Frame::SetFrameStepping(event.IsChecked());
+	Movie::SetFrameStepping(event.IsChecked());
 }
 
 void CFrame::OnChangeDisc(wxCommandEvent& WXUNUSED (event))
@@ -717,7 +724,7 @@ void CFrame::OnRecord(wxCommandEvent& WXUNUSED (event))
 			controllers |= (1 << (i + 4));
 	}
 
-	if(Frame::BeginRecordingInput(controllers))
+	if(Movie::BeginRecordingInput(controllers))
 		BootGame(std::string(""));
 }
 
@@ -734,7 +741,7 @@ void CFrame::OnPlayRecording(wxCommandEvent& WXUNUSED (event))
 	if(path.IsEmpty())
 		return;
 
-	if(Frame::PlayInput(path.mb_str()))
+	if(Movie::PlayInput(path.mb_str()))
 		BootGame(std::string(""));
 }
 
@@ -1047,10 +1054,10 @@ void CFrame::DoStop()
 		}
 
 		// TODO: Show the author/description dialog here
-		if(Frame::IsRecordingInput())
+		if(Movie::IsRecordingInput())
 			DoRecordingSave();
-		if(Frame::IsPlayingInput() || Frame::IsRecordingInput())
+		if(Movie::IsPlayingInput() || Movie::IsRecordingInput())
-			Frame::EndPlayInput(false);
+			Movie::EndPlayInput(false);
 
 		wxBeginBusyCursor();
 		BootManager::Stop();
@@ -1134,7 +1141,7 @@ void CFrame::DoRecordingSave()
 	if(path.IsEmpty())
 		return;
 	
-	Frame::SaveRecording(path.mb_str());
+	Movie::SaveRecording(path.mb_str());
 	
 	if (!paused)
 		DoPause();
@@ -1507,7 +1514,7 @@ void CFrame::OnFrameSkip(wxCommandEvent& event)
 {
 	int amount = event.GetId() - IDM_FRAMESKIP0;
 
-	Frame::SetFrameSkipping((unsigned int)amount);
+	Movie::SetFrameSkipping((unsigned int)amount);
 }
 
 
@@ -1544,9 +1551,9 @@ void CFrame::UpdateGUI()
 	// Emulation
 	GetMenuBar()->FindItem(IDM_STOP)->Enable(Running || Paused);
 	GetMenuBar()->FindItem(IDM_RESET)->Enable(Running || Paused);
-	GetMenuBar()->FindItem(IDM_RECORD)->Enable(!Frame::IsRecordingInput());
+	GetMenuBar()->FindItem(IDM_RECORD)->Enable(!Movie::IsRecordingInput());
 	GetMenuBar()->FindItem(IDM_PLAYRECORD)->Enable(!Initialized);
-	GetMenuBar()->FindItem(IDM_RECORDEXPORT)->Enable(Frame::IsRecordingInput());
+	GetMenuBar()->FindItem(IDM_RECORDEXPORT)->Enable(Movie::IsRecordingInput());
 	GetMenuBar()->FindItem(IDM_FRAMESTEP)->Enable(Running || Paused);
 	GetMenuBar()->FindItem(IDM_SCREENSHOT)->Enable(Running || Paused);
 	GetMenuBar()->FindItem(IDM_TOGGLE_FULLSCREEN)->Enable(Running || Paused);

Source/Core/DolphinWX/Src/Globals.h

@@ -79,6 +79,7 @@ enum
 	IDM_PLAYRECORD,
 	IDM_RECORDEXPORT,
 	IDM_RECORDREADONLY,
+	IDM_TASINPUT,
 	IDM_FRAMESTEP,
 	IDM_SCREENSHOT,
 	IDM_BROWSE,

Source/Plugins/Plugin_VideoDX11/Src/Render.cpp

@@ -39,7 +39,7 @@
 #include "TextureCache.h"
 #include "VertexShaderCache.h"
 #include "Core.h"
-#include "OnFrame.h"
+#include "Movie.h"
 #include "Television.h"
 #include "Host.h"
 
@@ -1036,7 +1036,7 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons
 	if (g_ActiveConfig.bShowInputDisplay)
 	{
 		char inputDisplay[1000];
-		StringCchPrintfA(inputDisplay, 1000, Frame::GetInputDisplay().c_str());
+		StringCchPrintfA(inputDisplay, 1000, Movie::GetInputDisplay().c_str());
 		D3D::font.DrawTextScaled(0, 30, 20, 0.0f, 0xFF00FFFF, inputDisplay);
 	}
 	Renderer::DrawDebugText();

Source/Plugins/Plugin_VideoDX9/Src/Render.cpp

@@ -52,7 +52,7 @@
 #include "DLCache.h"
 #include "Debugger.h"
 #include "Core.h"
-#include "OnFrame.h"
+#include "Movie.h"
 
 namespace DX9
 {
@@ -1139,7 +1139,7 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons
 	if (g_ActiveConfig.bShowInputDisplay)
 	{
 		char inputDisplay[1000];
-		StringCchPrintfA(inputDisplay, 1000, Frame::GetInputDisplay().c_str());
+		StringCchPrintfA(inputDisplay, 1000, Movie::GetInputDisplay().c_str());
 		D3D::font.DrawTextScaled(0, 30, 20, 20, 0.0f, 0xFF00FFFF, inputDisplay);
 	}
 	Renderer::DrawDebugText();

Source/Plugins/Plugin_VideoOGL/Src/Render.cpp

@@ -58,7 +58,7 @@
 #include "Fifo.h"
 #include "Debugger.h"
 #include "Core.h"
-#include "OnFrame.h"
+#include "Movie.h"
 #include "Host.h"
 
 #include "main.h" // Local
@@ -544,7 +544,7 @@ void Renderer::DrawDebugInfo()
 		p+=sprintf(p, "FPS: %d\n", s_fps);
 
 	if (g_ActiveConfig.bShowInputDisplay)
-		p+=sprintf(p, "%s", Frame::GetInputDisplay().c_str());
+		p+=sprintf(p, "%s", Movie::GetInputDisplay().c_str());
 
 	if (g_ActiveConfig.bShowEFBCopyRegions)
 	{