From 8da2ff4a2030a11bf59028cfce2289d438d8955e Mon Sep 17 00:00:00 2001 From: Kelvin Sherlock Date: Thu, 28 Mar 2024 19:28:32 -0400 Subject: [PATCH] for media beyond the second level, include default options since there isn't a UI to change it yet. --- Ample/Resources/ace100.plist | 14 +++++ Ample/Resources/ace1000.plist | 14 +++++ Ample/Resources/ace2200.plist | 14 +++++ Ample/Resources/albert.plist | 14 +++++ Ample/Resources/am100.plist | 14 +++++ Ample/Resources/am64.plist | 14 +++++ Ample/Resources/apple2.plist | 14 +++++ Ample/Resources/apple2e.plist | 14 +++++ Ample/Resources/apple2ee.plist | 14 +++++ Ample/Resources/apple2eefr.plist | 14 +++++ Ample/Resources/apple2ees.plist | 14 +++++ Ample/Resources/apple2eeuk.plist | 14 +++++ Ample/Resources/apple2ep.plist | 14 +++++ Ample/Resources/apple2euk.plist | 14 +++++ Ample/Resources/apple2gs.plist | 14 +++++ Ample/Resources/apple2gsr0.plist | 14 +++++ Ample/Resources/apple2gsr1.plist | 14 +++++ Ample/Resources/apple2jp.plist | 14 +++++ Ample/Resources/apple2p.plist | 14 +++++ Ample/Resources/basis108.plist | 14 +++++ Ample/Resources/cec2000.plist | 14 +++++ Ample/Resources/cece.plist | 14 +++++ Ample/Resources/cecg.plist | 14 +++++ Ample/Resources/ceci.plist | 14 +++++ Ample/Resources/cecm.plist | 14 +++++ Ample/Resources/coco.plist | 100 +++++++++++++++++++++++++++++++ Ample/Resources/coco2b.plist | 100 +++++++++++++++++++++++++++++++ Ample/Resources/coco3.plist | 100 +++++++++++++++++++++++++++++++ Ample/Resources/coco3p.plist | 100 +++++++++++++++++++++++++++++++ Ample/Resources/craft2p.plist | 14 +++++ Ample/Resources/d64plus.plist | 90 ++++++++++++++++++++++++++++ Ample/Resources/dodo.plist | 14 +++++ Ample/Resources/dragon200.plist | 90 ++++++++++++++++++++++++++++ Ample/Resources/dragon200e.plist | 90 ++++++++++++++++++++++++++++ Ample/Resources/dragon32.plist | 90 ++++++++++++++++++++++++++++ Ample/Resources/dragon64.plist | 90 ++++++++++++++++++++++++++++ Ample/Resources/elppa.plist | 14 +++++ Ample/Resources/hkc8800a.plist | 14 +++++ Ample/Resources/ivelultr.plist | 14 +++++ Ample/Resources/las128ex.plist | 14 +++++ Ample/Resources/laser128.plist | 14 +++++ Ample/Resources/laser128o.plist | 14 +++++ Ample/Resources/laser2c.plist | 14 +++++ Ample/Resources/maxxi.plist | 14 +++++ Ample/Resources/microeng.plist | 14 +++++ Ample/Resources/mprof3.plist | 14 +++++ Ample/Resources/prav82.plist | 14 +++++ Ample/Resources/prav8c.plist | 14 +++++ Ample/Resources/prav8m.plist | 14 +++++ Ample/Resources/space84.plist | 14 +++++ Ample/Resources/spectred.plist | 14 +++++ Ample/Resources/tanodr64.plist | 90 ++++++++++++++++++++++++++++ Ample/Resources/tk3000.plist | 14 +++++ Ample/Resources/uniap2en.plist | 14 +++++ Ample/Resources/uniap2pt.plist | 14 +++++ Ample/Resources/uniap2ti.plist | 14 +++++ Ample/Resources/zijini.plist | 14 +++++ python/mkmachines.py | 43 +++++++++---- 58 files changed, 1631 insertions(+), 10 deletions(-) diff --git a/Ample/Resources/ace100.plist b/Ample/Resources/ace100.plist index f17d775..b2e5cc4 100644 --- a/Ample/Resources/ace100.plist +++ b/Ample/Resources/ace100.plist @@ -6100,6 +6100,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value @@ -6179,6 +6186,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value diff --git a/Ample/Resources/ace1000.plist b/Ample/Resources/ace1000.plist index 5edf53f..f925c1b 100644 --- a/Ample/Resources/ace1000.plist +++ b/Ample/Resources/ace1000.plist @@ -6040,6 +6040,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value @@ -6119,6 +6126,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value diff --git a/Ample/Resources/ace2200.plist b/Ample/Resources/ace2200.plist index 0c09302..6b7a44b 100644 --- a/Ample/Resources/ace2200.plist +++ b/Ample/Resources/ace2200.plist @@ -5609,6 +5609,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value @@ -5688,6 +5695,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value diff --git a/Ample/Resources/albert.plist b/Ample/Resources/albert.plist index aed4a47..449c473 100644 --- a/Ample/Resources/albert.plist +++ b/Ample/Resources/albert.plist @@ -6040,6 +6040,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value @@ -6119,6 +6126,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value diff --git a/Ample/Resources/am100.plist b/Ample/Resources/am100.plist index 589d901..e0ff255 100644 --- a/Ample/Resources/am100.plist +++ b/Ample/Resources/am100.plist @@ -6040,6 +6040,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value @@ -6119,6 +6126,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value diff --git a/Ample/Resources/am64.plist b/Ample/Resources/am64.plist index 932f8f9..2008ec2 100644 --- a/Ample/Resources/am64.plist +++ b/Ample/Resources/am64.plist @@ -6040,6 +6040,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value @@ -6119,6 +6126,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value diff --git a/Ample/Resources/apple2.plist b/Ample/Resources/apple2.plist index 7c697bb..207fdc0 100644 --- a/Ample/Resources/apple2.plist +++ b/Ample/Resources/apple2.plist @@ -6129,6 +6129,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value @@ -6208,6 +6215,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value diff --git a/Ample/Resources/apple2e.plist b/Ample/Resources/apple2e.plist index c2a4bcb..6786598 100644 --- a/Ample/Resources/apple2e.plist +++ b/Ample/Resources/apple2e.plist @@ -8164,6 +8164,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value @@ -8243,6 +8250,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value diff --git a/Ample/Resources/apple2ee.plist b/Ample/Resources/apple2ee.plist index 5cacef2..c60c92b 100644 --- a/Ample/Resources/apple2ee.plist +++ b/Ample/Resources/apple2ee.plist @@ -8164,6 +8164,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value @@ -8243,6 +8250,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value diff --git a/Ample/Resources/apple2eefr.plist b/Ample/Resources/apple2eefr.plist index 8c09c1c..3632e18 100644 --- a/Ample/Resources/apple2eefr.plist +++ b/Ample/Resources/apple2eefr.plist @@ -8164,6 +8164,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value @@ -8243,6 +8250,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value diff --git a/Ample/Resources/apple2ees.plist b/Ample/Resources/apple2ees.plist index da4e2ac..d052fbd 100644 --- a/Ample/Resources/apple2ees.plist +++ b/Ample/Resources/apple2ees.plist @@ -8164,6 +8164,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value @@ -8243,6 +8250,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value diff --git a/Ample/Resources/apple2eeuk.plist b/Ample/Resources/apple2eeuk.plist index 7b2dfa5..18ba2d4 100644 --- a/Ample/Resources/apple2eeuk.plist +++ b/Ample/Resources/apple2eeuk.plist @@ -8164,6 +8164,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value @@ -8243,6 +8250,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value diff --git a/Ample/Resources/apple2ep.plist b/Ample/Resources/apple2ep.plist index 9a09e07..901cabc 100644 --- a/Ample/Resources/apple2ep.plist +++ b/Ample/Resources/apple2ep.plist @@ -8164,6 +8164,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value @@ -8243,6 +8250,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value diff --git a/Ample/Resources/apple2euk.plist b/Ample/Resources/apple2euk.plist index dabcf2b..728d77f 100644 --- a/Ample/Resources/apple2euk.plist +++ b/Ample/Resources/apple2euk.plist @@ -8164,6 +8164,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value @@ -8243,6 +8250,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value diff --git a/Ample/Resources/apple2gs.plist b/Ample/Resources/apple2gs.plist index fe3191a..b42949d 100644 --- a/Ample/Resources/apple2gs.plist +++ b/Ample/Resources/apple2gs.plist @@ -7970,6 +7970,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value @@ -8049,6 +8056,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value diff --git a/Ample/Resources/apple2gsr0.plist b/Ample/Resources/apple2gsr0.plist index ca7eb49..ecd4186 100644 --- a/Ample/Resources/apple2gsr0.plist +++ b/Ample/Resources/apple2gsr0.plist @@ -8010,6 +8010,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value @@ -8089,6 +8096,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value diff --git a/Ample/Resources/apple2gsr1.plist b/Ample/Resources/apple2gsr1.plist index cd66b7c..e60270c 100644 --- a/Ample/Resources/apple2gsr1.plist +++ b/Ample/Resources/apple2gsr1.plist @@ -8010,6 +8010,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value @@ -8089,6 +8096,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value diff --git a/Ample/Resources/apple2jp.plist b/Ample/Resources/apple2jp.plist index 0a51dbf..c8627c3 100644 --- a/Ample/Resources/apple2jp.plist +++ b/Ample/Resources/apple2jp.plist @@ -6040,6 +6040,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value @@ -6119,6 +6126,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value diff --git a/Ample/Resources/apple2p.plist b/Ample/Resources/apple2p.plist index f60b3aa..1d10eed 100644 --- a/Ample/Resources/apple2p.plist +++ b/Ample/Resources/apple2p.plist @@ -6040,6 +6040,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value @@ -6119,6 +6126,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value diff --git a/Ample/Resources/basis108.plist b/Ample/Resources/basis108.plist index d49bb2e..ad49b15 100644 --- a/Ample/Resources/basis108.plist +++ b/Ample/Resources/basis108.plist @@ -6100,6 +6100,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value @@ -6179,6 +6186,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value diff --git a/Ample/Resources/cec2000.plist b/Ample/Resources/cec2000.plist index 6b7d723..8131e38 100644 --- a/Ample/Resources/cec2000.plist +++ b/Ample/Resources/cec2000.plist @@ -6905,6 +6905,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value @@ -6984,6 +6991,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value diff --git a/Ample/Resources/cece.plist b/Ample/Resources/cece.plist index d4d935b..0deb9a4 100644 --- a/Ample/Resources/cece.plist +++ b/Ample/Resources/cece.plist @@ -6905,6 +6905,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value @@ -6984,6 +6991,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value diff --git a/Ample/Resources/cecg.plist b/Ample/Resources/cecg.plist index 1a62f05..86271c7 100644 --- a/Ample/Resources/cecg.plist +++ b/Ample/Resources/cecg.plist @@ -6905,6 +6905,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value @@ -6984,6 +6991,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value diff --git a/Ample/Resources/ceci.plist b/Ample/Resources/ceci.plist index 506c673..f8abf69 100644 --- a/Ample/Resources/ceci.plist +++ b/Ample/Resources/ceci.plist @@ -6940,6 +6940,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value @@ -7019,6 +7026,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value diff --git a/Ample/Resources/cecm.plist b/Ample/Resources/cecm.plist index f0a483f..9955819 100644 --- a/Ample/Resources/cecm.plist +++ b/Ample/Resources/cecm.plist @@ -6905,6 +6905,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value @@ -6984,6 +6991,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value diff --git a/Ample/Resources/coco.plist b/Ample/Resources/coco.plist index a890fb4..497fbba 100644 --- a/Ample/Resources/coco.plist +++ b/Ample/Resources/coco.plist @@ -1262,6 +1262,11 @@ CoCo Floppy Disk Controller default + media + + floppy_5_25 + 2 + value @@ -1286,6 +1291,13 @@ CoCo MIDI PAK default + media + + midiin + 1 + midiout + 2 + value @@ -1350,6 +1362,11 @@ Codimex CD-6809 Disk BASIC (1986) default + media + + floppy_5_25 + 2 + value @@ -1366,6 +1383,11 @@ Disto Super Controller II default + media + + floppy_5_25 + 2 + value @@ -1374,6 +1396,11 @@ Glenside IDE Adapter default + media + + hard + 1 + value @@ -1382,6 +1409,11 @@ Prológica CP-450 BASIC Disco V. 1.0 (1984) default + media + + floppy_5_25 + 2 + value @@ -1559,6 +1591,13 @@ CoCo MIDI PAK default + media + + midiin + 1 + midiout + 2 + value @@ -1631,6 +1670,11 @@ Glenside IDE Adapter default + media + + hard + 1 + value @@ -1710,6 +1754,13 @@ CoCo MIDI PAK default + media + + midiin + 1 + midiout + 2 + value @@ -1782,6 +1833,11 @@ Glenside IDE Adapter default + media + + hard + 1 + value @@ -1861,6 +1917,13 @@ CoCo MIDI PAK default + media + + midiin + 1 + midiout + 2 + value @@ -1933,6 +1996,11 @@ Glenside IDE Adapter default + media + + hard + 1 + value @@ -1996,6 +2064,11 @@ CoCo Floppy Disk Controller default + media + + floppy_5_25 + 2 + value @@ -2020,6 +2093,13 @@ CoCo MIDI PAK default + media + + midiin + 1 + midiout + 2 + value @@ -2084,6 +2164,11 @@ Codimex CD-6809 Disk BASIC (1986) default + media + + floppy_5_25 + 2 + value @@ -2100,6 +2185,11 @@ Disto Super Controller II default + media + + floppy_5_25 + 2 + value @@ -2108,6 +2198,11 @@ Glenside IDE Adapter default + media + + hard + 1 + value @@ -2116,6 +2211,11 @@ Prológica CP-450 BASIC Disco V. 1.0 (1984) default + media + + floppy_5_25 + 2 + value diff --git a/Ample/Resources/coco2b.plist b/Ample/Resources/coco2b.plist index 7ca86c5..f2b9dee 100644 --- a/Ample/Resources/coco2b.plist +++ b/Ample/Resources/coco2b.plist @@ -1191,6 +1191,11 @@ CoCo Floppy Disk Controller default + media + + floppy_5_25 + 2 + value @@ -1215,6 +1220,13 @@ CoCo MIDI PAK default + media + + midiin + 1 + midiout + 2 + value @@ -1279,6 +1291,11 @@ Codimex CD-6809 Disk BASIC (1986) default + media + + floppy_5_25 + 2 + value @@ -1295,6 +1312,11 @@ Disto Super Controller II default + media + + floppy_5_25 + 2 + value @@ -1303,6 +1325,11 @@ Glenside IDE Adapter default + media + + hard + 1 + value @@ -1311,6 +1338,11 @@ Prológica CP-450 BASIC Disco V. 1.0 (1984) default + media + + floppy_5_25 + 2 + value @@ -1488,6 +1520,13 @@ CoCo MIDI PAK default + media + + midiin + 1 + midiout + 2 + value @@ -1560,6 +1599,11 @@ Glenside IDE Adapter default + media + + hard + 1 + value @@ -1639,6 +1683,13 @@ CoCo MIDI PAK default + media + + midiin + 1 + midiout + 2 + value @@ -1711,6 +1762,11 @@ Glenside IDE Adapter default + media + + hard + 1 + value @@ -1790,6 +1846,13 @@ CoCo MIDI PAK default + media + + midiin + 1 + midiout + 2 + value @@ -1862,6 +1925,11 @@ Glenside IDE Adapter default + media + + hard + 1 + value @@ -1925,6 +1993,11 @@ CoCo Floppy Disk Controller default + media + + floppy_5_25 + 2 + value @@ -1949,6 +2022,13 @@ CoCo MIDI PAK default + media + + midiin + 1 + midiout + 2 + value @@ -2013,6 +2093,11 @@ Codimex CD-6809 Disk BASIC (1986) default + media + + floppy_5_25 + 2 + value @@ -2029,6 +2114,11 @@ Disto Super Controller II default + media + + floppy_5_25 + 2 + value @@ -2037,6 +2127,11 @@ Glenside IDE Adapter default + media + + hard + 1 + value @@ -2045,6 +2140,11 @@ Prológica CP-450 BASIC Disco V. 1.0 (1984) default + media + + floppy_5_25 + 2 + value diff --git a/Ample/Resources/coco3.plist b/Ample/Resources/coco3.plist index cd4ff1f..42b194e 100644 --- a/Ample/Resources/coco3.plist +++ b/Ample/Resources/coco3.plist @@ -1191,6 +1191,11 @@ CoCo Floppy Disk Controller default + media + + floppy_5_25 + 2 + value @@ -1215,6 +1220,13 @@ CoCo MIDI PAK default + media + + midiin + 1 + midiout + 2 + value @@ -1279,6 +1291,11 @@ Codimex CD-6809 Disk BASIC (1986) default + media + + floppy_5_25 + 2 + value @@ -1295,6 +1312,11 @@ Disto Super Controller II default + media + + floppy_5_25 + 2 + value @@ -1303,6 +1325,11 @@ Glenside IDE Adapter default + media + + hard + 1 + value @@ -1311,6 +1338,11 @@ Prológica CP-450 BASIC Disco V. 1.0 (1984) default + media + + floppy_5_25 + 2 + value @@ -1488,6 +1520,13 @@ CoCo MIDI PAK default + media + + midiin + 1 + midiout + 2 + value @@ -1560,6 +1599,11 @@ Glenside IDE Adapter default + media + + hard + 1 + value @@ -1639,6 +1683,13 @@ CoCo MIDI PAK default + media + + midiin + 1 + midiout + 2 + value @@ -1711,6 +1762,11 @@ Glenside IDE Adapter default + media + + hard + 1 + value @@ -1790,6 +1846,13 @@ CoCo MIDI PAK default + media + + midiin + 1 + midiout + 2 + value @@ -1862,6 +1925,11 @@ Glenside IDE Adapter default + media + + hard + 1 + value @@ -1925,6 +1993,11 @@ CoCo Floppy Disk Controller default + media + + floppy_5_25 + 2 + value @@ -1949,6 +2022,13 @@ CoCo MIDI PAK default + media + + midiin + 1 + midiout + 2 + value @@ -2013,6 +2093,11 @@ Codimex CD-6809 Disk BASIC (1986) default + media + + floppy_5_25 + 2 + value @@ -2029,6 +2114,11 @@ Disto Super Controller II default + media + + floppy_5_25 + 2 + value @@ -2037,6 +2127,11 @@ Glenside IDE Adapter default + media + + hard + 1 + value @@ -2045,6 +2140,11 @@ Prológica CP-450 BASIC Disco V. 1.0 (1984) default + media + + floppy_5_25 + 2 + value diff --git a/Ample/Resources/coco3p.plist b/Ample/Resources/coco3p.plist index 536c8c4..df403aa 100644 --- a/Ample/Resources/coco3p.plist +++ b/Ample/Resources/coco3p.plist @@ -1191,6 +1191,11 @@ CoCo Floppy Disk Controller default + media + + floppy_5_25 + 2 + value @@ -1215,6 +1220,13 @@ CoCo MIDI PAK default + media + + midiin + 1 + midiout + 2 + value @@ -1279,6 +1291,11 @@ Codimex CD-6809 Disk BASIC (1986) default + media + + floppy_5_25 + 2 + value @@ -1295,6 +1312,11 @@ Disto Super Controller II default + media + + floppy_5_25 + 2 + value @@ -1303,6 +1325,11 @@ Glenside IDE Adapter default + media + + hard + 1 + value @@ -1311,6 +1338,11 @@ Prológica CP-450 BASIC Disco V. 1.0 (1984) default + media + + floppy_5_25 + 2 + value @@ -1488,6 +1520,13 @@ CoCo MIDI PAK default + media + + midiin + 1 + midiout + 2 + value @@ -1560,6 +1599,11 @@ Glenside IDE Adapter default + media + + hard + 1 + value @@ -1639,6 +1683,13 @@ CoCo MIDI PAK default + media + + midiin + 1 + midiout + 2 + value @@ -1711,6 +1762,11 @@ Glenside IDE Adapter default + media + + hard + 1 + value @@ -1790,6 +1846,13 @@ CoCo MIDI PAK default + media + + midiin + 1 + midiout + 2 + value @@ -1862,6 +1925,11 @@ Glenside IDE Adapter default + media + + hard + 1 + value @@ -1925,6 +1993,11 @@ CoCo Floppy Disk Controller default + media + + floppy_5_25 + 2 + value @@ -1949,6 +2022,13 @@ CoCo MIDI PAK default + media + + midiin + 1 + midiout + 2 + value @@ -2013,6 +2093,11 @@ Codimex CD-6809 Disk BASIC (1986) default + media + + floppy_5_25 + 2 + value @@ -2029,6 +2114,11 @@ Disto Super Controller II default + media + + floppy_5_25 + 2 + value @@ -2037,6 +2127,11 @@ Glenside IDE Adapter default + media + + hard + 1 + value @@ -2045,6 +2140,11 @@ Prológica CP-450 BASIC Disco V. 1.0 (1984) default + media + + floppy_5_25 + 2 + value diff --git a/Ample/Resources/craft2p.plist b/Ample/Resources/craft2p.plist index 9e231ff..284458f 100644 --- a/Ample/Resources/craft2p.plist +++ b/Ample/Resources/craft2p.plist @@ -6040,6 +6040,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value @@ -6119,6 +6126,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value diff --git a/Ample/Resources/d64plus.plist b/Ample/Resources/d64plus.plist index 68690cb..b8dc470 100644 --- a/Ample/Resources/d64plus.plist +++ b/Ample/Resources/d64plus.plist @@ -1124,6 +1124,11 @@ Dragon FDC default + media + + floppy_5_25 + 2 + value @@ -1132,6 +1137,13 @@ Dragon MIDI PAK default + media + + midiin + 1 + midiout + 2 + value @@ -1140,6 +1152,11 @@ Dragon Peaksoft Prestel Module default + media + + bitbanger + 1 + value @@ -1172,6 +1189,11 @@ Premier FDC default + media + + floppy_5_25 + 2 + value @@ -1180,6 +1202,11 @@ SDTANDY FDC default + media + + floppy_5_25 + 2 + value @@ -1516,6 +1543,13 @@ Dragon MIDI PAK default + media + + midiin + 1 + midiout + 2 + value @@ -1524,6 +1558,11 @@ Dragon Peaksoft Prestel Module default + media + + bitbanger + 1 + value @@ -1667,6 +1706,13 @@ Dragon MIDI PAK default + media + + midiin + 1 + midiout + 2 + value @@ -1675,6 +1721,11 @@ Dragon Peaksoft Prestel Module default + media + + bitbanger + 1 + value @@ -1818,6 +1869,13 @@ Dragon MIDI PAK default + media + + midiin + 1 + midiout + 2 + value @@ -1826,6 +1884,11 @@ Dragon Peaksoft Prestel Module default + media + + bitbanger + 1 + value @@ -1969,6 +2032,11 @@ Dragon FDC default + media + + floppy_5_25 + 2 + value @@ -1977,6 +2045,13 @@ Dragon MIDI PAK default + media + + midiin + 1 + midiout + 2 + value @@ -1985,6 +2060,11 @@ Dragon Peaksoft Prestel Module default + media + + bitbanger + 1 + value @@ -2017,6 +2097,11 @@ Premier FDC default + media + + floppy_5_25 + 2 + value @@ -2025,6 +2110,11 @@ SDTANDY FDC default + media + + floppy_5_25 + 2 + value diff --git a/Ample/Resources/dodo.plist b/Ample/Resources/dodo.plist index 457f924..7d848d3 100644 --- a/Ample/Resources/dodo.plist +++ b/Ample/Resources/dodo.plist @@ -6040,6 +6040,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value @@ -6119,6 +6126,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value diff --git a/Ample/Resources/dragon200.plist b/Ample/Resources/dragon200.plist index c3eec81..515c5e7 100644 --- a/Ample/Resources/dragon200.plist +++ b/Ample/Resources/dragon200.plist @@ -1124,6 +1124,11 @@ Dragon FDC default + media + + floppy_5_25 + 2 + value @@ -1132,6 +1137,13 @@ Dragon MIDI PAK default + media + + midiin + 1 + midiout + 2 + value @@ -1140,6 +1152,11 @@ Dragon Peaksoft Prestel Module default + media + + bitbanger + 1 + value @@ -1172,6 +1189,11 @@ Premier FDC default + media + + floppy_5_25 + 2 + value @@ -1180,6 +1202,11 @@ SDTANDY FDC default + media + + floppy_5_25 + 2 + value @@ -1516,6 +1543,13 @@ Dragon MIDI PAK default + media + + midiin + 1 + midiout + 2 + value @@ -1524,6 +1558,11 @@ Dragon Peaksoft Prestel Module default + media + + bitbanger + 1 + value @@ -1667,6 +1706,13 @@ Dragon MIDI PAK default + media + + midiin + 1 + midiout + 2 + value @@ -1675,6 +1721,11 @@ Dragon Peaksoft Prestel Module default + media + + bitbanger + 1 + value @@ -1818,6 +1869,13 @@ Dragon MIDI PAK default + media + + midiin + 1 + midiout + 2 + value @@ -1826,6 +1884,11 @@ Dragon Peaksoft Prestel Module default + media + + bitbanger + 1 + value @@ -1969,6 +2032,11 @@ Dragon FDC default + media + + floppy_5_25 + 2 + value @@ -1977,6 +2045,13 @@ Dragon MIDI PAK default + media + + midiin + 1 + midiout + 2 + value @@ -1985,6 +2060,11 @@ Dragon Peaksoft Prestel Module default + media + + bitbanger + 1 + value @@ -2017,6 +2097,11 @@ Premier FDC default + media + + floppy_5_25 + 2 + value @@ -2025,6 +2110,11 @@ SDTANDY FDC default + media + + floppy_5_25 + 2 + value diff --git a/Ample/Resources/dragon200e.plist b/Ample/Resources/dragon200e.plist index 76f4c92..d00892a 100644 --- a/Ample/Resources/dragon200e.plist +++ b/Ample/Resources/dragon200e.plist @@ -1124,6 +1124,11 @@ Dragon FDC default + media + + floppy_5_25 + 2 + value @@ -1132,6 +1137,13 @@ Dragon MIDI PAK default + media + + midiin + 1 + midiout + 2 + value @@ -1140,6 +1152,11 @@ Dragon Peaksoft Prestel Module default + media + + bitbanger + 1 + value @@ -1172,6 +1189,11 @@ Premier FDC default + media + + floppy_5_25 + 2 + value @@ -1180,6 +1202,11 @@ SDTANDY FDC default + media + + floppy_5_25 + 2 + value @@ -1516,6 +1543,13 @@ Dragon MIDI PAK default + media + + midiin + 1 + midiout + 2 + value @@ -1524,6 +1558,11 @@ Dragon Peaksoft Prestel Module default + media + + bitbanger + 1 + value @@ -1667,6 +1706,13 @@ Dragon MIDI PAK default + media + + midiin + 1 + midiout + 2 + value @@ -1675,6 +1721,11 @@ Dragon Peaksoft Prestel Module default + media + + bitbanger + 1 + value @@ -1818,6 +1869,13 @@ Dragon MIDI PAK default + media + + midiin + 1 + midiout + 2 + value @@ -1826,6 +1884,11 @@ Dragon Peaksoft Prestel Module default + media + + bitbanger + 1 + value @@ -1969,6 +2032,11 @@ Dragon FDC default + media + + floppy_5_25 + 2 + value @@ -1977,6 +2045,13 @@ Dragon MIDI PAK default + media + + midiin + 1 + midiout + 2 + value @@ -1985,6 +2060,11 @@ Dragon Peaksoft Prestel Module default + media + + bitbanger + 1 + value @@ -2017,6 +2097,11 @@ Premier FDC default + media + + floppy_5_25 + 2 + value @@ -2025,6 +2110,11 @@ SDTANDY FDC default + media + + floppy_5_25 + 2 + value diff --git a/Ample/Resources/dragon32.plist b/Ample/Resources/dragon32.plist index 5d74d6f..a9aa7b7 100644 --- a/Ample/Resources/dragon32.plist +++ b/Ample/Resources/dragon32.plist @@ -987,6 +987,11 @@ Dragon FDC default + media + + floppy_5_25 + 2 + value @@ -995,6 +1000,13 @@ Dragon MIDI PAK default + media + + midiin + 1 + midiout + 2 + value @@ -1003,6 +1015,11 @@ Dragon Peaksoft Prestel Module default + media + + bitbanger + 1 + value @@ -1035,6 +1052,11 @@ Premier FDC default + media + + floppy_5_25 + 2 + value @@ -1043,6 +1065,11 @@ SDTANDY FDC default + media + + floppy_5_25 + 2 + value @@ -1379,6 +1406,13 @@ Dragon MIDI PAK default + media + + midiin + 1 + midiout + 2 + value @@ -1387,6 +1421,11 @@ Dragon Peaksoft Prestel Module default + media + + bitbanger + 1 + value @@ -1530,6 +1569,13 @@ Dragon MIDI PAK default + media + + midiin + 1 + midiout + 2 + value @@ -1538,6 +1584,11 @@ Dragon Peaksoft Prestel Module default + media + + bitbanger + 1 + value @@ -1681,6 +1732,13 @@ Dragon MIDI PAK default + media + + midiin + 1 + midiout + 2 + value @@ -1689,6 +1747,11 @@ Dragon Peaksoft Prestel Module default + media + + bitbanger + 1 + value @@ -1832,6 +1895,11 @@ Dragon FDC default + media + + floppy_5_25 + 2 + value @@ -1840,6 +1908,13 @@ Dragon MIDI PAK default + media + + midiin + 1 + midiout + 2 + value @@ -1848,6 +1923,11 @@ Dragon Peaksoft Prestel Module default + media + + bitbanger + 1 + value @@ -1880,6 +1960,11 @@ Premier FDC default + media + + floppy_5_25 + 2 + value @@ -1888,6 +1973,11 @@ SDTANDY FDC default + media + + floppy_5_25 + 2 + value diff --git a/Ample/Resources/dragon64.plist b/Ample/Resources/dragon64.plist index 1476ddc..6d498f6 100644 --- a/Ample/Resources/dragon64.plist +++ b/Ample/Resources/dragon64.plist @@ -1124,6 +1124,11 @@ Dragon FDC default + media + + floppy_5_25 + 2 + value @@ -1132,6 +1137,13 @@ Dragon MIDI PAK default + media + + midiin + 1 + midiout + 2 + value @@ -1140,6 +1152,11 @@ Dragon Peaksoft Prestel Module default + media + + bitbanger + 1 + value @@ -1172,6 +1189,11 @@ Premier FDC default + media + + floppy_5_25 + 2 + value @@ -1180,6 +1202,11 @@ SDTANDY FDC default + media + + floppy_5_25 + 2 + value @@ -1516,6 +1543,13 @@ Dragon MIDI PAK default + media + + midiin + 1 + midiout + 2 + value @@ -1524,6 +1558,11 @@ Dragon Peaksoft Prestel Module default + media + + bitbanger + 1 + value @@ -1667,6 +1706,13 @@ Dragon MIDI PAK default + media + + midiin + 1 + midiout + 2 + value @@ -1675,6 +1721,11 @@ Dragon Peaksoft Prestel Module default + media + + bitbanger + 1 + value @@ -1818,6 +1869,13 @@ Dragon MIDI PAK default + media + + midiin + 1 + midiout + 2 + value @@ -1826,6 +1884,11 @@ Dragon Peaksoft Prestel Module default + media + + bitbanger + 1 + value @@ -1969,6 +2032,11 @@ Dragon FDC default + media + + floppy_5_25 + 2 + value @@ -1977,6 +2045,13 @@ Dragon MIDI PAK default + media + + midiin + 1 + midiout + 2 + value @@ -1985,6 +2060,11 @@ Dragon Peaksoft Prestel Module default + media + + bitbanger + 1 + value @@ -2017,6 +2097,11 @@ Premier FDC default + media + + floppy_5_25 + 2 + value @@ -2025,6 +2110,11 @@ SDTANDY FDC default + media + + floppy_5_25 + 2 + value diff --git a/Ample/Resources/elppa.plist b/Ample/Resources/elppa.plist index 876f539..ed13852 100644 --- a/Ample/Resources/elppa.plist +++ b/Ample/Resources/elppa.plist @@ -6040,6 +6040,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value @@ -6119,6 +6126,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value diff --git a/Ample/Resources/hkc8800a.plist b/Ample/Resources/hkc8800a.plist index 4094503..ebdefb1 100644 --- a/Ample/Resources/hkc8800a.plist +++ b/Ample/Resources/hkc8800a.plist @@ -6040,6 +6040,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value @@ -6119,6 +6126,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value diff --git a/Ample/Resources/ivelultr.plist b/Ample/Resources/ivelultr.plist index 4561ed0..c60e512 100644 --- a/Ample/Resources/ivelultr.plist +++ b/Ample/Resources/ivelultr.plist @@ -6040,6 +6040,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value @@ -6119,6 +6126,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value diff --git a/Ample/Resources/las128ex.plist b/Ample/Resources/las128ex.plist index 8517924..0ce6ef0 100644 --- a/Ample/Resources/las128ex.plist +++ b/Ample/Resources/las128ex.plist @@ -5291,6 +5291,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value @@ -5370,6 +5377,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value diff --git a/Ample/Resources/laser128.plist b/Ample/Resources/laser128.plist index 281a68d..7885586 100644 --- a/Ample/Resources/laser128.plist +++ b/Ample/Resources/laser128.plist @@ -5326,6 +5326,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value @@ -5405,6 +5412,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value diff --git a/Ample/Resources/laser128o.plist b/Ample/Resources/laser128o.plist index 1b6afd1..6c6046e 100644 --- a/Ample/Resources/laser128o.plist +++ b/Ample/Resources/laser128o.plist @@ -5298,6 +5298,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value @@ -5377,6 +5384,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value diff --git a/Ample/Resources/laser2c.plist b/Ample/Resources/laser2c.plist index e95dc89..4eb8914 100644 --- a/Ample/Resources/laser2c.plist +++ b/Ample/Resources/laser2c.plist @@ -6040,6 +6040,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value @@ -6119,6 +6126,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value diff --git a/Ample/Resources/maxxi.plist b/Ample/Resources/maxxi.plist index d87eedd..05fa939 100644 --- a/Ample/Resources/maxxi.plist +++ b/Ample/Resources/maxxi.plist @@ -6040,6 +6040,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value @@ -6119,6 +6126,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value diff --git a/Ample/Resources/microeng.plist b/Ample/Resources/microeng.plist index aebf206..17f73d8 100644 --- a/Ample/Resources/microeng.plist +++ b/Ample/Resources/microeng.plist @@ -6040,6 +6040,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value @@ -6119,6 +6126,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value diff --git a/Ample/Resources/mprof3.plist b/Ample/Resources/mprof3.plist index 2224ffb..d6f196b 100644 --- a/Ample/Resources/mprof3.plist +++ b/Ample/Resources/mprof3.plist @@ -8164,6 +8164,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value @@ -8243,6 +8250,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value diff --git a/Ample/Resources/prav82.plist b/Ample/Resources/prav82.plist index 290671f..5dff330 100644 --- a/Ample/Resources/prav82.plist +++ b/Ample/Resources/prav82.plist @@ -6040,6 +6040,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value @@ -6119,6 +6126,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value diff --git a/Ample/Resources/prav8c.plist b/Ample/Resources/prav8c.plist index d7ee593..d1fc6fc 100644 --- a/Ample/Resources/prav8c.plist +++ b/Ample/Resources/prav8c.plist @@ -8164,6 +8164,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value @@ -8243,6 +8250,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value diff --git a/Ample/Resources/prav8m.plist b/Ample/Resources/prav8m.plist index e909750..1abfb68 100644 --- a/Ample/Resources/prav8m.plist +++ b/Ample/Resources/prav8m.plist @@ -6040,6 +6040,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value @@ -6119,6 +6126,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value diff --git a/Ample/Resources/space84.plist b/Ample/Resources/space84.plist index 729ffc6..c48a181 100644 --- a/Ample/Resources/space84.plist +++ b/Ample/Resources/space84.plist @@ -6040,6 +6040,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value @@ -6119,6 +6126,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value diff --git a/Ample/Resources/spectred.plist b/Ample/Resources/spectred.plist index 9cbf8bf..85a28dc 100644 --- a/Ample/Resources/spectred.plist +++ b/Ample/Resources/spectred.plist @@ -8164,6 +8164,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value @@ -8243,6 +8250,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value diff --git a/Ample/Resources/tanodr64.plist b/Ample/Resources/tanodr64.plist index bfbdb95..2927adf 100644 --- a/Ample/Resources/tanodr64.plist +++ b/Ample/Resources/tanodr64.plist @@ -1124,6 +1124,11 @@ Dragon FDC default + media + + floppy_5_25 + 2 + value @@ -1132,6 +1137,13 @@ Dragon MIDI PAK default + media + + midiin + 1 + midiout + 2 + value @@ -1140,6 +1152,11 @@ Dragon Peaksoft Prestel Module default + media + + bitbanger + 1 + value @@ -1172,6 +1189,11 @@ Premier FDC default + media + + floppy_5_25 + 2 + value @@ -1180,6 +1202,11 @@ SDTANDY FDC default + media + + floppy_5_25 + 2 + value @@ -1516,6 +1543,13 @@ Dragon MIDI PAK default + media + + midiin + 1 + midiout + 2 + value @@ -1524,6 +1558,11 @@ Dragon Peaksoft Prestel Module default + media + + bitbanger + 1 + value @@ -1667,6 +1706,13 @@ Dragon MIDI PAK default + media + + midiin + 1 + midiout + 2 + value @@ -1675,6 +1721,11 @@ Dragon Peaksoft Prestel Module default + media + + bitbanger + 1 + value @@ -1818,6 +1869,13 @@ Dragon MIDI PAK default + media + + midiin + 1 + midiout + 2 + value @@ -1826,6 +1884,11 @@ Dragon Peaksoft Prestel Module default + media + + bitbanger + 1 + value @@ -1969,6 +2032,11 @@ Dragon FDC default + media + + floppy_5_25 + 2 + value @@ -1977,6 +2045,13 @@ Dragon MIDI PAK default + media + + midiin + 1 + midiout + 2 + value @@ -1985,6 +2060,11 @@ Dragon Peaksoft Prestel Module default + media + + bitbanger + 1 + value @@ -2017,6 +2097,11 @@ Premier FDC default + media + + floppy_5_25 + 2 + value @@ -2025,6 +2110,11 @@ SDTANDY FDC default + media + + floppy_5_25 + 2 + value diff --git a/Ample/Resources/tk3000.plist b/Ample/Resources/tk3000.plist index da160e3..c7d188c 100644 --- a/Ample/Resources/tk3000.plist +++ b/Ample/Resources/tk3000.plist @@ -8164,6 +8164,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value @@ -8243,6 +8250,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value diff --git a/Ample/Resources/uniap2en.plist b/Ample/Resources/uniap2en.plist index 94b0819..eb8137a 100644 --- a/Ample/Resources/uniap2en.plist +++ b/Ample/Resources/uniap2en.plist @@ -6040,6 +6040,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value @@ -6119,6 +6126,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value diff --git a/Ample/Resources/uniap2pt.plist b/Ample/Resources/uniap2pt.plist index 0886928..37ba54f 100644 --- a/Ample/Resources/uniap2pt.plist +++ b/Ample/Resources/uniap2pt.plist @@ -6040,6 +6040,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value @@ -6119,6 +6126,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value diff --git a/Ample/Resources/uniap2ti.plist b/Ample/Resources/uniap2ti.plist index f167eda..99df1b6 100644 --- a/Ample/Resources/uniap2ti.plist +++ b/Ample/Resources/uniap2ti.plist @@ -6040,6 +6040,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value @@ -6119,6 +6126,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value diff --git a/Ample/Resources/zijini.plist b/Ample/Resources/zijini.plist index dc4b5bb..5f4dd3f 100644 --- a/Ample/Resources/zijini.plist +++ b/Ample/Resources/zijini.plist @@ -6905,6 +6905,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value @@ -6984,6 +6991,13 @@ Miracle Piano SNES Cable default + media + + midiin + 1 + midiout + 1 + value diff --git a/python/mkmachines.py b/python/mkmachines.py index 68f9925..7eba7ad 100644 --- a/python/mkmachines.py +++ b/python/mkmachines.py @@ -264,6 +264,7 @@ def find_media(parent, include_slots=False): for x in parent.findall("./slot/slotoption"): if x.get("default") != "yes": continue name = x.get("name") + devname = x.get("devname") if name in remap_slot: name = remap_slot[name] media[name] = media.get(name, 0) + 1 @@ -369,6 +370,34 @@ DEVICE_EXCLUDE = set([ 'cp2024', # Conner Peripherals CP-2024 hard disk ]) +def default_device_media(machine): + + media = {} + + for option in machine.findall("./slot/slotoption[@default='yes']"): + m = slot_option_media(option, False) + if not m: continue + for k,v in m.items(): + media[k] = v + media.get(k, 0) + + if media: return media + return None + +def slot_option_media(option, recurse): + name = option.get('name') + devname = option.get('devname') + + if name in DEVICE_MEDIA: return { DEVICE_MEDIA[name]: 1 } + + if devname: device = machine_cache[devname] + if device is None: return None + + if device.find("./device_ref[@name='bitbanger']") != None: return { 'bitbanger': 1 } + if device.find("./device_ref[@name='picture_image']") != None: return { 'picture': 1 } + + if recurse: return default_device_media(device) + return None + def make_device_options(slot): # # As of MAME .258 --- @@ -399,18 +428,12 @@ def make_device_options(slot): has_default |= default media = None - if name in DEVICE_MEDIA: media = { DEVICE_MEDIA[name]: 1 } - elif device is not None and device.find("./device_ref[@name='bitbanger']") != None: media = { 'bitbanger': 1 } - elif device is not None and device.find("./device_ref[@name='picture_image']") != None: media = { 'picture': 1 } + # if name in DEVICE_MEDIA: media = { DEVICE_MEDIA[name]: 1 } + # elif device is not None and device.find("./device_ref[@name='bitbanger']") != None: media = { 'bitbanger': 1 } + # elif device is not None and device.find("./device_ref[@name='picture_image']") != None: media = { 'picture': 1 } # elif device and device.find("./device_ref[@name='printer_image']") != None: media = { 'printout': 1 } - - # if name == "cdrom": - # print("{} - {} - {}".format(slot.get('name'), name, devname)) - # print(option) - # if slot.get('name') == ':scsibus:1': - # default = True - # has_default = True + media = slot_option_media(option, True) item = { 'value': name,