From 0c92603fd58219f7b3c8e22eea9233c820c9a0e9 Mon Sep 17 00:00:00 2001 From: degasus Date: Tue, 12 Jan 2016 09:35:24 +0100 Subject: Merge VideoBackendHardware into VideoBackend. And rename it to VideoBackendBase because of conflicts within the backends itself. --- Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp') diff --git a/Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp b/Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp index eba84552a2..b09d2b4e90 100644 --- a/Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp +++ b/Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp @@ -61,7 +61,7 @@ SoftwareVideoConfigDialog::SoftwareVideoConfigDialog(wxWindow* parent, const std wxStaticText* const label_backend = new wxStaticText(page_general, wxID_ANY, _("Backend:")); wxChoice* const choice_backend = new wxChoice(page_general, wxID_ANY); - for (const VideoBackend* backend : g_available_video_backends) + for (const VideoBackendBase* backend : g_available_video_backends) { choice_backend->AppendString(StrToWxStr(backend->GetDisplayName())); } -- cgit v1.2.3