summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/imagedev/picture.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/imagedev/picture.h')
-rw-r--r--src/devices/imagedev/picture.h32
1 files changed, 16 insertions, 16 deletions
diff --git a/src/devices/imagedev/picture.h b/src/devices/imagedev/picture.h
index 4261d6cf351..4e57d01714f 100644
--- a/src/devices/imagedev/picture.h
+++ b/src/devices/imagedev/picture.h
@@ -8,8 +8,8 @@
*********************************************************************/
-#ifndef MAME_DEVICES_IMAGEDEV_PICTURE_H
-#define MAME_DEVICES_IMAGEDEV_PICTURE_H
+#ifndef MAME_IMAGEDEV_PICTURE_H
+#define MAME_IMAGEDEV_PICTURE_H
#pragma once
@@ -29,30 +29,30 @@ public:
picture_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0);
virtual ~picture_image_device();
- // image-level overrides
- virtual image_init_result call_load() override;
+ // device_image_interface implementation
+ virtual std::pair<std::error_condition, std::string> call_load() override;
virtual void call_unload() override;
- virtual iodevice_t image_type() const override { return IO_PICTURE; }
- virtual bool is_readable() const override { return 1; }
- virtual bool is_writeable() const override { return 0; }
- virtual bool is_creatable() const override { return 0; }
- virtual bool must_be_loaded() const override { return 0; }
- virtual bool is_reset_on_load() const override { return 0; }
- virtual const char *file_extensions() const override { return "png"; }
+ virtual bool is_readable() const noexcept override { return true; }
+ virtual bool is_writeable() const noexcept override { return false; }
+ virtual bool is_creatable() const noexcept override { return false; }
+ virtual bool is_reset_on_load() const noexcept override { return false; }
+ virtual const char *file_extensions() const noexcept override { return "png,jpg,jpeg,jfif,bmp,dib"; }
+ virtual const char *image_type_name() const noexcept override { return "picture"; }
+ virtual const char *image_brief_type_name() const noexcept override { return "pic"; }
- bitmap_argb32 &get_bitmap() { return *m_picture; }
+ const bitmap_argb32 &get_bitmap() { return m_picture; }
protected:
- // device-level overrides
- virtual void device_start() override;
+ // device_t implementation
+ virtual void device_start() override ATTR_COLD;
private:
- bitmap_argb32 *m_picture;
+ bitmap_argb32 m_picture;
};
// device type definition
DECLARE_DEVICE_TYPE(IMAGE_PICTURE, picture_image_device)
-#endif // MAME_DEVICES_IMAGEDEV_PICTURE_H
+#endif // MAME_IMAGEDEV_PICTURE_H