Vas Crabb feedback: Replacing the enum with a class hierarchy, derived from 'software_list_loader'

src/devices/bus/a7800/a78_slot.h

@@ -96,7 +96,7 @@ public:
 	// image-level overrides
 	virtual bool call_load() override;
 	virtual void call_unload() override;
-	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
+	virtual const software_list_loader &get_software_list_loader() const override { return rom_software_list_loader::instance(); }
 
 	int get_cart_type() { return m_type; };
 	bool has_cart() { return m_cart != nullptr; }

src/devices/bus/a800/a800_slot.h

@@ -96,7 +96,7 @@ public:
 	// image-level overrides
 	virtual bool call_load() override;
 	virtual void call_unload() override;
-	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
+	virtual const software_list_loader &get_software_list_loader() const override { return rom_software_list_loader::instance(); }
 
 	int get_cart_type() { return m_type; };
 	int identify_cart_type(UINT8 *header);

src/devices/bus/adam/exp.h

@@ -73,7 +73,7 @@ protected:
 
 	// image-level overrides
 	virtual bool call_load() override;
-	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
+	virtual const software_list_loader &get_software_list_loader() const override { return rom_software_list_loader::instance(); }
 
 	virtual iodevice_t image_type() const override { return IO_CARTSLOT; }
 

src/devices/bus/apf/slot.h

@@ -67,7 +67,7 @@ public:
 	// image-level overrides
 	virtual bool call_load() override;
 	virtual void call_unload() override {}
-	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
+	virtual const software_list_loader &get_software_list_loader() const override { return rom_software_list_loader::instance(); }
 
 	int get_type() { return m_type; }
 

src/devices/bus/arcadia/slot.h

@@ -58,7 +58,7 @@ public:
 	// image-level overrides
 	virtual bool call_load() override;
 	virtual void call_unload() override {}
-	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
+	virtual const software_list_loader &get_software_list_loader() const override { return rom_software_list_loader::instance(); }
 
 	int get_type() { return m_type; }
 

src/devices/bus/astrocde/slot.h

@@ -58,7 +58,7 @@ public:
 	// image-level overrides
 	virtual bool call_load() override;
 	virtual void call_unload() override {}
-	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
+	virtual const software_list_loader &get_software_list_loader() const override { return rom_software_list_loader::instance(); }
 
 	int get_type() { return m_type; }
 

src/devices/bus/c64/exp.h

@@ -135,7 +135,7 @@ protected:
 
 	// image-level overrides
 	virtual bool call_load() override;
-	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
+	virtual const software_list_loader &get_software_list_loader() const override { return rom_software_list_loader::instance(); }
 
 	virtual iodevice_t image_type() const override { return IO_CARTSLOT; }
 

src/devices/bus/cbm2/exp.h

@@ -82,7 +82,7 @@ protected:
 
 	// image-level overrides
 	virtual bool call_load() override;
-	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
+	virtual const software_list_loader &get_software_list_loader() const override { return rom_software_list_loader::instance(); }
 
 	virtual iodevice_t image_type() const override { return IO_CARTSLOT; }
 

src/devices/bus/chanf/slot.h

@@ -70,7 +70,7 @@ public:
 	// image-level overrides
 	virtual bool call_load() override;
 	virtual void call_unload() override {}
-	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
+	virtual const software_list_loader &get_software_list_loader() const override { return rom_software_list_loader::instance(); }
 
 	int get_type() { return m_type; }
 

src/devices/bus/coco/cococart.h

@@ -88,7 +88,7 @@ public:
 
 	// image-level overrides
 	virtual bool call_load() override;
-	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
+	virtual const software_list_loader &get_software_list_loader() const override { return rom_software_list_loader::instance(); }
 
 	virtual iodevice_t image_type() const override { return IO_CARTSLOT; }
 

src/devices/bus/coleco/exp.h

@@ -79,7 +79,7 @@ protected:
 
 	// image-level overrides
 	virtual bool call_load() override;
-	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
+	virtual const software_list_loader &get_software_list_loader() const override { return rom_software_list_loader::instance(); }
 
 	virtual iodevice_t image_type() const override { return IO_CARTSLOT; }
 

src/devices/bus/crvision/slot.h

@@ -63,7 +63,7 @@ public:
 	// image-level overrides
 	virtual bool call_load() override;
 	virtual void call_unload() override {}
-	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
+	virtual const software_list_loader &get_software_list_loader() const override { return rom_software_list_loader::instance(); }
 
 	int get_type() { return m_type; }
 

src/devices/bus/gameboy/gb_slot.h

@@ -118,7 +118,7 @@ public:
 	// image-level overrides
 	virtual bool call_load() override;
 	virtual void call_unload() override;
-	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
+	virtual const software_list_loader &get_software_list_loader() const override { return rom_software_list_loader::instance(); }
 
 	int get_type() { return m_type; }
 	int get_cart_type(UINT8 *ROM, UINT32 len);

src/devices/bus/gba/gba_slot.h

@@ -87,7 +87,7 @@ public:
 	// image-level overrides
 	virtual bool call_load() override;
 	virtual void call_unload() override;
-	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
+	virtual const software_list_loader &get_software_list_loader() const override { return rom_software_list_loader::instance(); }
 
 	int get_type() { return m_type; }
 	int get_cart_type(UINT8 *ROM, UINT32 len);

src/devices/bus/generic/slot.h

@@ -114,7 +114,7 @@ public:
 	// image-level overrides
 	virtual bool call_load() override;
 	virtual void call_unload() override;
-	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
+	virtual const software_list_loader &get_software_list_loader() const override { return rom_software_list_loader::instance(); }
 
 	UINT32 common_get_size(const char *region);
 	void common_load_rom(UINT8 *ROM, UINT32 len, const char *region);

src/devices/bus/hp_optroms/hp_optrom.h

@@ -43,7 +43,7 @@ public:
 		// image-level overrides
 		virtual bool call_load() override;
 		virtual void call_unload() override;
-		virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
+		virtual const software_list_loader &get_software_list_loader() const override { return rom_software_list_loader::instance(); }
 
 		virtual iodevice_t image_type() const override { return IO_CARTSLOT; }
 		virtual bool is_readable()  const override { return true; }

src/devices/bus/intv/slot.h

@@ -102,7 +102,7 @@ public:
 	// image-level overrides
 	virtual bool call_load() override;
 	virtual void call_unload() override {}
-	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
+	virtual const software_list_loader &get_software_list_loader() const override { return rom_software_list_loader::instance(); }
 
 	int get_type() { return m_type; }
 	int load_fullpath();

src/devices/bus/iq151/iq151.h

@@ -93,7 +93,7 @@ public:
 
 	// image-level overrides
 	virtual bool call_load() override;
-	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
+	virtual const software_list_loader &get_software_list_loader() const override { return rom_software_list_loader::instance(); }
 
 	virtual iodevice_t image_type() const override { return IO_CARTSLOT; }
 	virtual bool is_readable()  const override { return 1; }

src/devices/bus/isa/sc499.h

@@ -30,7 +30,7 @@ public:
 
 	// image-level overrides
 	virtual bool call_load() override;
-	virtual softlist_type get_softlist_type() const override { return softlist_type::SOFTWARE; }
+	virtual const software_list_loader &get_software_list_loader() const override { return image_software_list_loader::instance(); }
 	virtual void call_unload() override;
 	virtual iodevice_t image_type() const override { return IO_MAGTAPE; }
 

src/devices/bus/kc/kc.h

@@ -91,7 +91,7 @@ public:
 
 	// image-level overrides
 	virtual bool call_load() override;
-	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
+	virtual const software_list_loader &get_software_list_loader() const override { return rom_software_list_loader::instance(); }
 
 	virtual iodevice_t image_type() const override { return IO_CARTSLOT; }
 	virtual bool is_readable()  const override { return 1; }

src/devices/bus/m5/slot.h

@@ -70,7 +70,7 @@ public:
 	// image-level overrides
 	virtual bool call_load() override;
 	virtual void call_unload() override {}
-	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
+	virtual const software_list_loader &get_software_list_loader() const override { return rom_software_list_loader::instance(); }
 
 	int get_type() { return m_type; }
 

src/devices/bus/megadrive/md_slot.h

@@ -153,7 +153,7 @@ public:
 	// image-level overrides
 	virtual bool call_load() override;
 	virtual void call_unload() override;
-	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
+	virtual const software_list_loader &get_software_list_loader() const override { return rom_software_list_loader::instance(); }
 
 	virtual iodevice_t image_type() const override { return IO_CARTSLOT; }
 	virtual bool is_readable()  const override { return 1; }

src/devices/bus/msx_slot/cartridge.h

@@ -43,7 +43,7 @@ public:
 	// image-level overrides
 	virtual bool call_load() override;
 	virtual void call_unload() override;
-	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
+	virtual const software_list_loader &get_software_list_loader() const override { return rom_software_list_loader::instance(); }
 	virtual iodevice_t image_type() const override { return IO_CARTSLOT; }
 	virtual bool is_readable()  const override { return true; }
 	virtual bool is_writeable() const override { return false; }

src/devices/bus/neogeo/slot.h

@@ -195,7 +195,7 @@ public:
 	// image-level overrides
 	virtual bool call_load() override;
 	virtual void call_unload() override;
-	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
+	virtual const software_list_loader &get_software_list_loader() const override { return rom_software_list_loader::instance(); }
 
 	virtual iodevice_t image_type() const override { return IO_CARTSLOT; }
 	virtual bool is_readable()  const override { return 1; }

src/devices/bus/nes/aladdin.h

@@ -52,7 +52,7 @@ public:
 
 	// image-level overrides
 	virtual bool call_load() override;
-	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
+	virtual const software_list_loader &get_software_list_loader() const override { return rom_software_list_loader::instance(); }
 
 	virtual iodevice_t image_type() const override { return IO_CARTSLOT; }
 	virtual bool is_readable()  const override { return 1; }

src/devices/bus/nes/datach.h

@@ -54,7 +54,7 @@ public:
 
 	// image-level overrides
 	virtual bool call_load() override;
-	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
+	virtual const software_list_loader &get_software_list_loader() const override { return rom_software_list_loader::instance(); }
 
 	virtual iodevice_t image_type() const override { return IO_CARTSLOT; }
 	virtual bool is_readable()  const override { return 1; }

src/devices/bus/nes/karastudio.h

@@ -51,7 +51,7 @@ public:
 
 	// image-level overrides
 	virtual bool call_load() override;
-	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
+	virtual const software_list_loader &get_software_list_loader() const override { return rom_software_list_loader::instance(); }
 
 	virtual iodevice_t image_type() const override { return IO_CARTSLOT; }
 	virtual bool is_readable()  const override { return 1; }

src/devices/bus/nes/nes_slot.h

@@ -346,7 +346,7 @@ public:
 	// image-level overrides
 	virtual bool call_load() override;
 	virtual void call_unload() override;
-	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
+	virtual const software_list_loader &get_software_list_loader() const override { return rom_software_list_loader::instance(); }
 
 	void call_load_ines();
 	void call_load_unif();

src/devices/bus/nes/sunsoft_dcs.h

@@ -48,7 +48,7 @@ public:
 
 	// image-level overrides
 	virtual bool call_load() override;
-	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
+	virtual const software_list_loader &get_software_list_loader() const override { return rom_software_list_loader::instance(); }
 
 	virtual iodevice_t image_type() const override { return IO_CARTSLOT; }
 	virtual bool is_readable()  const override { return 1; }

src/devices/bus/odyssey2/slot.h

@@ -69,7 +69,7 @@ public:
 	// image-level overrides
 	virtual bool call_load() override;
 	virtual void call_unload() override {}
-	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
+	virtual const software_list_loader &get_software_list_loader() const override { return rom_software_list_loader::instance(); }
 
 	int get_type() { return m_type; }
 

src/devices/bus/pce/pce_slot.h

@@ -68,7 +68,7 @@ public:
 	// image-level overrides
 	virtual bool call_load() override;
 	virtual void call_unload() override;
-	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
+	virtual const software_list_loader &get_software_list_loader() const override { return rom_software_list_loader::instance(); }
 
 	int get_type() { return m_type; }
 	int get_cart_type(UINT8 *ROM, UINT32 len);

src/devices/bus/plus4/exp.h

@@ -121,7 +121,7 @@ protected:
 
 	// image-level overrides
 	virtual bool call_load() override;
-	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
+	virtual const software_list_loader &get_software_list_loader() const override { return rom_software_list_loader::instance(); }
 
 	virtual iodevice_t image_type() const override { return IO_CARTSLOT; }
 

src/devices/bus/ql/rom.h

@@ -96,7 +96,7 @@ protected:
 
 	// image-level overrides
 	virtual bool call_load() override;
-	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
+	virtual const software_list_loader &get_software_list_loader() const override { return rom_software_list_loader::instance(); }
 
 	virtual iodevice_t image_type() const override { return IO_CARTSLOT; }
 

src/devices/bus/saturn/sat_slot.h

@@ -74,7 +74,7 @@ public:
 	// image-level overrides
 	virtual bool call_load() override;
 	virtual void call_unload() override;
-	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
+	virtual const software_list_loader &get_software_list_loader() const override { return rom_software_list_loader::instance(); }
 
 	int get_cart_type();
 

src/devices/bus/scv/slot.h

@@ -70,7 +70,7 @@ public:
 	// image-level overrides
 	virtual bool call_load() override;
 	virtual void call_unload() override {}
-	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
+	virtual const software_list_loader &get_software_list_loader() const override { return rom_software_list_loader::instance(); }
 
 	int get_type() { return m_type; }
 	int get_cart_type(UINT8 *ROM, UINT32 len);

src/devices/bus/sega8/sega8_slot.h

@@ -110,7 +110,7 @@ public:
 	// image-level overrides
 	virtual bool call_load() override;
 	virtual void call_unload() override;
-	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
+	virtual const software_list_loader &get_software_list_loader() const override { return rom_software_list_loader::instance(); }
 
 	int get_type() { return m_type; }
 	int get_cart_type(UINT8 *ROM, UINT32 len);

src/devices/bus/snes/snes_slot.h

@@ -159,7 +159,7 @@ public:
 	// image-level overrides
 	virtual bool call_load() override;
 	virtual void call_unload() override;
-	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
+	virtual const software_list_loader &get_software_list_loader() const override { return rom_software_list_loader::instance(); }
 
 	void get_cart_type_addon(UINT8 *ROM, UINT32 len, int &type, int &addon);
 	UINT32 snes_skip_header(UINT8 *ROM, UINT32 snes_rom_size);

src/devices/bus/ti99x/gromport.h

@@ -108,7 +108,7 @@ protected:
 	// Image handling: implementation of methods which are abstract in the parent
 	bool call_load() override;
 	void call_unload() override;
-	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
+	virtual const software_list_loader &get_software_list_loader() const override { return rom_software_list_loader::instance(); }
 	virtual void loaded_through_softlist() override;
 
 	void prepare_cartridge();

src/devices/bus/vboy/slot.h

@@ -66,7 +66,7 @@ public:
 	// image-level overrides
 	virtual bool call_load() override;
 	virtual void call_unload() override;
-	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
+	virtual const software_list_loader &get_software_list_loader() const override { return rom_software_list_loader::instance(); }
 
 	int get_type() { return m_type; }
 

src/devices/bus/vc4000/slot.h

@@ -68,7 +68,7 @@ public:
 	// image-level overrides
 	virtual bool call_load() override;
 	virtual void call_unload() override {}
-	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
+	virtual const software_list_loader &get_software_list_loader() const override { return rom_software_list_loader::instance(); }
 
 	int get_type() { return m_type; }
 

src/devices/bus/vcs/vcs_slot.h

@@ -96,7 +96,7 @@ public:
 	// image-level overrides
 	virtual bool call_load() override;
 	virtual void call_unload() override;
-	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
+	virtual const software_list_loader &get_software_list_loader() const override { return rom_software_list_loader::instance(); }
 
 	int get_cart_type() { return m_type; };
 	int identify_cart_type(UINT8 *ROM, UINT32 len);

src/devices/bus/vectrex/slot.h

@@ -68,7 +68,7 @@ public:
 	// image-level overrides
 	virtual bool call_load() override;
 	virtual void call_unload() override {}
-	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
+	virtual const software_list_loader &get_software_list_loader() const override { return rom_software_list_loader::instance(); }
 
 	int get_type() { return m_type; }
 	int get_vec3d() { return m_vec3d; }

src/devices/bus/vic10/exp.h

@@ -120,7 +120,7 @@ protected:
 
 	// image-level overrides
 	virtual bool call_load() override;
-	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
+	virtual const software_list_loader &get_software_list_loader() const override { return rom_software_list_loader::instance(); }
 
 	virtual iodevice_t image_type() const override { return IO_CARTSLOT; }
 

src/devices/bus/vic20/exp.h

@@ -111,7 +111,7 @@ protected:
 
 	// image-level overrides
 	virtual bool call_load() override;
-	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
+	virtual const software_list_loader &get_software_list_loader() const override { return rom_software_list_loader::instance(); }
 
 	virtual iodevice_t image_type() const override { return IO_CARTSLOT; }
 

src/devices/bus/vidbrain/exp.h

@@ -136,7 +136,7 @@ protected:
 
 	// image-level overrides
 	virtual bool call_load() override;
-	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
+	virtual const software_list_loader &get_software_list_loader() const override { return rom_software_list_loader::instance(); }
 
 	virtual iodevice_t image_type() const override { return IO_CARTSLOT; }
 

src/devices/bus/wswan/slot.h

@@ -76,7 +76,7 @@ public:
 	// image-level overrides
 	virtual bool call_load() override;
 	virtual void call_unload() override;
-	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
+	virtual const software_list_loader &get_software_list_loader() const override { return rom_software_list_loader::instance(); }
 
 	int get_type() { return m_type; }
 	int get_is_rotated() { return m_cart->get_is_rotated(); }

src/devices/bus/z88/z88.h

@@ -96,7 +96,7 @@ public:
 	// image-level overrides
 	virtual bool call_load() override;
 	virtual void call_unload() override;
-	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
+	virtual const software_list_loader &get_software_list_loader() const override { return rom_software_list_loader::instance(); }
 
 	virtual iodevice_t image_type() const override { return IO_CARTSLOT; }
 	virtual bool is_readable()  const override { return 1; }

src/devices/imagedev/cassette.h

@@ -59,7 +59,7 @@ public:
 	virtual bool call_create(int format_type, util::option_resolution *format_options) override;
 	virtual void call_unload() override;
 	virtual std::string call_display() override;
-	virtual softlist_type get_softlist_type() const override { return softlist_type::SOFTWARE; }
+	virtual const software_list_loader &get_software_list_loader() const override { return image_software_list_loader::instance(); }
 
 	virtual iodevice_t image_type() const override { return IO_CASSETTE; }
 

src/devices/imagedev/chd_cd.h

@@ -33,7 +33,7 @@ public:
 	// image-level overrides
 	virtual bool call_load() override;
 	virtual void call_unload() override;
-	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
+	virtual const software_list_loader &get_software_list_loader() const override { return rom_software_list_loader::instance(); }
 
 	virtual iodevice_t image_type() const override { return IO_CDROM; }
 

src/devices/imagedev/diablo.h

@@ -33,7 +33,7 @@ public:
 	virtual bool call_load() override;
 	virtual bool call_create(int create_format, util::option_resolution *create_args) override;
 	virtual void call_unload() override;
-	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
+	virtual const software_list_loader &get_software_list_loader() const override { return rom_software_list_loader::instance(); }
 
 	virtual iodevice_t image_type() const override { return IO_HARDDISK; }
 

src/devices/imagedev/flopdrv.h

@@ -100,7 +100,7 @@ public:
 	template<class _Object> static devcb_base &set_out_idx_func(device_t &device, _Object object) { return downcast<legacy_floppy_image_device &>(device).m_out_idx_func.set_callback(object); }
 
 	virtual bool call_load() override;
-	virtual softlist_type get_softlist_type() const override { return softlist_type::SOFTWARE; }
+	virtual const software_list_loader &get_software_list_loader() const override { return image_software_list_loader::instance(); }
 	virtual bool call_create(int format_type, util::option_resolution *format_options) override;
 	virtual void call_unload() override;
 

src/devices/imagedev/floppy.h

@@ -83,7 +83,7 @@ public:
 	virtual bool call_load() override;
 	virtual void call_unload() override;
 	virtual bool call_create(int format_type, util::option_resolution *format_options) override;
-	virtual softlist_type get_softlist_type() const override { return softlist_type::SOFTWARE; }
+	virtual const software_list_loader &get_software_list_loader() const override { return image_software_list_loader::instance(); }
 	virtual const char *image_interface() const override = 0;
 	virtual iodevice_t image_type() const override { return IO_FLOPPY; }
 

src/devices/imagedev/harddriv.h

@@ -35,7 +35,7 @@ public:
 	virtual bool call_load() override;
 	virtual bool call_create(int create_format, util::option_resolution *create_args) override;
 	virtual void call_unload() override;
-	virtual softlist_type get_softlist_type() const override { return softlist_type::ROM; }
+	virtual const software_list_loader &get_software_list_loader() const override { return rom_software_list_loader::instance(); }
 
 	virtual iodevice_t image_type() const override { return IO_HARDDISK; }
 

src/devices/imagedev/snapquik.h

@@ -27,7 +27,7 @@ public:
 
 	// image-level overrides
 	virtual bool call_load() override;
-	virtual softlist_type get_softlist_type() const override { return softlist_type::SOFTWARE; }
+	virtual const software_list_loader &get_software_list_loader() const override { return image_software_list_loader::instance(); }
 	virtual iodevice_t image_type() const override { return IO_SNAPSHOT; }
 
 	virtual bool is_readable()  const override { return 1; }

src/devices/machine/smartmed.h

@@ -216,7 +216,7 @@ public:
 
 	virtual bool call_load() override;
 	virtual void call_unload() override;
-	virtual softlist_type get_softlist_type() const override { return softlist_type::SOFTWARE; }
+	virtual const software_list_loader &get_software_list_loader() const override { return image_software_list_loader::instance(); }
 
 protected:
 	// device-level overrides

src/emu/diimage.cpp

@@ -1332,23 +1332,8 @@ const software_part *device_image_interface::find_software_item(const char *path
 
 bool device_image_interface::call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry)
 {
-	bool result = false;
-	switch (get_softlist_type())
-	{
-	case softlist_type::ROM:
-		device().machine().rom_load().load_software_part_region(*this, swlist, swname, start_entry);
-		result = true;
-		break;
-
-	case softlist_type::SOFTWARE:
-		result = load_software(swlist, swname, start_entry);
-		break;
-
-	case softlist_type::NONE:
-	default:
-		result = false;
-		break;		
-	}
+	const software_list_loader &loader = get_software_list_loader();
+	bool result = loader.load_software(*this, swlist, swname, start_entry);
 
 	// this is a hook that seems to only be used by TI99
 	if (result)

src/emu/diimage.h

@@ -21,6 +21,8 @@
 #include <string>
 #include <vector>
 
+#include "softlist.h"
+
 
 //**************************************************************************
 //  TYPE DEFINITIONS
@@ -137,13 +139,6 @@ class device_image_interface : public device_interface
 public:
 	typedef std::vector<std::unique_ptr<image_device_format>> formatlist_type;
 
-	enum class softlist_type
-	{
-		NONE,
-		ROM,
-		SOFTWARE
-	};
-
 	// construction/destruction
 	device_image_interface(const machine_config &mconfig, device_t &device);
 	virtual ~device_image_interface();
@@ -253,7 +248,7 @@ public:
 	bool user_loadable() const { return m_user_loadable; }
 
 protected:
-	virtual softlist_type get_softlist_type() const { return softlist_type::NONE; }
+	virtual const software_list_loader &get_software_list_loader() const { return false_software_list_loader::instance(); }
 	virtual void loaded_through_softlist() { }
 
 	bool load_internal(const char *path, bool is_create, int create_format, util::option_resolution *create_args, bool just_load);

src/emu/softlist.cpp

@@ -91,9 +91,47 @@ private:
 
 // device type definition
 const device_type SOFTWARE_LIST = &device_creator<software_list_device>;
+false_software_list_loader false_software_list_loader::s_instance;
+rom_software_list_loader rom_software_list_loader::s_instance;
+image_software_list_loader image_software_list_loader::s_instance;
 
 
 
+//**************************************************************************
+//  SOFTWARE LIST LOADER
+//**************************************************************************
+
+//-------------------------------------------------
+//  false_software_list_loader::load_software
+//-------------------------------------------------
+
+bool false_software_list_loader::load_software(device_image_interface &device, software_list_device &swlist, const char *swname, const rom_entry *start_entry) const
+{
+	return false;
+}
+
+
+//-------------------------------------------------
+//  rom_software_list_loader::load_software
+//-------------------------------------------------
+
+bool rom_software_list_loader::load_software(device_image_interface &device, software_list_device &swlist, const char *swname, const rom_entry *start_entry) const
+{
+	swlist.machine().rom_load().load_software_part_region(device, swlist, swname, start_entry);
+	return true;
+}
+
+
+//-------------------------------------------------
+//  image_software_list_loader::load_software
+//-------------------------------------------------
+
+bool image_software_list_loader::load_software(device_image_interface &device, software_list_device &swlist, const char *swname, const rom_entry *start_entry) const
+{
+	return device.load_software(swlist, swname, start_entry);
+}
+
+
 //**************************************************************************
 //  FEATURE LIST ITEM
 //**************************************************************************

src/emu/softlist.h

@@ -73,6 +73,59 @@ enum software_compatibility
 //  TYPE DEFINITIONS
 //**************************************************************************
 
+struct rom_entry;
+class software_info;
+class device_image_interface;
+class software_list_device;
+
+// ======================> software_list_loader
+
+class software_list_loader
+{
+public:
+	virtual bool load_software(device_image_interface &device, software_list_device &swlist, const char *swname, const rom_entry *start_entry) const = 0;
+};
+
+
+// ======================> false_software_list_loader
+
+class false_software_list_loader : public software_list_loader
+{
+public:
+	virtual bool load_software(device_image_interface &device, software_list_device &swlist, const char *swname, const rom_entry *start_entry) const override;
+	static const software_list_loader &instance() { return s_instance; }
+
+private:
+	static false_software_list_loader s_instance;
+};
+
+
+// ======================> rom_software_list_loader
+
+class rom_software_list_loader : public software_list_loader
+{
+public:
+	virtual bool load_software(device_image_interface &device, software_list_device &swlist, const char *swname, const rom_entry *start_entry) const override;
+	static const software_list_loader &instance() { return s_instance; }
+
+private:
+	static rom_software_list_loader s_instance;
+};
+
+
+// ======================> image_software_list_loader
+
+class image_software_list_loader : public software_list_loader
+{
+public:
+	virtual bool load_software(device_image_interface &device, software_list_device &swlist, const char *swname, const rom_entry *start_entry) const override;
+	static const software_list_loader &instance() { return s_instance; }
+
+private:
+	static image_software_list_loader s_instance;
+};
+
+
 // ======================> feature_list_item
 
 // an item in a list of name/value pairs

src/mame/machine/microdrv.h

@@ -50,7 +50,7 @@ public:
 	// image-level overrides
 	virtual bool call_load() override;
 	virtual void call_unload() override;
-	virtual softlist_type get_softlist_type() const override { return softlist_type::SOFTWARE; }
+	virtual const software_list_loader &get_software_list_loader() const override { return image_software_list_loader::instance(); }
 
 	virtual iodevice_t image_type() const override { return IO_CASSETTE; }
 

src/mame/machine/psion_pack.h

@@ -28,7 +28,7 @@ public:
 	virtual bool call_load() override;
 	virtual void call_unload() override;
 	virtual bool call_create(int format_type, util::option_resolution *create_args) override;
-	virtual softlist_type get_softlist_type() const override { return softlist_type::SOFTWARE; }
+	virtual const software_list_loader &get_software_list_loader() const override { return image_software_list_loader::instance(); }
 
 	virtual iodevice_t image_type() const override { return IO_CARTSLOT; }
 	virtual bool is_readable()  const override { return 1; }