Move frontend-common to util/core

src/duckstation-qt/CMakeLists.txt

@@ -170,7 +170,7 @@ qt6_add_translation(QM_FILES ${TS_FILES})
 
 add_executable(duckstation-qt ${SRCS} ${QM_FILES})
 target_include_directories(duckstation-qt PRIVATE "${Qt6Gui_PRIVATE_INCLUDE_DIRS}" "${CMAKE_CURRENT_SOURCE_DIR}")
-target_link_libraries(duckstation-qt PRIVATE frontend-common core common imgui glad minizip scmversion Qt6::Core Qt6::Gui Qt6::Widgets Qt6::Network)
+target_link_libraries(duckstation-qt PRIVATE core common imgui glad minizip scmversion Qt6::Core Qt6::Gui Qt6::Widgets Qt6::Network)
 
 if(WIN32)
   # We want a Windows subsystem application not console.

src/duckstation-qt/achievementlogindialog.cpp

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0)
 
 #include "achievementlogindialog.h"
-#include "frontend-common/achievements.h"
+#include "core/achievements_private.h"
 #include "qthost.h"
 #include <QtWidgets/QMessageBox>
 

src/duckstation-qt/achievementsettingswidget.cpp

@@ -3,13 +3,16 @@
 
 #include "achievementsettingswidget.h"
 #include "achievementlogindialog.h"
-#include "common/string_util.h"
-#include "core/system.h"
-#include "frontend-common/achievements.h"
 #include "mainwindow.h"
 #include "qtutils.h"
 #include "settingsdialog.h"
 #include "settingwidgetbinder.h"
+
+#include "core/achievements_private.h"
+#include "core/system.h"
+
+#include "common/string_util.h"
+
 #include <QtCore/QDateTime>
 #include <QtWidgets/QMessageBox>
 

src/duckstation-qt/audiosettingswidget.cpp

@@ -2,11 +2,14 @@
 // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0)
 
 #include "audiosettingswidget.h"
-#include "core/spu.h"
-#include "frontend-common/common_host.h"
 #include "settingsdialog.h"
 #include "settingwidgetbinder.h"
+
+#include "core/common_host.h"
+#include "core/spu.h"
+
 #include "util/audio_stream.h"
+
 #include <cmath>
 
 AudioSettingsWidget::AudioSettingsWidget(SettingsDialog* dialog, QWidget* parent) : QWidget(parent), m_dialog(dialog)
@@ -107,8 +110,8 @@ void AudioSettingsWidget::updateDriverNames()
 #ifdef WITH_CUBEB
   if (backend == AudioBackend::Cubeb)
   {
-    names = CommonHost::GetCubebDriverNames();
-    devices = CommonHost::GetCubebOutputDevices(m_dialog->getEffectiveStringValue("Audio", "Driver", "").c_str());
+    names = AudioStream::GetCubebDriverNames();
+    devices = AudioStream::GetCubebOutputDevices(m_dialog->getEffectiveStringValue("Audio", "Driver", "").c_str());
   }
 #endif
 

src/duckstation-qt/controllerbindingwidgets.cpp

@@ -8,7 +8,7 @@
 #include "controllersettingwidgetbinder.h"
 #include "core/controller.h"
 #include "core/host_settings.h"
-#include "frontend-common/input_manager.h"
+#include "util/input_manager.h"
 #include "qthost.h"
 #include "qtutils.h"
 #include "settingsdialog.h"

src/duckstation-qt/controllerglobalsettingswidget.cpp

@@ -7,7 +7,7 @@
 #include "qtutils.h"
 #include "settingwidgetbinder.h"
 
-#include "frontend-common/sdl_input_source.h"
+#include "util/sdl_input_source.h"
 
 ControllerGlobalSettingsWidget::ControllerGlobalSettingsWidget(QWidget* parent, ControllerSettingsDialog* dialog)
   : QWidget(parent), m_dialog(dialog)

src/duckstation-qt/controllersettingsdialog.cpp

@@ -8,7 +8,7 @@
 #include "controllerglobalsettingswidget.h"
 #include "core/controller.h"
 #include "core/host_settings.h"
-#include "frontend-common/input_manager.h"
+#include "util/input_manager.h"
 #include "hotkeysettingswidget.h"
 #include "qthost.h"
 #include "util/ini_settings_interface.h"

src/duckstation-qt/controllersettingsdialog.h

@@ -3,7 +3,7 @@
 
 #pragma once
 #include "common/types.h"
-#include "frontend-common/input_manager.h"
+#include "util/input_manager.h"
 #include "ui_controllersettingsdialog.h"
 #include <QtCore/QList>
 #include <QtCore/QPair>

src/duckstation-qt/coverdownloaddialog.cpp

@@ -2,8 +2,10 @@
 // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0)
 
 #include "coverdownloaddialog.h"
+
+#include "core/game_list.h"
+
 #include "common/assert.h"
-#include "frontend-common/game_list.h"
 
 CoverDownloadDialog::CoverDownloadDialog(QWidget* parent /*= nullptr*/) : QDialog(parent)
 {

src/duckstation-qt/displaysettingswidget.cpp

@@ -12,11 +12,11 @@
 
 // For enumerating adapters.
 #ifdef _WIN32
-#include "frontend-common/d3d11_host_display.h"
-#include "frontend-common/d3d12_host_display.h"
+#include "util/d3d11_host_display.h"
+#include "util/d3d12_host_display.h"
 #endif
 #ifdef WITH_VULKAN
-#include "frontend-common/vulkan_host_display.h"
+#include "util/vulkan_host_display.h"
 #endif
 
 DisplaySettingsWidget::DisplaySettingsWidget(SettingsDialog* dialog, QWidget* parent)

src/duckstation-qt/displaywidget.cpp

@@ -5,7 +5,7 @@
 #include "common/assert.h"
 #include "common/bitutils.h"
 #include "common/log.h"
-#include "frontend-common/imgui_manager.h"
+#include "util/imgui_manager.h"
 #include "mainwindow.h"
 #include "qthost.h"
 #include "qtutils.h"

src/duckstation-qt/duckstation-qt.vcxproj

@@ -343,8 +343,8 @@
     <ProjectReference Include="..\core\core.vcxproj">
       <Project>{868b98c8-65a1-494b-8346-250a73a48c0a}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\frontend-common\frontend-common.vcxproj">
-      <Project>{6245dec8-d2da-47ee-a373-cbd6fcf3ece6}</Project>
+    <ProjectReference Include="..\scmversion\scmversion.vcxproj">
+      <Project>{075ced82-6a20-46df-94c7-9624ac9ddbeb}</Project>
     </ProjectReference>
     <ProjectReference Include="..\util\util.vcxproj">
       <Project>{57f6206d-f264-4b07-baf8-11b9bbe1f455}</Project>
@@ -359,7 +359,7 @@
   </PropertyGroup>
   <Import Project="..\..\dep\msvc\vsprops\Win32Application.props" />
   <Import Project="..\..\dep\msvc\vsprops\QtCompile.props" />
-  <Import Project="..\frontend-common\frontend-common.props" />
+  <Import Project="..\core\core.props" />
   <ItemDefinitionGroup>
     <Link>
       <AdditionalDependencies>$(QtEntryPointLib);%(AdditionalDependencies)</AdditionalDependencies>

src/duckstation-qt/gamelistmodel.h

@@ -2,11 +2,14 @@
 // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0)
 
 #pragma once
+
+#include "core/game_database.h"
+#include "core/game_list.h"
+#include "core/types.h"
+
 #include "common/heterogeneous_containers.h"
 #include "common/lru_cache.h"
-#include "core/game_database.h"
-#include "core/types.h"
-#include "frontend-common/game_list.h"
+
 #include <QtCore/QAbstractTableModel>
 #include <QtGui/QPixmap>
 #include <algorithm>

src/duckstation-qt/gamelistrefreshthread.cpp

@@ -2,10 +2,13 @@
 // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0)
 
 #include "gamelistrefreshthread.h"
+
+#include "core/game_list.h"
+
 #include "common/log.h"
 #include "common/progress_callback.h"
 #include "common/timer.h"
-#include "frontend-common/game_list.h"
+
 #include <QtWidgets/QMessageBox>
 
 AsyncRefreshProgressCallback::AsyncRefreshProgressCallback(GameListRefreshThread* parent) : m_parent(parent) {}

src/duckstation-qt/gamelistsettingswidget.cpp

@@ -2,14 +2,16 @@
 // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0)
 
 #include "gamelistsettingswidget.h"
-#include "common/assert.h"
-#include "common/file_system.h"
-#include "common/string_util.h"
-#include "frontend-common/game_list.h"
+#include "core/game_list.h"
 #include "gamelistsearchdirectoriesmodel.h"
 #include "mainwindow.h"
 #include "qthost.h"
 #include "qtutils.h"
+
+#include "common/assert.h"
+#include "common/file_system.h"
+#include "common/string_util.h"
+
 #include <QtCore/QAbstractTableModel>
 #include <QtCore/QDebug>
 #include <QtCore/QSettings>

src/duckstation-qt/gamelistwidget.cpp

@@ -2,15 +2,18 @@
 // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0)
 
 #include "gamelistwidget.h"
-#include "common/assert.h"
-#include "common/string_util.h"
-#include "core/host_settings.h"
-#include "core/settings.h"
-#include "frontend-common/game_list.h"
 #include "gamelistmodel.h"
 #include "gamelistrefreshthread.h"
 #include "qthost.h"
 #include "qtutils.h"
+
+#include "core/game_list.h"
+#include "core/host_settings.h"
+#include "core/settings.h"
+
+#include "common/assert.h"
+#include "common/string_util.h"
+
 #include <QtCore/QSortFilterProxyModel>
 #include <QtGui/QGuiApplication>
 #include <QtGui/QPixmap>

src/duckstation-qt/gamelistwidget.h

@@ -2,9 +2,11 @@
 // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0)
 
 #pragma once
-#include "frontend-common/game_list.h"
 #include "ui_emptygamelistwidget.h"
 #include "ui_gamelistwidget.h"
+
+#include "core/game_list.h"
+
 #include <QtWidgets/QListView>
 #include <QtWidgets/QTableView>
 

src/duckstation-qt/gamesummarywidget.cpp

@@ -2,13 +2,17 @@
 // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0)
 
 #include "gamesummarywidget.h"
-#include "common/string_util.h"
-#include "core/game_database.h"
-#include "fmt/format.h"
-#include "frontend-common/game_list.h"
 #include "qthost.h"
 #include "qtprogresscallback.h"
 #include "settingsdialog.h"
+
+#include "core/game_database.h"
+#include "core/game_list.h"
+
+#include "common/string_util.h"
+
+#include "fmt/format.h"
+
 #include <QtConcurrent/QtConcurrent>
 #include <QtCore/QFuture>
 #include <QtWidgets/QMessageBox>

src/duckstation-qt/hotkeysettingswidget.cpp

@@ -3,7 +3,7 @@
 
 #include "hotkeysettingswidget.h"
 #include "controllersettingsdialog.h"
-#include "frontend-common/input_manager.h"
+#include "util/input_manager.h"
 #include "inputbindingwidgets.h"
 #include "qtutils.h"
 #include "settingwidgetbinder.h"

src/duckstation-qt/inputbindingdialog.h

@@ -3,7 +3,7 @@
 
 #pragma once
 #include "common/types.h"
-#include "frontend-common/input_manager.h"
+#include "util/input_manager.h"
 #include "ui_inputbindingdialog.h"
 #include <QtWidgets/QDialog>
 #include <optional>

src/duckstation-qt/inputbindingwidgets.h

@@ -3,7 +3,7 @@
 
 #pragma once
 #include "common/types.h"
-#include "frontend-common/input_manager.h"
+#include "util/input_manager.h"
 #include <QtWidgets/QPushButton>
 #include <optional>
 

src/duckstation-qt/mainwindow.cpp

@@ -5,20 +5,9 @@
 #include "aboutdialog.h"
 #include "autoupdaterdialog.h"
 #include "cheatmanagerdialog.h"
-#include "common/assert.h"
-#include "common/file_system.h"
-#include "common/log.h"
-#include "core/achievements.h"
-#include "core/host.h"
-#include "core/host_display.h"
-#include "core/memory_card.h"
-#include "core/settings.h"
-#include "core/system.h"
 #include "coverdownloaddialog.h"
 #include "debuggerwindow.h"
 #include "displaywidget.h"
-#include "frontend-common/game_list.h"
-#include "frontend-common/platform_misc.h"
 #include "gamelistsettingswidget.h"
 #include "gamelistwidget.h"
 #include "memorycardeditordialog.h"
@@ -26,7 +15,21 @@
 #include "qtutils.h"
 #include "settingsdialog.h"
 #include "settingwidgetbinder.h"
+
+#include "core/achievements.h"
+#include "core/game_list.h"
+#include "core/host.h"
+#include "core/memory_card.h"
+#include "core/settings.h"
+#include "core/system.h"
+
 #include "util/cd_image.h"
+#include "util/host_display.h"
+#include "util/platform_misc.h"
+
+#include "common/assert.h"
+#include "common/file_system.h"
+#include "common/log.h"
 
 #include <QtCore/QDebug>
 #include <QtCore/QFile>
@@ -44,7 +47,7 @@
 #include <cmath>
 
 #ifdef WITH_CHEEVOS
-#include "frontend-common/achievements.h"
+#include "core/achievements_private.h"
 #endif
 
 #ifdef _WIN32

src/duckstation-qt/postprocessingchainconfigwidget.cpp

@@ -2,9 +2,9 @@
 // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0)
 
 #include "postprocessingchainconfigwidget.h"
-#include "frontend-common/postprocessing_chain.h"
 #include "postprocessingshaderconfigwidget.h"
 #include "qthost.h"
+#include "util/postprocessing_chain.h"
 #include <QtGui/QCursor>
 #include <QtWidgets/QMenu>
 #include <QtWidgets/QMessageBox>

src/duckstation-qt/postprocessingchainconfigwidget.h

@@ -4,7 +4,7 @@
 #pragma once
 #include "common/types.h"
 #include "ui_postprocessingchainconfigwidget.h"
-#include "frontend-common/postprocessing_chain.h"
+#include "util/postprocessing_chain.h"
 #include <QtWidgets/QWidget>
 #include <optional>
 #include <memory>

src/duckstation-qt/postprocessingshaderconfigwidget.h

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0)
 
 #pragma once
-#include "frontend-common/postprocessing_shader.h"
+#include "util/postprocessing_shader.h"
 #include <QtWidgets/QDialog>
 #include <QtWidgets/QWidget>
 

src/duckstation-qt/qthost.cpp

@@ -2,6 +2,24 @@
 // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0)
 
 #include "qthost.h"
+#include "displaywidget.h"
+#include "mainwindow.h"
+#include "qtprogresscallback.h"
+#include "qtutils.h"
+
+#include "core/cheats.h"
+#include "core/controller.h"
+#include "core/fullscreen_ui.h"
+#include "core/game_database.h"
+#include "core/game_list.h"
+#include "core/gpu.h"
+#include "core/host.h"
+#include "core/host_settings.h"
+#include "core/imgui_overlays.h"
+#include "core/memory_card.h"
+#include "core/spu.h"
+#include "core/system.h"
+
 #include "common/assert.h"
 #include "common/byte_stream.h"
 #include "common/crash_handler.h"
@@ -10,28 +28,16 @@
 #include "common/path.h"
 #include "common/string_util.h"
 #include "common/window_info.h"
-#include "core/cheats.h"
-#include "core/controller.h"
-#include "core/game_database.h"
-#include "core/gpu.h"
-#include "core/host.h"
-#include "core/host_settings.h"
-#include "core/memory_card.h"
-#include "core/spu.h"
-#include "core/system.h"
-#include "displaywidget.h"
-#include "frontend-common/fullscreen_ui.h"
-#include "frontend-common/game_list.h"
-#include "frontend-common/imgui_manager.h"
-#include "frontend-common/imgui_overlays.h"
-#include "frontend-common/input_manager.h"
-#include "imgui.h"
-#include "mainwindow.h"
-#include "qtprogresscallback.h"
-#include "qtutils.h"
-#include "scmversion/scmversion.h"
+
 #include "util/audio_stream.h"
+#include "util/imgui_manager.h"
 #include "util/ini_settings_interface.h"
+#include "util/input_manager.h"
+
+#include "scmversion/scmversion.h"
+
+#include "imgui.h"
+
 #include <QtCore/QCoreApplication>
 #include <QtCore/QDateTime>
 #include <QtCore/QDebug>
@@ -49,7 +55,8 @@
 #include <cstdio>
 #include <cstdlib>
 #include <memory>
-Log_SetChannel(EmuThread);
+
+Log_SetChannel(QtHost);
 
 #ifdef _WIN32
 #include "common/windows_headers.h"
@@ -57,7 +64,7 @@ Log_SetChannel(EmuThread);
 #endif
 
 #ifdef WITH_CHEEVOS
-#include "frontend-common/achievements.h"
+#include "core/achievements_private.h"
 #endif
 
 static constexpr u32 SETTINGS_VERSION = 3;
@@ -807,6 +814,7 @@ void EmuThread::releaseHostDisplay()
     return;
 
   CommonHost::ReleaseHostDisplayResources();
+  FullscreenUI::Shutdown();
   ImGuiManager::Shutdown();
   g_host_display.reset();
   emit destroyDisplayRequested();

src/duckstation-qt/qthost.h

@@ -3,13 +3,13 @@
 
 #pragma once
 #include "core/host.h"
-#include "core/host_display.h"
+#include "util/host_display.h"
 #include "core/host_settings.h"
 #include "core/system.h"
 #include "core/types.h"
-#include "frontend-common/common_host.h"
-#include "frontend-common/game_list.h"
-#include "frontend-common/input_manager.h"
+#include "core/common_host.h"
+#include "core/game_list.h"
+#include "util/input_manager.h"
 #include "gdbserver.h"
 #include "qtutils.h"
 #include <QtCore/QByteArray>

src/duckstation-qt/qtkeycodes.cpp

@@ -4,7 +4,7 @@
 #include "qtutils.h"
 #include "common/string_util.h"
 #include "fmt/format.h"
-#include "frontend-common/input_manager.h"
+#include "util/input_manager.h"
 #include <QtGui/QKeyEvent>
 
 struct KeyCodeName

src/duckstation-qt/qttranslations.cpp

@@ -4,7 +4,7 @@
 #include "common/log.h"
 #include "common/string_util.h"
 #include "fmt/format.h"
-#include "frontend-common/imgui_manager.h"
+#include "util/imgui_manager.h"
 #include "imgui.h"
 #include "qthost.h"
 #include <QtCore/QFile>

src/duckstation-qt/qtutils.cpp

@@ -2,10 +2,13 @@
 // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0)
 
 #include "qtutils.h"
+
+#include "core/game_list.h"
+#include "core/system.h"
+
 #include "common/byte_stream.h"
 #include "common/make_array.h"
-#include "core/system.h"
-#include "frontend-common/game_list.h"
+
 #include <QtCore/QCoreApplication>
 #include <QtCore/QMetaObject>
 #include <QtGui/QDesktopServices>

src/duckstation-qt/settingsdialog.cpp

@@ -5,11 +5,8 @@
 #include "advancedsettingswidget.h"
 #include "audiosettingswidget.h"
 #include "biossettingswidget.h"
-#include "common/assert.h"
-#include "common/file_system.h"
 #include "consolesettingswidget.h"
-#include "core/host.h"
-#include "core/host_settings.h"
+
 #include "displaysettingswidget.h"
 #include "emulationsettingswidget.h"
 #include "enhancementsettingswidget.h"
@@ -21,13 +18,21 @@
 #include "memorycardsettingswidget.h"
 #include "postprocessingsettingswidget.h"
 #include "qthost.h"
+
+#include "core/host.h"
+#include "core/host_settings.h"
+
 #include "util/ini_settings_interface.h"
+
+#include "common/assert.h"
+#include "common/file_system.h"
+
 #include <QtWidgets/QMessageBox>
 #include <QtWidgets/QTextEdit>
 
 #ifdef WITH_CHEEVOS
 #include "achievementsettingswidget.h"
-#include "frontend-common/achievements.h"
+#include "core/achievements_private.h"
 #endif
 
 static QList<SettingsDialog*> s_open_game_properties_dialogs;