mirror of
https://github.com/Ardour/ardour.git
synced 2025-12-09 08:14:58 +01:00
audio_backend: Get name of standard device directly, without unnecessary enum StandardDeviceName
The StandardDeviceName enum was misleadingly *not* the name - the name only came from get_standard_device_name. Instead, simplify things, and just use two different trivial getters.
This commit is contained in:
parent
29e71b5c82
commit
a3ac3c7201
9 changed files with 53 additions and 62 deletions
|
|
@ -177,7 +177,7 @@ CoreAudioBackend::enumerate_input_devices () const
|
|||
std::map<size_t, std::string> devices;
|
||||
_pcmio->input_device_list(devices);
|
||||
|
||||
_input_audio_device_status.push_back (DeviceStatus (get_standard_device_name(DeviceNone), true));
|
||||
_input_audio_device_status.push_back (DeviceStatus (get_none_device_name (), true));
|
||||
for (std::map<size_t, std::string>::const_iterator i = devices.begin (); i != devices.end(); ++i) {
|
||||
if (_input_audio_device == "") _input_audio_device = i->second;
|
||||
_input_audio_device_status.push_back (DeviceStatus (i->second, true));
|
||||
|
|
@ -193,7 +193,7 @@ CoreAudioBackend::enumerate_output_devices () const
|
|||
std::map<size_t, std::string> devices;
|
||||
_pcmio->output_device_list(devices);
|
||||
|
||||
_output_audio_device_status.push_back (DeviceStatus (get_standard_device_name(DeviceNone), true));
|
||||
_output_audio_device_status.push_back (DeviceStatus (get_none_device_name (), true));
|
||||
for (std::map<size_t, std::string>::const_iterator i = devices.begin (); i != devices.end(); ++i) {
|
||||
if (_output_audio_device == "") _output_audio_device = i->second;
|
||||
_output_audio_device_status.push_back (DeviceStatus (i->second, true));
|
||||
|
|
@ -417,7 +417,7 @@ CoreAudioBackend::enumerate_midi_options () const
|
|||
{
|
||||
if (_midi_options.empty()) {
|
||||
_midi_options.push_back (_("CoreMidi"));
|
||||
_midi_options.push_back (get_standard_device_name(DeviceNone));
|
||||
_midi_options.push_back (get_none_device_name ());
|
||||
}
|
||||
return _midi_options;
|
||||
}
|
||||
|
|
@ -425,7 +425,7 @@ CoreAudioBackend::enumerate_midi_options () const
|
|||
int
|
||||
CoreAudioBackend::set_midi_option (const std::string& opt)
|
||||
{
|
||||
if (opt != get_standard_device_name(DeviceNone) && opt != _("CoreMidi")) {
|
||||
if (opt != get_none_device_name () && opt != _("CoreMidi")) {
|
||||
return -1;
|
||||
}
|
||||
_midi_driver_option = opt;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue