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

recording:gui: Temporarily remove Movie Editor GUI, add back at a later date 

This is a rather involved refactor and isn't critical to getting the main PR / spike merged.
This commit is contained in:
Tyler Wilding 2018-11-15 21:09:33 -05:00 committed by lightningterror
parent db4ff1e8fc
commit 6b3fb14339
13 changed files with 20 additions and 476 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcsx2/CMakeLists.txt
View File

@ -465,7 +465,6 @@ set(pcsx2RDebugHeaders
# Recording sources
set(pcsx2RecordingSources
Recording/InputRecording.cpp
Recording/InputRecordingEditor.cpp
Recording/InputRecordingFile.cpp
Recording/NewRecordingFrame.cpp
Recording/PadData.cpp
@ -477,7 +476,6 @@ set(pcsx2RecordingSources
# Recording headers
set(pcsx2RecordingHeaders
Recording/InputRecording.h
Recording/InputRecordingEditor.h
Recording/InputRecordingFile.h
Recording/NewRecordingFrame.h
Recording/PadData.h

3
pcsx2/Counters.cpp
View File

@ -34,7 +34,6 @@
#ifndef DISABLE_RECORDING
# include "Recording/RecordingControls.h"
# include "Recording/InputRecordingEditor.h"
#endif
using namespace Threading;
@ -576,8 +575,6 @@ __fi void rcntUpdate_vSync()
#ifndef DISABLE_RECORDING
if (g_Conf->EmuOptions.EnableRecordingTools)
{
InputRecordingEditor* dlg = wxGetApp().GetInputRecordingEditorPtr();
if (dlg)dlg->FrameUpdate();
g_RecordingControls.StopCheck();
}
#endif

337
pcsx2/Recording/InputRecordingEditor.cpp
View File

@ -1,337 +0,0 @@
#include "PrecompiledHeader.h"
#include "MemoryTypes.h"
#include "Counters.h"
#include "InputRecordingEditor.h"
#include "InputRecording.h"
#include "RecordingControls.h"
#include <string>
#include <wx/joystick.h>
enum {
ID_MenuAuthor = 1,
ID_MenuInputRecordingInfo,
ID_List_KeyFrame,
ID_Text_Edit,
ID_Btn_Update,
ID_Btn_Insert,
ID_Btn_Delete,
ID_Btn_Copy,
ID_Btn_DrawFrame,
ID_Btn_DrawNowFrame,
ID_CheckList_NormalKey1,
ID_Text_AnalogKey1,
ID_Text_AnalogKey2,
ID_Text_AnalogKey3,
ID_Text_AnalogKey4,
};
wxBEGIN_EVENT_TABLE(InputRecordingEditor, wxFrame)
EVT_CLOSE(InputRecordingEditor::OnClose)
wxEND_EVENT_TABLE()
InputRecordingEditor::InputRecordingEditor(wxWindow * parent)
: wxFrame(parent, wxID_ANY, L"InputRecordingEditor", wxPoint(437+680,52), wxSize(680,560))
{
// TODO - needs proper wxFrame design, no hardcoding of coordinates
// menu bar
wxMenu *menuFile = new wxMenu;
menuFile->Append(ID_MenuAuthor, L"&set author");
menuFile->Append(ID_MenuInputRecordingInfo, L"&InputRecordingInfo");
wxMenuBar *menuBar = new wxMenuBar;
menuBar->Append(menuFile, L"&menu");
SetMenuBar(menuBar);
// panel
int x = 2;
int y = 2;
wxPanel *panel = new wxPanel(this, wxID_ANY);
// listbox
frameList = new wxListBox(panel, ID_List_KeyFrame, wxPoint(x, y),wxSize(250,460));
x += 250 + 5;
// key
keyTextView = new wxTextCtrl(panel, wxID_ANY, L"", wxPoint(x, y), wxSize(420, 25));
keyTextView->Disable();
y += 25;
new wxButton(panel, ID_Btn_Copy, L"copy", wxPoint(x, y));
y += 28;
keyTextEdit = new wxTextCtrl(panel, ID_Text_Edit, L"", wxPoint(x, y), wxSize(420, 25));
y += 25;
wxArrayString tmp;
for (int i = 0; i < PadDataNormalKeysSize; i++) {
tmp.Add(PadDataNormalKeys[i]);
}
keyCheckList1 = new wxCheckListBox(panel, ID_CheckList_NormalKey1, wxPoint(x, y), wxSize(90, 300), tmp);
x += 90+5;
// analog
for (int i = 0; i < PadDataAnalogKeysSize; i++) {
(new wxTextCtrl(panel, wxID_ANY, PadDataAnalogKeys[i] , wxPoint(x, y), wxSize(100, 28)))->Disable();
analogKeyText[i] = new wxTextCtrl(panel, (ID_Text_AnalogKey1+i), "", wxPoint(x + 100, y), wxSize(80, 28));
y += 28;
}
// button
int w = 90;
new wxButton(panel, ID_Btn_Update, L"update", wxPoint(x,y));
new wxButton(panel, ID_Btn_Insert, L"insert", wxPoint(x+w, y));
new wxButton(panel, ID_Btn_Delete, L"delete", wxPoint(x+w*2, y));
y += 28+20;
frameTextFoeMove = new wxTextCtrl(panel, wxID_ANY, L"100", wxPoint(x, y), wxSize(80, 25));
y += 28;
new wxButton(panel, ID_Btn_DrawFrame, L"draw frame:", wxPoint(x, y));
new wxButton(panel, ID_Btn_DrawNowFrame, L"draw now frame", wxPoint(x + w, y));
// status bar
statusbar = CreateStatusBar();
statusbar->SetStatusText(L"key editor open");
// event
Bind(wxEVT_COMMAND_MENU_SELECTED, &InputRecordingEditor::OnMenuAuthor, this, ID_MenuAuthor);
Bind(wxEVT_COMMAND_MENU_SELECTED, &InputRecordingEditor::OnMenuInputRecordingInfo, this, ID_MenuInputRecordingInfo);
// button
Bind(wxEVT_COMMAND_BUTTON_CLICKED, &InputRecordingEditor::OnBtnUpdate, this, ID_Btn_Update);
Bind(wxEVT_COMMAND_BUTTON_CLICKED, &InputRecordingEditor::OnBtnInsert, this, ID_Btn_Insert);
Bind(wxEVT_COMMAND_BUTTON_CLICKED, &InputRecordingEditor::OnBtnDelete, this, ID_Btn_Delete);
Bind(wxEVT_COMMAND_BUTTON_CLICKED, &InputRecordingEditor::OnBtnCopy, this, ID_Btn_Copy);
Bind(wxEVT_COMMAND_BUTTON_CLICKED, &InputRecordingEditor::OnBtnDrawFrame, this, ID_Btn_DrawFrame);
Bind(wxEVT_COMMAND_BUTTON_CLICKED, &InputRecordingEditor::OnBtnDrawNowFrame, this, ID_Btn_DrawNowFrame);
//list box
Bind(wxEVT_COMMAND_LISTBOX_SELECTED, &InputRecordingEditor::OnListBox, this, ID_List_KeyFrame);
//checklist
Bind(wxEVT_CHECKLISTBOX, &InputRecordingEditor::OnCheckList_NormalKey1, this, ID_CheckList_NormalKey1);
//text
Bind(wxEVT_TEXT, &InputRecordingEditor::OnText_Edit, this, ID_Text_Edit);
Bind(wxEVT_TEXT, &InputRecordingEditor::OnText_Analog1, this, ID_Text_AnalogKey1);
Bind(wxEVT_TEXT, &InputRecordingEditor::OnText_Analog2, this, ID_Text_AnalogKey2);
Bind(wxEVT_TEXT, &InputRecordingEditor::OnText_Analog3, this, ID_Text_AnalogKey3);
Bind(wxEVT_TEXT, &InputRecordingEditor::OnText_Analog4, this, ID_Text_AnalogKey4);
}
void InputRecordingEditor::OnClose(wxCloseEvent& evt)
{
Hide();
}
void InputRecordingEditor::OnMenuAuthor(wxCommandEvent& event)
{
wxTextEntryDialog* dlg = new wxTextEntryDialog(NULL, L"input author.");
if (dlg->ShowModal() != wxID_OK) {
return;
}
g_InputRecordingHeader.setAuthor(dlg->GetValue());
g_InputRecordingData.writeHeader();
}
void InputRecordingEditor::OnMenuInputRecordingInfo(wxCommandEvent& event)
{
wxString s = L"";
s += wxString::Format(L"Ver:%d\n", g_InputRecordingHeader.version);
s += wxString::Format(L"Author:%s\n", g_InputRecordingHeader.author);
s += wxString::Format(L"Emu:%s\n", g_InputRecordingHeader.emu);
s += wxString::Format(L"CD:%s\n", g_InputRecordingHeader.cdrom);
s += wxString::Format(L"MaxFrame:%d\n", g_InputRecordingData.getMaxFrame());
s += wxString::Format(L"UndoCount:%d\n", g_InputRecordingData.getUndoCount());
wxMessageBox(s, L"InputRecording file header info", wxOK | wxICON_INFORMATION);
}
//-------------------------------
// every frame
//-------------------------------
void InputRecordingEditor::FrameUpdate()
{
if (g_FrameCount == 0)return;
wxString pauseMessage = g_RecordingControls.getStopFlag() ? L"[pause]" : L"[run]";
wxString recordMessage = "";
if (g_InputRecording.getModeState() == InputRecording::RECORD) {
recordMessage = L"[record]";
}
else if (g_InputRecording.getModeState() == InputRecording::REPLAY) {
recordMessage = L"[replay]";
}
SetTitle(wxString::Format(L"%d / %d ", g_FrameCount, g_InputRecordingData.getMaxFrame())+ pauseMessage+ recordMessage );
}
//-------------------------------
// draw
//-------------------------------
void InputRecordingEditor::DrawKeyFrameList(long selectFrame)
{
// Determine the number of frames to display
int start = selectFrame - 100;
unsigned int end = selectFrame +100;
if (start < 0) {
start = 0;
}
frameListStartFrame = start;
wxString selectKeyStr = "";
frameList->Clear();
for (unsigned long i = start; i < end; i++)
{
PadData key;
g_InputRecordingData.getPadData(key, i);
frameList->Append(wxString::Format("%d [%s]", i, key.serialize()));
if (selectFrame == i) {
selectKeyStr = key.serialize();
}
}
// select
long selectIndex = selectFrame - start;
if (0 <= selectIndex && selectIndex < (signed)frameList->GetCount())
{
frameList->SetSelection(selectIndex);
keyTextView->ChangeValue(selectKeyStr);
}
}
void InputRecordingEditor::DrawKeyButtonCheck()
{
PadData key;
key.deserialize(keyTextEdit->GetValue());
auto key1 = key.getNormalKeys(0);
for (int i = 0; i < PadDataNormalKeysSize;i++) {
keyCheckList1->Check( i , key1[PadDataNormalKeys[i]]);
}
auto key2 = key.getAnalogKeys(0);
for (int i = 0; i < PadDataAnalogKeysSize; i++) {
analogKeyText[i]->ChangeValue(wxString::Format(L"%d", key2.at(PadDataAnalogKeys[i])));
}
}
//----------------------------------------------
// event
// TODO: all of these need to be updated for the key editor window
//----------------------------------------------
void InputRecordingEditor::OnBtnUpdate(wxCommandEvent& event)
{
int select = frameList->GetSelection();
if (select == wxNOT_FOUND)return;
long frame = select + frameListStartFrame;
PadData key;
key.deserialize(keyTextEdit->GetValue());
if (g_InputRecordingData.UpdatePadData(frame, key))
{
frameTextFoeMove->ChangeValue(wxString::Format(L"%d", frame));
DrawKeyFrameList(frame);
}
}
void InputRecordingEditor::OnBtnInsert(wxCommandEvent& event)
{
int select = frameList->GetSelection();
if (select == wxNOT_FOUND)return;
long frame = select + frameListStartFrame;
PadData key;
key.deserialize(keyTextEdit->GetValue());
if (g_InputRecordingData.InsertPadData(frame,key))
{
frameTextFoeMove->ChangeValue(wxString::Format(L"%d", frame));
DrawKeyFrameList(frame);
}
}
void InputRecordingEditor::OnBtnDelete(wxCommandEvent& event)
{
int select = frameList->GetSelection();
if (select == wxNOT_FOUND)return;
long frame = select + frameListStartFrame;
if (g_InputRecordingData.DeletePadData(frame))
{
frameTextFoeMove->ChangeValue(wxString::Format(L"%d",frame));
DrawKeyFrameList(frame);
}
}
void InputRecordingEditor::OnBtnCopy(wxCommandEvent& event)
{
keyTextEdit->ChangeValue(keyTextView->GetValue());
DrawKeyButtonCheck();
}
void InputRecordingEditor::OnText_Edit(wxCommandEvent& event)
{
DrawKeyButtonCheck();
}
void InputRecordingEditor::OnListBox(wxCommandEvent& event)
{
int select = frameList->GetSelection();
if (select == wxNOT_FOUND)return;
long frame = select + frameListStartFrame;
PadData key;
g_InputRecordingData.getPadData(key,frame);
keyTextView->ChangeValue(key.serialize());
frameTextFoeMove->ChangeValue(wxString::Format(L"%d", frame));
}
void InputRecordingEditor::OnBtnDrawFrame(wxCommandEvent& event)
{
long selectFrame;
if (frameTextFoeMove->GetValue().ToLong(&selectFrame))
{
DrawKeyFrameList(selectFrame);
}
}
void InputRecordingEditor::OnBtnDrawNowFrame(wxCommandEvent& event)
{
frameTextFoeMove->ChangeValue(wxString::Format(L"%d", g_FrameCount));
DrawKeyFrameList(g_FrameCount);
}
void InputRecordingEditor::OnCheckList_NormalKey1(wxCommandEvent& event)
{
PadData key;
key.deserialize(keyTextEdit->GetValue());
if (!key.fExistKey)return;
auto tmpkey = key.getNormalKeys(0);
for (unsigned int i = 0; i < keyCheckList1->GetCount(); i++)
{
tmpkey[keyCheckList1->GetString(i)] = keyCheckList1->IsChecked(i);
}
key.setNormalKeys(0,tmpkey);
keyTextEdit->ChangeValue(key.serialize());
}
void InputRecordingEditor::_OnText_Analog(int num)
{
PadData key;
key.deserialize(keyTextEdit->GetValue());
if (!key.fExistKey)return;
auto tmpkey = key.getAnalogKeys(0);
try {
tmpkey[PadDataAnalogKeys[num]] = std::stoi( analogKeyText[num]->GetValue().ToStdString(), NULL, 10);
}
catch (std::invalid_argument e) {/*none*/ }
catch (std::out_of_range e) {/*none*/ }
key.setAnalogKeys(0, tmpkey);
wxString s = key.serialize();
keyTextEdit->ChangeValue(s);
}
void InputRecordingEditor::OnText_Analog1(wxCommandEvent& event)
{
_OnText_Analog(0);
}
void InputRecordingEditor::OnText_Analog2(wxCommandEvent& event)
{
_OnText_Analog(1);
}
void InputRecordingEditor::OnText_Analog3(wxCommandEvent& event)
{
_OnText_Analog(2);
}
void InputRecordingEditor::OnText_Analog4(wxCommandEvent& event)
{
_OnText_Analog(3);
}

65
pcsx2/Recording/InputRecordingEditor.h
View File

@ -1,65 +0,0 @@
#pragma once
#include <wx/wx.h>
#include <wx/listctrl.h>
#include "PadData.h"
class InputRecordingEditor : public wxFrame
{
public:
InputRecordingEditor(wxWindow * parent);
public:
void FrameUpdate();
private:
void DrawKeyFrameList(long frame);
void DrawKeyButtonCheck();
private:
long frameListStartFrame = 0;
private:
wxListBox * frameList;
wxStatusBar* statusbar;
wxTextCtrl* keyTextView;
wxTextCtrl* keyTextEdit;
wxTextCtrl* frameTextFoeMove;
wxTextCtrl* analogKeyText[PadDataAnalogKeysSize];
wxCheckListBox* keyCheckList1;
private:
void OnClose(wxCloseEvent& evt);
void OnMenuAuthor(wxCommandEvent& event);
void OnMenuInputRecordingInfo(wxCommandEvent& event);
void OnBtnUpdate(wxCommandEvent& event);
void OnBtnDelete(wxCommandEvent& event);
void OnBtnInsert(wxCommandEvent& event);
void OnBtnCopy(wxCommandEvent& event);
void OnBtnDrawFrame(wxCommandEvent& event);
void OnBtnDrawNowFrame(wxCommandEvent& event);
void OnListBox(wxCommandEvent& event);
void OnCheckList_NormalKey1(wxCommandEvent& event);
void OnText_Edit(wxCommandEvent& event);
void _OnText_Analog(int num);
void OnText_Analog1(wxCommandEvent& event);
void OnText_Analog2(wxCommandEvent& event);
void OnText_Analog3(wxCommandEvent& event);
void OnText_Analog4(wxCommandEvent& event);
wxDECLARE_EVENT_TABLE();
};

22
pcsx2/Recording/VirtualPad.cpp
View File

@ -6,7 +6,7 @@
#include "Recording/RecordingInputManager.h"
wxBEGIN_EVENT_TABLE(VirtualPad, wxFrame)
EVT_CLOSE(VirtualPad::OnClose)
EVT_CLOSE(VirtualPad::OnClose)
wxEND_EVENT_TABLE()
// TODO - Problems:
@ -130,26 +130,6 @@ void VirtualPad::OnClose(wxCloseEvent & event)
Hide();
}
/* TODO - remove this, live update later
void VirtualPad::FrameUpdate()
{
std::map<wxString, int> buttonPressures = g_RecordingInput.GetButtonPressureState(controllerPort);
std::map<wxString, int> analogValues = g_RecordingInput.GetAnalogState(controllerPort);
for (int i = 0; i < PadDataNormalKeysSize - 4; i++)
{
int value = buttonPressures.at(PadDataNormalKeys[i]);
buttonsPressure[i]->SetValue(value);
}
for (int i = 0; i < PadDataAnalogKeysSize; i++)
{
int value = analogValues.at(PadDataAnalogKeys[i]) - 127;
analogSliders[i]->SetValue(value);
}
}
**/
void VirtualPad::OnButtonPress(wxCommandEvent & event)
{
wxToggleButton* pressedButton = (wxToggleButton*) event.GetEventObject();

7
pcsx2/Recording/VirtualPad.h
View File

@ -12,13 +12,11 @@ public:
VirtualPad(wxWindow* parent, wxWindowID id, const wxString& title, int controllerPort, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_FRAME_STYLE);
bool Show(bool show = true) override;
void FrameUpdate();
private:
void SetProperties();
void DoLayout();
protected:
int controllerPort;
wxToggleButton* l2Button;
@ -67,14 +65,13 @@ protected:
wxSpinCtrl* analogVals[4];
int analogValsLength = 4;
// TODO - reset button
protected:
void OnClose(wxCloseEvent &event);
void OnButtonPress(wxCommandEvent &event);
void OnPressureChange(wxSpinEvent &event);
void OnAnalogValChange(wxSpinEvent &event);
void OnAnalogSliderChange(wxCommandEvent &event);
// TODO - reset button
protected:
wxDECLARE_EVENT_TABLE();
};

10
pcsx2/gui/App.h
View File

@ -31,7 +31,6 @@
#include "Saveslots.h"
#ifndef DISABLE_RECORDING
# include "Recording/InputRecordingEditor.h"
# include "Recording/VirtualPad.h"
# include "Recording/NewRecordingFrame.h"
#endif
@ -544,7 +543,6 @@ protected:
wxWindowID m_id_Disassembler;
#ifndef DISABLE_RECORDING
wxWindowID m_id_InputRecordingEditor;
wxWindowID m_id_VirtualPad[2];
wxWindowID m_id_NewRecordingFrame;
#endif
@ -574,12 +572,8 @@ public:
DisassemblyDialog* GetDisassemblyPtr() const { return (DisassemblyDialog*)wxWindow::FindWindowById(m_id_Disassembler); }
#ifndef DISABLE_RECORDING
InputRecordingEditor * GetInputRecordingEditorPtr() const { return (InputRecordingEditor*)wxWindow::FindWindowById(m_id_InputRecordingEditor); }
VirtualPad * GetVirtualPadPtr(int port) const {
if (port < 0 || port > 1) return NULL; // TODO i believe this is always false, linter errors picked it up, double check
return (VirtualPad*)wxWindow::FindWindowById(m_id_VirtualPad[port]);
}
NewRecordingFrame * GetNewRecordingFramePtr() const { return (NewRecordingFrame*)wxWindow::FindWindowById(m_id_NewRecordingFrame); }
VirtualPad* GetVirtualPadPtr(int port) const { return (VirtualPad*)wxWindow::FindWindowById(m_id_VirtualPad[port]); }
NewRecordingFrame* GetNewRecordingFramePtr() const { return (NewRecordingFrame*)wxWindow::FindWindowById(m_id_NewRecordingFrame); }
#endif
void enterDebugMode();

6
pcsx2/gui/AppInit.cpp
View File

@ -77,9 +77,6 @@ void Pcsx2App::OpenMainFrame()
m_id_Disassembler = disassembly->GetId();
#ifndef DISABLE_RECORDING
InputRecordingEditor* inputRecordingEditor = new InputRecordingEditor(mainFrame, wxID_ANY, wxEmptyString);
m_id_InputRecordingEditor = inputRecordingEditor->GetId();
VirtualPad* virtualPad0 = new VirtualPad(mainFrame, wxID_ANY, wxEmptyString, 0);
m_id_VirtualPad[0] = virtualPad0->GetId();
VirtualPad *virtualPad1 = new VirtualPad(mainFrame, wxID_ANY, wxEmptyString, 1);
@ -769,9 +766,6 @@ Pcsx2App::Pcsx2App()
m_id_GsFrame = wxID_ANY;
m_id_ProgramLogBox = wxID_ANY;
m_id_Disassembler = wxID_ANY;
#ifndef DISABLE_RECORDING
m_id_InputRecordingEditor = wxID_ANY;
#endif
m_ptr_ProgramLog = NULL;
SetAppName( L"PCSX2" );

2
pcsx2/gui/MainFrame.cpp
View File

@ -255,7 +255,6 @@ void MainEmuFrame::ConnectMenus()
Bind(wxEVT_MENU, &MainEmuFrame::Menu_Recording_New_Click, this, MenuId_Recording_New);
Bind(wxEVT_MENU, &MainEmuFrame::Menu_Recording_Play_Click, this, MenuId_Recording_Play);
Bind(wxEVT_MENU, &MainEmuFrame::Menu_Recording_Stop_Click, this, MenuId_Recording_Stop);
Bind(wxEVT_MENU, &MainEmuFrame::Menu_Recording_Editor_Click, this, MenuId_Recording_Editor);
Bind(wxEVT_MENU, &MainEmuFrame::Menu_Recording_VirtualPad_Open_Click, this, MenuId_Recording_VirtualPad_Port0);
Bind(wxEVT_MENU, &MainEmuFrame::Menu_Recording_VirtualPad_Open_Click, this, MenuId_Recording_VirtualPad_Port1);
#endif
@ -576,7 +575,6 @@ MainEmuFrame::MainEmuFrame(wxWindow* parent, const wxString& title)
m_menuRecording.Append(MenuId_Recording_Stop, _("Stop"))->Enable(false);
m_menuRecording.Append(MenuId_Recording_Play, _("Play"));
m_menuRecording.AppendSeparator();
m_menuRecording.Append(MenuId_Recording_Editor, _("Open Movie Editor"));
m_menuRecording.Append(MenuId_Recording_VirtualPad_Port0, _("Virtual Pad (Port 1)"));
m_menuRecording.Append(MenuId_Recording_VirtualPad_Port1, _("Virtual Pad (Port 2)"));
#endif

1
pcsx2/gui/MainFrame.h
View File

@ -228,7 +228,6 @@ protected:
void Menu_Recording_New_Click(wxCommandEvent &event);
void Menu_Recording_Play_Click(wxCommandEvent &event);
void Menu_Recording_Stop_Click(wxCommandEvent &event);
void Menu_Recording_Editor_Click(wxCommandEvent &event);
void Menu_Recording_VirtualPad_Open_Click(wxCommandEvent &event);
#endif

6
pcsx2/gui/MainMenuClicks.cpp
View File

@ -832,12 +832,6 @@ void MainEmuFrame::Menu_Recording_Stop_Click(wxCommandEvent &event)
m_menuRecording.FindChildItem(MenuId_Recording_Stop)->Enable(false);
}
void MainEmuFrame::Menu_Recording_Editor_Click(wxCommandEvent &event)
{
InputRecordingEditor* dlg = wxGetApp().GetInputRecordingEditorPtr();
if (dlg)dlg->Show();
}
void MainEmuFrame::Menu_Recording_VirtualPad_Open_Click(wxCommandEvent &event)
{
VirtualPad *vp;

2
pcsx2/windows/VCprojects/pcsx2.vcxproj
View File

@ -194,7 +194,6 @@
<ClCompile Include="..\..\ps2\pgif.cpp" />
<ClCompile Include="..\..\ShiftJisToUnicode.cpp" />
<ClCompile Include="..\..\sif2.cpp" />
<ClCompile Include="..\..\Recording\InputRecordingEditor.cpp" />
<ClCompile Include="..\..\Recording\InputRecording.cpp" />
<ClCompile Include="..\..\Recording\NewRecordingFrame.cpp" />
<ClCompile Include="..\..\Recording\InputRecordingFile.cpp" />
@ -450,7 +449,6 @@
<ClInclude Include="..\..\Patch.h" />
<ClInclude Include="..\..\PrecompiledHeader.h" />
<ClInclude Include="..\..\ps2\pgif.h" />
<ClInclude Include="..\..\Recording\InputRecordingEditor.h" />
<ClInclude Include="..\..\Recording\InputRecording.h" />
<ClInclude Include="..\..\Recording\NewRecordingFrame.h" />
<ClInclude Include="..\..\Recording\InputRecordingFile.h" />

33
pcsx2/windows/VCprojects/pcsx2.vcxproj.filters
View File

@ -151,6 +151,9 @@
<Filter Include="Recording">
<UniqueIdentifier>{7b917318-5a5e-44c0-8463-1dfab67f3b67}</UniqueIdentifier>
</Filter>
<Filter Include="Recording\gui">
<UniqueIdentifier>{93e36831-627f-4529-b709-1f4bad398512}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<None Include="..\..\Utilities\folderdesc.txt">
@ -868,30 +871,27 @@
<ClCompile Include="..\..\ps2\Iop\PsxBios.cpp">
<Filter>System\Ps2\Iop</Filter>
</ClCompile>
<ClCompile Include="..\..\Recording\InputRecordingEditor.cpp">
<Filter>Recording</Filter>
</ClCompile>
<ClCompile Include="..\..\Recording\InputRecording.cpp">
<Filter>Recording</Filter>
</ClCompile>
<ClCompile Include="..\..\Recording\NewRecordingFrame.cpp">
<Filter>Recording</Filter>
</ClCompile>
<ClCompile Include="..\..\Recording\InputRecordingFile.cpp">
<Filter>Recording</Filter>
</ClCompile>
<ClCompile Include="..\..\Recording\PadData.cpp">
<Filter>Recording</Filter>
</ClCompile>
<ClCompile Include="..\..\Recording\VirtualPad.cpp">
<Filter>Recording</Filter>
</ClCompile>
<ClCompile Include="..\..\Recording\RecordingControls.cpp">
<Filter>Recording</Filter>
</ClCompile>
<ClCompile Include="..\..\Recording\RecordingInputManager.cpp">
<Filter>Recording</Filter>
</ClCompile>
<ClCompile Include="..\..\Recording\NewRecordingFrame.cpp">
<Filter>Recording\gui</Filter>
</ClCompile>
<ClCompile Include="..\..\Recording\VirtualPad.cpp">
<Filter>Recording\gui</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\Patch.h">
@ -1335,30 +1335,27 @@
<ClInclude Include="..\..\Mdec.h">
<Filter>System\Ps2\Iop</Filter>
</ClInclude>
<ClInclude Include="..\..\Recording\InputRecordingEditor.h">
<Filter>Recording</Filter>
</ClInclude>
<ClInclude Include="..\..\Recording\InputRecording.h">
<Filter>Recording</Filter>
</ClInclude>
<ClInclude Include="..\..\Recording\NewRecordingFrame.h">
<Filter>Recording</Filter>
</ClInclude>
<ClInclude Include="..\..\Recording\InputRecordingFile.h">
<Filter>Recording</Filter>
</ClInclude>
<ClInclude Include="..\..\Recording\PadData.h">
<Filter>Recording</Filter>
</ClInclude>
<ClInclude Include="..\..\Recording\VirtualPad.h">
<Filter>Recording</Filter>
</ClInclude>
<ClInclude Include="..\..\Recording\RecordingControls.h">
<Filter>Recording</Filter>
</ClInclude>
<ClInclude Include="..\..\Recording\RecordingInputManager.h">
<Filter>Recording</Filter>
</ClInclude>
<ClInclude Include="..\..\Recording\NewRecordingFrame.h">
<Filter>Recording\gui</Filter>
</ClInclude>
<ClInclude Include="..\..\Recording\VirtualPad.h">
<Filter>Recording\gui</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\wxResources.rc">