adjusted various id names https://sourceforge.net/p/libmtp/bugs/1926/

1 files changed, 75 insertions, 75 deletions

diff --git a/src/music-players.h b/src/music-players.h
index 963f314..32465a8 100644
--- a/src/music-players.h
+++ b/src/music-players.h
@@ -1840,7 +1840,7 @@
    * Ah Hong <hongster@users.sourceforge.net>
    * Eowyn Carter
    */
-  { "SonyEricsson", 0x0fce,  "c1605 Xperia Dual E MTP", 0x0146,
+  { "SonyEricsson", 0x0fce,  "Xperia Dual E MTP", 0x0146,
       DEVICE_FLAG_NONE },
   { "SonyEricsson", 0x0fce, "LT15i Xperia arc S MTP", 0x014f,
       DEVICE_FLAG_NONE },
@@ -1948,62 +1948,62 @@
       DEVICE_FLAG_NONE },
   { "SONY", 0x0fce, "Xperia Z3 Tablet MTP", 0x01c0,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria M4 Aqua Dual MTP", 0x01c4,
+  { "SONY", 0x0fce, "Xperia M4 Aqua Dual MTP", 0x01c4,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "E2115 MTP", 0x01c5,
+  { "SONY", 0x0fce, "Xperia E4 Dual MTP", 0x01c5,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria Z3+ MTP", 0x01c9,
+  { "SONY", 0x0fce, "Xperia Z3+ MTP", 0x01c9,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria E4g MTP", 0x01cb,
+  { "SONY", 0x0fce, "Xperia E4g MTP", 0x01cb,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "C4 Dual MTP", 0x01d2,
+  { "SONY", 0x0fce, "Xperia C4 Dual MTP", 0x01d2,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria M5 MTP", 0x01d6,
+  { "SONY", 0x0fce, "Xperia M5 MTP", 0x01d6,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria Z5 MTP", 0x01d9,
+  { "SONY", 0x0fce, "Xperia Z5 MTP", 0x01d9,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria Z5 Compact MTP", 0x01da,
+  { "SONY", 0x0fce, "Xperia Z5 Compact MTP", 0x01da,
       DEVICE_FLAG_NONE },
   /* https://sourceforge.net/p/libmtp/feature-requests/236/ */
-  { "SONY", 0x0fce, "XPeria Z5 Premium Dual Sim MTP", 0x01db,
+  { "SONY", 0x0fce, "Xperia Z5 Premium Dual Sim MTP", 0x01db,
       DEVICE_FLAG_NONE },
   /* https://sourceforge.net/p/libmtp/bugs/1649/ */
-  { "SONY", 0x0fce, "XPeria XA MTP", 0x01de,
+  { "SONY", 0x0fce, "Xperia XA MTP", 0x01de,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria X MTP", 0x01e0,
+  { "SONY", 0x0fce, "Xperia X MTP", 0x01e0,
       DEVICE_FLAG_NONE },
   /* https://sourceforge.net/p/libmtp/feature-requests/251/ */
-  { "SONY", 0x0fce, "XPeria SOV33", 0x01e1,
+  { "SONY", 0x0fce, "Xperia SOV33", 0x01e1,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria XZ MTP", 0x01e7,
+  { "SONY", 0x0fce, "Xperia XZ MTP", 0x01e7,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria X Compact MTP", 0x01e8,
+  { "SONY", 0x0fce, "Xperia X Compact MTP", 0x01e8,
       DEVICE_FLAG_NONE },
   /* https://sourceforge.net/p/libmtp/feature-requests/252/ */
-  { "SONY", 0x0fce, "XPeria G3123", 0x01eb,
+  { "SONY", 0x0fce, "Xperia XA1", 0x01eb,
       DEVICE_FLAG_NONE },
   /* https://sourceforge.net/p/libmtp/support-requests/247/ */
-  { "SONY", 0x0fce, "XPeria XZ", 0x01ed,
+  { "SONY", 0x0fce, "Xperia XZ", 0x01ed,
       DEVICE_FLAG_NONE },
   /* https://sourceforge.net/p/libmtp/bugs/1812/ */
-  { "SONY", 0x0fce, "XPeria XA1 Ultra", 0x01ef,
+  { "SONY", 0x0fce, "Xperia XA1 Ultra", 0x01ef,
       DEVICE_FLAG_NONE },
   /* https://sourceforge.net/p/libmtp/support-requests/251/ */
-  { "SONY", 0x0fce, "XPeria XZ Premium", 0x01f1,
+  { "SONY", 0x0fce, "Xperia XZ Premium", 0x01f1,
       DEVICE_FLAG_NONE },
   /* Nicholas O'Connor <lavacano@lavacano.net> on libmtp-discuss */
-  { "SONY", 0x0fce, "XPeria XZ1", 0x01f3,
+  { "SONY", 0x0fce, "Xperia XZ1", 0x01f3,
       DEVICE_FLAG_NONE },
   /* https://sourceforge.net/p/libmtp/support-requests/252/ */
-  { "SONY", 0x0fce, "XPeria XZ1 Compact", 0x01f4,
+  { "SONY", 0x0fce, "Xperia XZ1 Compact", 0x01f4,
       DEVICE_FLAG_NONE },
   /* https://sourceforge.net/p/libmtp/feature-requests/281/ */
-  { "SONY", 0x0fce, "XPeria L2", 0x01f6,
+  { "SONY", 0x0fce, "Xperia L2", 0x01f6,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria XA2 Compact", 0x01f7,
+  { "SONY", 0x0fce, "Xperia XA2 Compact", 0x01f7,
       DEVICE_FLAG_NONE },
   /* https://sourceforge.net/p/libmtp/support-requests/285/ */
-  { "SONY", 0x0fce, "XPeria XA2 Ultra", 0x01f8,
+  { "SONY", 0x0fce, "Xperia XA2 Ultra", 0x01f8,
       DEVICE_FLAG_NONE },
   /* https://sourceforge.net/p/libmtp/bugs/1804/ */
   { "SONY", 0x0fce, "Xperia XZ2 Compact Dual Sim", 0x01f9,
@@ -2023,7 +2023,7 @@
   { "SONY", 0x0fce, "Xperia 1 (J9110)", 0x0205,
       DEVICE_FLAG_NONE },
   /* https://sourceforge.net/p/libmtp/bugs/1849/ */
-  { "SONY", 0x0fce, "Xperia I4312", 0x0207,
+  { "SONY", 0x0fce, "Xperia L3", 0x0207,
       DEVICE_FLAG_NONE },
   /* https://github.com/libmtp/libmtp/issues/113 */
   { "SONY", 0x0fce, "Xperia 5", 0x020a,
@@ -2123,51 +2123,51 @@
       DEVICE_FLAG_NONE },
   { "SONY", 0x0fce, "Xperia Z3 Tablet MTP+CDROM", 0x41c0,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria M4 Aqua Dual MTP+CDROM", 0x41c4,
+  { "SONY", 0x0fce, "Xperia M4 Aqua Dual MTP+CDROM", 0x41c4,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "E2115 MTP+CDROM", 0x41c5,
+  { "SONY", 0x0fce, "Xperia E4 Dual MTP+CDROM", 0x41c5,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria Z3+ MTP+CDROM", 0x41c9,
+  { "SONY", 0x0fce, "Xperia Z3+ MTP+CDROM", 0x41c9,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria E4g MTP+CDROM", 0x41cb,
+  { "SONY", 0x0fce, "Xperia E4g MTP+CDROM", 0x41cb,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "C4 Dual MTP+CDROM", 0x41d2,
+  { "SONY", 0x0fce, "Xperia C4 Dual MTP+CDROM", 0x41d2,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria M5 MTP+CDROM", 0x41d6,
+  { "SONY", 0x0fce, "Xperia M5 MTP+CDROM", 0x41d6,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria Z5 MTP+CDROM", 0x41d9,
+  { "SONY", 0x0fce, "Xperia Z5 MTP+CDROM", 0x41d9,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria Z5 Compact MTP+CDROM", 0x41da,
+  { "SONY", 0x0fce, "Xperia Z5 Compact MTP+CDROM", 0x41da,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria Z5 Premium Dual Sim MTP+CDROM", 0x41db,
+  { "SONY", 0x0fce, "Xperia Z5 Premium Dual Sim MTP+CDROM", 0x41db,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria XA MTP+CDROM", 0x41de,
+  { "SONY", 0x0fce, "Xperia XA MTP+CDROM", 0x41de,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria X MTP+CDROM", 0x41e0,
+  { "SONY", 0x0fce, "Xperia X MTP+CDROM", 0x41e0,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria SOV33 MTP+CDROM", 0x41e1,
+  { "SONY", 0x0fce, "Xperia SOV33 MTP+CDROM", 0x41e1,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria XZ MTP+CDROM", 0x41e7,
+  { "SONY", 0x0fce, "Xperia XZ MTP+CDROM", 0x41e7,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria X Compact MTP+CDROM", 0x41e8,
+  { "SONY", 0x0fce, "Xperia X Compact MTP+CDROM", 0x41e8,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria G3123 MTP+CDROM", 0x41eb,
+  { "SONY", 0x0fce, "Xperia XA1 MTP+CDROM", 0x41eb,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria XZ CDROM", 0x41ed,
+  { "SONY", 0x0fce, "Xperia XZ CDROM", 0x41ed,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria XA1 Ultra MTP+CDROM", 0x41ef,
+  { "SONY", 0x0fce, "Xperia XA1 Ultra MTP+CDROM", 0x41ef,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria XZ Premium MTP+CDROM", 0x41f1,
+  { "SONY", 0x0fce, "Xperia XZ Premium MTP+CDROM", 0x41f1,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria XZ1 MTP+CDROM", 0x41f3,
+  { "SONY", 0x0fce, "Xperia XZ1 MTP+CDROM", 0x41f3,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria XZ1 Compact MTP+CDROM", 0x41f4,
+  { "SONY", 0x0fce, "Xperia XZ1 Compact MTP+CDROM", 0x41f4,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria L2 MTP+CDROM", 0x41f6,
+  { "SONY", 0x0fce, "Xperia L2 MTP+CDROM", 0x41f6,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria XA2 Compact MTP+CDROM", 0x41f7,
+  { "SONY", 0x0fce, "Xperia XA2 Compact MTP+CDROM", 0x41f7,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria XA2 Ultra MTP+CDROM", 0x41f8,
+  { "SONY", 0x0fce, "Xperia XA2 Ultra MTP+CDROM", 0x41f8,
       DEVICE_FLAG_NONE },
   { "SONY", 0x0fce, "Xperia XZ2 Compact Dual Sim MTP+CDROM", 0x41f9,
       DEVICE_FLAG_NONE },
@@ -2181,7 +2181,7 @@
       DEVICE_FLAG_NONE },
   { "SONY", 0x0fce, "Xperia 1 (J9110) MTP+CDROM", 0x4205,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "Xperia I4312 MTP+CDROM", 0x4207,
+  { "SONY", 0x0fce, "Xperia L3 MTP+CDROM", 0x4207,
       DEVICE_FLAG_NONE },
   { "SONY", 0x0fce, "Xperia 5 MTP+CDROM", 0x420a,
       DEVICE_FLAG_NONE },
@@ -2191,7 +2191,7 @@
   /*
    * MTP+ADB personalities of MTP devices (see above)
    */
-  { "SonyEricsson", 0x0fce,  "c1605 Xperia Dual E MTP+ADB", 0x5146,
+  { "SonyEricsson", 0x0fce,  "Xperia Dual E MTP+ADB", 0x5146,
       DEVICE_FLAG_NONE },
   { "SonyEricsson", 0x0fce, "LT15i Xperia Arc MTP+ADB", 0x514f,
       DEVICE_FLAG_NONE },
@@ -2299,51 +2299,51 @@
       DEVICE_FLAG_NONE },
   { "SONY", 0x0fce, "Xperia Z3 Tablet MTP+ADB", 0x51c0,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria M4 Aqua Dual MTP+ADB", 0x51c4,
+  { "SONY", 0x0fce, "Xperia M4 Aqua Dual MTP+ADB", 0x51c4,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "E2115 MTP+ADB", 0x51c5,
+  { "SONY", 0x0fce, "Xperia E4 Dual MTP+ADB", 0x51c5,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria Z3+ MTP+ADB", 0x51c9,
+  { "SONY", 0x0fce, "Xperia Z3+ MTP+ADB", 0x51c9,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce,  "XPeria E4g MTP+ADB", 0x51cb,
+  { "SONY", 0x0fce, "Xperia E4g MTP+ADB", 0x51cb,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "C4 Dual MTP+ADB", 0x51d2,
+  { "SONY", 0x0fce, "Xperia C4 Dual MTP+ADB", 0x51d2,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria M5 MTP+ADB", 0x51d6,
+  { "SONY", 0x0fce, "Xperia M5 MTP+ADB", 0x51d6,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria Z5 MTP+ADB", 0x51d9,
+  { "SONY", 0x0fce, "Xperia Z5 MTP+ADB", 0x51d9,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria Z5 Compact MTP+ADB", 0x51da,
+  { "SONY", 0x0fce, "Xperia Z5 Compact MTP+ADB", 0x51da,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria Z5 Premium Dual Sim MTP+ADB", 0x51db,
+  { "SONY", 0x0fce, "Xperia Z5 Premium Dual Sim MTP+ADB", 0x51db,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria XA MTP+ADB", 0x51de,
+  { "SONY", 0x0fce, "Xperia XA MTP+ADB", 0x51de,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria X MTP+ADB", 0x51e0,
+  { "SONY", 0x0fce, "Xperia X MTP+ADB", 0x51e0,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria SOV33 MTP+ADB", 0x51e1,
+  { "SONY", 0x0fce, "Xperia SOV33 MTP+ADB", 0x51e1,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria XZ MTP+ADB", 0x51e7,
+  { "SONY", 0x0fce, "Xperia XZ MTP+ADB", 0x51e7,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria X Compact MTP+ADB", 0x51e8,
+  { "SONY", 0x0fce, "Xperia X Compact MTP+ADB", 0x51e8,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria G3123 MTP+ADB", 0x51eb,
+  { "SONY", 0x0fce, "Xperia XA1 MTP+ADB", 0x51eb,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria XZ ADB", 0x51ed,
+  { "SONY", 0x0fce, "Xperia XZ ADB", 0x51ed,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria XA1 Ultra MTP+ADB", 0x51ef,
+  { "SONY", 0x0fce, "Xperia XA1 Ultra MTP+ADB", 0x51ef,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria XZ Premium MTP+ADB", 0x51f1,
+  { "SONY", 0x0fce, "Xperia XZ Premium MTP+ADB", 0x51f1,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria XZ1 ADB", 0x51f3,
+  { "SONY", 0x0fce, "Xperia XZ1 ADB", 0x51f3,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria XZ1 Compact MTP+ADB", 0x51f4,
+  { "SONY", 0x0fce, "Xperia XZ1 Compact MTP+ADB", 0x51f4,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria L2 MTP+ADB", 0x51f6,
+  { "SONY", 0x0fce, "Xperia L2 MTP+ADB", 0x51f6,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria XA2 Compact MTP+ADB", 0x51f7,
+  { "SONY", 0x0fce, "Xperia XA2 Compact MTP+ADB", 0x51f7,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "XPeria XA2 Ultra MTP+ADB", 0x51f8,
+  { "SONY", 0x0fce, "Xperia XA2 Ultra MTP+ADB", 0x51f8,
       DEVICE_FLAG_NONE },
   { "SONY", 0x0fce, "Xperia XZ2 Compact Dual Sim MTP+ADB", 0x51f9,
       DEVICE_FLAG_NONE },
@@ -2357,7 +2357,7 @@
       DEVICE_FLAG_NONE },
   { "SONY", 0x0fce, "Xperia 1 (J9110) MTP+ADB", 0x5205,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "Xperia I4312 MTP+ADB", 0x5207,
+  { "SONY", 0x0fce, "Xperia L3 MTP+ADB", 0x5207,
       DEVICE_FLAG_NONE },
   { "SONY", 0x0fce, "Xperia 5 MTP+ADB", 0x520a,
       DEVICE_FLAG_NONE },
@@ -4280,7 +4280,7 @@
   { "FLIR", 0x09cb, "C5", 0x100b, DEVICE_FLAGS_ANDROID_BUGS },
 
   /* https://github.com/libmtp/libmtp/issues/135 */
-  { "Honor", 0x339b, "Any-NX1", 0x107d, DEVICE_FLAGS_ANDROID_BUGS },
+  { "Honor", 0x339b, "X8/X9 5G", 0x107d, DEVICE_FLAGS_ANDROID_BUGS },
 
   /* qemu 3.0.0 hw/usb/dev-mtp.c */
   { "QEMU", 0x46f4, "Virtual MTP", 0x0004, DEVICE_FLAG_NONE }