diff options
author | Miodrag Milanovic <mmicko@gmail.com> | 2016-01-20 21:42:13 +0100 |
---|---|---|
committer | Miodrag Milanovic <mmicko@gmail.com> | 2016-01-20 21:42:13 +0100 |
commit | 4e8e3066f847cc0fa11539f4d9ab8a63f70ca475 (patch) | |
tree | 25d48b50f2b89dd5b9e7dbbfeeb85c534ec6852a /src/devices/sound | |
parent | 3a8ccb89b426509be06089a19c51ecf55567ed1b (diff) |
reverting:
SHA-1: 1f90ceab075c4869298e963bf0a14a0aac2f1caa
* tags are now strings (nw)
fix start project for custom builds in Visual Studio (nw)
Diffstat (limited to 'src/devices/sound')
215 files changed, 473 insertions, 468 deletions
diff --git a/src/devices/sound/2151intf.cpp b/src/devices/sound/2151intf.cpp index 4bbe2580d6c..e46eea7b4f6 100644 --- a/src/devices/sound/2151intf.cpp +++ b/src/devices/sound/2151intf.cpp @@ -21,7 +21,7 @@ const device_type YM2151 = &device_creator<ym2151_device>; // ym2151_device - constructor //------------------------------------------------- -ym2151_device::ym2151_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ym2151_device::ym2151_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, YM2151, "YM2151", tag, owner, clock, "ym2151", __FILE__), device_sound_interface(mconfig, *this), m_stream(nullptr), diff --git a/src/devices/sound/2151intf.h b/src/devices/sound/2151intf.h index e1f9bd90189..e14892e9867 100644 --- a/src/devices/sound/2151intf.h +++ b/src/devices/sound/2151intf.h @@ -39,7 +39,7 @@ class ym2151_device : public device_t, { public: // construction/destruction - ym2151_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + ym2151_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<ym2151_device &>(device).m_irqhandler.set_callback(object); } diff --git a/src/devices/sound/2203intf.cpp b/src/devices/sound/2203intf.cpp index 3a1252015f1..8b1bada64ec 100644 --- a/src/devices/sound/2203intf.cpp +++ b/src/devices/sound/2203intf.cpp @@ -188,7 +188,7 @@ WRITE8_MEMBER( ym2203_device::write_port_w ) const device_type YM2203 = &device_creator<ym2203_device>; -ym2203_device::ym2203_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ym2203_device::ym2203_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : ay8910_device(mconfig, YM2203, "YM2203", tag, owner, clock, PSG_TYPE_YM, 3, 2, "ym2203", __FILE__), m_irq_handler(*this) { diff --git a/src/devices/sound/2203intf.h b/src/devices/sound/2203intf.h index 6dee36ca7a3..d9c44c2f7c7 100644 --- a/src/devices/sound/2203intf.h +++ b/src/devices/sound/2203intf.h @@ -16,7 +16,7 @@ void ym2203_update_request(void *param); class ym2203_device : public ay8910_device { public: - ym2203_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + ym2203_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<ym2203_device &>(device).m_irq_handler.set_callback(object); } diff --git a/src/devices/sound/2413intf.cpp b/src/devices/sound/2413intf.cpp index 4c501a02025..2010264313d 100644 --- a/src/devices/sound/2413intf.cpp +++ b/src/devices/sound/2413intf.cpp @@ -78,7 +78,7 @@ WRITE8_MEMBER( ym2413_device::data_port_w ) { write(space, 1, data); } const device_type YM2413 = &device_creator<ym2413_device>; -ym2413_device::ym2413_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ym2413_device::ym2413_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, YM2413, "YM2413", tag, owner, clock, "ym2413", __FILE__), device_sound_interface(mconfig, *this) { diff --git a/src/devices/sound/2413intf.h b/src/devices/sound/2413intf.h index cfab8b01018..6c188877000 100644 --- a/src/devices/sound/2413intf.h +++ b/src/devices/sound/2413intf.h @@ -11,7 +11,7 @@ class ym2413_device : public device_t, public device_sound_interface { public: - ym2413_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + ym2413_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); DECLARE_WRITE8_MEMBER( write ); diff --git a/src/devices/sound/2608intf.cpp b/src/devices/sound/2608intf.cpp index efc181382e2..ba6baba7bce 100644 --- a/src/devices/sound/2608intf.cpp +++ b/src/devices/sound/2608intf.cpp @@ -185,7 +185,7 @@ WRITE8_MEMBER( ym2608_device::write ) const device_type YM2608 = &device_creator<ym2608_device>; -ym2608_device::ym2608_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ym2608_device::ym2608_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : ay8910_device(mconfig, YM2608, "YM2608", tag, owner, clock, PSG_TYPE_YM, 1, 2, "ym2608", __FILE__), m_irq_handler(*this) { diff --git a/src/devices/sound/2608intf.h b/src/devices/sound/2608intf.h index 3a9c115fe60..f827f998521 100644 --- a/src/devices/sound/2608intf.h +++ b/src/devices/sound/2608intf.h @@ -16,7 +16,7 @@ void ym2608_update_request(void *param); class ym2608_device : public ay8910_device { public: - ym2608_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + ym2608_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<ym2608_device &>(device).m_irq_handler.set_callback(object); } diff --git a/src/devices/sound/2610intf.cpp b/src/devices/sound/2610intf.cpp index 004df9a8335..9111b03502c 100644 --- a/src/devices/sound/2610intf.cpp +++ b/src/devices/sound/2610intf.cpp @@ -206,13 +206,13 @@ WRITE8_MEMBER( ym2610_device::write ) const device_type YM2610 = &device_creator<ym2610_device>; -ym2610_device::ym2610_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ym2610_device::ym2610_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : ay8910_device(mconfig, YM2610, "YM2610", tag, owner, clock, PSG_TYPE_YM, 1, 0, "ym2610", __FILE__), m_irq_handler(*this) { } -ym2610_device::ym2610_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +ym2610_device::ym2610_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : ay8910_device(mconfig, type, name, tag, owner, clock, PSG_TYPE_YM, 1, 0, shortname, source), m_irq_handler(*this) { @@ -220,7 +220,7 @@ ym2610_device::ym2610_device(const machine_config &mconfig, device_type type, co const device_type YM2610B = &device_creator<ym2610b_device>; -ym2610b_device::ym2610b_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ym2610b_device::ym2610b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : ym2610_device(mconfig, YM2610B, "YM2610B", tag, owner, clock, "ym2610b", __FILE__) { } diff --git a/src/devices/sound/2610intf.h b/src/devices/sound/2610intf.h index cb7b1acbbc0..c4409e46f21 100644 --- a/src/devices/sound/2610intf.h +++ b/src/devices/sound/2610intf.h @@ -16,8 +16,8 @@ void ym2610_update_request(void *param); class ym2610_device : public ay8910_device { public: - ym2610_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - ym2610_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + ym2610_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + ym2610_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // static configuration helpers template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<ym2610_device &>(device).m_irq_handler.set_callback(object); } @@ -54,7 +54,7 @@ extern const device_type YM2610; class ym2610b_device : public ym2610_device { public: - ym2610b_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + ym2610b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual void stream_generate(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override; }; diff --git a/src/devices/sound/2612intf.cpp b/src/devices/sound/2612intf.cpp index 0771157b56d..c606f4eaece 100644 --- a/src/devices/sound/2612intf.cpp +++ b/src/devices/sound/2612intf.cpp @@ -150,14 +150,14 @@ WRITE8_MEMBER( ym2612_device::write ) const device_type YM2612 = &device_creator<ym2612_device>; -ym2612_device::ym2612_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ym2612_device::ym2612_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, YM2612, "YM2612", tag, owner, clock, "ym2612", __FILE__), device_sound_interface(mconfig, *this), m_irq_handler(*this) { } -ym2612_device::ym2612_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +ym2612_device::ym2612_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_sound_interface(mconfig, *this), m_irq_handler(*this) @@ -177,7 +177,7 @@ void ym2612_device::device_config_complete() const device_type YM3438 = &device_creator<ym3438_device>; -ym3438_device::ym3438_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ym3438_device::ym3438_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : ym2612_device(mconfig, YM3438, "YM3438", tag, owner, clock, "ym3438", __FILE__) { } diff --git a/src/devices/sound/2612intf.h b/src/devices/sound/2612intf.h index cb18940637f..0dc25ac5b25 100644 --- a/src/devices/sound/2612intf.h +++ b/src/devices/sound/2612intf.h @@ -16,8 +16,8 @@ class ym2612_device : public device_t, public device_sound_interface { public: - ym2612_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - ym2612_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + ym2612_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + ym2612_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // static configuration helpers template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<ym2612_device &>(device).m_irq_handler.set_callback(object); } @@ -55,7 +55,7 @@ extern const device_type YM2612; class ym3438_device : public ym2612_device { public: - ym3438_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + ym3438_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; extern const device_type YM3438; diff --git a/src/devices/sound/262intf.cpp b/src/devices/sound/262intf.cpp index ac8e8ee4917..d14497e672e 100644 --- a/src/devices/sound/262intf.cpp +++ b/src/devices/sound/262intf.cpp @@ -137,7 +137,7 @@ WRITE8_MEMBER( ymf262_device::write ) const device_type YMF262 = &device_creator<ymf262_device>; -ymf262_device::ymf262_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ymf262_device::ymf262_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, YMF262, "YMF262", tag, owner, clock, "ymf262", __FILE__), device_sound_interface(mconfig, *this), m_irq_handler(*this) diff --git a/src/devices/sound/262intf.h b/src/devices/sound/262intf.h index 655dd2d45d8..7dcdbbec065 100644 --- a/src/devices/sound/262intf.h +++ b/src/devices/sound/262intf.h @@ -14,7 +14,7 @@ class ymf262_device : public device_t, public device_sound_interface { public: - ymf262_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + ymf262_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<ymf262_device &>(device).m_irq_handler.set_callback(object); } diff --git a/src/devices/sound/315-5641.cpp b/src/devices/sound/315-5641.cpp index dbc742b837c..df5341c7382 100644 --- a/src/devices/sound/315-5641.cpp +++ b/src/devices/sound/315-5641.cpp @@ -5,7 +5,7 @@ const device_type SEGA_315_5641_PCM = &device_creator<sega_315_5641_pcm_device>; -sega_315_5641_pcm_device::sega_315_5641_pcm_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +sega_315_5641_pcm_device::sega_315_5641_pcm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : upd7759_device(mconfig, SEGA_315_5641_PCM, "315-5641 PCM", tag, owner, clock, "315-5641_pcm", __FILE__), m_fifo_read(0), m_fifo_write(0) { } diff --git a/src/devices/sound/315-5641.h b/src/devices/sound/315-5641.h index 02045773cc4..49e068fb4ac 100644 --- a/src/devices/sound/315-5641.h +++ b/src/devices/sound/315-5641.h @@ -9,7 +9,7 @@ class sega_315_5641_pcm_device : public upd7759_device { public: - sega_315_5641_pcm_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + sega_315_5641_pcm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); UINT8 get_fifo_space(); void advance_state() override; diff --git a/src/devices/sound/3526intf.cpp b/src/devices/sound/3526intf.cpp index 39c88db33a0..81ae14881f5 100644 --- a/src/devices/sound/3526intf.cpp +++ b/src/devices/sound/3526intf.cpp @@ -154,7 +154,7 @@ WRITE8_MEMBER( ym3526_device::write_port_w ) { write(space, 1, data); } const device_type YM3526 = &device_creator<ym3526_device>; -ym3526_device::ym3526_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ym3526_device::ym3526_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, YM3526, "YM3526", tag, owner, clock, "ym3526", __FILE__), device_sound_interface(mconfig, *this), m_stream(nullptr), diff --git a/src/devices/sound/3526intf.h b/src/devices/sound/3526intf.h index 53a4c2a1f9d..20ef0876292 100644 --- a/src/devices/sound/3526intf.h +++ b/src/devices/sound/3526intf.h @@ -14,7 +14,7 @@ class ym3526_device : public device_t, public device_sound_interface { public: - ym3526_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + ym3526_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<ym3526_device &>(device).m_irq_handler.set_callback(object); } diff --git a/src/devices/sound/3812intf.cpp b/src/devices/sound/3812intf.cpp index 7a6fb09b4ee..192d5bba6c8 100644 --- a/src/devices/sound/3812intf.cpp +++ b/src/devices/sound/3812intf.cpp @@ -152,7 +152,7 @@ WRITE8_MEMBER( ym3812_device::write_port_w ) { write( space, 1, data); } const device_type YM3812 = &device_creator<ym3812_device>; -ym3812_device::ym3812_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ym3812_device::ym3812_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, YM3812, "YM3812", tag, owner, clock, "ym3812", __FILE__), device_sound_interface(mconfig, *this), m_stream(nullptr), diff --git a/src/devices/sound/3812intf.h b/src/devices/sound/3812intf.h index 72c5f1b1a5a..a62c88302ab 100644 --- a/src/devices/sound/3812intf.h +++ b/src/devices/sound/3812intf.h @@ -14,7 +14,7 @@ class ym3812_device : public device_t, public device_sound_interface { public: - ym3812_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + ym3812_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<ym3812_device &>(device).m_irq_handler.set_callback(object); } diff --git a/src/devices/sound/8950intf.cpp b/src/devices/sound/8950intf.cpp index d50b699b48f..4454b37f941 100644 --- a/src/devices/sound/8950intf.cpp +++ b/src/devices/sound/8950intf.cpp @@ -203,7 +203,7 @@ WRITE8_MEMBER( y8950_device::write_port_w ) { write(space, 1, data); } const device_type Y8950 = &device_creator<y8950_device>; -y8950_device::y8950_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +y8950_device::y8950_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, Y8950, "Y8950", tag, owner, clock, "y8950", __FILE__), device_sound_interface(mconfig, *this), m_stream(nullptr), diff --git a/src/devices/sound/8950intf.h b/src/devices/sound/8950intf.h index 080bfe1c908..53a35111f77 100644 --- a/src/devices/sound/8950intf.h +++ b/src/devices/sound/8950intf.h @@ -26,7 +26,7 @@ class y8950_device : public device_t, public device_sound_interface { public: - y8950_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + y8950_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<y8950_device &>(device).m_irq_handler.set_callback(object); } diff --git a/src/devices/sound/aica.cpp b/src/devices/sound/aica.cpp index cbc15951a7a..524ef93d6bd 100644 --- a/src/devices/sound/aica.cpp +++ b/src/devices/sound/aica.cpp @@ -1466,7 +1466,7 @@ READ16_MEMBER( aica_device::midi_out_r ) const device_type AICA = &device_creator<aica_device>; -aica_device::aica_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +aica_device::aica_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, AICA, "AICA", tag, owner, clock, "aica", __FILE__), device_sound_interface(mconfig, *this), m_master(false), diff --git a/src/devices/sound/aica.h b/src/devices/sound/aica.h index 3f9544a5ce8..0494ecafad6 100644 --- a/src/devices/sound/aica.h +++ b/src/devices/sound/aica.h @@ -79,7 +79,7 @@ class aica_device : public device_t, public device_sound_interface { public: - aica_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + aica_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); static void set_master(device_t &device) { downcast<aica_device &>(device).m_master = true; } static void set_roffset(device_t &device, int roffset) { downcast<aica_device &>(device).m_roffset = roffset; } diff --git a/src/devices/sound/amiga.cpp b/src/devices/sound/amiga.cpp index e17a329ae6f..d11e115a59e 100644 --- a/src/devices/sound/amiga.cpp +++ b/src/devices/sound/amiga.cpp @@ -33,7 +33,7 @@ const device_type AMIGA = &device_creator<amiga_sound_device>; // amiga_sound_device - constructor //------------------------------------------------- -amiga_sound_device::amiga_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +amiga_sound_device::amiga_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, AMIGA, "Amiga Paula", tag, owner, clock, "amiga_paula", __FILE__), device_sound_interface(mconfig, *this), m_stream(nullptr) diff --git a/src/devices/sound/amiga.h b/src/devices/sound/amiga.h index b40e6b14b56..e93ff6a86a3 100644 --- a/src/devices/sound/amiga.h +++ b/src/devices/sound/amiga.h @@ -23,7 +23,7 @@ class amiga_sound_device : public device_t, public device_sound_interface { public: - amiga_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + amiga_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~amiga_sound_device() {} void update(); diff --git a/src/devices/sound/asc.cpp b/src/devices/sound/asc.cpp index e9572c37a57..c2692af9912 100644 --- a/src/devices/sound/asc.cpp +++ b/src/devices/sound/asc.cpp @@ -45,7 +45,7 @@ const device_type ASC = &device_creator<asc_device>; // asc_device - constructor //------------------------------------------------- -asc_device::asc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +asc_device::asc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ASC, "ASC", tag, owner, clock, "asc", __FILE__), device_sound_interface(mconfig, *this), write_irq(*this), diff --git a/src/devices/sound/asc.h b/src/devices/sound/asc.h index 64bbe7e9572..ba45288888d 100644 --- a/src/devices/sound/asc.h +++ b/src/devices/sound/asc.h @@ -65,7 +65,7 @@ class asc_device : public device_t, public device_sound_interface { public: // construction/destruction - asc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + asc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // inline configuration helpers static void static_set_type(device_t &device, int type); diff --git a/src/devices/sound/astrocde.cpp b/src/devices/sound/astrocde.cpp index 8a0bbb1414b..c26af3aca19 100644 --- a/src/devices/sound/astrocde.cpp +++ b/src/devices/sound/astrocde.cpp @@ -57,7 +57,7 @@ const device_type ASTROCADE = &device_creator<astrocade_device>; // astrocade_device - constructor //------------------------------------------------- -astrocade_device::astrocade_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +astrocade_device::astrocade_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ASTROCADE, "Astrocade", tag, owner, clock, "astrocade", __FILE__), device_sound_interface(mconfig, *this), m_stream(nullptr), diff --git a/src/devices/sound/astrocde.h b/src/devices/sound/astrocde.h index 5bb9d6de5bd..96826a120c6 100644 --- a/src/devices/sound/astrocde.h +++ b/src/devices/sound/astrocde.h @@ -27,7 +27,7 @@ class astrocade_device : public device_t, public device_sound_interface { public: - astrocade_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + astrocade_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~astrocade_device() { } protected: diff --git a/src/devices/sound/awacs.cpp b/src/devices/sound/awacs.cpp index 1049c0f1308..4784616cdf6 100644 --- a/src/devices/sound/awacs.cpp +++ b/src/devices/sound/awacs.cpp @@ -24,7 +24,7 @@ const device_type AWACS = &device_creator<awacs_device>; // awacs_device - constructor //------------------------------------------------- -awacs_device::awacs_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +awacs_device::awacs_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, AWACS, "AWACS", tag, owner, clock, "awacs", __FILE__), device_sound_interface(mconfig, *this), m_stream(nullptr), m_play_ptr(0), m_buffer_size(0), m_buffer_num(0), m_playback_enable(false), m_dma_space(nullptr), m_dma_offset_0(0), m_dma_offset_1(0), m_timer(nullptr) { diff --git a/src/devices/sound/awacs.h b/src/devices/sound/awacs.h index 14f85c86250..435508ef216 100644 --- a/src/devices/sound/awacs.h +++ b/src/devices/sound/awacs.h @@ -40,7 +40,7 @@ class awacs_device : public device_t, public device_sound_interface { public: // construction/destruction - awacs_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + awacs_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); DECLARE_READ8_MEMBER(read); DECLARE_WRITE8_MEMBER(write); diff --git a/src/devices/sound/ay8910.cpp b/src/devices/sound/ay8910.cpp index 3b2a57bd318..cb1e1c98bcb 100644 --- a/src/devices/sound/ay8910.cpp +++ b/src/devices/sound/ay8910.cpp @@ -654,11 +654,11 @@ void ay8910_device::ay8910_write_reg(int r, int v) if (!m_port_a_write_cb.isnull()) m_port_a_write_cb((offs_t)0, m_regs[AY_PORTA]); else - logerror("warning - write %02x to 8910 '%s' Port A\n",m_regs[AY_PORTA],tag().c_str()); + logerror("warning - write %02x to 8910 '%s' Port A\n",m_regs[AY_PORTA],tag()); } else { - logerror("warning: write to 8910 '%s' Port A set as input - ignored\n", tag().c_str()); + logerror("warning: write to 8910 '%s' Port A set as input - ignored\n",tag()); } break; case AY_PORTB: @@ -667,11 +667,11 @@ void ay8910_device::ay8910_write_reg(int r, int v) if (!m_port_b_write_cb.isnull()) m_port_b_write_cb((offs_t)0, m_regs[AY_PORTB]); else - logerror("warning - write %02x to 8910 '%s' Port B\n",m_regs[AY_PORTB],tag().c_str()); + logerror("warning - write %02x to 8910 '%s' Port B\n",m_regs[AY_PORTB],tag()); } else { - logerror("warning: write to 8910 '%s' Port B set as input - ignored\n", tag().c_str()); + logerror("warning: write to 8910 '%s' Port B set as input - ignored\n",tag()); } break; } @@ -881,10 +881,10 @@ void ay8910_device::device_start() int master_clock = clock(); if (m_ioports < 1 && !(m_port_a_read_cb.isnull() && m_port_a_write_cb.isnull())) - fatalerror("Device '%s' is a %s and has no port A!", tag().c_str(), name()); + fatalerror("Device '%s' is a %s and has no port A!", tag(), name()); if (m_ioports < 2 && !(m_port_b_read_cb.isnull() && m_port_b_write_cb.isnull())) - fatalerror("Device '%s' is a %s and has no port B!", tag().c_str(), name()); + fatalerror("Device '%s' is a %s and has no port B!", tag(), name()); m_port_a_read_cb.resolve(); m_port_b_read_cb.resolve(); @@ -893,7 +893,7 @@ void ay8910_device::device_start() if ((m_flags & AY8910_SINGLE_OUTPUT) != 0) { - logerror("%s device '%s' using single output!\n", name(), tag().c_str()); + logerror("%s device '%s' using single output!\n", name(), tag()); m_streams = 1; } @@ -1001,7 +1001,7 @@ int ay8910_device::ay8910_read_ym() { case AY_PORTA: if ((m_regs[AY_ENABLE] & 0x40) != 0) - logerror("warning: read from 8910 '%s' Port A set as output\n", tag().c_str()); + logerror("warning: read from 8910 '%s' Port A set as output\n",tag()); /* even if the port is set as output, we still need to return the external data. Some games, like kidniki, need this to work. @@ -1015,15 +1015,15 @@ int ay8910_device::ay8910_read_ym() if (!m_port_a_read_cb.isnull()) m_regs[AY_PORTA] = m_port_a_read_cb(0); else - logerror("%s: warning - read 8910 '%s' Port A\n",machine().describe_context(),tag().c_str()); + logerror("%s: warning - read 8910 '%s' Port A\n",machine().describe_context(),tag()); break; case AY_PORTB: if ((m_regs[AY_ENABLE] & 0x80) != 0) - logerror("warning: read from 8910 '%s' Port B set as output\n", tag().c_str()); + logerror("warning: read from 8910 '%s' Port B set as output\n",tag()); if (!m_port_b_read_cb.isnull()) m_regs[AY_PORTB] = m_port_b_read_cb(0); else - logerror("%s: warning - read 8910 '%s' Port B\n",machine().describe_context(),tag().c_str()); + logerror("%s: warning - read 8910 '%s' Port B\n",machine().describe_context(),tag()); break; } @@ -1124,7 +1124,7 @@ WRITE8_MEMBER( ay8914_device::write ) const device_type AY8910 = &device_creator<ay8910_device>; -ay8910_device::ay8910_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ay8910_device::ay8910_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, AY8910, "AY-3-8910A", tag, owner, clock, "ay8910", __FILE__), device_sound_interface(mconfig, *this), m_type(PSG_TYPE_AY), @@ -1165,7 +1165,7 @@ ay8910_device::ay8910_device(const machine_config &mconfig, std::string tag, dev m_res_load[0] = m_res_load[1] = m_res_load[2] = 1000; //Default values for resistor loads } -ay8910_device::ay8910_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, +ay8910_device::ay8910_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, psg_type_t psg_type, int streams, int ioports, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_sound_interface(mconfig, *this), @@ -1209,7 +1209,7 @@ ay8910_device::ay8910_device(const machine_config &mconfig, device_type type, co const device_type AY8912 = &device_creator<ay8912_device>; -ay8912_device::ay8912_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ay8912_device::ay8912_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : ay8910_device(mconfig, AY8912, "AY-3-8912A", tag, owner, clock, PSG_TYPE_AY, 3, 1, "ay8912", __FILE__) { } @@ -1217,7 +1217,7 @@ ay8912_device::ay8912_device(const machine_config &mconfig, std::string tag, dev const device_type AY8913 = &device_creator<ay8913_device>; -ay8913_device::ay8913_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ay8913_device::ay8913_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : ay8910_device(mconfig, AY8913, "AY-3-8913A", tag, owner, clock, PSG_TYPE_AY, 3, 0, "ay8913", __FILE__) { } @@ -1225,7 +1225,7 @@ ay8913_device::ay8913_device(const machine_config &mconfig, std::string tag, dev const device_type AY8914 = &device_creator<ay8914_device>; -ay8914_device::ay8914_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ay8914_device::ay8914_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : ay8910_device(mconfig, AY8914, "AY-3-8914", tag, owner, clock, PSG_TYPE_AY, 3, 2, "ay8914", __FILE__) { } @@ -1233,7 +1233,7 @@ ay8914_device::ay8914_device(const machine_config &mconfig, std::string tag, dev const device_type AY8930 = &device_creator<ay8930_device>; -ay8930_device::ay8930_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ay8930_device::ay8930_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : ay8910_device(mconfig, AY8930, "AY8930", tag, owner, clock, PSG_TYPE_AY, 3, 2, "ay8930", __FILE__) { } @@ -1241,7 +1241,7 @@ ay8930_device::ay8930_device(const machine_config &mconfig, std::string tag, dev const device_type YM2149 = &device_creator<ym2149_device>; -ym2149_device::ym2149_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ym2149_device::ym2149_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : ay8910_device(mconfig, YM2149, "YM2149", tag, owner, clock, PSG_TYPE_YM, 3, 2, "ym2149", __FILE__) { } @@ -1249,7 +1249,7 @@ ym2149_device::ym2149_device(const machine_config &mconfig, std::string tag, dev const device_type YM3439 = &device_creator<ym3439_device>; -ym3439_device::ym3439_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ym3439_device::ym3439_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : ay8910_device(mconfig, YM3439, "YM3439", tag, owner, clock, PSG_TYPE_YM, 3, 2, "ym3429", __FILE__) { } @@ -1257,7 +1257,7 @@ ym3439_device::ym3439_device(const machine_config &mconfig, std::string tag, dev const device_type YMZ284 = &device_creator<ymz284_device>; -ymz284_device::ymz284_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ymz284_device::ymz284_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : ay8910_device(mconfig, YMZ284, "YMZ284", tag, owner, clock, PSG_TYPE_YM, 1, 0, "ymz284", __FILE__) { } @@ -1265,7 +1265,7 @@ ymz284_device::ymz284_device(const machine_config &mconfig, std::string tag, dev const device_type YMZ294 = &device_creator<ymz294_device>; -ymz294_device::ymz294_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ymz294_device::ymz294_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : ay8910_device(mconfig, YMZ294, "YMZ294", tag, owner, clock, PSG_TYPE_YM, 1, 0, "ymz294", __FILE__) { } diff --git a/src/devices/sound/ay8910.h b/src/devices/sound/ay8910.h index 853f40853ea..6fda797d679 100644 --- a/src/devices/sound/ay8910.h +++ b/src/devices/sound/ay8910.h @@ -100,8 +100,8 @@ public: }; // construction/destruction - ay8910_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - ay8910_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, + ay8910_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + ay8910_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, psg_type_t psg_type, int streams, int ioports, const char *shortname, const char *source); // static configuration helpers @@ -204,7 +204,7 @@ extern const device_type AY8910; class ay8912_device : public ay8910_device { public: - ay8912_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + ay8912_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; extern const device_type AY8912; @@ -212,7 +212,7 @@ extern const device_type AY8912; class ay8913_device : public ay8910_device { public: - ay8913_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + ay8913_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; extern const device_type AY8913; @@ -220,7 +220,7 @@ extern const device_type AY8913; class ay8914_device : public ay8910_device { public: - ay8914_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + ay8914_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); /* AY8914 handlers needed due to different register map */ DECLARE_READ8_MEMBER( read ); @@ -232,7 +232,7 @@ extern const device_type AY8914; class ay8930_device : public ay8910_device { public: - ay8930_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + ay8930_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; extern const device_type AY8930; @@ -240,7 +240,7 @@ extern const device_type AY8930; class ym2149_device : public ay8910_device { public: - ym2149_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + ym2149_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; extern const device_type YM2149; @@ -248,7 +248,7 @@ extern const device_type YM2149; class ym3439_device : public ay8910_device { public: - ym3439_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + ym3439_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; extern const device_type YM3439; @@ -256,7 +256,7 @@ extern const device_type YM3439; class ymz284_device : public ay8910_device { public: - ymz284_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + ymz284_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; extern const device_type YMZ284; @@ -264,7 +264,7 @@ extern const device_type YMZ284; class ymz294_device : public ay8910_device { public: - ymz294_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + ymz294_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; extern const device_type YMZ294; diff --git a/src/devices/sound/beep.cpp b/src/devices/sound/beep.cpp index 4275b7af205..e5c9362dc9f 100644 --- a/src/devices/sound/beep.cpp +++ b/src/devices/sound/beep.cpp @@ -31,7 +31,7 @@ const device_type BEEP = &device_creator<beep_device>; // beep_device - constructor //------------------------------------------------- -beep_device::beep_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +beep_device::beep_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, BEEP, "Beep", tag, owner, clock, "beep", __FILE__), device_sound_interface(mconfig, *this), m_stream(nullptr), diff --git a/src/devices/sound/beep.h b/src/devices/sound/beep.h index 02f5301782b..68fddb54a29 100644 --- a/src/devices/sound/beep.h +++ b/src/devices/sound/beep.h @@ -15,7 +15,7 @@ class beep_device : public device_t, public device_sound_interface { public: - beep_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + beep_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~beep_device() { } protected: diff --git a/src/devices/sound/bsmt2000.cpp b/src/devices/sound/bsmt2000.cpp index 220ca635be3..2741f447fb5 100644 --- a/src/devices/sound/bsmt2000.cpp +++ b/src/devices/sound/bsmt2000.cpp @@ -76,7 +76,7 @@ ROM_END // bsmt2000_device - constructor //------------------------------------------------- -bsmt2000_device::bsmt2000_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +bsmt2000_device::bsmt2000_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, BSMT2000, "BSMT2000", tag, owner, clock, "bsmt2000", __FILE__), device_sound_interface(mconfig, *this), device_memory_interface(mconfig, *this), diff --git a/src/devices/sound/bsmt2000.h b/src/devices/sound/bsmt2000.h index f362928a94c..9c1470278b7 100644 --- a/src/devices/sound/bsmt2000.h +++ b/src/devices/sound/bsmt2000.h @@ -43,7 +43,7 @@ class bsmt2000_device : public device_t, public: // construction/destruction - bsmt2000_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + bsmt2000_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // inline configuration helpers static void static_set_ready_callback(device_t &device, ready_callback callback); diff --git a/src/devices/sound/c140.cpp b/src/devices/sound/c140.cpp index 22f6a3ff9c1..daaa33cd47e 100644 --- a/src/devices/sound/c140.cpp +++ b/src/devices/sound/c140.cpp @@ -86,7 +86,7 @@ static inline int limit(INT32 in) // c140_device - constructor //------------------------------------------------- -c140_device::c140_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +c140_device::c140_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, C140, "C140", tag, owner, clock, "c140", __FILE__), device_sound_interface(mconfig, *this), m_sample_rate(0), diff --git a/src/devices/sound/c140.h b/src/devices/sound/c140.h index b27a24290aa..d94818e9df7 100644 --- a/src/devices/sound/c140.h +++ b/src/devices/sound/c140.h @@ -77,7 +77,7 @@ class c140_device : public device_t, public device_sound_interface { public: - c140_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + c140_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~c140_device() { } // static configuration diff --git a/src/devices/sound/c352.cpp b/src/devices/sound/c352.cpp index 4638ceaffc4..2da83f0dd4d 100644 --- a/src/devices/sound/c352.cpp +++ b/src/devices/sound/c352.cpp @@ -45,7 +45,7 @@ ADDRESS_MAP_END // c352_device - constructor //------------------------------------------------- -c352_device::c352_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +c352_device::c352_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, C352, "C352", tag, owner, clock, "c352", __FILE__), device_sound_interface(mconfig, *this), device_memory_interface(mconfig, *this), diff --git a/src/devices/sound/c352.h b/src/devices/sound/c352.h index 0f150be41c2..d64917d3252 100644 --- a/src/devices/sound/c352.h +++ b/src/devices/sound/c352.h @@ -28,7 +28,7 @@ class c352_device : public device_t, { public: // construction/destruction - c352_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + c352_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // inline configuration helpers static void static_set_divider(device_t &device, int setting); diff --git a/src/devices/sound/c6280.cpp b/src/devices/sound/c6280.cpp index ec9a0990c49..d484b8281c0 100644 --- a/src/devices/sound/c6280.cpp +++ b/src/devices/sound/c6280.cpp @@ -231,7 +231,7 @@ WRITE8_MEMBER( c6280_device::c6280_w ) const device_type C6280 = &device_creator<c6280_device>; -c6280_device::c6280_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +c6280_device::c6280_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, C6280, "HuC6280", tag, owner, clock, "c6280", __FILE__), device_sound_interface(mconfig, *this), m_cpudevice(*this) diff --git a/src/devices/sound/c6280.h b/src/devices/sound/c6280.h index 9a92cbc3156..7b78f5efe0e 100644 --- a/src/devices/sound/c6280.h +++ b/src/devices/sound/c6280.h @@ -11,9 +11,9 @@ class c6280_device : public device_t, public device_sound_interface { public: - c6280_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + c6280_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - static void set_devicecpu_tag(device_t &device, std::string tag) { downcast<c6280_device &>(device).m_cpudevice.set_tag(tag); } + static void set_devicecpu_tag(device_t &device, const char *tag) { downcast<c6280_device &>(device).m_cpudevice.set_tag(tag); } // read/write DECLARE_READ8_MEMBER( c6280_r ); diff --git a/src/devices/sound/cdda.cpp b/src/devices/sound/cdda.cpp index 96b96ef2baa..3223142a062 100644 --- a/src/devices/sound/cdda.cpp +++ b/src/devices/sound/cdda.cpp @@ -254,7 +254,7 @@ INT16 cdda_device::get_channel_volume(int channel) const device_type CDDA = &device_creator<cdda_device>; -cdda_device::cdda_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +cdda_device::cdda_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, CDDA, "CD/DA", tag, owner, clock, "cdda", __FILE__), device_sound_interface(mconfig, *this) { diff --git a/src/devices/sound/cdda.h b/src/devices/sound/cdda.h index e9619792f09..2d9b6d86584 100644 --- a/src/devices/sound/cdda.h +++ b/src/devices/sound/cdda.h @@ -11,7 +11,7 @@ class cdda_device : public device_t, public device_sound_interface { public: - cdda_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + cdda_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); void set_cdrom(void *file); diff --git a/src/devices/sound/cdp1863.cpp b/src/devices/sound/cdp1863.cpp index 257c4f43398..63515aa7c43 100644 --- a/src/devices/sound/cdp1863.cpp +++ b/src/devices/sound/cdp1863.cpp @@ -46,7 +46,7 @@ const device_type CDP1863 = &device_creator<cdp1863_device>; // cdp1863_device - constructor //------------------------------------------------- -cdp1863_device::cdp1863_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +cdp1863_device::cdp1863_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, CDP1863, "CDP1863", tag, owner, clock, "cdp1863", __FILE__), device_sound_interface(mconfig, *this), m_stream(nullptr), diff --git a/src/devices/sound/cdp1863.h b/src/devices/sound/cdp1863.h index 013cb9d7cd0..738d6368e5f 100644 --- a/src/devices/sound/cdp1863.h +++ b/src/devices/sound/cdp1863.h @@ -47,7 +47,7 @@ class cdp1863_device : public device_t, { public: // construction/destruction - cdp1863_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + cdp1863_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // inline configuration helpers static void static_set_clock2(device_t &device, int clock2); diff --git a/src/devices/sound/cdp1864.cpp b/src/devices/sound/cdp1864.cpp index 4da872409b6..9b1d1807d96 100644 --- a/src/devices/sound/cdp1864.cpp +++ b/src/devices/sound/cdp1864.cpp @@ -56,7 +56,7 @@ const device_type CDP1864 = &device_creator<cdp1864_device>; // cdp1864_device - constructor //------------------------------------------------- -cdp1864_device::cdp1864_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +cdp1864_device::cdp1864_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, CDP1864, "CDP1864", tag, owner, clock, "cdp1864", __FILE__), device_sound_interface(mconfig, *this), device_video_interface(mconfig, *this), diff --git a/src/devices/sound/cdp1864.h b/src/devices/sound/cdp1864.h index e0c3fc44d7e..b4a311caff0 100644 --- a/src/devices/sound/cdp1864.h +++ b/src/devices/sound/cdp1864.h @@ -114,7 +114,7 @@ class cdp1864_device : public device_t, { public: // construction/destruction - cdp1864_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + cdp1864_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template<class _inlace> void set_inlace_callback(_inlace inlace) { m_read_inlace.set_callback(inlace); } template<class _irq> void set_irq_callback(_irq irq) { m_write_irq.set_callback(irq); } diff --git a/src/devices/sound/cdp1869.cpp b/src/devices/sound/cdp1869.cpp index 4db884823c8..5f70edc8cef 100644 --- a/src/devices/sound/cdp1869.cpp +++ b/src/devices/sound/cdp1869.cpp @@ -340,7 +340,7 @@ inline int cdp1869_device::get_pen(int ccb0, int ccb1, int pcb) // cdp1869_device - constructor //------------------------------------------------- -cdp1869_device::cdp1869_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +cdp1869_device::cdp1869_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, CDP1869, "RCA CDP1869", tag, owner, clock, "cdp1869", __FILE__), device_sound_interface(mconfig, *this), device_video_interface(mconfig, *this), diff --git a/src/devices/sound/cdp1869.h b/src/devices/sound/cdp1869.h index fb630ef4479..23f538fb931 100644 --- a/src/devices/sound/cdp1869.h +++ b/src/devices/sound/cdp1869.h @@ -191,7 +191,7 @@ class cdp1869_device : public device_t, { public: // construction/destruction - cdp1869_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + cdp1869_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template<class _Object> static devcb_base &set_pal_ntsc_rd_callback(device_t &device, _Object object) { return downcast<cdp1869_device &>(device).m_read_pal_ntsc.set_callback(object); } template<class _Object> static devcb_base &set_prd_wr_callback(device_t &device, _Object object) { return downcast<cdp1869_device &>(device).m_write_prd.set_callback(object); } diff --git a/src/devices/sound/cem3394.cpp b/src/devices/sound/cem3394.cpp index 24768f21201..5d345fa6507 100644 --- a/src/devices/sound/cem3394.cpp +++ b/src/devices/sound/cem3394.cpp @@ -115,7 +115,7 @@ const device_type CEM3394 = &device_creator<cem3394_device>; // cem3394_device - constructor //------------------------------------------------- -cem3394_device::cem3394_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +cem3394_device::cem3394_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, CEM3394, "CEM3394", tag, owner, clock, "cem3394", __FILE__), device_sound_interface(mconfig, *this), m_stream(nullptr), diff --git a/src/devices/sound/cem3394.h b/src/devices/sound/cem3394.h index 17d126e1e2f..88d2608bec1 100644 --- a/src/devices/sound/cem3394.h +++ b/src/devices/sound/cem3394.h @@ -47,7 +47,7 @@ class cem3394_device : public device_t, public device_sound_interface { public: - cem3394_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + cem3394_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~cem3394_device() { } static void set_ext_input_callback(device_t &device, cem3394_ext_input_delegate callback) { downcast<cem3394_device &>(device).m_ext_cb = callback; } diff --git a/src/devices/sound/dac.cpp b/src/devices/sound/dac.cpp index 166cad66794..d51b51c1410 100644 --- a/src/devices/sound/dac.cpp +++ b/src/devices/sound/dac.cpp @@ -24,7 +24,7 @@ const device_type DAC = &device_creator<dac_device>; // dac_device - constructor //------------------------------------------------- -dac_device::dac_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +dac_device::dac_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, DAC, "DAC", tag, owner, clock, "dac", __FILE__), device_sound_interface(mconfig, *this), m_stream(nullptr), diff --git a/src/devices/sound/dac.h b/src/devices/sound/dac.h index 787f6ef6bc7..bd5bdf16d62 100644 --- a/src/devices/sound/dac.h +++ b/src/devices/sound/dac.h @@ -35,7 +35,7 @@ class dac_device : public device_t, public: // construction/destruction - dac_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + dac_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // public interface INT16 output() const { return m_output; } diff --git a/src/devices/sound/digitalk.cpp b/src/devices/sound/digitalk.cpp index 4d20e4b5681..262e930bddf 100644 --- a/src/devices/sound/digitalk.cpp +++ b/src/devices/sound/digitalk.cpp @@ -263,7 +263,7 @@ static const int pitch_vals[32] = { const device_type DIGITALKER = &device_creator<digitalker_device>; -digitalker_device::digitalker_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +digitalker_device::digitalker_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, DIGITALKER, "Digitalker", tag, owner, clock, "digitalker", __FILE__), device_sound_interface(mconfig, *this), m_rom(nullptr), diff --git a/src/devices/sound/digitalk.h b/src/devices/sound/digitalk.h index 9fc10414b16..7be2a733c56 100644 --- a/src/devices/sound/digitalk.h +++ b/src/devices/sound/digitalk.h @@ -24,7 +24,7 @@ class digitalker_device : public device_t, public device_sound_interface { public: - digitalker_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + digitalker_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~digitalker_device() { } void digitalker_0_cs_w(int line); diff --git a/src/devices/sound/disc_sys.inc b/src/devices/sound/disc_sys.inc index 9098c43a3fc..92b00c30383 100644 --- a/src/devices/sound/disc_sys.inc +++ b/src/devices/sound/disc_sys.inc @@ -34,7 +34,7 @@ DISCRETE_START( dso_csvlog ) log_num = m_device->same_module_index(*this); m_sample_num = 0; - sprintf(m_name, "discrete_%s_%d.csv", m_device->tag().c_str(), log_num); + sprintf(m_name, "discrete_%s_%d.csv", m_device->tag(), log_num); m_csv_file = fopen(m_name, "w"); /* Output some header info */ fprintf(m_csv_file, "\"MAME Discrete System Node Log\"\n"); @@ -80,7 +80,7 @@ DISCRETE_START( dso_wavlog ) int log_num; log_num = m_device->same_module_index(*this); - sprintf(m_name, "discrete_%s_%d.wav", m_device->tag().c_str(), log_num); + sprintf(m_name, "discrete_%s_%d.wav", m_device->tag(), log_num); m_wavfile = wav_open(m_name, sample_rate(), active_inputs()/2); } diff --git a/src/devices/sound/discrete.cpp b/src/devices/sound/discrete.cpp index 55326a0bd7e..22b5ebe942a 100644 --- a/src/devices/sound/discrete.cpp +++ b/src/devices/sound/discrete.cpp @@ -834,7 +834,7 @@ void discrete_device::static_set_intf(device_t &device, const discrete_block *in // discrete_device - constructor //------------------------------------------------- -discrete_device::discrete_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock) +discrete_device::discrete_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, type, name, tag, owner, clock, "discrete", __FILE__), m_intf(nullptr), m_sample_rate(0), @@ -849,7 +849,7 @@ discrete_device::discrete_device(const machine_config &mconfig, device_type type { } -discrete_sound_device::discrete_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +discrete_sound_device::discrete_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : discrete_device(mconfig, DISCRETE, "DISCRETE", tag, owner, clock), device_sound_interface(mconfig, *this), m_stream(nullptr) @@ -884,7 +884,7 @@ void discrete_device::device_start() m_total_stream_updates = 0; /* create the logfile */ - sprintf(name, "discrete%s.log", this->tag().c_str()); + sprintf(name, "discrete%s.log", this->tag()); if (DISCRETE_DEBUGLOG) m_disclogfile = fopen(name, "w"); diff --git a/src/devices/sound/discrete.h b/src/devices/sound/discrete.h index a82f3c1b6db..e5145b39132 100644 --- a/src/devices/sound/discrete.h +++ b/src/devices/sound/discrete.h @@ -4284,7 +4284,7 @@ class discrete_device : public device_t protected: // construction/destruction - discrete_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock); + discrete_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock); public: // inline configuration helpers @@ -4373,7 +4373,7 @@ class discrete_sound_device : public discrete_device, { public: // construction/destruction - discrete_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + discrete_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual ~discrete_sound_device(void) { }; /* --------------------------------- */ diff --git a/src/devices/sound/dmadac.cpp b/src/devices/sound/dmadac.cpp index 769cfaf9f89..24e89835d06 100644 --- a/src/devices/sound/dmadac.cpp +++ b/src/devices/sound/dmadac.cpp @@ -198,7 +198,7 @@ void dmadac_sound_device::set_volume(UINT16 volume) const device_type DMADAC = &device_creator<dmadac_sound_device>; -dmadac_sound_device::dmadac_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +dmadac_sound_device::dmadac_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, DMADAC, "DMA-driven DAC", tag, owner, clock, "dmadac", __FILE__), device_sound_interface(mconfig, *this), m_buffer(nullptr), diff --git a/src/devices/sound/dmadac.h b/src/devices/sound/dmadac.h index 9ec4c6afd21..6e0c4f47dd6 100644 --- a/src/devices/sound/dmadac.h +++ b/src/devices/sound/dmadac.h @@ -17,7 +17,7 @@ class dmadac_sound_device : public device_t, public device_sound_interface { public: - dmadac_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + dmadac_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); void flush(); void transfer(int channel, offs_t channel_spacing, offs_t frame_spacing, offs_t total_frames, INT16 *data); diff --git a/src/devices/sound/es1373.cpp b/src/devices/sound/es1373.cpp index e1d25f9d72c..efe1abb405d 100644 --- a/src/devices/sound/es1373.cpp +++ b/src/devices/sound/es1373.cpp @@ -22,15 +22,15 @@ DEVICE_ADDRESS_MAP_START(map, 32, es1373_device) AM_RANGE(0x00, 0x3f) AM_READWRITE (reg_r, reg_w) ADDRESS_MAP_END -es1373_device::es1373_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +es1373_device::es1373_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : pci_device(mconfig, ES1373, "Creative Labs Ensoniq AudioPCI97 ES1373", tag, owner, clock, "es1373", __FILE__), device_sound_interface(mconfig, *this), m_stream(nullptr), - m_eslog(nullptr), m_tempCount(0), m_timer(nullptr), m_memory_space(nullptr), m_cpu(nullptr), + m_eslog(nullptr), m_tempCount(0), m_timer(nullptr), m_memory_space(nullptr), m_cpu_tag(nullptr), m_cpu(nullptr), m_irq_num(-1) { } -void es1373_device::set_irq_info(std::string tag, const int irq_num) +void es1373_device::set_irq_info(const char *tag, const int irq_num) { m_cpu_tag = tag; m_irq_num = irq_num; @@ -125,7 +125,7 @@ void es1373_device::device_timer(emu_timer &timer, device_timer_id tid, int para void es1373_device::sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) { if (m_dac1.enable) { - logerror("%s: sound_stream_update DAC1 not implemented yet\n", tag().c_str()); + logerror("%s: sound_stream_update DAC1 not implemented yet\n", tag()); } if (m_dac2.enable) { @@ -134,7 +134,7 @@ void es1373_device::sound_stream_update(sound_stream &stream, stream_sample_t ** if (m_adc.enable) { if (m_adc.format!=SCTRL_16BIT_MONO) { - logerror("%s: sound_stream_update Only SCTRL_16BIT_MONO recorded supported\n", tag().c_str()); + logerror("%s: sound_stream_update Only SCTRL_16BIT_MONO recorded supported\n", tag()); } else { for (int i=0; i<samples; i++) { if (m_adc.buf_count<=m_adc.buf_size) { @@ -314,7 +314,7 @@ UINT32 es1373_device::calc_size(const UINT8 &format) return 4; break; } - logerror("%s: calc_size Invalid format = %X specified\n", tag().c_str(), format); + logerror("%s: calc_size Invalid format = %X specified\n", tag(), format); return 0; } @@ -432,7 +432,7 @@ WRITE32_MEMBER(es1373_device::reg_w) } } if (0 && LOG_ES_REG) - logerror("%s: es1373_device::reg_w adc_int_en: %i dac1_int_en: %i dac2_int_en: %i\n", tag().c_str(), m_adc.int_en, m_dac1.int_en, m_dac2.int_en); + logerror("%s: es1373_device::reg_w adc_int_en: %i dac1_int_en: %i dac2_int_en: %i\n", tag(), m_adc.int_en, m_dac1.int_en, m_dac2.int_en); break; case ES_DAC2_CNT: m_dac2.buf_count = 0; diff --git a/src/devices/sound/es1373.h b/src/devices/sound/es1373.h index 704e9ae0b79..4b77bdc2898 100644 --- a/src/devices/sound/es1373.h +++ b/src/devices/sound/es1373.h @@ -95,11 +95,11 @@ struct chan_info { class es1373_device : public pci_device, public device_sound_interface { public: - es1373_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + es1373_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual void map_extra(UINT64 memory_window_start, UINT64 memory_window_end, UINT64 memory_offset, address_space *memory_space, UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space) override; - void set_irq_info(std::string tag, const int irq_num); + void set_irq_info(const char *tag, const int irq_num); DECLARE_READ32_MEMBER (reg_r); DECLARE_WRITE32_MEMBER(reg_w); @@ -123,7 +123,7 @@ private: UINT32 m_tempCount; emu_timer *m_timer; address_space *m_memory_space; - std::string m_cpu_tag; + const char *m_cpu_tag; cpu_device *m_cpu; int m_irq_num; DECLARE_ADDRESS_MAP(map, 32); diff --git a/src/devices/sound/es5503.cpp b/src/devices/sound/es5503.cpp index bc57eba8be8..8103ffbc456 100644 --- a/src/devices/sound/es5503.cpp +++ b/src/devices/sound/es5503.cpp @@ -57,7 +57,7 @@ ADDRESS_MAP_END // es5503_device - constructor //------------------------------------------------- -es5503_device::es5503_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +es5503_device::es5503_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ES5503, "Ensoniq ES5503", tag, owner, clock, "es5503", __FILE__), device_sound_interface(mconfig, *this), device_memory_interface(mconfig, *this), diff --git a/src/devices/sound/es5503.h b/src/devices/sound/es5503.h index c1b301550a8..941c56ef8c4 100644 --- a/src/devices/sound/es5503.h +++ b/src/devices/sound/es5503.h @@ -27,7 +27,7 @@ class es5503_device : public device_t, { public: // construction/destruction - es5503_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + es5503_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); static void static_set_channels(device_t &device, int channels); diff --git a/src/devices/sound/es5506.cpp b/src/devices/sound/es5506.cpp index 2a43090188f..282ee217e15 100644 --- a/src/devices/sound/es5506.cpp +++ b/src/devices/sound/es5506.cpp @@ -127,7 +127,7 @@ Ensoniq OTIS - ES5505 Ensoniq OTTO - #define CONTROL_STOPMASK (CONTROL_STOP1 | CONTROL_STOP0) -es550x_device::es550x_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +es550x_device::es550x_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_sound_interface(mconfig, *this), m_stream(nullptr), @@ -165,7 +165,7 @@ es550x_device::es550x_device(const machine_config &mconfig, device_type type, co const device_type ES5506 = &device_creator<es5506_device>; -es5506_device::es5506_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +es5506_device::es5506_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : es550x_device(mconfig, ES5506, "ES5506", tag, owner, clock, "es5506", __FILE__) { } @@ -310,7 +310,7 @@ void es550x_device::device_stop() const device_type ES5505 = &device_creator<es5505_device>; -es5505_device::es5505_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +es5505_device::es5505_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : es550x_device(mconfig, ES5505, "ES5505", tag, owner, clock, "es5505", __FILE__) { } diff --git a/src/devices/sound/es5506.h b/src/devices/sound/es5506.h index f9804a69647..4ccc9d2d3f6 100644 --- a/src/devices/sound/es5506.h +++ b/src/devices/sound/es5506.h @@ -115,7 +115,7 @@ class es550x_device : public device_t, public device_sound_interface { public: - es550x_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + es550x_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); ~es550x_device() {} static void set_region0(device_t &device, const char *region0) { downcast<es550x_device &>(device).m_region0 = region0; } @@ -186,7 +186,7 @@ protected: class es5506_device : public es550x_device { public: - es5506_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + es5506_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~es5506_device() {} DECLARE_READ8_MEMBER( read ); @@ -218,7 +218,7 @@ extern const device_type ES5506; class es5505_device : public es550x_device { public: - es5505_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + es5505_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); DECLARE_READ16_MEMBER( read ); DECLARE_WRITE16_MEMBER( write ); diff --git a/src/devices/sound/es8712.cpp b/src/devices/sound/es8712.cpp index ff5de6f0239..e7fee35bbe8 100644 --- a/src/devices/sound/es8712.cpp +++ b/src/devices/sound/es8712.cpp @@ -39,7 +39,7 @@ const device_type ES8712 = &device_creator<es8712_device>; // es8712_device - constructor //------------------------------------------------- -es8712_device::es8712_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +es8712_device::es8712_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ES8712, "ES8712", tag, owner, clock, "es8712", __FILE__), device_sound_interface(mconfig, *this), m_rom(*this, DEVICE_SELF), @@ -288,7 +288,7 @@ void es8712_device::play() /* invalid samples go here */ else { - logerror("ES871295:'%s' requested to play invalid sample range %06x-%06x\n", tag().c_str(), m_start, m_end); + logerror("ES871295:'%s' requested to play invalid sample range %06x-%06x\n", tag(), m_start, m_end); if (m_playing) { diff --git a/src/devices/sound/es8712.h b/src/devices/sound/es8712.h index bceb9b16783..74e61d232dc 100644 --- a/src/devices/sound/es8712.h +++ b/src/devices/sound/es8712.h @@ -28,7 +28,7 @@ class es8712_device : public device_t, public device_sound_interface { public: - es8712_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + es8712_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~es8712_device() { } protected: diff --git a/src/devices/sound/esqpump.cpp b/src/devices/sound/esqpump.cpp index 59f8a0ec79a..496cc5c832a 100644 --- a/src/devices/sound/esqpump.cpp +++ b/src/devices/sound/esqpump.cpp @@ -12,7 +12,7 @@ const device_type ESQ_5505_5510_PUMP = &device_creator<esq_5505_5510_pump>; -esq_5505_5510_pump::esq_5505_5510_pump(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +esq_5505_5510_pump::esq_5505_5510_pump(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ESQ_5505_5510_PUMP, "ESQ_5505_5510_PUMP", tag, owner, clock, "esq_5505_5510_pump", __FILE__), device_sound_interface(mconfig, *this), m_stream(nullptr), m_timer(nullptr), m_otis(nullptr), m_esp(nullptr), m_esp_halted(true), ticks_spent_processing(0), samples_processed(0) diff --git a/src/devices/sound/esqpump.h b/src/devices/sound/esqpump.h index 9381b6f270a..1fded404997 100644 --- a/src/devices/sound/esqpump.h +++ b/src/devices/sound/esqpump.h @@ -18,7 +18,7 @@ class esq_5505_5510_pump : public device_t, public device_sound_interface { public: - esq_5505_5510_pump(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + esq_5505_5510_pump(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); void set_otis(es5505_device *otis) { m_otis = otis; } void set_esp(es5510_device *esp) { m_esp = esp; } diff --git a/src/devices/sound/flt_rc.cpp b/src/devices/sound/flt_rc.cpp index eeb12f1f896..cf37a4fd6d8 100644 --- a/src/devices/sound/flt_rc.cpp +++ b/src/devices/sound/flt_rc.cpp @@ -16,7 +16,7 @@ const device_type FILTER_RC = &device_creator<filter_rc_device>; // filter_rc_device - constructor //------------------------------------------------- -filter_rc_device::filter_rc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +filter_rc_device::filter_rc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, FILTER_RC, "RC Filter", tag, owner, clock, "filter_rc", __FILE__), device_sound_interface(mconfig, *this), m_stream(nullptr), diff --git a/src/devices/sound/flt_rc.h b/src/devices/sound/flt_rc.h index 9f2f7fa570e..79c1abfa2ca 100644 --- a/src/devices/sound/flt_rc.h +++ b/src/devices/sound/flt_rc.h @@ -70,7 +70,7 @@ class filter_rc_device : public device_t, public device_sound_interface { public: - filter_rc_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + filter_rc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~filter_rc_device() { } // static configuration diff --git a/src/devices/sound/flt_vol.cpp b/src/devices/sound/flt_vol.cpp index 83260a4444d..e980b502b8e 100644 --- a/src/devices/sound/flt_vol.cpp +++ b/src/devices/sound/flt_vol.cpp @@ -11,7 +11,7 @@ const device_type FILTER_VOLUME = &device_creator<filter_volume_device>; // filter_volume_device - constructor //------------------------------------------------- -filter_volume_device::filter_volume_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +filter_volume_device::filter_volume_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, FILTER_VOLUME, "Volume Filter", tag, owner, clock, "filter_volume", __FILE__), device_sound_interface(mconfig, *this), m_stream(nullptr), diff --git a/src/devices/sound/flt_vol.h b/src/devices/sound/flt_vol.h index ac247bbe5ca..f9b090002c3 100644 --- a/src/devices/sound/flt_vol.h +++ b/src/devices/sound/flt_vol.h @@ -27,7 +27,7 @@ class filter_volume_device : public device_t, public device_sound_interface { public: - filter_volume_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + filter_volume_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~filter_volume_device() { } void flt_volume_set_volume(float volume); diff --git a/src/devices/sound/gaelco.cpp b/src/devices/sound/gaelco.cpp index 9202e35a7e9..6fe6b0de784 100644 --- a/src/devices/sound/gaelco.cpp +++ b/src/devices/sound/gaelco.cpp @@ -56,19 +56,21 @@ static wav_file* wavraw; // Raw waveform const device_type GAELCO_GAE1 = &device_creator<gaelco_gae1_device>; -gaelco_gae1_device::gaelco_gae1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +gaelco_gae1_device::gaelco_gae1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, GAELCO_GAE1, "Gaelco GAE1", tag, owner, clock, "gaelco_gae1", __FILE__), device_sound_interface(mconfig, *this), m_stream(nullptr), - m_snd_data(nullptr) + m_snd_data(nullptr), + m_data_tag(nullptr) { } -gaelco_gae1_device::gaelco_gae1_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +gaelco_gae1_device::gaelco_gae1_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_sound_interface(mconfig, *this), m_stream(nullptr), - m_snd_data(nullptr) + m_snd_data(nullptr), + m_data_tag(nullptr) { } @@ -268,7 +270,7 @@ void gaelco_gae1_device::device_stop() const device_type GAELCO_CG1V = &device_creator<gaelco_cg1v_device>; -gaelco_cg1v_device::gaelco_cg1v_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +gaelco_cg1v_device::gaelco_cg1v_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : gaelco_gae1_device(mconfig, GAELCO_CG1V, "Gaelco CG1V", tag, owner, clock, "gaelco_cg1v", __FILE__) { } diff --git a/src/devices/sound/gaelco.h b/src/devices/sound/gaelco.h index 57695f1eb48..8c128ab4bdc 100644 --- a/src/devices/sound/gaelco.h +++ b/src/devices/sound/gaelco.h @@ -40,11 +40,11 @@ class gaelco_gae1_device : public device_t, public device_sound_interface { public: - gaelco_gae1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - gaelco_gae1_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + gaelco_gae1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + gaelco_gae1_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); ~gaelco_gae1_device() { } - static void set_snd_data_tag(device_t &device, std::string tag) { downcast<gaelco_gae1_device &>(device).m_data_tag = tag; } + static void set_snd_data_tag(device_t &device, const char *tag) { downcast<gaelco_gae1_device &>(device).m_data_tag = tag; } static void set_bank_offsets(device_t &device, int offs1, int offs2, int offs3, int offs4) { gaelco_gae1_device &dev = downcast<gaelco_gae1_device &>(device); @@ -72,7 +72,7 @@ private: int m_banks[4]; /* start of each ROM bank */ gaelco_sound_channel m_channel[GAELCO_NUM_CHANNELS]; /* 7 stereo channels */ - std::string m_data_tag; + const char *m_data_tag; UINT16 m_sndregs[0x38]; @@ -89,7 +89,7 @@ extern const device_type GAELCO_GAE1; class gaelco_cg1v_device : public gaelco_gae1_device { public: - gaelco_cg1v_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + gaelco_cg1v_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; extern const device_type GAELCO_CG1V; diff --git a/src/devices/sound/hc55516.cpp b/src/devices/sound/hc55516.cpp index 256e9c427e8..5c291804a90 100644 --- a/src/devices/sound/hc55516.cpp +++ b/src/devices/sound/hc55516.cpp @@ -25,7 +25,7 @@ const device_type HC55516 = &device_creator<hc55516_device>; -hc55516_device::hc55516_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +hc55516_device::hc55516_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, HC55516, "HC-55516", tag, owner, clock, "hc55516", __FILE__), device_sound_interface(mconfig, *this), m_channel(nullptr), @@ -45,7 +45,7 @@ hc55516_device::hc55516_device(const machine_config &mconfig, std::string tag, d m_leak(0) { } -hc55516_device::hc55516_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +hc55516_device::hc55516_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_sound_interface(mconfig, *this), m_channel(nullptr), @@ -96,7 +96,7 @@ void hc55516_device::device_reset() const device_type MC3417 = &device_creator<mc3417_device>; -mc3417_device::mc3417_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +mc3417_device::mc3417_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : hc55516_device(mconfig, MC3417, "MC3417", tag, owner, clock, "mc3417", __FILE__) { } @@ -113,7 +113,7 @@ void mc3417_device::device_start() const device_type MC3418 = &device_creator<mc3418_device>; -mc3418_device::mc3418_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +mc3418_device::mc3418_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : hc55516_device(mconfig, MC3418, "MC3418", tag, owner, clock, "mc3418", __FILE__) { } diff --git a/src/devices/sound/hc55516.h b/src/devices/sound/hc55516.h index f676afec8ee..cabfa02e92a 100644 --- a/src/devices/sound/hc55516.h +++ b/src/devices/sound/hc55516.h @@ -9,8 +9,8 @@ class hc55516_device : public device_t, public device_sound_interface { public: - hc55516_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - hc55516_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + hc55516_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + hc55516_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); ~hc55516_device() {} /* sets the digit (0 or 1) */ @@ -66,7 +66,7 @@ extern const device_type HC55516; class mc3417_device : public hc55516_device { public: - mc3417_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + mc3417_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: // device-level overrides virtual void device_start() override; @@ -80,7 +80,7 @@ extern const device_type MC3417; class mc3418_device : public hc55516_device { public: - mc3418_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + mc3418_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: // device-level overrides virtual void device_start() override; diff --git a/src/devices/sound/i5000.cpp b/src/devices/sound/i5000.cpp index 7e46107d84a..11dc147f0b0 100644 --- a/src/devices/sound/i5000.cpp +++ b/src/devices/sound/i5000.cpp @@ -23,7 +23,7 @@ // device type definition const device_type I5000_SND = &device_creator<i5000snd_device>; -i5000snd_device::i5000snd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +i5000snd_device::i5000snd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, I5000_SND, "I5000", tag, owner, clock, "i5000snd", __FILE__), device_sound_interface(mconfig, *this), m_stream(nullptr), m_rom_base(nullptr), m_rom_mask(0) { diff --git a/src/devices/sound/i5000.h b/src/devices/sound/i5000.h index 3fd00b6eeee..fce3659d072 100644 --- a/src/devices/sound/i5000.h +++ b/src/devices/sound/i5000.h @@ -34,7 +34,7 @@ class i5000snd_device : public device_t, { public: // construction/destruction - i5000snd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + i5000snd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); DECLARE_READ16_MEMBER(read); DECLARE_WRITE16_MEMBER(write); diff --git a/src/devices/sound/ics2115.cpp b/src/devices/sound/ics2115.cpp index 4c5411d004f..f42d1ee52e2 100644 --- a/src/devices/sound/ics2115.cpp +++ b/src/devices/sound/ics2115.cpp @@ -17,7 +17,7 @@ // device type definition const device_type ICS2115 = &device_creator<ics2115_device>; -ics2115_device::ics2115_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ics2115_device::ics2115_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ICS2115, "ICS2115", tag, owner, clock, "ics2115", __FILE__), device_sound_interface(mconfig, *this), m_stream(nullptr), m_rom(*this, DEVICE_SELF), diff --git a/src/devices/sound/ics2115.h b/src/devices/sound/ics2115.h index f8ac2f65a8e..ee6bab23934 100644 --- a/src/devices/sound/ics2115.h +++ b/src/devices/sound/ics2115.h @@ -90,7 +90,7 @@ class ics2115_device : public device_t, public device_sound_interface { public: // construction/destruction - ics2115_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + ics2115_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template<class _Object> static devcb_base &set_irq_callback(device_t &device, _Object object) { return downcast<ics2115_device &>(device).m_irq_cb.set_callback(object); } diff --git a/src/devices/sound/iremga20.cpp b/src/devices/sound/iremga20.cpp index 69e8ddaff4c..b913546337e 100644 --- a/src/devices/sound/iremga20.cpp +++ b/src/devices/sound/iremga20.cpp @@ -46,7 +46,7 @@ const device_type IREMGA20 = &device_creator<iremga20_device>; // iremga20_device - constructor //------------------------------------------------- -iremga20_device::iremga20_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +iremga20_device::iremga20_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, IREMGA20, "Irem GA20", tag, owner, clock, "iremga20", __FILE__), device_sound_interface(mconfig, *this), m_rom(nullptr), diff --git a/src/devices/sound/iremga20.h b/src/devices/sound/iremga20.h index 259402fb696..1b6d73674e2 100644 --- a/src/devices/sound/iremga20.h +++ b/src/devices/sound/iremga20.h @@ -46,7 +46,7 @@ class iremga20_device : public device_t, public device_sound_interface { public: - iremga20_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + iremga20_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~iremga20_device() { } protected: diff --git a/src/devices/sound/k005289.cpp b/src/devices/sound/k005289.cpp index f7f058a5d3b..b49d97b1555 100644 --- a/src/devices/sound/k005289.cpp +++ b/src/devices/sound/k005289.cpp @@ -53,7 +53,7 @@ const device_type K005289 = &device_creator<k005289_device>; // k005289_device - constructor //------------------------------------------------- -k005289_device::k005289_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +k005289_device::k005289_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, K005289, "K005289 SCC", tag, owner, clock, "k005289", __FILE__), device_sound_interface(mconfig, *this), m_sound_prom(nullptr), diff --git a/src/devices/sound/k005289.h b/src/devices/sound/k005289.h index 4c00df74e8d..24f84638263 100644 --- a/src/devices/sound/k005289.h +++ b/src/devices/sound/k005289.h @@ -22,7 +22,7 @@ class k005289_device : public device_t, public device_sound_interface { public: - k005289_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + k005289_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~k005289_device() { } protected: diff --git a/src/devices/sound/k007232.cpp b/src/devices/sound/k007232.cpp index 6b692db5297..cc25519e4b9 100644 --- a/src/devices/sound/k007232.cpp +++ b/src/devices/sound/k007232.cpp @@ -147,7 +147,7 @@ static const float kdaca_fn[][2] = { const device_type K007232 = &device_creator<k007232_device>; -k007232_device::k007232_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +k007232_device::k007232_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, K007232, "K007232 PCM Controller", tag, owner, clock, "k007232", __FILE__), device_sound_interface(mconfig, *this), m_rom(*this, DEVICE_SELF), diff --git a/src/devices/sound/k007232.h b/src/devices/sound/k007232.h index 7fc09ebcf30..31ab2f4f3a5 100644 --- a/src/devices/sound/k007232.h +++ b/src/devices/sound/k007232.h @@ -19,7 +19,7 @@ class k007232_device : public device_t, public device_sound_interface { public: - k007232_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + k007232_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~k007232_device() {} template<class _Object> static devcb_base &set_port_write_handler(device_t &device, _Object object) { return downcast<k007232_device &>(device).m_port_write_handler.set_callback(object); } diff --git a/src/devices/sound/k051649.cpp b/src/devices/sound/k051649.cpp index 6db3f94b83d..dde61572d44 100644 --- a/src/devices/sound/k051649.cpp +++ b/src/devices/sound/k051649.cpp @@ -43,7 +43,7 @@ const device_type K051649 = &device_creator<k051649_device>; // k051649_device - constructor //------------------------------------------------- -k051649_device::k051649_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +k051649_device::k051649_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, K051649, "K051649 SCC1", tag, owner, clock, "k051649", __FILE__), device_sound_interface(mconfig, *this), m_stream(nullptr), diff --git a/src/devices/sound/k051649.h b/src/devices/sound/k051649.h index 09b156e7a1b..f5e4997f02c 100644 --- a/src/devices/sound/k051649.h +++ b/src/devices/sound/k051649.h @@ -46,7 +46,7 @@ class k051649_device : public device_t, public device_sound_interface { public: - k051649_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + k051649_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~k051649_device() { } protected: diff --git a/src/devices/sound/k053260.cpp b/src/devices/sound/k053260.cpp index 8780a873e0b..f3ebc4b2445 100644 --- a/src/devices/sound/k053260.cpp +++ b/src/devices/sound/k053260.cpp @@ -73,9 +73,10 @@ const device_type K053260 = &device_creator<k053260_device>; // k053260_device - constructor //------------------------------------------------- -k053260_device::k053260_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +k053260_device::k053260_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, K053260, "K053260 KDSC", tag, owner, clock, "k053260", __FILE__), device_sound_interface(mconfig, *this), + m_rgnoverride(nullptr), m_stream(nullptr), m_rom(nullptr), m_rom_size(0), @@ -92,7 +93,7 @@ k053260_device::k053260_device(const machine_config &mconfig, std::string tag, d void k053260_device::device_start() { - memory_region *ROM = (!m_rgnoverride.empty()) ? owner()->memregion(m_rgnoverride) : region(); + memory_region *ROM = (m_rgnoverride) ? owner()->memregion(m_rgnoverride) : region(); m_rom = ROM->base(); m_rom_size = ROM->bytes(); diff --git a/src/devices/sound/k053260.h b/src/devices/sound/k053260.h index 2aba303d873..ace87855740 100644 --- a/src/devices/sound/k053260.h +++ b/src/devices/sound/k053260.h @@ -35,10 +35,10 @@ class k053260_device : public device_t, public device_sound_interface { public: - k053260_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + k053260_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~k053260_device() { } - static void set_region_tag(device_t &device, std::string tag) { downcast<k053260_device &>(device).m_rgnoverride = tag; } + static void set_region_tag(device_t &device, const char *tag) { downcast<k053260_device &>(device).m_rgnoverride = tag; } DECLARE_READ8_MEMBER( main_read ); DECLARE_WRITE8_MEMBER( main_write ); @@ -55,7 +55,7 @@ protected: private: // configuration - std::string m_rgnoverride; + const char * m_rgnoverride; sound_stream * m_stream; UINT8 * m_rom; diff --git a/src/devices/sound/k054539.cpp b/src/devices/sound/k054539.cpp index 86d55ee7a95..5270f5b80d6 100644 --- a/src/devices/sound/k054539.cpp +++ b/src/devices/sound/k054539.cpp @@ -17,7 +17,7 @@ const device_type K054539 = &device_creator<k054539_device>; #define VERBOSE 0 #define LOG(x) do { if (VERBOSE) logerror x; } while (0) -k054539_device::k054539_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +k054539_device::k054539_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, K054539, "K054539 ADPCM", tag, owner, clock, "k054539", __FILE__), device_sound_interface(mconfig, *this), flags(0), ram(nullptr), reverb_pos(0), cur_ptr(0), cur_limit(0), cur_zone(nullptr), rom(nullptr), rom_size(0), rom_mask(0), stream(nullptr), m_timer(nullptr), m_timer_state(0), diff --git a/src/devices/sound/k054539.h b/src/devices/sound/k054539.h index 27a78c0066a..fd196d306b8 100644 --- a/src/devices/sound/k054539.h +++ b/src/devices/sound/k054539.h @@ -42,7 +42,7 @@ public: }; // construction/destruction - k054539_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + k054539_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers static void set_analog_callback(device_t &device, k054539_cb_delegate callback) { downcast<k054539_device &>(device).m_apan_cb = callback; } diff --git a/src/devices/sound/k056800.cpp b/src/devices/sound/k056800.cpp index 6e4411f9bcf..beac3a67b73 100644 --- a/src/devices/sound/k056800.cpp +++ b/src/devices/sound/k056800.cpp @@ -20,7 +20,7 @@ const device_type K056800 = &device_creator<k056800_device>; // k056800_device - constructor //------------------------------------------------- -k056800_device::k056800_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +k056800_device::k056800_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, K056800, "K056800 MIRAC", tag, owner, clock, "k056800", __FILE__), m_int_pending(false), m_int_enabled(false), m_int_handler(*this) { diff --git a/src/devices/sound/k056800.h b/src/devices/sound/k056800.h index dbedadef4e9..8126fa6b868 100644 --- a/src/devices/sound/k056800.h +++ b/src/devices/sound/k056800.h @@ -29,7 +29,7 @@ class k056800_device : public device_t { public: // construction/destruction - k056800_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + k056800_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers template<class _Object> static devcb_base &set_int_handler(device_t &device, _Object object) { return downcast<k056800_device &>(device).m_int_handler.set_callback(object); } diff --git a/src/devices/sound/l7a1045_l6028_dsp_a.cpp b/src/devices/sound/l7a1045_l6028_dsp_a.cpp index 1d9a59b85f2..ca30c79e5fc 100644 --- a/src/devices/sound/l7a1045_l6028_dsp_a.cpp +++ b/src/devices/sound/l7a1045_l6028_dsp_a.cpp @@ -100,7 +100,7 @@ const device_type L7A1045 = &device_creator<l7a1045_sound_device>; // l7a1045_sound_device - constructor //------------------------------------------------- -l7a1045_sound_device::l7a1045_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +l7a1045_sound_device::l7a1045_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, L7A1045, "L7A1045 L6028 DSP-A", tag, owner, clock, "l7a1045_custom", __FILE__), device_sound_interface(mconfig, *this), m_stream(nullptr), diff --git a/src/devices/sound/l7a1045_l6028_dsp_a.h b/src/devices/sound/l7a1045_l6028_dsp_a.h index 59ccce387aa..e97edefc814 100644 --- a/src/devices/sound/l7a1045_l6028_dsp_a.h +++ b/src/devices/sound/l7a1045_l6028_dsp_a.h @@ -29,7 +29,7 @@ class l7a1045_sound_device : public device_t, public device_sound_interface { public: - l7a1045_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + l7a1045_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~l7a1045_sound_device() { } // void set_base(INT8* base) { m_base = base; } diff --git a/src/devices/sound/lmc1992.cpp b/src/devices/sound/lmc1992.cpp index c03a7509f7e..f4007ea875d 100644 --- a/src/devices/sound/lmc1992.cpp +++ b/src/devices/sound/lmc1992.cpp @@ -82,47 +82,47 @@ inline void lmc1992_device::execute_command(int addr, int data) case FUNCTION_INPUT_SELECT: if (data == INPUT_SELECT_OPEN) { - if (LOG) logerror("LMC1992 '%s' Input Select : OPEN\n", tag().c_str()); + if (LOG) logerror("LMC1992 '%s' Input Select : OPEN\n", tag()); } else { - if (LOG) logerror("LMC1992 '%s' Input Select : INPUT%u\n", tag().c_str(), data); + if (LOG) logerror("LMC1992 '%s' Input Select : INPUT%u\n", tag(), data); } m_input = data; break; case FUNCTION_BASS: - if (LOG) logerror("LMC1992 '%s' Bass : %i dB\n", tag().c_str(), -40 + (data * 2)); + if (LOG) logerror("LMC1992 '%s' Bass : %i dB\n", tag(), -40 + (data * 2)); m_bass = data; break; case FUNCTION_TREBLE: - if (LOG) logerror("LMC1992 '%s' Treble : %i dB\n", tag().c_str(), -40 + (data * 2)); + if (LOG) logerror("LMC1992 '%s' Treble : %i dB\n", tag(), -40 + (data * 2)); m_treble = data; break; case FUNCTION_VOLUME: - if (LOG) logerror("LMC1992 '%s' Volume : %i dB\n", tag().c_str(), -80 + (data * 2)); + if (LOG) logerror("LMC1992 '%s' Volume : %i dB\n", tag(), -80 + (data * 2)); m_volume = data; break; case FUNCTION_RIGHT_FRONT_FADER: - if (LOG) logerror("LMC1992 '%s' Right Front Fader : %i dB\n", tag().c_str(), -40 + (data * 2)); + if (LOG) logerror("LMC1992 '%s' Right Front Fader : %i dB\n", tag(), -40 + (data * 2)); m_fader_rf = data; break; case FUNCTION_LEFT_FRONT_FADER: - if (LOG) logerror("LMC1992 '%s' Left Front Fader : %i dB\n", tag().c_str(), -40 + (data * 2)); + if (LOG) logerror("LMC1992 '%s' Left Front Fader : %i dB\n", tag(), -40 + (data * 2)); m_fader_lf = data; break; case FUNCTION_RIGHT_REAR_FADER: - if (LOG) logerror("LMC1992 '%s' Right Rear Fader : %i dB\n", tag().c_str(), -40 + (data * 2)); + if (LOG) logerror("LMC1992 '%s' Right Rear Fader : %i dB\n", tag(), -40 + (data * 2)); m_fader_rr = data; break; case FUNCTION_LEFT_REAR_FADER: - if (LOG) logerror("LMC1992 '%s' Left Rear Fader : %i dB\n", tag().c_str(), -40 + (data * 2)); + if (LOG) logerror("LMC1992 '%s' Left Rear Fader : %i dB\n", tag(), -40 + (data * 2)); m_fader_lr = data; break; } @@ -138,7 +138,7 @@ inline void lmc1992_device::execute_command(int addr, int data) // lmc1992_device - constructor //------------------------------------------------- -lmc1992_device::lmc1992_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +lmc1992_device::lmc1992_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, LMC1992, "LMC1992", tag, owner, clock, "lmc1992", __FILE__), device_sound_interface(mconfig, *this) { diff --git a/src/devices/sound/lmc1992.h b/src/devices/sound/lmc1992.h index 7fe0b9c00f6..198b8e46dd3 100644 --- a/src/devices/sound/lmc1992.h +++ b/src/devices/sound/lmc1992.h @@ -71,7 +71,7 @@ class lmc1992_device : public device_t, { public: // construction/destruction - lmc1992_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + lmc1992_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); DECLARE_WRITE_LINE_MEMBER( clock_w ); DECLARE_WRITE_LINE_MEMBER( data_w ); diff --git a/src/devices/sound/mas3507d.cpp b/src/devices/sound/mas3507d.cpp index bee766e0695..7b081d0a4bf 100644 --- a/src/devices/sound/mas3507d.cpp +++ b/src/devices/sound/mas3507d.cpp @@ -10,7 +10,7 @@ // device type definition const device_type MAS3507D = &device_creator<mas3507d_device>; -mas3507d_device::mas3507d_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +mas3507d_device::mas3507d_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, MAS3507D, "MAS3507D", tag, owner, clock, "mas3507d", __FILE__), device_sound_interface(mconfig, *this), i2c_bus_state(), i2c_bus_address(), i2c_scli(false), i2c_sclo(false), i2c_sdai(false), i2c_sdao(false), i2c_bus_curbit(0), i2c_bus_curval(0), i2c_subdest(), i2c_command(), i2c_bytecount(0), i2c_io_bank(0), i2c_io_adr(0), i2c_io_count(0), i2c_io_val(0) diff --git a/src/devices/sound/mas3507d.h b/src/devices/sound/mas3507d.h index 81e401bc4a5..1244f152ede 100644 --- a/src/devices/sound/mas3507d.h +++ b/src/devices/sound/mas3507d.h @@ -24,7 +24,7 @@ class mas3507d_device : public device_t, public device_sound_interface { public: // construction/destruction - mas3507d_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + mas3507d_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); int i2c_scl_r(); int i2c_sda_r(); diff --git a/src/devices/sound/mos6560.cpp b/src/devices/sound/mos6560.cpp index 5e9e0cdff36..f7c31e96ea9 100644 --- a/src/devices/sound/mos6560.cpp +++ b/src/devices/sound/mos6560.cpp @@ -688,7 +688,7 @@ static ADDRESS_MAP_START( mos6560_colorram_map, AS_1, 8, mos6560_device ) AM_RANGE(0x000, 0x3ff) AM_RAM ADDRESS_MAP_END -mos6560_device::mos6560_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source) +mos6560_device::mos6560_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_memory_interface(mconfig, *this), device_sound_interface(mconfig, *this), @@ -701,7 +701,7 @@ mos6560_device::mos6560_device(const machine_config &mconfig, device_type type, { } -mos6560_device::mos6560_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +mos6560_device::mos6560_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, MOS6560, "MOS6560", tag, owner, clock, "mos6560", __FILE__), device_memory_interface(mconfig, *this), device_sound_interface(mconfig, *this), @@ -714,10 +714,10 @@ mos6560_device::mos6560_device(const machine_config &mconfig, std::string tag, d { } -mos6561_device::mos6561_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +mos6561_device::mos6561_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :mos6560_device(mconfig, MOS6561, "MOS6561", tag, owner, clock, TYPE_6561, "mos6561", __FILE__) { } -mos656x_attack_ufo_device::mos656x_attack_ufo_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +mos656x_attack_ufo_device::mos656x_attack_ufo_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :mos6560_device(mconfig, MOS656X_ATTACK_UFO, "MOS656X", tag, owner, clock, TYPE_ATTACK_UFO, "mos656x_attack_ufo", __FILE__) { } diff --git a/src/devices/sound/mos6560.h b/src/devices/sound/mos6560.h index 202f71385b4..d84897027d5 100644 --- a/src/devices/sound/mos6560.h +++ b/src/devices/sound/mos6560.h @@ -135,8 +135,8 @@ class mos6560_device : public device_t, public device_video_interface { public: - mos6560_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source); - mos6560_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + mos6560_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source); + mos6560_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template<class _Object> static devcb_base &set_potx_rd_callback(device_t &device, _Object object) { return downcast<mos6560_device &>(device).m_read_potx.set_callback(object); } template<class _Object> static devcb_base &set_poty_rd_callback(device_t &device, _Object object) { return downcast<mos6560_device &>(device).m_read_poty.set_callback(object); } @@ -236,7 +236,7 @@ class mos6561_device : public mos6560_device { public: // construction/destruction - mos6561_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + mos6561_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; @@ -246,7 +246,7 @@ class mos656x_attack_ufo_device : public mos6560_device { public: // construction/destruction - mos656x_attack_ufo_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + mos656x_attack_ufo_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; diff --git a/src/devices/sound/mos6581.cpp b/src/devices/sound/mos6581.cpp index 163f337afeb..6f9a4ae24cb 100644 --- a/src/devices/sound/mos6581.cpp +++ b/src/devices/sound/mos6581.cpp @@ -37,7 +37,7 @@ const device_type MOS8580 = &device_creator<mos8580_device>; // mos6581_device - constructor //------------------------------------------------- -mos6581_device::mos6581_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source) +mos6581_device::mos6581_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_sound_interface(mconfig, *this), m_read_potx(*this), @@ -48,7 +48,7 @@ mos6581_device::mos6581_device(const machine_config &mconfig, device_type type, m_token = global_alloc_clear<SID6581_t>(); } -mos6581_device::mos6581_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +mos6581_device::mos6581_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, MOS6581, "MOS6581", tag, owner, clock, "mos6581", __FILE__), device_sound_interface(mconfig, *this), m_read_potx(*this), @@ -68,7 +68,7 @@ mos6581_device::~mos6581_device() // mos8580_device - constructor //------------------------------------------------- -mos8580_device::mos8580_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +mos8580_device::mos8580_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : mos6581_device(mconfig, MOS8580, "MOS8580", tag, owner, clock, TYPE_8580, "mos8580", __FILE__) { } diff --git a/src/devices/sound/mos6581.h b/src/devices/sound/mos6581.h index 8a4a859b321..f0e31e7dab0 100644 --- a/src/devices/sound/mos6581.h +++ b/src/devices/sound/mos6581.h @@ -56,8 +56,8 @@ class mos6581_device : public device_t, public device_sound_interface { public: - mos6581_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source); - mos6581_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + mos6581_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source); + mos6581_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~mos6581_device(); template<class _Object> static devcb_base &set_potx_rd_callback(device_t &device, _Object object) { return downcast<mos6581_device &>(device).m_read_potx.set_callback(object); } @@ -97,7 +97,7 @@ private: class mos8580_device : public mos6581_device { public: - mos8580_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + mos8580_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; diff --git a/src/devices/sound/mos7360.cpp b/src/devices/sound/mos7360.cpp index 103bc3a68db..6478d931111 100644 --- a/src/devices/sound/mos7360.cpp +++ b/src/devices/sound/mos7360.cpp @@ -253,7 +253,7 @@ inline UINT8 mos7360_device::read_rom(offs_t offset) // mos7360_device - constructor //------------------------------------------------- -mos7360_device::mos7360_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +mos7360_device::mos7360_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, MOS7360, "MOS7360", tag, owner, clock, "mos7360", __FILE__), device_memory_interface(mconfig, *this), device_sound_interface(mconfig, *this), diff --git a/src/devices/sound/mos7360.h b/src/devices/sound/mos7360.h index aea354b8ce6..cba7b398762 100644 --- a/src/devices/sound/mos7360.h +++ b/src/devices/sound/mos7360.h @@ -94,8 +94,8 @@ class mos7360_device : public device_t, { public: // construction/destruction - //mos7360_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock); - mos7360_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + //mos7360_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock); + mos7360_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template<class _irq, class _k> void set_callbacks(const char *cpu_tag, _irq irq, _k k) { m_cpu_tag = cpu_tag; diff --git a/src/devices/sound/msm5205.cpp b/src/devices/sound/msm5205.cpp index fc88a05cceb..ae925a513b8 100644 --- a/src/devices/sound/msm5205.cpp +++ b/src/devices/sound/msm5205.cpp @@ -57,7 +57,7 @@ const device_type MSM5205 = &device_creator<msm5205_device>; const device_type MSM6585 = &device_creator<msm6585_device>; -msm5205_device::msm5205_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +msm5205_device::msm5205_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, MSM5205, "MSM5205", tag, owner, clock, "msm5205", __FILE__), device_sound_interface(mconfig, *this), m_prescaler(0), @@ -67,7 +67,7 @@ msm5205_device::msm5205_device(const machine_config &mconfig, std::string tag, d { } -msm5205_device::msm5205_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +msm5205_device::msm5205_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_sound_interface(mconfig, *this), m_prescaler(0), @@ -78,7 +78,7 @@ msm5205_device::msm5205_device(const machine_config &mconfig, device_type type, } -msm6585_device::msm6585_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +msm6585_device::msm6585_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : msm5205_device(mconfig, MSM6585, "MSM6585", tag, owner, clock, "msm6585", __FILE__) { } @@ -219,7 +219,7 @@ TIMER_CALLBACK_MEMBER( msm5205_device::vclk_callback ) void msm5205_device::vclk_w(int vclk) { if (m_prescaler != 0) - logerror("error: msm5205_vclk_w() called with chip = '%s', but VCLK selected master mode\n", this->device().tag().c_str()); + logerror("error: msm5205_vclk_w() called with chip = '%s', but VCLK selected master mode\n", this->device().tag()); else { if (m_vclk != vclk) diff --git a/src/devices/sound/msm5205.h b/src/devices/sound/msm5205.h index 0c8283ebbc1..6730fea7b88 100644 --- a/src/devices/sound/msm5205.h +++ b/src/devices/sound/msm5205.h @@ -43,8 +43,8 @@ class msm5205_device : public device_t, public device_sound_interface { public: - msm5205_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - msm5205_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + msm5205_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + msm5205_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); ~msm5205_device() {} static void set_prescaler_selector(device_t &device, int select) { downcast<msm5205_device &>(device).m_select = select; } @@ -97,7 +97,7 @@ extern const device_type MSM5205; class msm6585_device : public msm5205_device { public: - msm6585_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + msm6585_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // sound stream update overrides virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override; diff --git a/src/devices/sound/msm5232.cpp b/src/devices/sound/msm5232.cpp index 71a72d39e35..5d3f2ddf8b0 100644 --- a/src/devices/sound/msm5232.cpp +++ b/src/devices/sound/msm5232.cpp @@ -13,7 +13,7 @@ const device_type MSM5232 = &device_creator<msm5232_device>; -msm5232_device::msm5232_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +msm5232_device::msm5232_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, MSM5232, "MSM5232", tag, owner, clock, "msm5232", __FILE__), device_sound_interface(mconfig, *this), m_stream(nullptr), m_noise_cnt(0), m_noise_step(0), m_noise_rng(0), m_noise_clocks(0), m_UpdateStep(0), m_control1(0), m_control2(0), m_gate(0), m_chip_clock(0), m_rate(0), m_gate_handler_cb(*this) diff --git a/src/devices/sound/msm5232.h b/src/devices/sound/msm5232.h index f5486860f8a..5edb00b6cff 100644 --- a/src/devices/sound/msm5232.h +++ b/src/devices/sound/msm5232.h @@ -45,7 +45,7 @@ class msm5232_device : public device_t, public device_sound_interface { public: - msm5232_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + msm5232_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~msm5232_device() {} static void static_set_capacitors(device_t &device, double cap1, double cap2, double cap3, double cap4, double cap5, double cap6, double cap7, double cap8); diff --git a/src/devices/sound/multipcm.cpp b/src/devices/sound/multipcm.cpp index f5967947d45..0ce61d419f7 100644 --- a/src/devices/sound/multipcm.cpp +++ b/src/devices/sound/multipcm.cpp @@ -453,7 +453,7 @@ static ADDRESS_MAP_START( multipcm, AS_0, 8, multipcm_device ) AM_RANGE(0x000000, 0x3fffff) AM_ROM ADDRESS_MAP_END -multipcm_device::multipcm_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +multipcm_device::multipcm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, MULTIPCM, "Sega/Yamaha 315-5560", tag, owner, clock, "multipcm", __FILE__), device_sound_interface(mconfig, *this), device_memory_interface(mconfig, *this), diff --git a/src/devices/sound/multipcm.h b/src/devices/sound/multipcm.h index db87d64b2cf..3abb6bd214e 100644 --- a/src/devices/sound/multipcm.h +++ b/src/devices/sound/multipcm.h @@ -10,7 +10,7 @@ class multipcm_device : public device_t, public device_memory_interface { public: - multipcm_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + multipcm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~multipcm_device() {} DECLARE_WRITE8_MEMBER( write ); diff --git a/src/devices/sound/n63701x.cpp b/src/devices/sound/n63701x.cpp index 2cd62df8bd3..d544eb6e4ee 100644 --- a/src/devices/sound/n63701x.cpp +++ b/src/devices/sound/n63701x.cpp @@ -31,7 +31,7 @@ static const int vol_table[4] = { 26, 84, 200, 258 }; // device type definition const device_type NAMCO_63701X = &device_creator<namco_63701x_device>; -namco_63701x_device::namco_63701x_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +namco_63701x_device::namco_63701x_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, NAMCO_63701X, "Namco 63701X", tag, owner, clock, "namco_63701x", __FILE__), device_sound_interface(mconfig, *this), m_rom(*this, DEVICE_SELF), diff --git a/src/devices/sound/n63701x.h b/src/devices/sound/n63701x.h index 70cc9df3c02..430406b3078 100644 --- a/src/devices/sound/n63701x.h +++ b/src/devices/sound/n63701x.h @@ -44,7 +44,7 @@ class namco_63701x_device : public device_t, public device_sound_interface { public: - namco_63701x_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + namco_63701x_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~namco_63701x_device() { } protected: diff --git a/src/devices/sound/namco.cpp b/src/devices/sound/namco.cpp index 69632ccf1fb..070ae056597 100644 --- a/src/devices/sound/namco.cpp +++ b/src/devices/sound/namco.cpp @@ -35,7 +35,7 @@ const device_type NAMCO = &device_creator<namco_device>; const device_type NAMCO_15XX = &device_creator<namco_15xx_device>; const device_type NAMCO_CUS30 = &device_creator<namco_cus30_device>; -namco_audio_device::namco_audio_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +namco_audio_device::namco_audio_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__), device_sound_interface(mconfig, *this), m_last_channel(nullptr), @@ -52,17 +52,17 @@ namco_audio_device::namco_audio_device(const machine_config &mconfig, device_typ { } -namco_device::namco_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +namco_device::namco_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : namco_audio_device(mconfig, NAMCO, "Namco", tag, owner, clock, "namco", __FILE__) { } -namco_15xx_device::namco_15xx_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +namco_15xx_device::namco_15xx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :namco_audio_device(mconfig, NAMCO_15XX, "Namco 15XX", tag, owner, clock, "namco_15xx", __FILE__) { } -namco_cus30_device::namco_cus30_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +namco_cus30_device::namco_cus30_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : namco_audio_device(mconfig, NAMCO_CUS30, "Namco CUS30", tag, owner, clock, "namco_cus30", __FILE__) { } diff --git a/src/devices/sound/namco.h b/src/devices/sound/namco.h index 27cd8d85fef..e79484e4f4a 100644 --- a/src/devices/sound/namco.h +++ b/src/devices/sound/namco.h @@ -36,7 +36,7 @@ class namco_audio_device : public device_t, public device_sound_interface { public: - namco_audio_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + namco_audio_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); ~namco_audio_device() {} // static configuration @@ -79,7 +79,7 @@ protected: class namco_device : public namco_audio_device { public: - namco_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + namco_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); DECLARE_WRITE8_MEMBER( pacman_sound_enable_w ); DECLARE_WRITE8_MEMBER( pacman_sound_w ); @@ -98,7 +98,7 @@ extern const device_type NAMCO; class namco_15xx_device : public namco_audio_device { public: - namco_15xx_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + namco_15xx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); DECLARE_WRITE8_MEMBER( namco_15xx_w ); DECLARE_READ8_MEMBER( sharedram_r ); @@ -115,7 +115,7 @@ extern const device_type NAMCO_15XX; class namco_cus30_device : public namco_audio_device { public: - namco_cus30_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + namco_cus30_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); DECLARE_WRITE8_MEMBER( namcos1_cus30_w ); /* wavedata + sound registers + RAM */ DECLARE_READ8_MEMBER( namcos1_cus30_r ); diff --git a/src/devices/sound/nes_apu.cpp b/src/devices/sound/nes_apu.cpp index c5edec692d4..3792311c77e 100644 --- a/src/devices/sound/nes_apu.cpp +++ b/src/devices/sound/nes_apu.cpp @@ -103,7 +103,7 @@ static void create_noise(uint8 *buf, const int bits, int size) const device_type NES_APU = &device_creator<nesapu_device>; -nesapu_device::nesapu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +nesapu_device::nesapu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, NES_APU, "N2A03 APU", tag, owner, clock, "nesapu", __FILE__), device_sound_interface(mconfig, *this), m_apu_incsize(0.0), @@ -134,10 +134,10 @@ nesapu_device::nesapu_device(const machine_config &mconfig, std::string tag, dev } } -void nesapu_device::set_tag_memory(std::string tag) +void nesapu_device::set_tag_memory(const char *tag) { /* Initialize individual chips */ - if (!tag.empty()) + if (tag) (m_APU.dpcm).memory = &machine().device(tag)->memory().space(AS_PROGRAM); } diff --git a/src/devices/sound/nes_apu.h b/src/devices/sound/nes_apu.h index d158c39b830..6c1b51cc8fd 100644 --- a/src/devices/sound/nes_apu.h +++ b/src/devices/sound/nes_apu.h @@ -47,11 +47,11 @@ class nesapu_device : public device_t, public device_sound_interface { public: - nesapu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + nesapu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~nesapu_device() {} - static void set_cpu_tag(device_t &device, std::string tag) { downcast<nesapu_device &>(device).m_cpu_tag = tag; } - void set_tag_memory(std::string tag); + static void set_cpu_tag(device_t &device, const char *tag) { downcast<nesapu_device &>(device).m_cpu_tag = tag; } + void set_tag_memory(const char *tag); DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); @@ -76,7 +76,7 @@ private: uint32 m_sync_times2[SYNCS_MAX2]; /* Samples per sync table */ sound_stream *m_stream; - std::string m_cpu_tag; + const char *m_cpu_tag; void create_syncs(unsigned long sps); int8 apu_square(square_t *chan); diff --git a/src/devices/sound/nile.cpp b/src/devices/sound/nile.cpp index 4687b5f4944..3a21b1c6415 100644 --- a/src/devices/sound/nile.cpp +++ b/src/devices/sound/nile.cpp @@ -52,7 +52,7 @@ enum const device_type NILE = &device_creator<nile_device>; -nile_device::nile_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +nile_device::nile_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, NILE, "NiLe", tag, owner, clock, "nile", __FILE__), device_sound_interface(mconfig, *this), m_stream(nullptr), diff --git a/src/devices/sound/nile.h b/src/devices/sound/nile.h index 4c9877d6a79..4265f439813 100644 --- a/src/devices/sound/nile.h +++ b/src/devices/sound/nile.h @@ -28,7 +28,7 @@ class nile_device : public device_t, public device_sound_interface { public: - nile_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + nile_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~nile_device() { } protected: diff --git a/src/devices/sound/okim6258.cpp b/src/devices/sound/okim6258.cpp index 898faee501c..e317696efa6 100644 --- a/src/devices/sound/okim6258.cpp +++ b/src/devices/sound/okim6258.cpp @@ -46,7 +46,7 @@ const device_type OKIM6258 = &device_creator<okim6258_device>; // okim6258_device - constructor //------------------------------------------------- -okim6258_device::okim6258_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +okim6258_device::okim6258_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, OKIM6258, "OKI6258", tag, owner, clock, "okim6258", __FILE__), device_sound_interface(mconfig, *this), m_status(0), diff --git a/src/devices/sound/okim6258.h b/src/devices/sound/okim6258.h index 49e67ae9f09..ecb5e8938c5 100644 --- a/src/devices/sound/okim6258.h +++ b/src/devices/sound/okim6258.h @@ -45,7 +45,7 @@ class okim6258_device : public device_t, public device_sound_interface { public: - okim6258_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + okim6258_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~okim6258_device() { } // static configuration diff --git a/src/devices/sound/okim6295.cpp b/src/devices/sound/okim6295.cpp index bbee369c008..7e97d04e916 100644 --- a/src/devices/sound/okim6295.cpp +++ b/src/devices/sound/okim6295.cpp @@ -86,7 +86,7 @@ ADDRESS_MAP_END // okim6295_device - constructor //------------------------------------------------- -okim6295_device::okim6295_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +okim6295_device::okim6295_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, OKIM6295, "OKI6295", tag, owner, clock, "okim6295", __FILE__), device_sound_interface(mconfig, *this), device_memory_interface(mconfig, *this), @@ -329,12 +329,12 @@ void okim6295_device::write_command(UINT8 command) // invalid samples go here else { - logerror("OKIM6295:'%s' requested to play invalid sample %02x\n", tag().c_str(),m_command); + logerror("OKIM6295:'%s' requested to play invalid sample %02x\n",tag(),m_command); } } else { - logerror("OKIM6295:'%s' requested to play sample %02x on non-stopped voice\n", tag().c_str(),m_command); + logerror("OKIM6295:'%s' requested to play sample %02x on non-stopped voice\n",tag(),m_command); } } diff --git a/src/devices/sound/okim6295.h b/src/devices/sound/okim6295.h index b641c37a5a6..36be5b3a084 100644 --- a/src/devices/sound/okim6295.h +++ b/src/devices/sound/okim6295.h @@ -58,7 +58,7 @@ class okim6295_device : public device_t, { public: // construction/destruction - okim6295_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + okim6295_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // inline configuration helpers static void static_set_pin7(device_t &device, int pin7); diff --git a/src/devices/sound/okim6376.cpp b/src/devices/sound/okim6376.cpp index 89bb7661eb6..e4a74eefdb5 100644 --- a/src/devices/sound/okim6376.cpp +++ b/src/devices/sound/okim6376.cpp @@ -112,7 +112,7 @@ static void reset_adpcm(struct ADPCMVoice *voice) const device_type OKIM6376 = &device_creator<okim6376_device>; -okim6376_device::okim6376_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +okim6376_device::okim6376_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, OKIM6376, "OKI6376", tag, owner, clock, "okim6376", __FILE__), device_sound_interface(mconfig, *this), m_region_base(*this, DEVICE_SELF), @@ -439,14 +439,14 @@ READ_LINE_MEMBER( okim6376_device::busy_r ) READ_LINE_MEMBER( okim6376_device::nar_r ) { - MSM6376LOG(("OKIM6376:'%s' NAR %x\n", tag().c_str(),m_nar)); + MSM6376LOG(("OKIM6376:'%s' NAR %x\n",tag(),m_nar)); return m_nar; } WRITE_LINE_MEMBER( okim6376_device::ch2_w ) { m_ch2_update = 0;//Clear flag - MSM6376LOG(("OKIM6376:'%s' CH2 %x\n", tag().c_str(),state)); + MSM6376LOG(("OKIM6376:'%s' CH2 %x\n",tag(),state)); if (m_ch2 != state) { @@ -459,7 +459,7 @@ WRITE_LINE_MEMBER( okim6376_device::ch2_w ) struct ADPCMVoice *voice0 = &m_voice[0]; struct ADPCMVoice *voice1 = &m_voice[1]; // We set to channel 2 - MSM6376LOG(("OKIM6376:'%s' Channel 1\n", tag().c_str())); + MSM6376LOG(("OKIM6376:'%s' Channel 1\n",tag())); m_channel = 1; if ((voice0->playing)&&(m_st)) @@ -474,7 +474,7 @@ WRITE_LINE_MEMBER( okim6376_device::ch2_w ) { m_stage[1]=0; oki_process(1, m_command[1]); - MSM6376LOG(("OKIM6376:'%s' Channel 0\n", tag().c_str())); + MSM6376LOG(("OKIM6376:'%s' Channel 0\n",tag())); m_channel = 0; } } @@ -485,7 +485,7 @@ WRITE_LINE_MEMBER( okim6376_device::st_w ) //As in STart, presumably, this triggers everything m_st_update = 0;//Clear flag - MSM6376LOG(("OKIM6376:'%s' ST %x\n", tag().c_str(),state)); + MSM6376LOG(("OKIM6376:'%s' ST %x\n",tag(),state)); if (m_st != state) { @@ -497,7 +497,7 @@ WRITE_LINE_MEMBER( okim6376_device::st_w ) struct ADPCMVoice *voice = &m_voice[m_channel]; { m_st_pulses ++; - MSM6376LOG(("OKIM6376:'%s' ST pulses %x\n", tag().c_str(),m_st_pulses)); + MSM6376LOG(("OKIM6376:'%s' ST pulses %x\n",tag(),m_st_pulses)); if (m_st_pulses > 3) { m_st_pulses = 3; //undocumented behaviour beyond 3 pulses diff --git a/src/devices/sound/okim6376.h b/src/devices/sound/okim6376.h index 4abf8245a3e..df5255291b1 100644 --- a/src/devices/sound/okim6376.h +++ b/src/devices/sound/okim6376.h @@ -25,7 +25,7 @@ class okim6376_device : public device_t, public device_sound_interface { public: - okim6376_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + okim6376_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~okim6376_device() {} DECLARE_WRITE8_MEMBER( write ); diff --git a/src/devices/sound/okim9810.cpp b/src/devices/sound/okim9810.cpp index 028aae5c157..cd89d77a3e0 100644 --- a/src/devices/sound/okim9810.cpp +++ b/src/devices/sound/okim9810.cpp @@ -77,7 +77,7 @@ ADDRESS_MAP_END // okim9810_device - constructor //------------------------------------------------- -okim9810_device::okim9810_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +okim9810_device::okim9810_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, OKIM9810, "OKI9810", tag, owner, clock, "okim9810", __FILE__), device_sound_interface(mconfig, *this), device_memory_interface(mconfig, *this), diff --git a/src/devices/sound/okim9810.h b/src/devices/sound/okim9810.h index ec6ee805f82..ea37366288e 100644 --- a/src/devices/sound/okim9810.h +++ b/src/devices/sound/okim9810.h @@ -72,7 +72,7 @@ class okim9810_device : public device_t, { public: // construction/destruction - okim9810_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + okim9810_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); UINT8 read_status(); void write_TMP_register(UINT8 command); diff --git a/src/devices/sound/pci-ac97.cpp b/src/devices/sound/pci-ac97.cpp index a93b70dfc94..84018534e46 100644 --- a/src/devices/sound/pci-ac97.cpp +++ b/src/devices/sound/pci-ac97.cpp @@ -16,7 +16,7 @@ ADDRESS_MAP_END DEVICE_ADDRESS_MAP_START(bus_mastering_map, 32, ac97_device) ADDRESS_MAP_END -ac97_device::ac97_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ac97_device::ac97_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : pci_device(mconfig, AC97, "AC97 audio", tag, owner, clock, "ac97", __FILE__) { } diff --git a/src/devices/sound/pci-ac97.h b/src/devices/sound/pci-ac97.h index e62b95ecab1..185a89084e2 100644 --- a/src/devices/sound/pci-ac97.h +++ b/src/devices/sound/pci-ac97.h @@ -10,7 +10,7 @@ class ac97_device : public pci_device { public: - ac97_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + ac97_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: virtual void device_start() override; diff --git a/src/devices/sound/pokey.cpp b/src/devices/sound/pokey.cpp index e188cb44c35..b23980c8b05 100644 --- a/src/devices/sound/pokey.cpp +++ b/src/devices/sound/pokey.cpp @@ -177,7 +177,7 @@ const device_type POKEY = &device_creator<pokey_device>; // okim9810_device - constructor //------------------------------------------------- -pokey_device::pokey_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +pokey_device::pokey_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, POKEY, "POKEY", tag, owner, clock, "pokey", __FILE__), device_sound_interface(mconfig, *this), device_execute_interface(mconfig, *this), @@ -815,12 +815,12 @@ UINT8 pokey_device::read(offs_t offset) { /* we have a value measured */ data = m_POTx[pot]; - LOG(("POKEY '%s' read POT%d (final value) $%02x\n", tag().c_str(), pot, data)); + LOG(("POKEY '%s' read POT%d (final value) $%02x\n", tag(), pot, data)); } else { data = m_pot_counter; - LOG(("POKEY '%s' read POT%d (interpolated) $%02x\n", tag().c_str(), pot, data)); + LOG(("POKEY '%s' read POT%d (interpolated) $%02x\n", tag(), pot, data)); } break; @@ -832,17 +832,17 @@ UINT8 pokey_device::read(offs_t offset) if( (m_SKCTL & SK_RESET) == 0) { data = 0; - LOG(("POKEY '%s' ALLPOT internal $%02x (reset)\n", tag().c_str(), data)); + LOG(("POKEY '%s' ALLPOT internal $%02x (reset)\n", tag(), data)); } else if( !m_allpot_r_cb.isnull() ) { data = m_allpot_r_cb(offset); - LOG(("%s: POKEY '%s' ALLPOT callback $%02x\n", machine().describe_context(), tag().c_str(), data)); + LOG(("%s: POKEY '%s' ALLPOT callback $%02x\n", machine().describe_context(), tag(), data)); } else { data = m_ALLPOT ^ 0xff; - LOG(("POKEY '%s' ALLPOT internal $%02x\n", tag().c_str(), data)); + LOG(("POKEY '%s' ALLPOT internal $%02x\n", tag(), data)); } break; @@ -854,12 +854,12 @@ UINT8 pokey_device::read(offs_t offset) if( m_AUDCTL & POLY9 ) { data = m_poly9[m_p9] & 0xff; - LOG_RAND(("POKEY '%s' rand9[$%05x]: $%02x\n", tag().c_str(), m_p9, data)); + LOG_RAND(("POKEY '%s' rand9[$%05x]: $%02x\n", tag(), m_p9, data)); } else { data = (m_poly17[m_p17] >> 8) & 0xff; - LOG_RAND(("POKEY '%s' rand17[$%05x]: $%02x\n", tag().c_str(), m_p17, data)); + LOG_RAND(("POKEY '%s' rand17[$%05x]: $%02x\n", tag(), m_p17, data)); } break; @@ -867,24 +867,24 @@ UINT8 pokey_device::read(offs_t offset) if( !m_serin_r_cb.isnull() ) m_SERIN = m_serin_r_cb(offset); data = m_SERIN; - LOG(("POKEY '%s' SERIN $%02x\n", tag().c_str(), data)); + LOG(("POKEY '%s' SERIN $%02x\n", tag(), data)); break; case IRQST_C: /* IRQST is an active low input port; we keep it active high */ /* internally to ease the (un-)masking of bits */ data = m_IRQST ^ 0xff; - LOG(("POKEY '%s' IRQST $%02x\n", tag().c_str(), data)); + LOG(("POKEY '%s' IRQST $%02x\n", tag(), data)); break; case SKSTAT_C: /* SKSTAT is also an active low input port */ data = m_SKSTAT ^ 0xff; - LOG(("POKEY '%s' SKSTAT $%02x\n", tag().c_str(), data)); + LOG(("POKEY '%s' SKSTAT $%02x\n", tag(), data)); break; default: - LOG(("POKEY '%s' register $%02x\n", tag().c_str(), offset)); + LOG(("POKEY '%s' register $%02x\n", tag(), offset)); data = 0xff; break; } @@ -913,55 +913,55 @@ void pokey_device::write_internal(offs_t offset, UINT8 data) switch (offset & 15) { case AUDF1_C: - LOG_SOUND(("POKEY '%s' AUDF1 $%02x\n", tag().c_str(), data)); + LOG_SOUND(("POKEY '%s' AUDF1 $%02x\n", tag(), data)); m_channel[CHAN1].m_AUDF = data; break; case AUDC1_C: - LOG_SOUND(("POKEY '%s' AUDC1 $%02x (%s)\n", tag().c_str(), data, audc2str(data))); + LOG_SOUND(("POKEY '%s' AUDC1 $%02x (%s)\n", tag(), data, audc2str(data))); m_channel[CHAN1].m_AUDC = data; break; case AUDF2_C: - LOG_SOUND(("POKEY '%s' AUDF2 $%02x\n", tag().c_str(), data)); + LOG_SOUND(("POKEY '%s' AUDF2 $%02x\n", tag(), data)); m_channel[CHAN2].m_AUDF = data; break; case AUDC2_C: - LOG_SOUND(("POKEY '%s' AUDC2 $%02x (%s)\n", tag().c_str(), data, audc2str(data))); + LOG_SOUND(("POKEY '%s' AUDC2 $%02x (%s)\n", tag(), data, audc2str(data))); m_channel[CHAN2].m_AUDC = data; break; case AUDF3_C: - LOG_SOUND(("POKEY '%s' AUDF3 $%02x\n", tag().c_str(), data)); + LOG_SOUND(("POKEY '%s' AUDF3 $%02x\n", tag(), data)); m_channel[CHAN3].m_AUDF = data; break; case AUDC3_C: - LOG_SOUND(("POKEY '%s' AUDC3 $%02x (%s)\n", tag().c_str(), data, audc2str(data))); + LOG_SOUND(("POKEY '%s' AUDC3 $%02x (%s)\n", tag(), data, audc2str(data))); m_channel[CHAN3].m_AUDC = data; break; case AUDF4_C: - LOG_SOUND(("POKEY '%s' AUDF4 $%02x\n", tag().c_str(), data)); + LOG_SOUND(("POKEY '%s' AUDF4 $%02x\n", tag(), data)); m_channel[CHAN4].m_AUDF = data; break; case AUDC4_C: - LOG_SOUND(("POKEY '%s' AUDC4 $%02x (%s)\n", tag().c_str(), data, audc2str(data))); + LOG_SOUND(("POKEY '%s' AUDC4 $%02x (%s)\n", tag(), data, audc2str(data))); m_channel[CHAN4].m_AUDC = data; break; case AUDCTL_C: if( data == m_AUDCTL ) return; - LOG_SOUND(("POKEY '%s' AUDCTL $%02x (%s)\n", tag().c_str(), data, audctl2str(data))); + LOG_SOUND(("POKEY '%s' AUDCTL $%02x (%s)\n", tag(), data, audctl2str(data))); m_AUDCTL = data; break; case STIMER_C: - LOG_TIMER(("POKEY '%s' STIMER $%02x\n", tag().c_str(), data)); + LOG_TIMER(("POKEY '%s' STIMER $%02x\n", tag(), data)); /* From the pokey documentation: * reset all counters to zero (side effect) @@ -979,17 +979,17 @@ void pokey_device::write_internal(offs_t offset, UINT8 data) case SKREST_C: /* reset SKSTAT */ - LOG(("POKEY '%s' SKREST $%02x\n", tag().c_str(), data)); + LOG(("POKEY '%s' SKREST $%02x\n", tag(), data)); m_SKSTAT &= ~(SK_FRAME|SK_OVERRUN|SK_KBERR); break; case POTGO_C: - LOG(("POKEY '%s' POTGO $%02x\n", tag().c_str(), data)); + LOG(("POKEY '%s' POTGO $%02x\n", tag(), data)); pokey_potgo(); break; case SEROUT_C: - LOG(("POKEY '%s' SEROUT $%02x\n", tag().c_str(), data)); + LOG(("POKEY '%s' SEROUT $%02x\n", tag(), data)); m_serout_w_cb(offset, data); m_SKSTAT |= SK_SEROUT; /* @@ -1003,7 +1003,7 @@ void pokey_device::write_internal(offs_t offset, UINT8 data) break; case IRQEN_C: - LOG(("POKEY '%s' IRQEN $%02x\n", tag().c_str(), data)); + LOG(("POKEY '%s' IRQEN $%02x\n", tag(), data)); /* acknowledge one or more IRQST bits ? */ if( m_IRQST & ~data ) @@ -1024,7 +1024,7 @@ void pokey_device::write_internal(offs_t offset, UINT8 data) case SKCTL_C: if( data == m_SKCTL ) return; - LOG(("POKEY '%s' SKCTL $%02x\n", tag().c_str(), data)); + LOG(("POKEY '%s' SKCTL $%02x\n", tag(), data)); m_SKCTL = data; if( !(data & SK_RESET) ) { @@ -1115,7 +1115,7 @@ void pokey_device::pokey_potgo(void) { int r = m_pot0_r_cb(pot); - LOG(("POKEY %s pot_r(%d) returned $%02x\n", tag().c_str(), pot, r)); + LOG(("POKEY %s pot_r(%d) returned $%02x\n", tag(), pot, r)); if (r >= 228) { r = 228; @@ -1137,7 +1137,7 @@ void pokey_device::pokey_potgo(void) { int r = m_pot1_r_cb(pot); - LOG(("POKEY %s pot_r(%d) returned $%02x\n", tag().c_str(), pot, r)); + LOG(("POKEY %s pot_r(%d) returned $%02x\n", tag(), pot, r)); if (r >= 228) { r = 228; @@ -1159,7 +1159,7 @@ void pokey_device::pokey_potgo(void) { int r = m_pot2_r_cb(pot); - LOG(("POKEY %s pot_r(%d) returned $%02x\n", tag().c_str(), pot, r)); + LOG(("POKEY %s pot_r(%d) returned $%02x\n", tag(), pot, r)); if (r >= 228) { r = 228; @@ -1181,7 +1181,7 @@ void pokey_device::pokey_potgo(void) { int r = m_pot3_r_cb(pot); - LOG(("POKEY %s pot_r(%d) returned $%02x\n", tag().c_str(), pot, r)); + LOG(("POKEY %s pot_r(%d) returned $%02x\n", tag(), pot, r)); if (r >= 228) { r = 228; @@ -1203,7 +1203,7 @@ void pokey_device::pokey_potgo(void) { int r = m_pot4_r_cb(pot); - LOG(("POKEY %s pot_r(%d) returned $%02x\n", tag().c_str(), pot, r)); + LOG(("POKEY %s pot_r(%d) returned $%02x\n", tag(), pot, r)); if (r >= 228) { r = 228; @@ -1225,7 +1225,7 @@ void pokey_device::pokey_potgo(void) { int r = m_pot5_r_cb(pot); - LOG(("POKEY %s pot_r(%d) returned $%02x\n", tag().c_str(), pot, r)); + LOG(("POKEY %s pot_r(%d) returned $%02x\n", tag(), pot, r)); if (r >= 228) { r = 228; @@ -1247,7 +1247,7 @@ void pokey_device::pokey_potgo(void) { int r = m_pot6_r_cb(pot); - LOG(("POKEY %s pot_r(%d) returned $%02x\n", tag().c_str(), pot, r)); + LOG(("POKEY %s pot_r(%d) returned $%02x\n", tag(), pot, r)); if (r >= 228) { r = 228; @@ -1269,7 +1269,7 @@ void pokey_device::pokey_potgo(void) { int r = m_pot7_r_cb(pot); - LOG(("POKEY %s pot_r(%d) returned $%02x\n", tag().c_str(), pot, r)); + LOG(("POKEY %s pot_r(%d) returned $%02x\n", tag(), pot, r)); if (r >= 228) { r = 228; @@ -1318,7 +1318,7 @@ void pokey_device::vol_init() { rTot = 1.0 / r_chan[j] + 3.0 / r_chan[0]; rTot = 1.0 / rTot; - LOG(("%s: %3d - %4.3f\n", tag().c_str(), j, rTot / (rTot+pull_up)*4.75)); + LOG(("%s: %3d - %4.3f\n", tag(), j, rTot / (rTot+pull_up)*4.75)); } for (int j=0; j<0x10000; j++) { diff --git a/src/devices/sound/pokey.h b/src/devices/sound/pokey.h index ed625974f2c..f555ae4b5b0 100644 --- a/src/devices/sound/pokey.h +++ b/src/devices/sound/pokey.h @@ -208,7 +208,7 @@ public: }; // construction/destruction - pokey_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + pokey_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template<class _Object> static devcb_base &set_pot0_r_callback(device_t &device, _Object object) { return downcast<pokey_device &>(device).m_pot0_r_cb.set_callback(object); } template<class _Object> static devcb_base &set_pot1_r_callback(device_t &device, _Object object) { return downcast<pokey_device &>(device).m_pot1_r_cb.set_callback(object); } diff --git a/src/devices/sound/qs1000.cpp b/src/devices/sound/qs1000.cpp index 688e6097b94..a892945adad 100644 --- a/src/devices/sound/qs1000.cpp +++ b/src/devices/sound/qs1000.cpp @@ -179,7 +179,7 @@ ADDRESS_MAP_END //------------------------------------------------- // qs1000_device - constructor //------------------------------------------------- -qs1000_device::qs1000_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +qs1000_device::qs1000_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, QS1000, "QS1000", tag, owner, clock, "qs1000", __FILE__), device_sound_interface(mconfig, *this), device_memory_interface(mconfig, *this), diff --git a/src/devices/sound/qs1000.h b/src/devices/sound/qs1000.h index d1a3388fa84..1543a01b057 100644 --- a/src/devices/sound/qs1000.h +++ b/src/devices/sound/qs1000.h @@ -59,7 +59,7 @@ class qs1000_device : public device_t, { public: // construction/destruction - qs1000_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + qs1000_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); static void set_external_rom(device_t &device, bool external_rom) { downcast<qs1000_device &>(device).m_external_rom = external_rom; } template<class _Object> static devcb_base &set_in_p1_callback(device_t &device, _Object object) { return downcast<qs1000_device &>(device).m_in_p1_cb.set_callback(object); } diff --git a/src/devices/sound/qsound.cpp b/src/devices/sound/qsound.cpp index 0cb335fdce6..cc5fc28560a 100644 --- a/src/devices/sound/qsound.cpp +++ b/src/devices/sound/qsound.cpp @@ -67,7 +67,7 @@ ROM_END // qsound_device - constructor //------------------------------------------------- -qsound_device::qsound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +qsound_device::qsound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, QSOUND, "Q-Sound", tag, owner, clock, "qsound", __FILE__), device_sound_interface(mconfig, *this), m_cpu(*this, "qsound"), diff --git a/src/devices/sound/qsound.h b/src/devices/sound/qsound.h index 18ddb71dc2a..cd90136238e 100644 --- a/src/devices/sound/qsound.h +++ b/src/devices/sound/qsound.h @@ -32,7 +32,7 @@ class qsound_device : public device_t, public device_sound_interface { public: - qsound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + qsound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~qsound_device() { } DECLARE_WRITE8_MEMBER(qsound_w); diff --git a/src/devices/sound/rf5c400.cpp b/src/devices/sound/rf5c400.cpp index 8477fa6ae53..ad381817ccf 100644 --- a/src/devices/sound/rf5c400.cpp +++ b/src/devices/sound/rf5c400.cpp @@ -65,7 +65,7 @@ const device_type RF5C400 = &device_creator<rf5c400_device>; // rf5c400_device - constructor //------------------------------------------------- -rf5c400_device::rf5c400_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +rf5c400_device::rf5c400_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, RF5C400, "RF5C400", tag, owner, clock, "rf5c400", __FILE__), device_sound_interface(mconfig, *this), m_rom(*this, DEVICE_SELF), diff --git a/src/devices/sound/rf5c400.h b/src/devices/sound/rf5c400.h index d84df4bfb33..fd04b788f93 100644 --- a/src/devices/sound/rf5c400.h +++ b/src/devices/sound/rf5c400.h @@ -79,7 +79,7 @@ class rf5c400_device : public device_t, public device_sound_interface { public: - rf5c400_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + rf5c400_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~rf5c400_device() { } protected: diff --git a/src/devices/sound/rf5c68.cpp b/src/devices/sound/rf5c68.cpp index 28e95a6cfb9..8b5273bf5c4 100644 --- a/src/devices/sound/rf5c68.cpp +++ b/src/devices/sound/rf5c68.cpp @@ -20,7 +20,7 @@ const device_type RF5C68 = &device_creator<rf5c68_device>; // rf5c68_device - constructor //------------------------------------------------- -rf5c68_device::rf5c68_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +rf5c68_device::rf5c68_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, RF5C68, "RF5C68", tag, owner, clock, "rf5c68", __FILE__), device_sound_interface(mconfig, *this), m_stream(nullptr), diff --git a/src/devices/sound/rf5c68.h b/src/devices/sound/rf5c68.h index ed948d8f474..b8ebe577e0e 100644 --- a/src/devices/sound/rf5c68.h +++ b/src/devices/sound/rf5c68.h @@ -60,7 +60,7 @@ class rf5c68_device : public device_t, public device_sound_interface { public: - rf5c68_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + rf5c68_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~rf5c68_device() { } static void set_end_callback(device_t &device, rf5c68_sample_end_cb_delegate callback) { downcast<rf5c68_device &>(device).m_sample_end_cb = callback; } diff --git a/src/devices/sound/s14001a.cpp b/src/devices/sound/s14001a.cpp index 4100a9c3dcc..f806ba3c358 100644 --- a/src/devices/sound/s14001a.cpp +++ b/src/devices/sound/s14001a.cpp @@ -570,7 +570,7 @@ void s14001a_device::set_volume(int volume) const device_type S14001A = &device_creator<s14001a_device>; -s14001a_device::s14001a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +s14001a_device::s14001a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, S14001A, "S14001A", tag, owner, clock, "s14001a", __FILE__), device_sound_interface(mconfig, *this), m_SpeechRom(*this, DEVICE_SELF), diff --git a/src/devices/sound/s14001a.h b/src/devices/sound/s14001a.h index 3ade4bb0d1e..5c7b2ad379b 100644 --- a/src/devices/sound/s14001a.h +++ b/src/devices/sound/s14001a.h @@ -19,7 +19,7 @@ class s14001a_device : public device_t, public device_sound_interface { public: - s14001a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + s14001a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~s14001a_device() {} // static configuration helpers diff --git a/src/devices/sound/saa1099.cpp b/src/devices/sound/saa1099.cpp index 2665a52db88..22ec858a36c 100644 --- a/src/devices/sound/saa1099.cpp +++ b/src/devices/sound/saa1099.cpp @@ -133,7 +133,7 @@ const device_type SAA1099 = &device_creator<saa1099_device>; // saa1099_device - constructor //------------------------------------------------- -saa1099_device::saa1099_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +saa1099_device::saa1099_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, SAA1099, "SAA1099", tag, owner, clock, "saa1099", __FILE__), device_sound_interface(mconfig, *this), m_stream(nullptr), @@ -346,7 +346,7 @@ WRITE8_MEMBER( saa1099_device::control_w ) if ((data & 0xff) > 0x1c) { /* Error! */ - logerror("%s: (SAA1099 '%s') Unknown register selected\n", machine().describe_context(), tag().c_str()); + logerror("%s: (SAA1099 '%s') Unknown register selected\n", machine().describe_context(), tag()); } m_selected_reg = data & 0x1f; @@ -431,7 +431,7 @@ WRITE8_MEMBER( saa1099_device::data_w ) int i; /* Synch & Reset generators */ - logerror("%s: (SAA1099 '%s') -reg 0x1c- Chip reset\n", machine().describe_context(), tag().c_str()); + logerror("%s: (SAA1099 '%s') -reg 0x1c- Chip reset\n", machine().describe_context(), tag()); for (i = 0; i < 6; i++) { m_channels[i].level = 0; @@ -440,6 +440,6 @@ WRITE8_MEMBER( saa1099_device::data_w ) } break; default: /* Error! */ - logerror("%s: (SAA1099 '%s') Unknown operation (reg:%02x, data:%02x)\n", machine().describe_context(), tag().c_str(), reg, data); + logerror("%s: (SAA1099 '%s') Unknown operation (reg:%02x, data:%02x)\n", machine().describe_context(), tag(), reg, data); } } diff --git a/src/devices/sound/saa1099.h b/src/devices/sound/saa1099.h index 04420ffd968..b2c67e66edd 100644 --- a/src/devices/sound/saa1099.h +++ b/src/devices/sound/saa1099.h @@ -71,7 +71,7 @@ class saa1099_device : public device_t, public device_sound_interface { public: - saa1099_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + saa1099_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~saa1099_device() { } protected: diff --git a/src/devices/sound/samples.cpp b/src/devices/sound/samples.cpp index e7100d1f054..7a756dbb0fe 100644 --- a/src/devices/sound/samples.cpp +++ b/src/devices/sound/samples.cpp @@ -45,7 +45,7 @@ const device_type SAMPLES = &device_creator<samples_device>; // samples_device - constructors //------------------------------------------------- -samples_device::samples_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +samples_device::samples_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, SAMPLES, "Samples", tag, owner, clock, "samples", __FILE__), device_sound_interface(mconfig, *this), m_channels(0), @@ -53,7 +53,7 @@ samples_device::samples_device(const machine_config &mconfig, std::string tag, d { } -samples_device::samples_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +samples_device::samples_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_sound_interface(mconfig, *this), m_channels(0), @@ -633,7 +633,7 @@ bool samples_device::load_samples() read_sample(file, m_sample[index]); else if (filerr == FILERR_NOT_FOUND) { - logerror("%s: Sample '%s' NOT FOUND\n", tag().c_str(), samplename); + logerror("%s: Sample '%s' NOT FOUND\n", tag(), samplename); ok = false; } } diff --git a/src/devices/sound/samples.h b/src/devices/sound/samples.h index 7d42a2f0f0c..f1512853a6a 100644 --- a/src/devices/sound/samples.h +++ b/src/devices/sound/samples.h @@ -42,7 +42,7 @@ class samples_device : public device_t, { public: // construction/destruction - samples_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + samples_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers static void static_set_channels(device_t &device, UINT8 channels) { downcast<samples_device &>(device).m_channels = channels; } @@ -82,7 +82,7 @@ public: protected: // subclasses can do it this way - samples_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + samples_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // device-level overrides virtual void device_start() override; diff --git a/src/devices/sound/sb0400.cpp b/src/devices/sound/sb0400.cpp index 1670f810a3a..343cb6aecaa 100644 --- a/src/devices/sound/sb0400.cpp +++ b/src/devices/sound/sb0400.cpp @@ -7,7 +7,7 @@ const device_type SB0400 = &device_creator<sb0400_device>; DEVICE_ADDRESS_MAP_START(map, 32, sb0400_device) ADDRESS_MAP_END -sb0400_device::sb0400_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +sb0400_device::sb0400_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : pci_device(mconfig, SB0400, "Creative Labs SB0400 Audigy2 Value", tag, owner, clock, "sb0400", __FILE__) { } diff --git a/src/devices/sound/sb0400.h b/src/devices/sound/sb0400.h index 46a8581625e..a83ce69dbd8 100644 --- a/src/devices/sound/sb0400.h +++ b/src/devices/sound/sb0400.h @@ -12,7 +12,7 @@ class sb0400_device : public pci_device { public: - sb0400_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + sb0400_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: virtual void device_start() override; diff --git a/src/devices/sound/scsp.cpp b/src/devices/sound/scsp.cpp index ba529bf5901..7a20010714d 100644 --- a/src/devices/sound/scsp.cpp +++ b/src/devices/sound/scsp.cpp @@ -143,7 +143,7 @@ static const float SDLT[8]={-1000000.0f,-36.0f,-30.0f,-24.0f,-18.0f,-12.0f,-6.0f const device_type SCSP = &device_creator<scsp_device>; -scsp_device::scsp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +scsp_device::scsp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, SCSP, "SCSP", tag, owner, clock, "scsp", __FILE__), device_sound_interface(mconfig, *this), m_roffset(0), @@ -506,7 +506,7 @@ void scsp_device::init() m_MidiOutR=m_MidiOutW=0; // get SCSP RAM - if (tag()==":scsp" || tag()==":scsp1") + if (strcmp(tag(), ":scsp") == 0 || strcmp(tag(), ":scsp1") == 0) { m_Master=1; } diff --git a/src/devices/sound/scsp.h b/src/devices/sound/scsp.h index dd65dd25497..981936f37db 100644 --- a/src/devices/sound/scsp.h +++ b/src/devices/sound/scsp.h @@ -77,7 +77,7 @@ class scsp_device : public device_t, public device_sound_interface { public: - scsp_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + scsp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); static void set_roffset(device_t &device, int roffset) { downcast<scsp_device &>(device).m_roffset = roffset; } template<class _Object> static devcb_base &set_irq_callback(device_t &device, _Object object) { return downcast<scsp_device &>(device).m_irq_cb.set_callback(object); } diff --git a/src/devices/sound/segapcm.cpp b/src/devices/sound/segapcm.cpp index bbd6799bf6a..555ee019b16 100644 --- a/src/devices/sound/segapcm.cpp +++ b/src/devices/sound/segapcm.cpp @@ -16,7 +16,7 @@ const device_type SEGAPCM = &device_creator<segapcm_device>; // segapcm_device - constructor //------------------------------------------------- -segapcm_device::segapcm_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +segapcm_device::segapcm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, SEGAPCM, "Sega PCM", tag, owner, clock, "segapcm", __FILE__), device_sound_interface(mconfig, *this), m_rom(*this, DEVICE_SELF), diff --git a/src/devices/sound/segapcm.h b/src/devices/sound/segapcm.h index 3d47b20758d..48474134b46 100644 --- a/src/devices/sound/segapcm.h +++ b/src/devices/sound/segapcm.h @@ -38,7 +38,7 @@ class segapcm_device : public device_t, public device_sound_interface { public: - segapcm_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + segapcm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~segapcm_device() { } // static configuration diff --git a/src/devices/sound/sn76477.cpp b/src/devices/sound/sn76477.cpp index e331b530bf1..ba31190b5ce 100644 --- a/src/devices/sound/sn76477.cpp +++ b/src/devices/sound/sn76477.cpp @@ -159,7 +159,7 @@ static const double out_neg_gain[] = const device_type SN76477 = &device_creator<sn76477_device>; -sn76477_device::sn76477_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +sn76477_device::sn76477_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, SN76477, "SN76477", tag, owner, clock, "sn76477", __FILE__), device_sound_interface(mconfig, *this), m_enable(0), @@ -643,7 +643,7 @@ void sn76477_device::log_enable_line() "Enabled", "Inhibited" }; - LOG(1, ("SN76477 '%s': Enable line (9): %d [%s]\n", tag().c_str(), m_enable, desc[m_enable])); + LOG(1, ("SN76477 '%s': Enable line (9): %d [%s]\n", tag(), m_enable, desc[m_enable])); } @@ -655,7 +655,7 @@ void sn76477_device::log_mixer_mode() "SLF/Noise", "SLF/VCO/Noise", "SLF/VCO", "Inhibit" }; - LOG(1, ("SN76477 '%s': Mixer mode (25-27): %d [%s]\n", tag().c_str(), m_mixer_mode, desc[m_mixer_mode])); + LOG(1, ("SN76477 '%s': Mixer mode (25-27): %d [%s]\n", tag(), m_mixer_mode, desc[m_mixer_mode])); } @@ -666,7 +666,7 @@ void sn76477_device::log_envelope_mode() "VCO", "One-Shot", "Mixer Only", "VCO with Alternating Polarity" }; - LOG(1, ("SN76477 '%s': Envelope mode (1,28): %d [%s]\n", tag().c_str(), m_envelope_mode, desc[m_envelope_mode])); + LOG(1, ("SN76477 '%s': Envelope mode (1,28): %d [%s]\n", tag(), m_envelope_mode, desc[m_envelope_mode])); } @@ -677,7 +677,7 @@ void sn76477_device::log_vco_mode() "External (Pin 16)", "Internal (SLF)" }; - LOG(1, ("SN76477 '%s': VCO mode (22): %d [%s]\n", tag().c_str(), m_vco_mode, desc[m_vco_mode])); + LOG(1, ("SN76477 '%s': VCO mode (22): %d [%s]\n", tag(), m_vco_mode, desc[m_vco_mode])); } @@ -687,16 +687,16 @@ void sn76477_device::log_one_shot_time() { if (compute_one_shot_cap_charging_rate() > 0) { - LOG(1, ("SN76477 '%s': One-shot time (23,24): %.4f sec\n", tag().c_str(), ONE_SHOT_CAP_VOLTAGE_RANGE * (1 / compute_one_shot_cap_charging_rate()))); + LOG(1, ("SN76477 '%s': One-shot time (23,24): %.4f sec\n", tag(), ONE_SHOT_CAP_VOLTAGE_RANGE * (1 / compute_one_shot_cap_charging_rate()))); } else { - LOG(1, ("SN76477 '%s': One-shot time (23,24): N/A\n", tag().c_str())); + LOG(1, ("SN76477 '%s': One-shot time (23,24): N/A\n", tag())); } } else { - LOG(1, ("SN76477 '%s': One-shot time (23,24): External (cap = %.2fV)\n", tag().c_str(), m_one_shot_cap_voltage)); + LOG(1, ("SN76477 '%s': One-shot time (23,24): External (cap = %.2fV)\n", tag(), m_one_shot_cap_voltage)); } } @@ -710,29 +710,29 @@ void sn76477_device::log_slf_freq() double charging_time = (1 / compute_slf_cap_charging_rate()) * SLF_CAP_VOLTAGE_RANGE; double discharging_time = (1 / compute_slf_cap_discharging_rate()) * SLF_CAP_VOLTAGE_RANGE; - LOG(1, ("SN76477 '%s': SLF frequency (20,21): %.2f Hz\n", tag().c_str(), 1 / (charging_time + discharging_time))); + LOG(1, ("SN76477 '%s': SLF frequency (20,21): %.2f Hz\n", tag(), 1 / (charging_time + discharging_time))); } else { - LOG(1, ("SN76477 '%s': SLF frequency (20,21): N/A\n", tag().c_str())); + LOG(1, ("SN76477 '%s': SLF frequency (20,21): N/A\n", tag())); } } else { - LOG(1, ("SN76477 '%s': SLF frequency (20,21): External (cap = %.2fV)\n", tag().c_str(), m_slf_cap_voltage)); + LOG(1, ("SN76477 '%s': SLF frequency (20,21): External (cap = %.2fV)\n", tag(), m_slf_cap_voltage)); } } void sn76477_device::log_vco_pitch_voltage() { - LOG(1, ("SN76477 '%s': VCO pitch voltage (19): %.2fV\n", tag().c_str(), m_pitch_voltage)); + LOG(1, ("SN76477 '%s': VCO pitch voltage (19): %.2fV\n", tag(), m_pitch_voltage)); } void sn76477_device::log_vco_duty_cycle() { - LOG(1, ("SN76477 '%s': VCO duty cycle (16,19): %.0f%%\n", tag().c_str(), compute_vco_duty_cycle() * 100.0)); + LOG(1, ("SN76477 '%s': VCO duty cycle (16,19): %.0f%%\n", tag(), compute_vco_duty_cycle() * 100.0)); } @@ -745,16 +745,16 @@ void sn76477_device::log_vco_freq() double min_freq = compute_vco_cap_charging_discharging_rate() / (2 * VCO_CAP_VOLTAGE_RANGE); double max_freq = compute_vco_cap_charging_discharging_rate() / (2 * VCO_TO_SLF_VOLTAGE_DIFF); - LOG(1, ("SN76477 '%s': VCO frequency (17,18): %.2f Hz - %.1f Hz\n", tag().c_str(), min_freq, max_freq)); + LOG(1, ("SN76477 '%s': VCO frequency (17,18): %.2f Hz - %.1f Hz\n", tag(), min_freq, max_freq)); } else { - LOG(1, ("SN76477 '%s': VCO frequency (17,18): N/A\n", tag().c_str())); + LOG(1, ("SN76477 '%s': VCO frequency (17,18): N/A\n", tag())); } } else { - LOG(1, ("SN76477 '%s': VCO frequency (17,18): External (cap = %.2fV)\n", tag().c_str(), m_vco_cap_voltage)); + LOG(1, ("SN76477 '%s': VCO frequency (17,18): External (cap = %.2fV)\n", tag(), m_vco_cap_voltage)); } } @@ -766,13 +766,13 @@ void sn76477_device::log_vco_ext_voltage() double min_freq = compute_vco_cap_charging_discharging_rate() / (2 * VCO_CAP_VOLTAGE_RANGE); double max_freq = compute_vco_cap_charging_discharging_rate() / (2 * VCO_TO_SLF_VOLTAGE_DIFF); - LOG(1, ("SN76477 '%s': VCO ext. voltage (16): %.2fV (%.2f Hz)\n", tag().c_str(), + LOG(1, ("SN76477 '%s': VCO ext. voltage (16): %.2fV (%.2f Hz)\n", tag(), m_vco_voltage, min_freq + ((max_freq - min_freq) * m_vco_voltage / VCO_MAX_EXT_VOLTAGE))); } else { - LOG(1, ("SN76477 '%s': VCO ext. voltage (16): %.2fV (saturated, no output)\n", tag().c_str(), m_vco_voltage)); + LOG(1, ("SN76477 '%s': VCO ext. voltage (16): %.2fV (saturated, no output)\n", tag(), m_vco_voltage)); } } @@ -781,17 +781,17 @@ void sn76477_device::log_noise_gen_freq() { if (m_noise_clock_ext) { - LOG(1, ("SN76477 '%s': Noise gen frequency (4): External\n", tag().c_str())); + LOG(1, ("SN76477 '%s': Noise gen frequency (4): External\n", tag())); } else { if (compute_noise_gen_freq() > 0) { - LOG(1, ("SN76477 '%s': Noise gen frequency (4): %d Hz\n", tag().c_str(), compute_noise_gen_freq())); + LOG(1, ("SN76477 '%s': Noise gen frequency (4): %d Hz\n", tag(), compute_noise_gen_freq())); } else { - LOG(1, ("SN76477 '%s': Noise gen frequency (4): N/A\n", tag().c_str())); + LOG(1, ("SN76477 '%s': Noise gen frequency (4): N/A\n", tag())); } } } @@ -810,21 +810,21 @@ void sn76477_device::log_noise_filter_freq() double charging_time = (1 / charging_rate) * NOISE_CAP_VOLTAGE_RANGE; double discharging_time = (1 / charging_rate) * NOISE_CAP_VOLTAGE_RANGE; - LOG(1, ("SN76477 '%s': Noise filter frequency (5,6): %.0f Hz\n", tag().c_str(), 1 / (charging_time + discharging_time))); + LOG(1, ("SN76477 '%s': Noise filter frequency (5,6): %.0f Hz\n", tag(), 1 / (charging_time + discharging_time))); } else { - LOG(1, ("SN76477 '%s': Noise filter frequency (5,6): Very Large (Filtering Disabled)\n", tag().c_str())); + LOG(1, ("SN76477 '%s': Noise filter frequency (5,6): Very Large (Filtering Disabled)\n", tag())); } } else { - LOG(1, ("SN76477 '%s': Noise filter frequency (5,6): N/A\n", tag().c_str())); + LOG(1, ("SN76477 '%s': Noise filter frequency (5,6): N/A\n", tag())); } } else { - LOG(1, ("SN76477 '%s': Noise filter frequency (5,6): External (cap = %.2fV)\n", tag().c_str(), m_noise_filter_cap)); + LOG(1, ("SN76477 '%s': Noise filter frequency (5,6): External (cap = %.2fV)\n", tag(), m_noise_filter_cap)); } } @@ -835,16 +835,16 @@ void sn76477_device::log_attack_time() { if (compute_attack_decay_cap_charging_rate() > 0) { - LOG(1, ("SN76477 '%s': Attack time (8,10): %.4f sec\n", tag().c_str(), AD_CAP_VOLTAGE_RANGE * (1 / compute_attack_decay_cap_charging_rate()))); + LOG(1, ("SN76477 '%s': Attack time (8,10): %.4f sec\n", tag(), AD_CAP_VOLTAGE_RANGE * (1 / compute_attack_decay_cap_charging_rate()))); } else { - LOG(1, ("SN76477 '%s': Attack time (8,10): N/A\n", tag().c_str())); + LOG(1, ("SN76477 '%s': Attack time (8,10): N/A\n", tag())); } } else { - LOG(1, ("SN76477 '%s': Attack time (8,10): External (cap = %.2fV)\n", tag().c_str(), m_attack_decay_cap_voltage)); + LOG(1, ("SN76477 '%s': Attack time (8,10): External (cap = %.2fV)\n", tag(), m_attack_decay_cap_voltage)); } } @@ -855,16 +855,16 @@ void sn76477_device::log_decay_time() { if (compute_attack_decay_cap_discharging_rate() > 0) { - LOG(1, ("SN76477 '%s': Decay time (7,8): %.4f sec\n", tag().c_str(), AD_CAP_VOLTAGE_RANGE * (1 / compute_attack_decay_cap_discharging_rate()))); + LOG(1, ("SN76477 '%s': Decay time (7,8): %.4f sec\n", tag(), AD_CAP_VOLTAGE_RANGE * (1 / compute_attack_decay_cap_discharging_rate()))); } else { - LOG(1, ("SN76477 '%s': Decay time (8,10): N/A\n", tag().c_str())); + LOG(1, ("SN76477 '%s': Decay time (8,10): N/A\n", tag())); } } else { - LOG(1, ("SN76477 '%s': Decay time (7, 8): External (cap = %.2fV)\n", tag().c_str(), m_attack_decay_cap_voltage)); + LOG(1, ("SN76477 '%s': Decay time (7, 8): External (cap = %.2fV)\n", tag(), m_attack_decay_cap_voltage)); } } @@ -872,7 +872,7 @@ void sn76477_device::log_decay_time() void sn76477_device::log_voltage_out() { LOG(1, ("SN76477 '%s': Voltage OUT range (11,12): %.2fV - %.2fV (clips above %.2fV)\n", - tag().c_str(), + tag(), OUT_CENTER_LEVEL_VOLTAGE + compute_center_to_peak_voltage_out() * out_neg_gain[(int)(AD_CAP_VOLTAGE_MAX * 10)], OUT_CENTER_LEVEL_VOLTAGE + compute_center_to_peak_voltage_out() * out_pos_gain[(int)(AD_CAP_VOLTAGE_MAX * 10)], OUT_HIGH_CLIP_THRESHOLD)); @@ -911,10 +911,10 @@ void sn76477_device::open_wav_file() { char wav_file_name[30]; - sprintf(wav_file_name, LOG_WAV_FILE_NAME, tag().c_str()); + sprintf(wav_file_name, LOG_WAV_FILE_NAME, tag()); m_file = wav_open(wav_file_name, m_our_sample_rate, 2); - LOG(1, ("SN76477 '%s': Logging output: %s\n", tag().c_str(), wav_file_name)); + LOG(1, ("SN76477 '%s': Logging output: %s\n", tag(), wav_file_name)); } diff --git a/src/devices/sound/sn76477.h b/src/devices/sound/sn76477.h index a614ad07715..6c582c74b09 100644 --- a/src/devices/sound/sn76477.h +++ b/src/devices/sound/sn76477.h @@ -93,7 +93,7 @@ class sn76477_device : public device_t, public device_sound_interface { public: - sn76477_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + sn76477_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~sn76477_device() {} static void set_noise_params(device_t &device, double clock_res, double filter_res, double filter_cap) diff --git a/src/devices/sound/sn76496.cpp b/src/devices/sound/sn76496.cpp index 79546e16be8..f39fc04bc38 100644 --- a/src/devices/sound/sn76496.cpp +++ b/src/devices/sound/sn76496.cpp @@ -131,7 +131,7 @@ sn76496_base_device::sn76496_base_device(const machine_config &mconfig, device_type type, const char *name, - std::string tag, int feedbackmask, int noisetap1, int noisetap2, bool negate, bool stereo, int clockdivider, int sega, + const char *tag, int feedbackmask, int noisetap1, int noisetap2, bool negate, bool stereo, int clockdivider, int sega, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), @@ -147,34 +147,34 @@ sn76496_base_device::sn76496_base_device(const machine_config &mconfig, device_t { } -sn76496_device::sn76496_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +sn76496_device::sn76496_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : sn76496_base_device(mconfig, SN76496, "SN76496", tag, 0x10000, 0x04, 0x08, false, false, 8, true, owner, clock, "sn76496", __FILE__) { } -u8106_device::u8106_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +u8106_device::u8106_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : sn76496_base_device(mconfig, U8106, "U8106", tag, 0x4000, 0x01, 0x02, true, false, 8, true, owner, clock, "u8106", __FILE__) { } -y2404_device::y2404_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +y2404_device::y2404_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : sn76496_base_device(mconfig, Y2404, "Y2404", tag, 0x10000, 0x04, 0x08, false, false, 8, true, owner, clock, "y2404", __FILE__) { } -sn76489_device::sn76489_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +sn76489_device::sn76489_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : sn76496_base_device(mconfig, SN76489, "SN76489", tag, 0x4000, 0x01, 0x02, true, false, 8, true, owner, clock, "sn76489", __FILE__) { } -sn76489a_device::sn76489a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +sn76489a_device::sn76489a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : sn76496_base_device(mconfig, SN76489A, "SN76489A", tag, 0x10000, 0x04, 0x08, false, false, 8, true, owner, clock, "sn76489a", __FILE__) { } -sn76494_device::sn76494_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +sn76494_device::sn76494_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : sn76496_base_device(mconfig, SN76494, "SN76494", tag, 0x10000, 0x04, 0x08, false, false, 1, true, owner, clock, "sn76494", __FILE__) { } -sn94624_device::sn94624_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +sn94624_device::sn94624_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : sn76496_base_device(mconfig, SN94624, "SN94624", tag, 0x4000, 0x01, 0x02, true, false, 1, true, owner, clock, "sn94624", __FILE__) { } -ncr7496_device::ncr7496_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ncr7496_device::ncr7496_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : sn76496_base_device(mconfig, NCR7496, "NCR7496", tag, 0x8000, 0x02, 0x20, false, false, 8, true, owner, clock, "ncr7496", __FILE__) { } -gamegear_device::gamegear_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +gamegear_device::gamegear_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : sn76496_base_device(mconfig, GAMEGEAR, "Game Gear PSG", tag, 0x8000, 0x01, 0x08, true, true, 8, false, owner, clock, "gamegear_psg", __FILE__) { } -segapsg_device::segapsg_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +segapsg_device::segapsg_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : sn76496_base_device(mconfig, SEGAPSG, "SEGA VDP PSG", tag, 0x8000, 0x01, 0x08, true, false, 8, false, owner, clock, "segapsg", __FILE__) { } diff --git a/src/devices/sound/sn76496.h b/src/devices/sound/sn76496.h index f7f9bea7714..28a685959ad 100644 --- a/src/devices/sound/sn76496.h +++ b/src/devices/sound/sn76496.h @@ -23,7 +23,7 @@ extern const device_type SEGAPSG; class sn76496_base_device : public device_t, public device_sound_interface { public: - sn76496_base_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, + sn76496_base_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, int feedbackmask, int noisetap1, int noisetap2, bool negate, bool stereo, int clockdivider, int sega, device_t *owner, UINT32 clock, const char *shortname, const char *source); @@ -75,70 +75,70 @@ private: class sn76496_device : public sn76496_base_device { public: - sn76496_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + sn76496_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; // U8106 not verified yet. todo: verify; (a custom marked sn76489? only used on mr. do and maybe other universal games) class u8106_device : public sn76496_base_device { public: - u8106_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + u8106_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; // Y2404 not verified yet. todo: verify; (don't be fooled by the Y, it's a TI chip, not Yamaha) class y2404_device : public sn76496_base_device { public: - y2404_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + y2404_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; // SN76489 not verified yet. todo: verify; class sn76489_device : public sn76496_base_device { public: - sn76489_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + sn76489_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; // SN76489A: whitenoise verified, phase verified, periodic verified (by plgdavid) class sn76489a_device : public sn76496_base_device { public: - sn76489a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + sn76489a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; // SN76494 not verified, (according to datasheet: same as sn76489a but without the /8 divider) class sn76494_device : public sn76496_base_device { public: - sn76494_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + sn76494_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; // SN94624 whitenoise verified, phase verified, period verified; verified by PlgDavid class sn94624_device : public sn76496_base_device { public: - sn94624_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + sn94624_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; // NCR7496 not verified; info from smspower wiki class ncr7496_device : public sn76496_base_device { public: - ncr7496_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + ncr7496_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; // Verified by Justin Kerk class gamegear_device : public sn76496_base_device { public: - gamegear_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + gamegear_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; // todo: verify; from smspower wiki, assumed to have same invert as gamegear class segapsg_device : public sn76496_base_device { public: - segapsg_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + segapsg_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; #endif /* __SN76496_H__ */ diff --git a/src/devices/sound/snkwave.cpp b/src/devices/sound/snkwave.cpp index 2bbf95abd26..79a6ed1bcb4 100644 --- a/src/devices/sound/snkwave.cpp +++ b/src/devices/sound/snkwave.cpp @@ -21,7 +21,7 @@ const device_type SNKWAVE = &device_creator<snkwave_device>; // snkwave_device - constructor //------------------------------------------------- -snkwave_device::snkwave_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +snkwave_device::snkwave_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, SNKWAVE, "SNK Wave", tag, owner, clock, "snkwave", __FILE__), device_sound_interface(mconfig, *this), m_stream(nullptr), diff --git a/src/devices/sound/snkwave.h b/src/devices/sound/snkwave.h index de5248e115e..07c45c96134 100644 --- a/src/devices/sound/snkwave.h +++ b/src/devices/sound/snkwave.h @@ -28,7 +28,7 @@ class snkwave_device : public device_t, public device_sound_interface { public: - snkwave_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + snkwave_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~snkwave_device() { } protected: diff --git a/src/devices/sound/sp0250.cpp b/src/devices/sound/sp0250.cpp index fa9b0bc1d52..004cd6d6921 100644 --- a/src/devices/sound/sp0250.cpp +++ b/src/devices/sound/sp0250.cpp @@ -36,7 +36,7 @@ should be 312, but 312 = 39*8 so it doesn't look right because a divider by 39 i const device_type SP0250 = &device_creator<sp0250_device>; -sp0250_device::sp0250_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +sp0250_device::sp0250_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, SP0250, "SP0250", tag, owner, clock, "sp0250", __FILE__), device_sound_interface(mconfig, *this), m_amp(0), diff --git a/src/devices/sound/sp0250.h b/src/devices/sound/sp0250.h index 8bc6cdc8ca9..ab3b11220ff 100644 --- a/src/devices/sound/sp0250.h +++ b/src/devices/sound/sp0250.h @@ -9,7 +9,7 @@ class sp0250_device : public device_t, public device_sound_interface { public: - sp0250_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + sp0250_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~sp0250_device() {} template<class _Object> static devcb_base &set_drq_callback(device_t &device, _Object object) { return downcast<sp0250_device &>(device).m_drq.set_callback(object); } diff --git a/src/devices/sound/sp0256.cpp b/src/devices/sound/sp0256.cpp index 24ad62d68cb..f009516a807 100644 --- a/src/devices/sound/sp0256.cpp +++ b/src/devices/sound/sp0256.cpp @@ -95,7 +95,7 @@ const device_type SP0256 = &device_creator<sp0256_device>; // LIVE DEVICE //************************************************************************** -sp0256_device::sp0256_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +sp0256_device::sp0256_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, SP0256, "SP0256", tag, owner, clock, "sp0256", __FILE__), device_sound_interface(mconfig, *this), m_rom(*this, DEVICE_SELF), diff --git a/src/devices/sound/sp0256.h b/src/devices/sound/sp0256.h index 9d0756a5ae3..c7215cb4e6c 100644 --- a/src/devices/sound/sp0256.h +++ b/src/devices/sound/sp0256.h @@ -71,7 +71,7 @@ class sp0256_device : public device_t, public device_sound_interface { public: - sp0256_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + sp0256_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~sp0256_device() { } template<class _Object> static devcb_base &set_data_request_callback(device_t &device, _Object object) { return downcast<sp0256_device &>(device).m_drq_cb.set_callback(object); } diff --git a/src/devices/sound/speaker.cpp b/src/devices/sound/speaker.cpp index 4f2fd4bd8e9..7872351a0e3 100644 --- a/src/devices/sound/speaker.cpp +++ b/src/devices/sound/speaker.cpp @@ -83,7 +83,7 @@ static const int RATE_MULTIPLIER = 4; const device_type SPEAKER_SOUND = &device_creator<speaker_sound_device>; -speaker_sound_device::speaker_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +speaker_sound_device::speaker_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, SPEAKER_SOUND, "Filtered 1-bit DAC", tag, owner, clock, "speaker_sound", __FILE__), device_sound_interface(mconfig, *this), m_num_levels(2), diff --git a/src/devices/sound/speaker.h b/src/devices/sound/speaker.h index 65c0ba87a69..8b2bce895d0 100644 --- a/src/devices/sound/speaker.h +++ b/src/devices/sound/speaker.h @@ -26,7 +26,7 @@ class speaker_sound_device : public device_t, public device_sound_interface { public: - speaker_sound_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + speaker_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~speaker_sound_device() {} // static configuration diff --git a/src/devices/sound/spu.cpp b/src/devices/sound/spu.cpp index 619e060237a..3686fab3f9d 100644 --- a/src/devices/sound/spu.cpp +++ b/src/devices/sound/spu.cpp @@ -954,7 +954,7 @@ static int shift_register15(int &shift) // spu_device - constructor //------------------------------------------------- -spu_device::spu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : +spu_device::spu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, SPU, "SPU", tag, owner, clock, "spu", __FILE__), device_sound_interface(mconfig, *this), m_irq_handler(*this), diff --git a/src/devices/sound/spu.h b/src/devices/sound/spu.h index 0009f05ddb5..6381464c7cd 100644 --- a/src/devices/sound/spu.h +++ b/src/devices/sound/spu.h @@ -221,7 +221,7 @@ protected: static reverb_preset *find_reverb_preset(const unsigned short *param); public: - spu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + spu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<spu_device &>(device).m_irq_handler.set_callback(object); } diff --git a/src/devices/sound/st0016.cpp b/src/devices/sound/st0016.cpp index a59bff84496..59a2c3bdc7d 100644 --- a/src/devices/sound/st0016.cpp +++ b/src/devices/sound/st0016.cpp @@ -24,7 +24,7 @@ const device_type ST0016 = &device_creator<st0016_device>; // st0016_device - constructor //------------------------------------------------- -st0016_device::st0016_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +st0016_device::st0016_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ST0016, "ST0016 (Audio)", tag, owner, clock, "st0016_audio", __FILE__), device_sound_interface(mconfig, *this), m_stream(nullptr), diff --git a/src/devices/sound/st0016.h b/src/devices/sound/st0016.h index b1fd2a1f6cd..6eb9f521ef6 100644 --- a/src/devices/sound/st0016.h +++ b/src/devices/sound/st0016.h @@ -23,7 +23,7 @@ class st0016_device : public device_t, public device_sound_interface { public: - st0016_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + st0016_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~st0016_device() { } template<class _Object> static devcb_base &set_soundram_callback(device_t &device, _Object object) { return downcast<st0016_device &>(device).m_ram_read_cb.set_callback(object); } diff --git a/src/devices/sound/t6721a.cpp b/src/devices/sound/t6721a.cpp index e53c5d25973..d5c48f89e4b 100644 --- a/src/devices/sound/t6721a.cpp +++ b/src/devices/sound/t6721a.cpp @@ -35,7 +35,7 @@ const device_type T6721A = &device_creator<t6721a_device>; // t6721a_device - constructor //------------------------------------------------- -t6721a_device::t6721a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +t6721a_device::t6721a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, T6721A, "T6721A", tag, owner, clock, "t6721a", __FILE__), device_sound_interface(mconfig, *this), m_write_eos(*this), diff --git a/src/devices/sound/t6721a.h b/src/devices/sound/t6721a.h index 10a20e0e774..51f952cdf80 100644 --- a/src/devices/sound/t6721a.h +++ b/src/devices/sound/t6721a.h @@ -67,7 +67,7 @@ class t6721a_device : public device_t, public device_sound_interface { public: - t6721a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + t6721a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers template<class _eos> void set_eos_callback(_eos eos) { m_write_eos.set_callback(eos); } diff --git a/src/devices/sound/t6w28.cpp b/src/devices/sound/t6w28.cpp index cac62a8275d..25303ec4f1b 100644 --- a/src/devices/sound/t6w28.cpp +++ b/src/devices/sound/t6w28.cpp @@ -349,7 +349,7 @@ void t6w28_device::set_enable(bool enable) const device_type T6W28 = &device_creator<t6w28_device>; -t6w28_device::t6w28_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +t6w28_device::t6w28_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, T6W28, "T6W28", tag, owner, clock, "t6w28", __FILE__), device_sound_interface(mconfig, *this) { diff --git a/src/devices/sound/t6w28.h b/src/devices/sound/t6w28.h index 8e56377e612..7e3cc39f7e4 100644 --- a/src/devices/sound/t6w28.h +++ b/src/devices/sound/t6w28.h @@ -9,7 +9,7 @@ class t6w28_device : public device_t, public device_sound_interface { public: - t6w28_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + t6w28_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); DECLARE_WRITE8_MEMBER( write ); void set_enable( bool enable ); diff --git a/src/devices/sound/tc8830f.cpp b/src/devices/sound/tc8830f.cpp index 1c30765b90f..06759146d93 100644 --- a/src/devices/sound/tc8830f.cpp +++ b/src/devices/sound/tc8830f.cpp @@ -24,7 +24,7 @@ // device type definition const device_type TC8830F = &device_creator<tc8830f_device>; -tc8830f_device::tc8830f_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +tc8830f_device::tc8830f_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, TC8830F, "TC8830F", tag, owner, clock, "tc8830f", __FILE__), device_sound_interface(mconfig, *this), m_stream(nullptr), m_playing(false), diff --git a/src/devices/sound/tc8830f.h b/src/devices/sound/tc8830f.h index bda1674cf9a..655e83167a6 100644 --- a/src/devices/sound/tc8830f.h +++ b/src/devices/sound/tc8830f.h @@ -32,7 +32,7 @@ class tc8830f_device : public device_t, { public: // construction/destruction - tc8830f_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + tc8830f_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); void reset(); void write_p(UINT8 data); diff --git a/src/devices/sound/tiaintf.cpp b/src/devices/sound/tiaintf.cpp index 903f96fa51b..a16fe0698dc 100644 --- a/src/devices/sound/tiaintf.cpp +++ b/src/devices/sound/tiaintf.cpp @@ -16,7 +16,7 @@ const device_type TIA = &device_creator<tia_device>; // tia_device - constructor //------------------------------------------------- -tia_device::tia_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +tia_device::tia_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, TIA, "TIA", tag, owner, clock, "tia_sound", __FILE__), device_sound_interface(mconfig, *this), m_channel(nullptr), diff --git a/src/devices/sound/tiaintf.h b/src/devices/sound/tiaintf.h index 5f9aff57e39..37d9f276459 100644 --- a/src/devices/sound/tiaintf.h +++ b/src/devices/sound/tiaintf.h @@ -25,7 +25,7 @@ class tia_device : public device_t, public device_sound_interface { public: - tia_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + tia_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~tia_device() { } protected: diff --git a/src/devices/sound/tms3615.cpp b/src/devices/sound/tms3615.cpp index 3201e3addcb..a37cc81a654 100644 --- a/src/devices/sound/tms3615.cpp +++ b/src/devices/sound/tms3615.cpp @@ -21,7 +21,7 @@ const device_type TMS3615 = &device_creator<tms3615_device>; // tms3615_device - constructor //------------------------------------------------- -tms3615_device::tms3615_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +tms3615_device::tms3615_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, TMS3615, "TMS3615", tag, owner, clock, "tms3615", __FILE__), device_sound_interface(mconfig, *this), m_channel(nullptr), diff --git a/src/devices/sound/tms3615.h b/src/devices/sound/tms3615.h index 1cbbb698301..c63ef18e7c3 100644 --- a/src/devices/sound/tms3615.h +++ b/src/devices/sound/tms3615.h @@ -31,7 +31,7 @@ class tms3615_device : public device_t, public device_sound_interface { public: - tms3615_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + tms3615_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~tms3615_device() { } protected: diff --git a/src/devices/sound/tms36xx.cpp b/src/devices/sound/tms36xx.cpp index 10eac82aa38..d8052d7651a 100644 --- a/src/devices/sound/tms36xx.cpp +++ b/src/devices/sound/tms36xx.cpp @@ -320,7 +320,7 @@ const device_type TMS36XX = &device_creator<tms36xx_device>; // tms36xx_device - constructor //------------------------------------------------- -tms36xx_device::tms36xx_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +tms36xx_device::tms36xx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, TMS36XX, "TMS36XX", tag, owner, clock, "tms36xx", __FILE__), device_sound_interface(mconfig, *this), m_subtype(nullptr), diff --git a/src/devices/sound/tms36xx.h b/src/devices/sound/tms36xx.h index 565f84918a6..8bb13316771 100644 --- a/src/devices/sound/tms36xx.h +++ b/src/devices/sound/tms36xx.h @@ -43,7 +43,7 @@ class tms36xx_device : public device_t, public device_sound_interface { public: - tms36xx_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + tms36xx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~tms36xx_device() { } static void set_subtype(device_t &device, int type) diff --git a/src/devices/sound/tms5110.cpp b/src/devices/sound/tms5110.cpp index 3d6c8520083..724e2b02c98 100644 --- a/src/devices/sound/tms5110.cpp +++ b/src/devices/sound/tms5110.cpp @@ -1530,7 +1530,7 @@ WRITE_LINE_MEMBER( tmsprom_device::enable_w ) const device_type TMS5110 = &device_creator<tms5110_device>; -tms5110_device::tms5110_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +tms5110_device::tms5110_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, TMS5110, "TMS5110", tag, owner, clock, "tms5110", __FILE__), device_sound_interface(mconfig, *this), m_m0_cb(*this), @@ -1541,7 +1541,7 @@ tms5110_device::tms5110_device(const machine_config &mconfig, std::string tag, d { } -tms5110_device::tms5110_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +tms5110_device::tms5110_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_sound_interface(mconfig, *this), m_m0_cb(*this), @@ -1555,56 +1555,56 @@ tms5110_device::tms5110_device(const machine_config &mconfig, device_type type, const device_type TMS5100 = &device_creator<tms5100_device>; -tms5100_device::tms5100_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +tms5100_device::tms5100_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : tms5110_device(mconfig, TMS5100, "TMS5100", tag, owner, clock, "tms5100", __FILE__) { } const device_type TMC0281 = &device_creator<tmc0281_device>; -tmc0281_device::tmc0281_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +tmc0281_device::tmc0281_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : tms5110_device(mconfig, TMC0281, "TMC0281", tag, owner, clock, "tmc0281", __FILE__) { } const device_type TMS5100A = &device_creator<tms5100a_device>; -tms5100a_device::tms5100a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +tms5100a_device::tms5100a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : tms5110_device(mconfig, TMS5100A, "TMS5100A", tag, owner, clock, "tms5100a", __FILE__) { } const device_type TMC0281D = &device_creator<tmc0281d_device>; -tmc0281d_device::tmc0281d_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +tmc0281d_device::tmc0281d_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : tms5110_device(mconfig, TMC0281D, "TMC0281D", tag, owner, clock, "tmc0281d", __FILE__) { } const device_type CD2801 = &device_creator<cd2801_device>; -cd2801_device::cd2801_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +cd2801_device::cd2801_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : tms5110_device(mconfig, CD2801, "CD2801", tag, owner, clock, "cd2801", __FILE__) { } const device_type CD2802 = &device_creator<cd2802_device>; -cd2802_device::cd2802_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +cd2802_device::cd2802_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : tms5110_device(mconfig, CD2802, "CD2802", tag, owner, clock, "cd2802", __FILE__) { } const device_type TMS5110A = &device_creator<tms5110a_device>; -tms5110a_device::tms5110a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +tms5110a_device::tms5110a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : tms5110_device(mconfig, TMS5110A, "TMS5110A", tag, owner, clock, "tms5110a", __FILE__) { } const device_type M58817 = &device_creator<m58817_device>; -m58817_device::m58817_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +m58817_device::m58817_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : tms5110_device(mconfig, M58817, "M58817", tag, owner, clock, "m58817", __FILE__) { } @@ -1612,7 +1612,7 @@ m58817_device::m58817_device(const machine_config &mconfig, std::string tag, dev const device_type TMSPROM = &device_creator<tmsprom_device>; -tmsprom_device::tmsprom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +tmsprom_device::tmsprom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, TMSPROM, "TMSPROM", tag, owner, clock, "tmsprom", __FILE__), m_prom_region(""), m_rom_size(0), diff --git a/src/devices/sound/tms5110.h b/src/devices/sound/tms5110.h index cd08726663e..6dd6c707fff 100644 --- a/src/devices/sound/tms5110.h +++ b/src/devices/sound/tms5110.h @@ -46,8 +46,8 @@ class tms5110_device : public device_t, public device_sound_interface { public: - tms5110_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - tms5110_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + tms5110_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + tms5110_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); template<class _Object> static devcb_base &set_m0_callback(device_t &device, _Object object) { return downcast<tms5110_device &>(device).m_m0_cb.set_callback(object); } template<class _Object> static devcb_base &set_m1_callback(device_t &device, _Object object) { return downcast<tms5110_device &>(device).m_m1_cb.set_callback(object); } @@ -199,7 +199,7 @@ extern const device_type TMS5110; class tms5100_device : public tms5110_device { public: - tms5100_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + tms5100_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: // device-level overrides virtual void device_start() override; @@ -210,7 +210,7 @@ extern const device_type TMS5100; class tmc0281_device : public tms5110_device { public: - tmc0281_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + tmc0281_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: // device-level overrides virtual void device_start() override; @@ -221,7 +221,7 @@ extern const device_type TMC0281; class tms5100a_device : public tms5110_device { public: - tms5100a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + tms5100a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: // device-level overrides virtual void device_start() override; @@ -232,7 +232,7 @@ extern const device_type TMS5100A; class tmc0281d_device : public tms5110_device { public: - tmc0281d_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + tmc0281d_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: // device-level overrides virtual void device_start() override; @@ -243,7 +243,7 @@ extern const device_type TMC0281D; class cd2801_device : public tms5110_device { public: - cd2801_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + cd2801_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: // device-level overrides virtual void device_start() override; @@ -254,7 +254,7 @@ extern const device_type CD2801; class cd2802_device : public tms5110_device { public: - cd2802_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + cd2802_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: // device-level overrides virtual void device_start() override; @@ -265,7 +265,7 @@ extern const device_type CD2802; class tms5110a_device : public tms5110_device { public: - tms5110a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + tms5110a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: // device-level overrides virtual void device_start() override; @@ -276,7 +276,7 @@ extern const device_type TMS5110A; class m58817_device : public tms5110_device { public: - m58817_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + m58817_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); DECLARE_READ8_MEMBER( status_r ); @@ -294,7 +294,7 @@ extern const device_type M58817; class tmsprom_device : public device_t { public: - tmsprom_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + tmsprom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); static void set_region(device_t &device, const char *region) { downcast<tmsprom_device &>(device).m_prom_region = region; } static void set_rom_size(device_t &device, UINT32 rom_size) { downcast<tmsprom_device &>(device).m_rom_size = rom_size; } diff --git a/src/devices/sound/tms5220.cpp b/src/devices/sound/tms5220.cpp index f5b2fd9c202..ac512ffb004 100644 --- a/src/devices/sound/tms5220.cpp +++ b/src/devices/sound/tms5220.cpp @@ -1454,12 +1454,12 @@ void tms5220_device::update_ready_state() void tms5220_device::device_start() { - if (!m_speechrom_tag.empty()) + if (m_speechrom_tag) { m_speechrom = siblingdevice<speechrom_device>( m_speechrom_tag ); if( !m_speechrom ) { - throw new emu_fatalerror("Error: %s '%s' can't find speechrom '%s'\n", shortname(), tag().c_str(), m_speechrom_tag.c_str() ); + throw new emu_fatalerror("Error: %s '%s' can't find speechrom '%s'\n", shortname(), tag(), m_speechrom_tag ); } } else @@ -1904,7 +1904,7 @@ void tms5220_device::set_frequency(int frequency) const device_type TMS5220C = &device_creator<tms5220c_device>; -tms5220c_device::tms5220c_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +tms5220c_device::tms5220c_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : tms5220_device(mconfig, TMS5220C, "TMS5220C", tag, owner, clock, "tms5220c", __FILE__) { } @@ -1912,19 +1912,21 @@ tms5220c_device::tms5220c_device(const machine_config &mconfig, std::string tag, const device_type TMS5220 = &device_creator<tms5220_device>; -tms5220_device::tms5220_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +tms5220_device::tms5220_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, TMS5220, "TMS5220", tag, owner, clock, "tms5220", __FILE__), device_sound_interface(mconfig, *this), m_irq_handler(*this), - m_readyq_handler(*this) + m_readyq_handler(*this), + m_speechrom_tag(nullptr) { } -tms5220_device::tms5220_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +tms5220_device::tms5220_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_sound_interface(mconfig, *this), m_irq_handler(*this), - m_readyq_handler(*this) + m_readyq_handler(*this), + m_speechrom_tag(nullptr) { } @@ -1941,7 +1943,7 @@ void tms5220_device::device_config_complete() const device_type CD2501E = &device_creator<cd2501e_device>; -cd2501e_device::cd2501e_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +cd2501e_device::cd2501e_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : tms5220_device(mconfig, CD2501E, "CD2501E", tag, owner, clock, "cd2501e", __FILE__) { } @@ -1949,7 +1951,7 @@ cd2501e_device::cd2501e_device(const machine_config &mconfig, std::string tag, d const device_type TMS5200 = &device_creator<tms5200_device>; -tms5200_device::tms5200_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +tms5200_device::tms5200_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : tms5220_device(mconfig, TMS5200, "TMS5200", tag, owner, clock, "tms5200", __FILE__) { } @@ -1957,7 +1959,7 @@ tms5200_device::tms5200_device(const machine_config &mconfig, std::string tag, d const device_type CD2501ECD = &device_creator<cd2501ecd_device>; -cd2501ecd_device::cd2501ecd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +cd2501ecd_device::cd2501ecd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : tms5220_device(mconfig, CD2501ECD, "CD2501ECD", tag, owner, clock, "cd2501ecd", __FILE__) { } diff --git a/src/devices/sound/tms5220.h b/src/devices/sound/tms5220.h index b5dbf271afd..2f764eecb80 100644 --- a/src/devices/sound/tms5220.h +++ b/src/devices/sound/tms5220.h @@ -32,13 +32,13 @@ class tms5220_device : public device_t, public device_sound_interface { public: - tms5220_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - tms5220_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + tms5220_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + tms5220_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // static configuration helpers template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<tms5220_device &>(device).m_irq_handler.set_callback(object); } template<class _Object> static devcb_base &set_readyq_handler(device_t &device, _Object object) { return downcast<tms5220_device &>(device).m_readyq_handler.set_callback(object); } - static void set_speechrom_tag(device_t &device, std::string _tag) { downcast<tms5220_device &>(device).m_speechrom_tag = _tag; } + static void set_speechrom_tag(device_t &device, const char *_tag) { downcast<tms5220_device &>(device).m_speechrom_tag = _tag; } /* Control lines - once written to will switch interface into * "true" timing behaviour. @@ -201,7 +201,7 @@ private: /* callbacks */ devcb_write_line m_irq_handler; devcb_write_line m_readyq_handler; - std::string m_speechrom_tag; + const char *m_speechrom_tag; speechrom_device *m_speechrom; }; @@ -210,7 +210,7 @@ extern const device_type TMS5220; class tms5220c_device : public tms5220_device { public: - tms5220c_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + tms5220c_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: // device-level overrides virtual void device_start() override; @@ -221,7 +221,7 @@ extern const device_type TMS5220C; class cd2501e_device : public tms5220_device { public: - cd2501e_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + cd2501e_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: // device-level overrides virtual void device_start() override; @@ -232,7 +232,7 @@ extern const device_type CD2501E; class tms5200_device : public tms5220_device { public: - tms5200_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + tms5200_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: // device-level overrides virtual void device_start() override; @@ -243,7 +243,7 @@ extern const device_type TMS5200; class cd2501ecd_device : public tms5220_device { public: - cd2501ecd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + cd2501ecd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: // device-level overrides virtual void device_start() override; diff --git a/src/devices/sound/upd7752.cpp b/src/devices/sound/upd7752.cpp index b28d2ec098d..ccb07e56dc7 100644 --- a/src/devices/sound/upd7752.cpp +++ b/src/devices/sound/upd7752.cpp @@ -34,7 +34,7 @@ ADDRESS_MAP_END // upd7752_device - constructor //------------------------------------------------- -upd7752_device::upd7752_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +upd7752_device::upd7752_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, UPD7752, "uPD7752", tag, owner, clock, "upd7752", __FILE__), device_sound_interface(mconfig, *this), device_memory_interface(mconfig, *this), m_stream(nullptr), diff --git a/src/devices/sound/upd7752.h b/src/devices/sound/upd7752.h index b652e23ec28..d801cef0bbe 100644 --- a/src/devices/sound/upd7752.h +++ b/src/devices/sound/upd7752.h @@ -37,7 +37,7 @@ class upd7752_device : public device_t, { public: // construction/destruction - upd7752_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + upd7752_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // I/O operations DECLARE_WRITE8_MEMBER( write ); diff --git a/src/devices/sound/upd7759.cpp b/src/devices/sound/upd7759.cpp index bd4c60afd01..a7e0491687f 100644 --- a/src/devices/sound/upd7759.cpp +++ b/src/devices/sound/upd7759.cpp @@ -144,7 +144,7 @@ #define FRAC_MASK (FRAC_ONE - 1) -upd775x_device::upd775x_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +upd775x_device::upd775x_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), device_sound_interface(mconfig, *this), m_channel(nullptr), @@ -181,14 +181,14 @@ upd775x_device::upd775x_device(const machine_config &mconfig, device_type type, const device_type UPD7759 = &device_creator<upd7759_device>; -upd7759_device::upd7759_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +upd7759_device::upd7759_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : upd775x_device(mconfig, UPD7759, "uPD7759", tag, owner, clock, "upd7759", __FILE__), m_timer(nullptr) { } -upd7759_device::upd7759_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +upd7759_device::upd7759_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : upd775x_device(mconfig, type, name, tag, owner, clock, shortname, source), m_timer(nullptr) { @@ -197,7 +197,7 @@ upd7759_device::upd7759_device(const machine_config &mconfig, device_type type, const device_type UPD7756 = &device_creator<upd7756_device>; -upd7756_device::upd7756_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +upd7756_device::upd7756_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : upd775x_device(mconfig, UPD7756, "uPD7756", tag, owner, clock, "upd7756", __FILE__) { } diff --git a/src/devices/sound/upd7759.h b/src/devices/sound/upd7759.h index a624c51fcdd..637732b22fa 100644 --- a/src/devices/sound/upd7759.h +++ b/src/devices/sound/upd7759.h @@ -37,7 +37,7 @@ class upd775x_device : public device_t, public device_sound_interface { public: - upd775x_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + upd775x_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); ~upd775x_device() {} template<class _Object> static devcb_base &set_drq_callback(device_t &device, _Object object) { return downcast<upd775x_device &>(device).m_drqcallback.set_callback(object); } @@ -109,8 +109,8 @@ protected: class upd7759_device : public upd775x_device { public: - upd7759_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - upd7759_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + upd7759_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + upd7759_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); enum { @@ -130,7 +130,7 @@ public: class upd7756_device : public upd775x_device { public: - upd7756_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + upd7756_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual void device_start() override; virtual void device_reset() override; diff --git a/src/devices/sound/vlm5030.cpp b/src/devices/sound/vlm5030.cpp index 672546fe41c..836a0de7eac 100644 --- a/src/devices/sound/vlm5030.cpp +++ b/src/devices/sound/vlm5030.cpp @@ -159,7 +159,7 @@ static const int vlm5030_speed_table[8] = const device_type VLM5030 = &device_creator<vlm5030_device>; -vlm5030_device::vlm5030_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +vlm5030_device::vlm5030_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, VLM5030, "VLM5030", tag, owner, clock, "vlm5030", __FILE__), device_sound_interface(mconfig, *this), m_channel(nullptr), diff --git a/src/devices/sound/vlm5030.h b/src/devices/sound/vlm5030.h index e0b5a2b5508..cf2c620f13f 100644 --- a/src/devices/sound/vlm5030.h +++ b/src/devices/sound/vlm5030.h @@ -9,7 +9,7 @@ public device_sound_interface { public: - vlm5030_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + vlm5030_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~vlm5030_device() {} /* set speech rom address */ diff --git a/src/devices/sound/votrax.cpp b/src/devices/sound/votrax.cpp index 19543687604..d77b3669aa0 100644 --- a/src/devices/sound/votrax.cpp +++ b/src/devices/sound/votrax.cpp @@ -94,7 +94,7 @@ const double votrax_sc01_device::s_glottal_wave[16] = // votrax_sc01_device - constructor //------------------------------------------------- -votrax_sc01_device::votrax_sc01_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +votrax_sc01_device::votrax_sc01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, VOTRAX_SC01, "Votrax SC-01", tag, owner, clock, "votrax", __FILE__), device_sound_interface(mconfig, *this), m_stream(nullptr), diff --git a/src/devices/sound/votrax.h b/src/devices/sound/votrax.h index 70ebaf6a75c..540f2b5feb1 100644 --- a/src/devices/sound/votrax.h +++ b/src/devices/sound/votrax.h @@ -35,7 +35,7 @@ class votrax_sc01_device : public device_t, { public: // construction/destruction - votrax_sc01_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + votrax_sc01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template<class _Object> static devcb_base &set_request_callback(device_t &device, _Object object) { return downcast<votrax_sc01_device &>(device).m_request_cb.set_callback(object); } diff --git a/src/devices/sound/vrc6.cpp b/src/devices/sound/vrc6.cpp index 46247931aa9..c3673afc2b3 100644 --- a/src/devices/sound/vrc6.cpp +++ b/src/devices/sound/vrc6.cpp @@ -29,7 +29,7 @@ const device_type VRC6 = &device_creator<vrc6snd_device>; // vrc6snd_device - constructor //------------------------------------------------- -vrc6snd_device::vrc6snd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +vrc6snd_device::vrc6snd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, VRC6, "VRC6 sound", tag, owner, clock, "vrc6snd", __FILE__), device_sound_interface(mconfig, *this), m_freqctrl(0), m_sawrate(0), m_sawfrql(0), m_sawfrqh(0), m_sawclock(0), m_sawaccum(0), m_stream(nullptr) { diff --git a/src/devices/sound/vrc6.h b/src/devices/sound/vrc6.h index 8f640f4c6d0..ba4bf2026bb 100644 --- a/src/devices/sound/vrc6.h +++ b/src/devices/sound/vrc6.h @@ -32,7 +32,7 @@ class vrc6snd_device : public device_t, public device_sound_interface { public: // construction/destruction - vrc6snd_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + vrc6snd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); DECLARE_WRITE8_MEMBER(write); diff --git a/src/devices/sound/vrender0.cpp b/src/devices/sound/vrender0.cpp index 67aafd60f47..7226f35d304 100644 --- a/src/devices/sound/vrender0.cpp +++ b/src/devices/sound/vrender0.cpp @@ -83,7 +83,7 @@ const device_type VRENDER0 = &device_creator<vrender0_device>; // vrender0_device - constructor //------------------------------------------------- -vrender0_device::vrender0_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +vrender0_device::vrender0_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, VRENDER0, "VRender0", tag, owner, clock, "vrender0", __FILE__), device_sound_interface(mconfig, *this), m_TexBase(nullptr), diff --git a/src/devices/sound/vrender0.h b/src/devices/sound/vrender0.h index d0f9292d552..490e1ff617b 100644 --- a/src/devices/sound/vrender0.h +++ b/src/devices/sound/vrender0.h @@ -29,7 +29,7 @@ class vrender0_device : public device_t, public device_sound_interface { public: - vrender0_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + vrender0_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~vrender0_device() { } // static configuration diff --git a/src/devices/sound/wave.cpp b/src/devices/sound/wave.cpp index dc2285eaaef..650389b332e 100644 --- a/src/devices/sound/wave.cpp +++ b/src/devices/sound/wave.cpp @@ -30,7 +30,7 @@ void wave_device::static_set_cassette_tag(device_t &device, const char *cassette const device_type WAVE = &device_creator<wave_device>; -wave_device::wave_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +wave_device::wave_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, WAVE, "Wave", tag, owner, clock, "wave", __FILE__), device_sound_interface(mconfig, *this), m_cass(nullptr) { diff --git a/src/devices/sound/wave.h b/src/devices/sound/wave.h index e357713b3df..fde443b90e4 100644 --- a/src/devices/sound/wave.h +++ b/src/devices/sound/wave.h @@ -16,7 +16,7 @@ class wave_device : public device_t, public device_sound_interface { public: - wave_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + wave_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); static void static_set_cassette_tag(device_t &device, const char *cassette_tag); diff --git a/src/devices/sound/x1_010.cpp b/src/devices/sound/x1_010.cpp index a2ec042eb98..8a599027c24 100644 --- a/src/devices/sound/x1_010.cpp +++ b/src/devices/sound/x1_010.cpp @@ -85,7 +85,7 @@ struct X1_010_CHANNEL { const device_type X1_010 = &device_creator<x1_010_device>; -x1_010_device::x1_010_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +x1_010_device::x1_010_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, X1_010, "X1-010", tag, owner, clock, "x1_010", __FILE__), device_sound_interface(mconfig, *this), m_region(*this, DEVICE_SELF), diff --git a/src/devices/sound/x1_010.h b/src/devices/sound/x1_010.h index f8ee7edb343..d5c3c075d02 100644 --- a/src/devices/sound/x1_010.h +++ b/src/devices/sound/x1_010.h @@ -11,7 +11,7 @@ class x1_010_device : public device_t, public device_sound_interface { public: - x1_010_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + x1_010_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~x1_010_device() {} // static configuration diff --git a/src/devices/sound/ymf271.cpp b/src/devices/sound/ymf271.cpp index ec6f8c64469..14dd53be324 100644 --- a/src/devices/sound/ymf271.cpp +++ b/src/devices/sound/ymf271.cpp @@ -1746,7 +1746,7 @@ void ymf271_device::device_reset() const device_type YMF271 = &device_creator<ymf271_device>; -ymf271_device::ymf271_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ymf271_device::ymf271_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, YMF271, "YMF271", tag, owner, clock, "ymf271", __FILE__), device_sound_interface(mconfig, *this), m_timerA(0), diff --git a/src/devices/sound/ymf271.h b/src/devices/sound/ymf271.h index c63f27f8794..b4fbcead1af 100644 --- a/src/devices/sound/ymf271.h +++ b/src/devices/sound/ymf271.h @@ -20,7 +20,7 @@ class ymf271_device : public device_t, public device_sound_interface { public: - ymf271_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + ymf271_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<ymf271_device &>(device).m_irq_handler.set_callback(object); } diff --git a/src/devices/sound/ymf278b.cpp b/src/devices/sound/ymf278b.cpp index d2837cab5dd..af186ff0100 100644 --- a/src/devices/sound/ymf278b.cpp +++ b/src/devices/sound/ymf278b.cpp @@ -1029,7 +1029,7 @@ void ymf278b_device::device_start() const device_type YMF278B = &device_creator<ymf278b_device>; -ymf278b_device::ymf278b_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ymf278b_device::ymf278b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, YMF278B, "YMF278B", tag, owner, clock, "ymf278b", __FILE__), device_sound_interface(mconfig, *this), device_memory_interface(mconfig, *this), diff --git a/src/devices/sound/ymf278b.h b/src/devices/sound/ymf278b.h index 9c8b1d371d6..6c750fcfd91 100644 --- a/src/devices/sound/ymf278b.h +++ b/src/devices/sound/ymf278b.h @@ -17,7 +17,7 @@ class ymf278b_device : public device_t, public device_memory_interface { public: - ymf278b_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + ymf278b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<ymf278b_device &>(device).m_irq_handler.set_callback(object); } diff --git a/src/devices/sound/ymz280b.cpp b/src/devices/sound/ymz280b.cpp index 1c9d7b56098..02c0283b4ae 100644 --- a/src/devices/sound/ymz280b.cpp +++ b/src/devices/sound/ymz280b.cpp @@ -936,7 +936,7 @@ WRITE8_MEMBER( ymz280b_device::write ) const device_type YMZ280B = &device_creator<ymz280b_device>; -ymz280b_device::ymz280b_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ymz280b_device::ymz280b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, YMZ280B, "YMZ280B", tag, owner, clock, "ymz280b", __FILE__), device_sound_interface(mconfig, *this), m_current_register(0), diff --git a/src/devices/sound/ymz280b.h b/src/devices/sound/ymz280b.h index 1a987f70984..44cd6e16665 100644 --- a/src/devices/sound/ymz280b.h +++ b/src/devices/sound/ymz280b.h @@ -29,7 +29,7 @@ class ymz280b_device : public device_t, public device_sound_interface { public: - ymz280b_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + ymz280b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<ymz280b_device &>(device).m_irq_handler.set_callback(object); } diff --git a/src/devices/sound/ymz770.cpp b/src/devices/sound/ymz770.cpp index aa380501ddc..6456c346ffd 100644 --- a/src/devices/sound/ymz770.cpp +++ b/src/devices/sound/ymz770.cpp @@ -30,7 +30,7 @@ const device_type YMZ770 = &device_creator<ymz770_device>; // ymz770_device - constructor //------------------------------------------------- -ymz770_device::ymz770_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +ymz770_device::ymz770_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, YMZ770, "Yamaha YMZ770", tag, owner, clock, "ymz770", __FILE__), device_sound_interface(mconfig, *this), m_stream(nullptr), m_cur_reg(0), diff --git a/src/devices/sound/ymz770.h b/src/devices/sound/ymz770.h index 92fa8c808b9..ddcd72e7bfa 100644 --- a/src/devices/sound/ymz770.h +++ b/src/devices/sound/ymz770.h @@ -63,7 +63,7 @@ class ymz770_device : public device_t, public device_sound_interface public: // construction/destruction - ymz770_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + ymz770_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); DECLARE_WRITE8_MEMBER(write); diff --git a/src/devices/sound/zsg2.cpp b/src/devices/sound/zsg2.cpp index 7f335b13c68..805acd892cc 100644 --- a/src/devices/sound/zsg2.cpp +++ b/src/devices/sound/zsg2.cpp @@ -65,7 +65,7 @@ const device_type ZSG2 = &device_creator<zsg2_device>; // zsg2_device - constructor //------------------------------------------------- -zsg2_device::zsg2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +zsg2_device::zsg2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ZSG2, "ZSG-2", tag, owner, clock, "zsg2", __FILE__), device_sound_interface(mconfig, *this), m_mem_base(*this, DEVICE_SELF), diff --git a/src/devices/sound/zsg2.h b/src/devices/sound/zsg2.h index 5886878eb51..c88e2c60cc5 100644 --- a/src/devices/sound/zsg2.h +++ b/src/devices/sound/zsg2.h @@ -29,7 +29,7 @@ class zsg2_device : public device_t, public device_sound_interface { public: - zsg2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + zsg2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~zsg2_device() { } // static configuration helpers |