summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Ryan Holtz <rholtz@batcountryentertainment.com>2011-05-23 05:03:16 +0000
committer Ryan Holtz <rholtz@batcountryentertainment.com>2011-05-23 05:03:16 +0000
commitb63233e7a6fefc7101369fcd653abbccfe14fb1f (patch)
treec41cf1a68d275a8627f1005121718f10aa91b3b9
parentae9fbbe44df5e8e4469d69f075a03ce8e7579286 (diff)
Call off the dogs, the OSD routing for OSD-side sliders has been fixed. nwn
-rw-r--r--src/emu/uimenu.c2
-rw-r--r--src/osd/osdcore.h10
-rw-r--r--src/osd/osdepend.c9
-rw-r--r--src/osd/osdepend.h3
-rw-r--r--src/osd/windows/drawd3d.c4
-rw-r--r--src/osd/windows/winmain.h3
6 files changed, 18 insertions, 13 deletions
diff --git a/src/emu/uimenu.c b/src/emu/uimenu.c
index acd41848617..2b113cbc178 100644
--- a/src/emu/uimenu.c
+++ b/src/emu/uimenu.c
@@ -3015,7 +3015,7 @@ static void menu_sliders_populate(running_machine &machine, ui_menu *menu, int m
}
/* add all sliders */
- for (curslider = (slider_state*)osd_get_slider_list(); curslider != NULL; curslider = curslider->next)
+ for (curslider = (slider_state*)machine.osd().get_slider_list(); curslider != NULL; curslider = curslider->next)
{
INT32 curval = (*curslider->update)(machine, curslider->arg, &tempstring, SLIDER_NOCHANGE);
UINT32 flags = 0;
diff --git a/src/osd/osdcore.h b/src/osd/osdcore.h
index a750da1fcd7..a34bbf2a705 100644
--- a/src/osd/osdcore.h
+++ b/src/osd/osdcore.h
@@ -905,16 +905,6 @@ file_error osd_get_full_path(char **dst, const char *path);
-----------------------------------------------------------------------------*/
const char *osd_get_volume_name(int idx);
-/*-----------------------------------------------------------------------------
- osd_set_shared_float_buffer: retrieves the OSD-shared float buffer
-
- Return value:
-
- pointer to the OSD-specific list of sliders
-
------------------------------------------------------------------------------*/
-const void *osd_get_slider_list();
-
#ifdef __cplusplus
}
#endif
diff --git a/src/osd/osdepend.c b/src/osd/osdepend.c
index 33a352b599e..115c506a297 100644
--- a/src/osd/osdepend.c
+++ b/src/osd/osdepend.c
@@ -231,3 +231,12 @@ bitmap_t *osd_interface::font_get_bitmap(osd_font font, unicode_char chnum, INT3
{
return NULL;
}
+
+//-------------------------------------------------
+// get_slider_list - allocate and populate a
+// list of OS-dependent slider values.
+//-------------------------------------------------
+void *osd_interface::get_slider_list()
+{
+ return NULL;
+}
diff --git a/src/osd/osdepend.h b/src/osd/osdepend.h
index 878c02b0ffb..174d2bef488 100644
--- a/src/osd/osdepend.h
+++ b/src/osd/osdepend.h
@@ -90,6 +90,9 @@ public:
virtual void font_close(osd_font font);
virtual bitmap_t *font_get_bitmap(osd_font font, unicode_char chnum, INT32 &width, INT32 &xoffs, INT32 &yoffs);
+ // video overridables
+ virtual void *get_slider_list();
+
private:
// internal state
running_machine * m_machine;
diff --git a/src/osd/windows/drawd3d.c b/src/osd/windows/drawd3d.c
index e87936b2759..3f4f2b5cf03 100644
--- a/src/osd/windows/drawd3d.c
+++ b/src/osd/windows/drawd3d.c
@@ -705,10 +705,10 @@ static slider_state *init_slider_list(d3d_info *d3d)
}
//============================================================
-// osd_get_slider_list
+// get_slider_list
//============================================================
-const void *osd_get_slider_list()
+void *windows_osd_interface::get_slider_list()
{
return (void*)slider_list;
}
diff --git a/src/osd/windows/winmain.h b/src/osd/windows/winmain.h
index f7ec9cb7f59..916f6a2b155 100644
--- a/src/osd/windows/winmain.h
+++ b/src/osd/windows/winmain.h
@@ -338,6 +338,9 @@ public:
virtual void update_audio_stream(const INT16 *buffer, int samples_this_frame);
virtual void set_mastervolume(int attenuation);
+ // video overridables
+ virtual void *get_slider_list();
+
// input overridables
virtual void customize_input_type_list(input_type_desc *typelist);