Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-21 07:52:35 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #580 from ajrhacker/inputname

Browse Source 
Have sound_stream::input_name return the std::string it constructs [AJR]
This commit is contained in:
Miodrag Milanović 2016-01-25 08:20:33 +01:00
commit 494aec133f
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/emu/sound.cpp
View File

@ -163,8 +163,10 @@ float sound_stream::output_gain(int outputnum) const
// on a given stream's input
//-------------------------------------------------
const char *sound_stream::input_name(int inputnum, std::string &str) const
std::string sound_stream::input_name(int inputnum) const
{
std::string str;
// start with our device name and tag
assert(inputnum >= 0 && inputnum < m_input.size());
strprintf(str, "%s '%s': ", m_device.name(), m_device.tag());
@ -191,7 +193,7 @@ const char *sound_stream::input_name(int inputnum, std::string &str) const
}
}
}
return str.c_str();
return str;
}

2
src/emu/sound.h
View File

@ -106,7 +106,7 @@ public:
attotime sample_period() const { return attotime(0, m_attoseconds_per_sample); }
int input_count() const { return m_input.size(); }
int output_count() const { return m_output.size(); }
const char *input_name(int inputnum, std::string &str) const;
std::string input_name(int inputnum) const;
device_t *input_source_device(int inputnum) const;
int input_source_outputnum(int inputnum) const;
float user_gain(int inputnum) const;

2
src/emu/ui/ui.cpp
View File

@ -1872,7 +1872,7 @@ static slider_state *slider_init(running_machine &machine)
INT32 maxval = 2000;
INT32 defval = 1000;
info.stream->input_name(info.inputnum, str);
str.assign(info.stream->input_name(info.inputnum));
str.append(" Volume");
*tailptr = slider_alloc(machine, str.c_str(), 0, defval, maxval, 20, slider_mixervol, (void *)(FPTR)item);
tailptr = &(*tailptr)->next;