Remove EmuState

2018-03-31 16:21:17 +02:00
parent 180eb35876
commit 6a0c15491b
98 changed files with 6 additions and 310 deletions
@@ -204,7 +204,7 @@ void CFrame::BindMenuBarEvents()
  Bind(wxEVT_MENU, &CFrame::OnToggleWindow, this, IDM_LOG_WINDOW, IDM_VIDEO_WINDOW);
  Bind(wxEVT_MENU, &CFrame::GameListChanged, this, IDM_LIST_WAD, IDM_LIST_DRIVES);
  Bind(wxEVT_MENU, &CFrame::GameListChanged, this, IDM_PURGE_GAME_LIST_CACHE);
-  Bind(wxEVT_MENU, &CFrame::OnChangeColumnsVisible, this, IDM_SHOW_SYSTEM, IDM_SHOW_STATE);
+  Bind(wxEVT_MENU, &CFrame::OnChangeColumnsVisible, this, IDM_SHOW_SYSTEM, IDM_SHOW_SIZE);

  // Help menu
  Bind(wxEVT_MENU, &CFrame::OnHelp, this, IDM_HELP_WEBSITE);
@@ -1918,9 +1918,6 @@ void CFrame::OnChangeColumnsVisible(wxCommandEvent& event)
  case IDM_SHOW_SIZE:
    SConfig::GetInstance().m_showSizeColumn = !SConfig::GetInstance().m_showSizeColumn;
    break;
-  case IDM_SHOW_STATE:
-    SConfig::GetInstance().m_showStateColumn = !SConfig::GetInstance().m_showStateColumn;
-    break;
  default:
    return;
  }
@@ -131,17 +131,6 @@ static int CompareGameListItems(const UICommon::GameFile* iso1, const UICommon::
    if (iso1->GetPlatform() < iso2->GetPlatform())
      return -1 * t;
    break;
-
-  case GameListCtrl::COLUMN_EMULATION_STATE:
-  {
-    const int nState1 = iso1->GetEmuState(), nState2 = iso2->GetEmuState();
-
-    if (nState1 > nState2)
-      return 1 * t;
-    if (nState1 < nState2)
-      return -1 * t;
-    break;
-  }
  }

  if (sortData != GameListCtrl::COLUMN_TITLE)
@@ -235,7 +224,7 @@ struct GameListCtrl::ColumnInfo

 GameListCtrl::GameListCtrl(bool disable_scanning, wxWindow* parent, const wxWindowID id,
                           const wxPoint& pos, const wxSize& size, long style)
-    : wxListCtrl(parent, id, pos, size, style), m_tooltip(nullptr),
+    : wxListCtrl(parent, id, pos, size, style),
      m_columns({// {COLUMN, {default_width (without platform padding), resizability, visibility}}
                 {COLUMN_PLATFORM, 32 + 1 /* icon padding */, false,
                  SConfig::GetInstance().m_showSystemColumn},
@@ -245,13 +234,11 @@ GameListCtrl::GameListCtrl(bool disable_scanning, wxWindow* parent, const wxWind
                 {COLUMN_FILENAME, 100, true, SConfig::GetInstance().m_showFileNameColumn},
                 {COLUMN_ID, 75, false, SConfig::GetInstance().m_showIDColumn},
                 {COLUMN_COUNTRY, 32, false, SConfig::GetInstance().m_showRegionColumn},
-                 {COLUMN_EMULATION_STATE, 48, false, SConfig::GetInstance().m_showStateColumn},
                 {COLUMN_SIZE, wxLIST_AUTOSIZE, false, SConfig::GetInstance().m_showSizeColumn}})
 {
  Bind(wxEVT_SIZE, &GameListCtrl::OnSize, this);
  Bind(wxEVT_RIGHT_DOWN, &GameListCtrl::OnRightClick, this);
  Bind(wxEVT_LEFT_DOWN, &GameListCtrl::OnLeftClick, this);
-  Bind(wxEVT_MOTION, &GameListCtrl::OnMouseMotion, this);
  Bind(wxEVT_LIST_KEY_DOWN, &GameListCtrl::OnKeyPress, this);
  Bind(wxEVT_LIST_COL_BEGIN_DRAG, &GameListCtrl::OnColBeginDrag, this);
  Bind(wxEVT_LIST_COL_CLICK, &GameListCtrl::OnColumnClick, this);
@@ -323,7 +310,6 @@ void GameListCtrl::InitBitmaps()
  const wxSize size = FromDIP(wxSize(96, 32));
  const wxSize flag_bmp_size = FromDIP(wxSize(32, 32));
  const wxSize platform_bmp_size = flag_bmp_size;
-  const wxSize rating_bmp_size = FromDIP(wxSize(48, 32));
  wxImageList* img_list = new wxImageList(size.GetWidth(), size.GetHeight());
  AssignImageList(img_list, wxIMAGE_LIST_SMALL);

@@ -360,15 +346,6 @@ void GameListCtrl::InitBitmaps()
  InitBitmap(img_list, &platform_indexes, this, platform_bmp_size, DiscIO::Platform::ELFOrDOL,
             "Platform_File");

-  auto& emu_state_indexes = m_image_indexes.emu_state;
-  emu_state_indexes.resize(6);
-  InitBitmap(img_list, &emu_state_indexes, this, rating_bmp_size, 0, "rating0", true);
-  InitBitmap(img_list, &emu_state_indexes, this, rating_bmp_size, 1, "rating1", true);
-  InitBitmap(img_list, &emu_state_indexes, this, rating_bmp_size, 2, "rating2", true);
-  InitBitmap(img_list, &emu_state_indexes, this, rating_bmp_size, 3, "rating3", true);
-  InitBitmap(img_list, &emu_state_indexes, this, rating_bmp_size, 4, "rating4", true);
-  InitBitmap(img_list, &emu_state_indexes, this, rating_bmp_size, 5, "rating5", true);
-
  auto& utility_banner_indexes = m_image_indexes.utility_banner;
  utility_banner_indexes.resize(1);
  InitBitmap(img_list, &utility_banner_indexes, this, size, 0, "nobanner");
@@ -425,8 +402,6 @@ void GameListCtrl::RefreshList()
      auto file = std::make_shared<UICommon::GameFile>(drive);
      if (file->IsValid())
      {
-        if (file->EmuStateChanged())
-          file->EmuStateCommit();
        if (file->CustomNameChanged(m_title_database))
          file->CustomNameCommit();
        m_shown_files.push_back(file);
@@ -453,7 +428,6 @@ void GameListCtrl::RefreshList()
    InsertColumn(COLUMN_ID, _("ID"));
    InsertColumn(COLUMN_COUNTRY, "");
    InsertColumn(COLUMN_SIZE, _("Size"));
-    InsertColumn(COLUMN_EMULATION_STATE, _("State"));

 #ifdef __WXMSW__
    const int platform_padding = 0;
@@ -572,10 +546,6 @@ void GameListCtrl::UpdateItemAtColumn(long index, int column)
  case COLUMN_FILENAME:
    SetItem(index, COLUMN_FILENAME, wxFileNameFromPath(StrToWxStr(iso_file.GetFilePath())), -1);
    break;
-  case COLUMN_EMULATION_STATE:
-    SetItemColumnImage(index, COLUMN_EMULATION_STATE,
-                       m_image_indexes.emu_state[iso_file.GetEmuState()]);
-    break;
  case COLUMN_COUNTRY:
    SetItemColumnImage(index, COLUMN_COUNTRY,
                       m_image_indexes.flag[static_cast<size_t>(iso_file.GetCountry())]);
@@ -829,84 +799,6 @@ void GameListCtrl::OnKeyPress(wxListEvent& event)
  event.Skip();
 }

-// This shows a little tooltip with the current Game's emulation state
-void GameListCtrl::OnMouseMotion(wxMouseEvent& event)
-{
-  int flags;
-  long subitem = 0;
-  const long item = HitTest(event.GetPosition(), flags, &subitem);
-  static int lastItem = -1;
-
-  if (GetColumnCount() <= 1)
-    return;
-
-  if (item != wxNOT_FOUND)
-  {
-    wxRect Rect;
-#ifdef __WXMSW__
-    if (subitem == COLUMN_EMULATION_STATE)
-#else
-    // The subitem parameter of HitTest is only implemented for wxMSW.  On
-    // all other platforms it will always be -1.  Check the x position
-    // instead.
-    GetItemRect(item, Rect);
-    if (Rect.GetX() + Rect.GetWidth() - GetColumnWidth(COLUMN_EMULATION_STATE) < event.GetX())
-#endif
-    {
-      if (m_tooltip || lastItem == item || this != FindFocus())
-      {
-        if (lastItem != item)
-          lastItem = -1;
-        event.Skip();
-        return;
-      }
-
-      // Emulation status
-      static const char* const emuState[] = {"Broken", "Intro", "In-Game", "Playable", "Perfect"};
-
-      const UICommon::GameFile* iso = GetISO(GetItemData(item));
-
-      const int emu_state = iso->GetEmuState();
-      const std::string& issues = iso->GetIssues();
-
-      // Show a tooltip containing the EmuState and the state description
-      if (emu_state > 0 && emu_state < 6)
-      {
-        char temp[2048];
-        sprintf(temp, "^ %s%s%s", emuState[emu_state - 1], issues.size() > 0 ? " :\n" : "",
-                issues.c_str());
-        m_tooltip = new wxEmuStateTip(this, StrToWxStr(temp), &m_tooltip);
-      }
-      else
-      {
-        m_tooltip = new wxEmuStateTip(this, _("Not Set"), &m_tooltip);
-      }
-
-      // Get item Coords
-      GetItemRect(item, Rect);
-      int mx = Rect.GetWidth();
-      int my = Rect.GetY();
-#if !defined(__WXMSW__) && !defined(__WXOSX__)
-      // For some reason the y position does not account for the header
-      // row, so subtract the y position of the first visible item.
-      GetItemRect(GetTopItem(), Rect);
-      my -= Rect.GetY();
-#endif
-      // Convert to screen coordinates
-      ClientToScreen(&mx, &my);
-      m_tooltip->SetBoundingRect(wxRect(mx - GetColumnWidth(COLUMN_EMULATION_STATE), my,
-                                        GetColumnWidth(COLUMN_EMULATION_STATE), Rect.GetHeight()));
-      m_tooltip->SetPosition(
-          wxPoint(mx - GetColumnWidth(COLUMN_EMULATION_STATE), my - 5 + Rect.GetHeight()));
-      lastItem = item;
-    }
-  }
-  if (!m_tooltip)
-    lastItem = -1;
-
-  event.Skip();
-}
-
 void GameListCtrl::OnLeftClick(wxMouseEvent& event)
 {
  // Focus the clicked item.
@@ -23,23 +23,6 @@ namespace UICommon
 class GameFile;
 }

-class wxEmuStateTip : public wxTipWindow
-{
-public:
-  wxEmuStateTip(wxWindow* parent, const wxString& text, wxEmuStateTip** windowPtr)
-      : wxTipWindow(parent, text, 70, (wxTipWindow**)windowPtr)
-  {
-    Bind(wxEVT_KEY_DOWN, &wxEmuStateTip::OnKeyDown, this);
-  }
-
-  // wxTipWindow doesn't correctly handle KeyEvents and crashes... we must overload that.
-  void OnKeyDown(wxKeyEvent& event)
-  {
-    event.StopPropagation();
-    Close();
-  }
-};
-
 wxDECLARE_EVENT(DOLPHIN_EVT_REFRESH_GAMELIST, wxCommandEvent);
 wxDECLARE_EVENT(DOLPHIN_EVT_RESCAN_GAMELIST, wxCommandEvent);

@@ -68,7 +51,6 @@ public:
    COLUMN_ID,
    COLUMN_COUNTRY,
    COLUMN_SIZE,
-    COLUMN_EMULATION_STATE,
    NUMBER_OF_COLUMN
  };

@@ -92,7 +74,6 @@ private:
  void OnRescanGameList(wxCommandEvent& event);
  void OnLeftClick(wxMouseEvent& event);
  void OnRightClick(wxMouseEvent& event);
-  void OnMouseMotion(wxMouseEvent& event);
  void OnColumnClick(wxListEvent& event);
  void OnColBeginDrag(wxListEvent& event);
  void OnKeyPress(wxListEvent& event);
@@ -124,7 +105,6 @@ private:
    std::vector<int> flag;
    std::vector<int> platform;
    std::vector<int> utility_banner;
-    std::vector<int> emu_state;
  } m_image_indexes;

  // Actual backing GameFiles are maintained in a background thread and cached to file
@@ -142,7 +122,6 @@ private:
  int m_last_column;
  int m_last_sort;
  wxSize m_lastpos;
-  wxEmuStateTip* m_tooltip;

  std::vector<ColumnInfo> m_columns;
 };
@@ -180,7 +180,6 @@ enum
  IDM_SHOW_ID,
  IDM_SHOW_REGION,
  IDM_SHOW_SIZE,
-  IDM_SHOW_STATE,

  // Float Window IDs
  IDM_LOG_WINDOW_PARENT,
@@ -183,7 +183,6 @@ EVT_CLOSE(CISOProperties::OnClose)
 EVT_BUTTON(wxID_OK, CISOProperties::OnCloseClick)
 EVT_BUTTON(ID_EDITCONFIG, CISOProperties::OnEditConfig)
 EVT_BUTTON(ID_SHOWDEFAULTCONFIG, CISOProperties::OnShowDefaultConfig)
-EVT_CHOICE(ID_EMUSTATE, CISOProperties::OnEmustateChanged)
 EVT_LISTBOX(ID_PATCHES_LIST, CISOProperties::PatchListSelectionChanged)
 EVT_BUTTON(ID_EDITPATCH, CISOProperties::PatchButtonClicked)
 EVT_BUTTON(ID_ADDPATCH, CISOProperties::PatchButtonClicked)
@@ -333,22 +332,6 @@ void CISOProperties::CreateGUIControls()
                     wxDefaultSize, GetElementStyle("Video_Stereoscopy", "StereoEFBMonoDepth"));
  m_mono_depth->SetToolTip(_("Use a single depth buffer for both eyes. Needed for a few games."));

-  wxBoxSizer* const emustate_sizer = new wxBoxSizer(wxHORIZONTAL);
-  wxStaticText* const emustate_text =
-      new wxStaticText(m_GameConfig, wxID_ANY, _("Emulation State:"));
-  m_emustate_string.Add(_("Not Set"));
-  m_emustate_string.Add(_("Broken"));
-  m_emustate_string.Add(_("Intro"));
-  m_emustate_string.Add(_("In Game"));
-  m_emustate_string.Add(_("Playable"));
-  m_emustate_string.Add(_("Perfect"));
-  m_emustate_choice =
-      new wxChoice(m_GameConfig, ID_EMUSTATE, wxDefaultPosition, wxDefaultSize, m_emustate_string);
-  m_emu_issues = new wxTextCtrl(m_GameConfig, ID_EMU_ISSUES, wxEmptyString);
-  emustate_sizer->Add(emustate_text, 0, wxALIGN_CENTER_VERTICAL);
-  emustate_sizer->Add(m_emustate_choice, 0, wxALIGN_CENTER_VERTICAL);
-  emustate_sizer->Add(m_emu_issues, 1, wxEXPAND);
-
  wxStaticBoxSizer* const core_overrides_sizer =
      new wxStaticBoxSizer(wxVERTICAL, m_GameConfig, _("Core"));
  core_overrides_sizer->Add(m_cpu_thread, 0, wxLEFT | wxRIGHT, space5);
@@ -390,8 +373,6 @@ void CISOProperties::CreateGUIControls()
  config_page_sizer->AddSpacer(space5);
  config_page_sizer->Add(game_config_sizer, 0, wxEXPAND | wxLEFT | wxRIGHT, space5);
  config_page_sizer->AddSpacer(space5);
-  config_page_sizer->Add(emustate_sizer, 0, wxEXPAND | wxLEFT | wxRIGHT, space5);
-  config_page_sizer->AddSpacer(space5);
  m_GameConfig->SetSizer(config_page_sizer);

  // Patches
@@ -489,11 +470,6 @@ void CISOProperties::OnCloseClick(wxCommandEvent& WXUNUSED(event))
  Close();
 }

-void CISOProperties::OnEmustateChanged(wxCommandEvent& event)
-{
-  m_emu_issues->Enable(event.GetSelection() != 0);
-}
-
 void CISOProperties::SetCheckboxValueFromGameini(const char* section, const char* key,
                                                 wxCheckBox* checkbox)
 {
@@ -538,20 +514,6 @@ void CISOProperties::LoadGameConfig()
  if (m_gameini_local.GetIfExists("Video", "PH_ZFar", &sTemp))
    m_phack_data.PHZFar = sTemp;

-  IniFile::Section* default_emustate = m_gameini_default.GetOrCreateSection("EmuState");
-  default_emustate->Get("EmulationStateId", &iTemp, 0 /*Not Set*/);
-  m_emustate_choice->SetSelection(iTemp);
-  if (m_gameini_local.GetIfExists("EmuState", "EmulationStateId", &iTemp))
-    m_emustate_choice->SetSelection(iTemp);
-
-  default_emustate->Get("EmulationIssues", &sTemp);
-  if (!sTemp.empty())
-    m_emu_issues->SetValue(StrToWxStr(sTemp));
-  if (m_gameini_local.GetIfExists("EmuState", "EmulationIssues", &sTemp))
-    m_emu_issues->SetValue(StrToWxStr(sTemp));
-
-  m_emu_issues->Enable(m_emustate_choice->GetSelection() != 0);
-
  sTemp = "";
  if (!m_gameini_local.GetIfExists("Core", "GPUDeterminismMode", &sTemp))
    m_gameini_default.GetIfExists("Core", "GPUDeterminismMode", &sTemp);
@@ -637,10 +599,6 @@ bool CISOProperties::SaveGameConfig()
  SAVE_IF_NOT_DEFAULT("Video", "PH_SZFar", (m_phack_data.PHackSZFar ? 1 : 0), 0);
  SAVE_IF_NOT_DEFAULT("Video", "PH_ZNear", m_phack_data.PHZNear, "");
  SAVE_IF_NOT_DEFAULT("Video", "PH_ZFar", m_phack_data.PHZFar, "");
-  SAVE_IF_NOT_DEFAULT("EmuState", "EmulationStateId", m_emustate_choice->GetSelection(), 0);
-
-  std::string emu_issues = m_emu_issues->GetValue().ToStdString();
-  SAVE_IF_NOT_DEFAULT("EmuState", "EmulationIssues", emu_issues, "");

  std::string tmp;
  if (m_gpu_determinism->GetSelection() == 0)
@@ -80,10 +80,6 @@ private:
  wxSpinCtrl* m_convergence;
  wxCheckBox* m_mono_depth;

-  wxArrayString m_emustate_string;
-  wxChoice* m_emustate_choice;
-  wxTextCtrl* m_emu_issues;
-
  wxCheckListBox* m_patches;
  wxButton* m_edit_patch;
  wxButton* m_remove_patch;
@@ -116,8 +112,6 @@ private:
    ID_ENABLEWIDESCREEN,
    ID_EDITCONFIG,
    ID_SHOWDEFAULTCONFIG,
-    ID_EMUSTATE,
-    ID_EMU_ISSUES,
    ID_PATCHES_LIST,
    ID_EDITPATCH,
    ID_ADDPATCH,
@@ -137,7 +131,6 @@ private:
  void OnShowDefaultConfig(wxCommandEvent& event);
  void PatchListSelectionChanged(wxCommandEvent& event);
  void PatchButtonClicked(wxCommandEvent& event);
-  void OnEmustateChanged(wxCommandEvent& event);
  void OnCheatCodeToggled(wxCommandEvent& event);
  void OnChangeTitle(wxCommandEvent& event);

@@ -319,8 +319,6 @@ wxMenu* MainMenuBar::CreateViewMenu() const
  columns_menu->Check(IDM_SHOW_REGION, config_instance.m_showRegionColumn);
  columns_menu->AppendCheckItem(IDM_SHOW_SIZE, _("File Size"));
  columns_menu->Check(IDM_SHOW_SIZE, config_instance.m_showSizeColumn);
-  columns_menu->AppendCheckItem(IDM_SHOW_STATE, _("State"));
-  columns_menu->Check(IDM_SHOW_STATE, config_instance.m_showStateColumn);

  auto* const view_menu = new wxMenu;
  view_menu->AppendCheckItem(IDM_TOGGLE_TOOLBAR, _("Show &Toolbar"));