fixup! config: Read network_interface

Let's yuzu_cmd use a network interface. Also adds it to the default ini.

.ci/templates/merge-private.yml

@@ -1,8 +1,6 @@
 jobs:
 - job: merge
   displayName: 'pull requests'
-  pool:
-    vmImage: 'ubuntu-latest'
   steps:
   - checkout: self
     submodules: recursive
@@ -26,8 +24,6 @@ jobs:
 - job: upload_source
   displayName: 'upload'
   dependsOn: merge
-  pool:
-    vmImage: 'ubuntu-latest'
   steps:
   - template: ./sync-source.yml
     parameters:

.ci/templates/merge.yml

@@ -1,8 +1,6 @@
 jobs:
 - job: merge
   displayName: 'pull requests'
-  pool:
-    vmImage: 'ubuntu-latest'
   steps:
   - checkout: self
     submodules: recursive
@@ -25,8 +23,6 @@ jobs:
 - job: upload_source
   displayName: 'upload'
   dependsOn: merge
-  pool:
-    vmImage: 'ubuntu-latest'
   steps:
   - template: ./sync-source.yml
     parameters:

.ci/yuzu-mainline-step2.yml

@@ -66,7 +66,5 @@ stages:
   jobs:
   - job: github
     displayName: 'github'
-    pool:
-      vmImage: ubuntu-latest
     steps:
     - template: ./templates/release-github.yml

.ci/yuzu-patreon-step2.yml

@@ -29,7 +29,5 @@ stages:
   jobs:
     - job: release
       displayName: 'source'
-      pool:
-        vmImage: 'ubuntu-latest'
       steps:
         - template: ./templates/release-private-tag.yml

src/core/hle/service/am/applets/applet_web_browser.cpp

@@ -24,7 +24,6 @@
 #include "core/hle/service/am/applets/applet_web_browser.h"
 #include "core/hle/service/filesystem/filesystem.h"
 #include "core/hle/service/ns/pl_u.h"
-#include "core/loader/loader.h"
 
 namespace Service::AM::Applets {
 
@@ -123,15 +122,6 @@ FileSys::VirtualFile GetOfflineRomFS(Core::System& system, u64 title_id,
         const auto nca = system.GetContentProvider().GetEntry(title_id, nca_type);
 
         if (nca == nullptr) {
-            if (nca_type == FileSys::ContentRecordType::HtmlDocument) {
-                LOG_WARNING(Service_AM, "Falling back to AppLoader to get the RomFS.");
-                FileSys::VirtualFile romfs;
-                system.GetAppLoader().ReadManualRomFS(romfs);
-                if (romfs != nullptr) {
-                    return romfs;
-                }
-            }
-
             LOG_ERROR(Service_AM,
                       "NCA of type={} with title_id={:016X} is not found in the ContentProvider!",
                       nca_type, title_id);

src/video_core/command_classes/vic.cpp

@@ -88,10 +88,9 @@ void Vic::Execute() {
     const u64 surface_width = config.surface_width_minus1 + 1;
     const u64 surface_height = config.surface_height_minus1 + 1;
     if (static_cast<u64>(frame->width) != surface_width ||
-        static_cast<u64>(frame->height) > surface_height) {
+        static_cast<u64>(frame->height) != surface_height) {
         // TODO: Properly support multiple video streams with differing frame dimensions
-        LOG_WARNING(Debug,
-                    "Frame dimensions {}x{} can't be safely decoded into surface dimensions {}x{}",
+        LOG_WARNING(Debug, "Frame dimensions {}x{} do not match expected surface dimensions {}x{}",
                     frame->width, frame->height, surface_width, surface_height);
         return;
     }

src/yuzu/configuration/configure_graphics.ui

@@ -200,17 +200,17 @@
             <widget class="QComboBox" name="nvdec_emulation">
              <item>
               <property name="text">
-               <string>No Video Output</string>
+               <string>Disabled</string>
               </property>
              </item>
              <item>
               <property name="text">
-               <string>CPU Video Decoding</string>
+               <string>CPU Decoding</string>
               </property>
              </item>
              <item>
               <property name="text">
-               <string>GPU Video Decoding (Default)</string>
+               <string>GPU Decoding</string>
               </property>
              </item>
             </widget>

src/yuzu_cmd/config.cpp

@@ -518,6 +518,9 @@ void Config::ReadValues() {
     ReadSetting("WebService", Settings::values.web_api_url);
     ReadSetting("WebService", Settings::values.yuzu_username);
     ReadSetting("WebService", Settings::values.yuzu_token);
+
+    // Network
+    ReadSetting("Network", Settings::values.network_interface);
 }
 
 void Config::Reload() {

src/yuzu_cmd/default_ini.h

@@ -428,6 +428,12 @@ web_api_url = https://api.yuzu-emu.org
 yuzu_username =
 yuzu_token =
 
+[Network]
+# Name of the network interface device to use with yuzu LAN play.
+# e.g. On *nix: 'enp7s0', 'wlp6s0u1u3u3', 'lo'
+# e.g. On Windows: 'Ethernet', 'Wi-Fi'
+network_interface =
+
 [AddOns]
 # Used to disable add-ons
 # List of title IDs of games that will have add-ons disabled (separated by '|'):