summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/sound
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2016-01-16 20:05:32 +0100
committer Miodrag Milanovic <mmicko@gmail.com>2016-01-16 20:05:32 +0100
commitcaba131d844ade3f2b30d6be24ea6cf46b2949d7 (patch)
tree03a87639748f22e37c6ef572354e8662517b7ec9 /src/devices/sound
parent2d96e6f4d304f1e8dbc15d305b9445769724219b (diff)
rest of device parameters to std::string (nw)
Diffstat (limited to 'src/devices/sound')
-rw-r--r--src/devices/sound/2610intf.cpp2
-rw-r--r--src/devices/sound/2610intf.h2
-rw-r--r--src/devices/sound/2612intf.cpp2
-rw-r--r--src/devices/sound/2612intf.h2
-rw-r--r--src/devices/sound/ay8910.cpp10
-rw-r--r--src/devices/sound/ay8910.h4
-rw-r--r--src/devices/sound/discrete.cpp2
-rw-r--r--src/devices/sound/discrete.h2
-rw-r--r--src/devices/sound/es5506.cpp2
-rw-r--r--src/devices/sound/es5506.h2
-rw-r--r--src/devices/sound/gaelco.cpp2
-rw-r--r--src/devices/sound/gaelco.h2
-rw-r--r--src/devices/sound/hc55516.cpp2
-rw-r--r--src/devices/sound/hc55516.h2
-rw-r--r--src/devices/sound/mos6560.cpp2
-rw-r--r--src/devices/sound/mos6560.h2
-rw-r--r--src/devices/sound/mos6581.cpp2
-rw-r--r--src/devices/sound/mos6581.h2
-rw-r--r--src/devices/sound/mos7360.h2
-rw-r--r--src/devices/sound/msm5205.cpp2
-rw-r--r--src/devices/sound/msm5205.h2
-rw-r--r--src/devices/sound/namco.cpp2
-rw-r--r--src/devices/sound/namco.h2
-rw-r--r--src/devices/sound/samples.cpp2
-rw-r--r--src/devices/sound/samples.h2
-rw-r--r--src/devices/sound/sn76496.cpp2
-rw-r--r--src/devices/sound/sn76496.h2
-rw-r--r--src/devices/sound/tms5110.cpp2
-rw-r--r--src/devices/sound/tms5110.h2
-rw-r--r--src/devices/sound/tms5220.cpp4
-rw-r--r--src/devices/sound/tms5220.h2
-rw-r--r--src/devices/sound/upd7759.cpp4
-rw-r--r--src/devices/sound/upd7759.h4
33 files changed, 41 insertions, 41 deletions
diff --git a/src/devices/sound/2610intf.cpp b/src/devices/sound/2610intf.cpp
index 004df9a8335..053830e0585 100644
--- a/src/devices/sound/2610intf.cpp
+++ b/src/devices/sound/2610intf.cpp
@@ -212,7 +212,7 @@ ym2610_device::ym2610_device(const machine_config &mconfig, std::string tag, dev
{
}
-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, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source)
: ay8910_device(mconfig, type, name, tag, owner, clock, PSG_TYPE_YM, 1, 0, shortname, source),
m_irq_handler(*this)
{
diff --git a/src/devices/sound/2610intf.h b/src/devices/sound/2610intf.h
index cb7b1acbbc0..bbb3392c95c 100644
--- a/src/devices/sound/2610intf.h
+++ b/src/devices/sound/2610intf.h
@@ -17,7 +17,7 @@ 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, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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); }
diff --git a/src/devices/sound/2612intf.cpp b/src/devices/sound/2612intf.cpp
index 0771157b56d..be68f080422 100644
--- a/src/devices/sound/2612intf.cpp
+++ b/src/devices/sound/2612intf.cpp
@@ -157,7 +157,7 @@ ym2612_device::ym2612_device(const machine_config &mconfig, std::string tag, dev
{
}
-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, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_sound_interface(mconfig, *this),
m_irq_handler(*this)
diff --git a/src/devices/sound/2612intf.h b/src/devices/sound/2612intf.h
index cb18940637f..3dd596eea26 100644
--- a/src/devices/sound/2612intf.h
+++ b/src/devices/sound/2612intf.h
@@ -17,7 +17,7 @@ class ym2612_device : public device_t,
{
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, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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); }
diff --git a/src/devices/sound/ay8910.cpp b/src/devices/sound/ay8910.cpp
index 3b2a57bd318..d51defa982b 100644
--- a/src/devices/sound/ay8910.cpp
+++ b/src/devices/sound/ay8910.cpp
@@ -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().c_str(), name().c_str());
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().c_str(), name().c_str());
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().c_str(), tag().c_str());
m_streams = 1;
}
@@ -1165,8 +1165,8 @@ 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,
- psg_type_t psg_type, int streams, int ioports, const char *shortname, const char *source)
+ay8910_device::ay8910_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock,
+ psg_type_t psg_type, int streams, int ioports, std::string shortname, std::string source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_sound_interface(mconfig, *this),
m_type(psg_type),
diff --git a/src/devices/sound/ay8910.h b/src/devices/sound/ay8910.h
index 853f40853ea..a4a860461af 100644
--- a/src/devices/sound/ay8910.h
+++ b/src/devices/sound/ay8910.h
@@ -101,8 +101,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,
- UINT32 clock, psg_type_t psg_type, int streams, int ioports, const char *shortname, const char *source);
+ ay8910_device(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner,
+ UINT32 clock, psg_type_t psg_type, int streams, int ioports, std::string shortname, std::string source);
// static configuration helpers
static void set_flags(device_t &device, int flags) { downcast<ay8910_device &>(device).m_flags = flags; }
diff --git a/src/devices/sound/discrete.cpp b/src/devices/sound/discrete.cpp
index 55326a0bd7e..c66e5cd9884 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, std::string name, std::string tag, device_t *owner, UINT32 clock)
: device_t(mconfig, type, name, tag, owner, clock, "discrete", __FILE__),
m_intf(nullptr),
m_sample_rate(0),
diff --git a/src/devices/sound/discrete.h b/src/devices/sound/discrete.h
index a82f3c1b6db..c6ff30cd6b2 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, std::string name, std::string tag, device_t *owner, UINT32 clock);
public:
// inline configuration helpers
diff --git a/src/devices/sound/es5506.cpp b/src/devices/sound/es5506.cpp
index 2a43090188f..8375955c485 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, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_sound_interface(mconfig, *this),
m_stream(nullptr),
diff --git a/src/devices/sound/es5506.h b/src/devices/sound/es5506.h
index f9804a69647..798d66d596a 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, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source);
~es550x_device() {}
static void set_region0(device_t &device, const char *region0) { downcast<es550x_device &>(device).m_region0 = region0; }
diff --git a/src/devices/sound/gaelco.cpp b/src/devices/sound/gaelco.cpp
index 9202e35a7e9..a696b0ac475 100644
--- a/src/devices/sound/gaelco.cpp
+++ b/src/devices/sound/gaelco.cpp
@@ -64,7 +64,7 @@ gaelco_gae1_device::gaelco_gae1_device(const machine_config &mconfig, std::strin
{
}
-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, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_sound_interface(mconfig, *this),
m_stream(nullptr),
diff --git a/src/devices/sound/gaelco.h b/src/devices/sound/gaelco.h
index 57695f1eb48..2c8ba538867 100644
--- a/src/devices/sound/gaelco.h
+++ b/src/devices/sound/gaelco.h
@@ -41,7 +41,7 @@ class gaelco_gae1_device : public device_t,
{
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, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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; }
diff --git a/src/devices/sound/hc55516.cpp b/src/devices/sound/hc55516.cpp
index 256e9c427e8..06a43dc5d63 100644
--- a/src/devices/sound/hc55516.cpp
+++ b/src/devices/sound/hc55516.cpp
@@ -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, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_sound_interface(mconfig, *this),
m_channel(nullptr),
diff --git a/src/devices/sound/hc55516.h b/src/devices/sound/hc55516.h
index f676afec8ee..2ceb38d1053 100644
--- a/src/devices/sound/hc55516.h
+++ b/src/devices/sound/hc55516.h
@@ -10,7 +10,7 @@ class hc55516_device : public device_t,
{
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, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source);
~hc55516_device() {}
/* sets the digit (0 or 1) */
diff --git a/src/devices/sound/mos6560.cpp b/src/devices/sound/mos6560.cpp
index 5e9e0cdff36..09ea8e16892 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, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, std::string shortname, std::string source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_memory_interface(mconfig, *this),
device_sound_interface(mconfig, *this),
diff --git a/src/devices/sound/mos6560.h b/src/devices/sound/mos6560.h
index 202f71385b4..b8d249cde85 100644
--- a/src/devices/sound/mos6560.h
+++ b/src/devices/sound/mos6560.h
@@ -135,7 +135,7 @@ 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, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, std::string shortname, std::string source);
mos6560_device(const machine_config &mconfig, std::string 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); }
diff --git a/src/devices/sound/mos6581.cpp b/src/devices/sound/mos6581.cpp
index 163f337afeb..bed5b5109ba 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, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, std::string shortname, std::string source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_sound_interface(mconfig, *this),
m_read_potx(*this),
diff --git a/src/devices/sound/mos6581.h b/src/devices/sound/mos6581.h
index 8a4a859b321..80ef13ff7b9 100644
--- a/src/devices/sound/mos6581.h
+++ b/src/devices/sound/mos6581.h
@@ -56,7 +56,7 @@ 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, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, UINT32 variant, std::string shortname, std::string source);
mos6581_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
~mos6581_device();
diff --git a/src/devices/sound/mos7360.h b/src/devices/sound/mos7360.h
index aea354b8ce6..ac122569e39 100644
--- a/src/devices/sound/mos7360.h
+++ b/src/devices/sound/mos7360.h
@@ -94,7 +94,7 @@ 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, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock);
mos7360_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
template<class _irq, class _k> void set_callbacks(const char *cpu_tag, _irq irq, _k k) {
diff --git a/src/devices/sound/msm5205.cpp b/src/devices/sound/msm5205.cpp
index fc88a05cceb..003f3e839da 100644
--- a/src/devices/sound/msm5205.cpp
+++ b/src/devices/sound/msm5205.cpp
@@ -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, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_sound_interface(mconfig, *this),
m_prescaler(0),
diff --git a/src/devices/sound/msm5205.h b/src/devices/sound/msm5205.h
index 0c8283ebbc1..34980aaea85 100644
--- a/src/devices/sound/msm5205.h
+++ b/src/devices/sound/msm5205.h
@@ -44,7 +44,7 @@ class msm5205_device : public device_t,
{
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, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source);
~msm5205_device() {}
static void set_prescaler_selector(device_t &device, int select) { downcast<msm5205_device &>(device).m_select = select; }
diff --git a/src/devices/sound/namco.cpp b/src/devices/sound/namco.cpp
index 69632ccf1fb..ea0b201c895 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, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__),
device_sound_interface(mconfig, *this),
m_last_channel(nullptr),
diff --git a/src/devices/sound/namco.h b/src/devices/sound/namco.h
index 27cd8d85fef..88b3926b811 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, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source);
~namco_audio_device() {}
// static configuration
diff --git a/src/devices/sound/samples.cpp b/src/devices/sound/samples.cpp
index e7100d1f054..d00751d19a7 100644
--- a/src/devices/sound/samples.cpp
+++ b/src/devices/sound/samples.cpp
@@ -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, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_sound_interface(mconfig, *this),
m_channels(0),
diff --git a/src/devices/sound/samples.h b/src/devices/sound/samples.h
index 7d42a2f0f0c..33d4a80ced6 100644
--- a/src/devices/sound/samples.h
+++ b/src/devices/sound/samples.h
@@ -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, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/sound/sn76496.cpp b/src/devices/sound/sn76496.cpp
index 79546e16be8..53896d9221a 100644
--- a/src/devices/sound/sn76496.cpp
+++ b/src/devices/sound/sn76496.cpp
@@ -132,7 +132,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,
- device_t *owner, UINT32 clock, const char *shortname, const char *source)
+ device_t *owner, UINT32 clock, std::string shortname, std::string source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_sound_interface(mconfig, *this),
diff --git a/src/devices/sound/sn76496.h b/src/devices/sound/sn76496.h
index f7f9bea7714..f1659469aae 100644
--- a/src/devices/sound/sn76496.h
+++ b/src/devices/sound/sn76496.h
@@ -25,7 +25,7 @@ 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,
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 *owner, UINT32 clock, std::string shortname, std::string source);
// static configuration helpers
template<class _Object> static devcb_base &set_ready_handler(device_t &device, _Object object) { return downcast<sn76496_base_device &>(device).m_ready_handler.set_callback(object); }
diff --git a/src/devices/sound/tms5110.cpp b/src/devices/sound/tms5110.cpp
index 3d6c8520083..651cf134070 100644
--- a/src/devices/sound/tms5110.cpp
+++ b/src/devices/sound/tms5110.cpp
@@ -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, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_sound_interface(mconfig, *this),
m_m0_cb(*this),
diff --git a/src/devices/sound/tms5110.h b/src/devices/sound/tms5110.h
index cd08726663e..35b5fd4f809 100644
--- a/src/devices/sound/tms5110.h
+++ b/src/devices/sound/tms5110.h
@@ -47,7 +47,7 @@ class tms5110_device : public device_t,
{
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, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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); }
diff --git a/src/devices/sound/tms5220.cpp b/src/devices/sound/tms5220.cpp
index f5b2fd9c202..fc35af0411c 100644
--- a/src/devices/sound/tms5220.cpp
+++ b/src/devices/sound/tms5220.cpp
@@ -1459,7 +1459,7 @@ void tms5220_device::device_start()
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().c_str(), tag().c_str(), m_speechrom_tag.c_str() );
}
}
else
@@ -1920,7 +1920,7 @@ tms5220_device::tms5220_device(const machine_config &mconfig, std::string tag, d
{
}
-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, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_sound_interface(mconfig, *this),
m_irq_handler(*this),
diff --git a/src/devices/sound/tms5220.h b/src/devices/sound/tms5220.h
index b5dbf271afd..db3fbe22c20 100644
--- a/src/devices/sound/tms5220.h
+++ b/src/devices/sound/tms5220.h
@@ -33,7 +33,7 @@ class tms5220_device : public device_t,
{
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, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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); }
diff --git a/src/devices/sound/upd7759.cpp b/src/devices/sound/upd7759.cpp
index bd4c60afd01..5891696fe62 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, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_sound_interface(mconfig, *this),
m_channel(nullptr),
@@ -188,7 +188,7 @@ upd7759_device::upd7759_device(const machine_config &mconfig, std::string tag, d
}
-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, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source)
: upd775x_device(mconfig, type, name, tag, owner, clock, shortname, source),
m_timer(nullptr)
{
diff --git a/src/devices/sound/upd7759.h b/src/devices/sound/upd7759.h
index a624c51fcdd..cf53812f0a7 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, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string 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); }
@@ -110,7 +110,7 @@ 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, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source);
enum
{