X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2FLibCecTray%2Fcontroller%2Fapplications%2Finternal%2FXBMCController.cs;h=b2dfc20455973408970b258a79a136a0218c9663;hb=9c72728bd85e738350d8bd28fc9fd5cc26b80e1e;hp=5ffe8f9ec88c15d3968d48bec1354d471dd4115b;hpb=496897540ebcc6fc13b346aa5e08f2148a2770c7;p=deb_libcec.git
diff --git a/src/LibCecTray/controller/applications/internal/XBMCController.cs b/src/LibCecTray/controller/applications/internal/XBMCController.cs
index 5ffe8f9..b2dfc20 100644
--- a/src/LibCecTray/controller/applications/internal/XBMCController.cs
+++ b/src/LibCecTray/controller/applications/internal/XBMCController.cs
@@ -71,7 +71,9 @@ namespace LibCECTray.controller.applications.@internal
public bool LoadXMLConfiguration()
{
var xbmcDir = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + @"\XBMC\userdata\peripheral_data";
- return LoadXMLConfiguration(xbmcDir + @"\usb_2548_1001.xml") || LoadXMLConfiguration(xbmcDir + @"\usb_2548_1002.xml");
+ return LoadXMLConfiguration(xbmcDir + string.Format(@"\usb_{0:X}_{1:X}.xml", Program.Instance.Controller.AdapterVendorId, Program.Instance.Controller.AdapterProductId)) ||
+ LoadXMLConfiguration(xbmcDir + @"\usb_2548_1001.xml") ||
+ LoadXMLConfiguration(xbmcDir + @"\usb_2548_1002.xml");
}
public bool LoadXMLConfiguration(string filename)
@@ -219,7 +221,7 @@ namespace LibCECTray.controller.applications.@internal
{
Title = Resources.store_settings_where,
InitialDirectory = xbmcDir,
- FileName = string.Format("usb_{0}.xml", Program.Instance.Controller.USBDescriptor.Replace(':', '_')),
+ FileName = string.Format("usb_{0:X}_{1:X}.xml", Program.Instance.Controller.AdapterVendorId, Program.Instance.Controller.AdapterProductId),
Filter = Resources.xml_file_filter,
FilterIndex = 1
};
@@ -279,8 +281,7 @@ namespace LibCECTray.controller.applications.@internal
// only supported by 1.5.1+ clients
output.AppendLine("");
- //TODO
- //output.AppendLine("");
+ output.AppendLine("");
output.AppendLine("");
writer.Write(output.ToString());