diff options
author | couriersud <couriersud@arcor.de> | 2015-01-24 02:20:18 +0100 |
---|---|---|
committer | couriersud <couriersud@arcor.de> | 2015-01-24 02:20:18 +0100 |
commit | 3818ac2be2ae54c20c888bc9438668648ae595c1 (patch) | |
tree | e4e50f8006ab5aa3ce412a5f874cb14283d69d93 /src/osd/modules/lib/osdobj_common.h | |
parent | b828f37eef4b4f1db85e0b617b9caf0c029bad9c (diff) |
Converted sound modules to be osd_modules. Simplified code. (nw)
Diffstat (limited to 'src/osd/modules/lib/osdobj_common.h')
-rw-r--r-- | src/osd/modules/lib/osdobj_common.h | 35 |
1 files changed, 2 insertions, 33 deletions
diff --git a/src/osd/modules/lib/osdobj_common.h b/src/osd/modules/lib/osdobj_common.h index 8ce422ea09c..a9d0d10b718 100644 --- a/src/osd/modules/lib/osdobj_common.h +++ b/src/osd/modules/lib/osdobj_common.h @@ -16,6 +16,7 @@ #include "osdepend.h" #include "modules/osdmodule.h" #include "modules/font/font_module.h" +#include "modules/sound/sound_module.h" #include "cliopts.h" //============================================================ @@ -103,13 +104,9 @@ private: static const options_entry s_option_entries[]; }; -class osd_sound_interface; class osd_debugger_interface; // a osd_sound_type is simply a pointer to its alloc function -typedef osd_sound_interface *(*osd_sound_type)(const osd_interface &osd, running_machine &machine); - -// a osd_sound_type is simply a pointer to its alloc function typedef osd_debugger_interface *(*osd_debugger_type)(const osd_interface &osd); @@ -172,9 +169,6 @@ public: virtual void video_register(); virtual bool window_init(); - virtual bool sound_init(); - virtual void sound_register(); - virtual void input_resume(); virtual bool output_init(); virtual bool network_init(); @@ -183,7 +177,6 @@ public: virtual void exit_subsystems(); virtual void video_exit(); virtual void window_exit(); - virtual void sound_exit(); virtual void input_exit(); virtual void output_exit(); virtual void network_exit(); @@ -192,7 +185,6 @@ public: virtual void osd_exit(); virtual void video_options_add(const char *name, void *type); - virtual void sound_options_add(const char *name, osd_sound_type type); virtual void debugger_options_add(const char *name, osd_debugger_type type); osd_options &options() { return m_options; } @@ -231,39 +223,16 @@ private: } protected: - osd_sound_interface* m_sound; + sound_module* m_sound; osd_debugger_interface* m_debugger; private: //tagmap_t<osd_video_type> m_video_options; dynamic_array<const char *> m_video_names; - tagmap_t<osd_sound_type> m_sound_options; - dynamic_array<const char *> m_sound_names; tagmap_t<osd_debugger_type> m_debugger_options; dynamic_array<const char *> m_debugger_names; }; -class osd_sound_interface -{ -public: - // construction/destruction - osd_sound_interface(const osd_interface &osd, running_machine &machine); - virtual ~osd_sound_interface(); - - virtual void update_audio_stream(const INT16 *buffer, int samples_this_frame) = 0; - virtual void set_mastervolume(int attenuation) = 0; -protected: - const osd_interface& m_osd; - running_machine& m_machine; -}; - -// this template function creates a stub which constructs a sound subsystem -template<class _DeviceClass> -osd_sound_interface *osd_sound_creator(const osd_interface &osd, running_machine &machine) -{ - return global_alloc(_DeviceClass(osd, machine)); -} - class osd_debugger_interface { public: |