eden-emu/eden
14
3
Fork 4
Code Issues 3 Pull requests 2 Projects Releases 2 Packages Wiki Activity Actions

Merge https://git.eden-emu.dev/eden-emu/eden into purple

Browse source
This commit is contained in:
MrPurple666 2025-04-19 18:53:45 -03:00
commit 6ac5eaea11
52 changed files with 554 additions and 268 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/core/hle/service/audio/audio_controller.cpp
View file

@ -179,6 +179,8 @@ Result IAudioController::AcquireTargetNotification(
*out_notification_event = &notification_event->GetReadableEvent();
R_SUCCEED();
}
Result IAudioController::Unknown5000(Out<SharedPointer<IAudioController>> out_audio_controller) {
LOG_DEBUG(Audio, "Creating duplicate audio controller interface");
Result IAudioController::Unknown5000(Out<SharedPointer<IAudioController>> out_audio_controller) {
LOG_DEBUG(Audio, "Creating duplicate audio controller interface");
@ -188,5 +190,4 @@ Result IAudioController::Unknown5000(Out<SharedPointer<IAudioController>> out_au
R_SUCCEED();
}
} // namespace Service::Audio

2
src/dedicated_room/yuzu_room.rc
View file

@ -9,7 +9,7 @@
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
YUZU_ICON ICON "../../dist/yuzu.ico"
YUZU_ICON ICON "../../dist/eden.ico"
/////////////////////////////////////////////////////////////////////////////

4
src/yuzu/aboutdialog.ui
View file

@ -36,7 +36,7 @@
<string/>
</property>
<property name="pixmap">
<pixmap resource="../../dist/qt_themes/default/default.qrc">:/icons/default/256x256/yuzu.png</pixmap>
<pixmap resource="../../dist/qt_themes/default/default.qrc">:/icons/default/256x256/eden.png</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
@ -144,7 +144,7 @@ li.checked::marker { content: &quot;\2612&quot;; }
</sizepolicy>
</property>
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:7pt;&quot;&gt;&amp;quot;Nintendo Switch&amp;quot; is a trademark of Nintendo. yuzu is not affiliated with Nintendo in any way.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:7pt;&quot;&gt;&amp;quot;Nintendo Switch&amp;quot; is a trademark of Nintendo. eden is not affiliated with Nintendo in any way.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>

2
src/yuzu/main.ui
View file

@ -15,7 +15,7 @@
</property>
<property name="windowIcon">
<iconset resource="yuzu.qrc">
<normaloff>:/img/yuzu.ico</normaloff>:/img/yuzu.ico</iconset>
<normaloff>:/img/eden.ico</normaloff>:/img/eden.ico</iconset>
</property>
<property name="tabShape">
<enum>QTabWidget::TabShape::Rounded</enum>

2
src/yuzu/yuzu.qrc
View file

@ -5,6 +5,6 @@ SPDX-License-Identifier: GPL-2.0-or-later
<RCC>
<qresource prefix="/img">
<file alias="yuzu.ico">../../dist/yuzu.ico</file>
<file alias="eden.ico">../../dist/eden.ico</file>
</qresource>
</RCC>

2
src/yuzu/yuzu.rc
View file

@ -11,7 +11,7 @@
// remains consistent on all systems.
// QT requires that the default application icon is named IDI_ICON1
IDI_ICON1 ICON "../../dist/yuzu.ico"
IDI_ICON1 ICON "../../dist/eden.ico"
/////////////////////////////////////////////////////////////////////////////

2
src/yuzu_cmd/yuzu.rc
View file

@ -9,7 +9,7 @@
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
YUZU_ICON ICON "../../dist/yuzu.ico"
YUZU_ICON ICON "../../dist/eden.ico"
/////////////////////////////////////////////////////////////////////////////