smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-10 08:36:32 +01:00
Code Issues Projects Releases Wiki Activity

Merge 79e99c12a5 into 152e0c2beb

Browse source
This commit is contained in:
kiilerix 2025-11-28 18:12:52 -08:00 • committed by GitHub
commit 13305304af
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
28 changed files with 106 additions and 165 deletions
Download patch file Download diff file Expand all files Collapse all files

20
libs/backends/coreaudio/coreaudio_backend.cc
View file

@ -148,12 +148,6 @@ CoreAudioBackend::name () const
return X_("CoreAudio");
}
bool
CoreAudioBackend::is_realtime () const
{
return true;
}
std::vector<AudioBackend::DeviceStatus>
CoreAudioBackend::enumerate_devices () const
{
@ -176,7 +170,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));
@ -192,7 +186,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));
@ -416,7 +410,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;
}
@ -424,7 +418,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;
@ -1534,7 +1528,7 @@ CoreAudioBackend::hw_changed_callback ()
static std::shared_ptr<CoreAudioBackend> _instance;
static std::shared_ptr<AudioBackend> backend_factory (AudioEngine& e);
static int instantiate (const std::string& arg1, const std::string& /* arg2 */);
static int instantiate (const std::string& client_name, const std::string& /* session_id */);
static int deinstantiate ();
static bool already_configured ();
static bool available ();
@ -1558,9 +1552,9 @@ backend_factory (AudioEngine& e)
}
static int
instantiate (const std::string& arg1, const std::string& /* arg2 */)
instantiate (const std::string& client_name, const std::string& /* session_id */)
{
s_instance_name = arg1;
s_instance_name = client_name;
return 0;
}