summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd/modules/lib
diff options
context:
space:
mode:
Diffstat (limited to 'src/osd/modules/lib')
-rw-r--r--src/osd/modules/lib/osdobj_common.cpp34
-rw-r--r--src/osd/modules/lib/osdobj_common.h14
2 files changed, 5 insertions, 43 deletions
diff --git a/src/osd/modules/lib/osdobj_common.cpp b/src/osd/modules/lib/osdobj_common.cpp
index 5cb7cb85da4..f85a322dc58 100644
--- a/src/osd/modules/lib/osdobj_common.cpp
+++ b/src/osd/modules/lib/osdobj_common.cpp
@@ -508,40 +508,6 @@ void osd_common_t::customize_input_type_list(simple_list<input_type_entry> &type
//-------------------------------------------------
-// font_open - attempt to "open" a handle to the
-// font with the given name
-//-------------------------------------------------
-
-osd_font *osd_common_t::font_open(const char *name, int &height)
-{
- return nullptr;
-}
-
-
-//-------------------------------------------------
-// font_close - release resources associated with
-// a given OSD font
-//-------------------------------------------------
-
-void osd_common_t::font_close(osd_font *font)
-{
-}
-
-
-//-------------------------------------------------
-// font_get_bitmap - allocate and populate a
-// BITMAP_FORMAT_ARGB32 bitmap containing the
-// pixel values rgb_t(0xff,0xff,0xff,0xff)
-// or rgb_t(0x00,0xff,0xff,0xff) for each
-// pixel of a black & white font
-//-------------------------------------------------
-
-bool osd_common_t::font_get_bitmap(osd_font *font, unicode_char chnum, bitmap_argb32 &bitmap, INT32 &width, INT32 &xoffs, INT32 &yoffs)
-{
- return false;
-}
-
-//-------------------------------------------------
// get_slider_list - allocate and populate a
// list of OS-dependent slider values.
//-------------------------------------------------
diff --git a/src/osd/modules/lib/osdobj_common.h b/src/osd/modules/lib/osdobj_common.h
index 592391b5161..27e8d29d4a5 100644
--- a/src/osd/modules/lib/osdobj_common.h
+++ b/src/osd/modules/lib/osdobj_common.h
@@ -10,8 +10,8 @@
#pragma once
-#ifndef __OSDOBJ_COMMON_H__
-#define __OSDOBJ_COMMON__
+#ifndef MAME_OSD_LIB_OSDOBJ_COMMON_H
+#define MAME_OSD_LIB_OSDOBJ_COMMON_H
#include "osdepend.h"
#include "modules/osdmodule.h"
@@ -182,18 +182,14 @@ public:
// input overridables
virtual void customize_input_type_list(simple_list<input_type_entry> &typelist) override;
- // font overridables
- virtual osd_font *font_open(const char *name, int &height);
- virtual void font_close(osd_font *font);
- virtual bool font_get_bitmap(osd_font *font, unicode_char chnum, bitmap_argb32 &bitmap, INT32 &width, INT32 &xoffs, INT32 &yoffs);
-
// video overridables
virtual slider_state *get_slider_list() override;
// command option overrides
virtual bool execute_command(const char *command) override;
- virtual osd_font *font_alloc() override { return m_font_module->font_alloc(); }
+ virtual osd_font::ptr font_alloc() override { return m_font_module->font_alloc(); }
+ virtual bool get_font_families(std::string const &font_path, std::vector<std::pair<std::string, std::string> > &result) override { return m_font_module->get_font_families(font_path, result); }
virtual osd_midi_device *create_midi_device() override { return m_midi->create_midi_device(); }
@@ -286,4 +282,4 @@ debug_module *osd_debugger_creator()
return global_alloc(_DeviceClass());
}
-#endif /* __OSDOBJ_COMMON_H__ */
+#endif // MAME_OSD_LIB_OSDOBJ_COMMON_H