smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-11 17:16:38 +01:00
Code Issues Projects Releases Wiki Activity

Use AudioBackend::get_standard_device_name for "None" midi device in PortaudioBackend

Browse source
This commit is contained in:
Tim Mayberry 2015-08-22 20:04:29 +10:00
parent 94f3e3029a
commit ee77a7a883
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
libs/backends/portaudio/portaudio_backend.cc
View file

@ -32,6 +32,7 @@
#include "pbd/compose.h" #include "pbd/compose.h"
#include "pbd/error.h" #include "pbd/error.h"
#include "pbd/file_utils.h" #include "pbd/file_utils.h"
#include "ardour/filesystem_paths.h" #include "ardour/filesystem_paths.h"
#include "ardour/port_manager.h" #include "ardour/port_manager.h"
#include "i18n.h" #include "i18n.h"
@ -67,7 +68,7 @@ PortAudioBackend::PortAudioBackend (AudioEngine& e, AudioBackendInfo& info)
, m_max_deviation_us(0) , m_max_deviation_us(0)
, _input_audio_device("") , _input_audio_device("")
, _output_audio_device("") , _output_audio_device("")
, _midi_driver_option(_("None")) , _midi_driver_option(get_standard_device_name(DeviceNone))
, _samplerate (48000) , _samplerate (48000)
, _samples_per_period (1024) , _samples_per_period (1024)
, _n_inputs (0) , _n_inputs (0)
@ -395,7 +396,7 @@ PortAudioBackend::enumerate_midi_options () const
{ {
if (_midi_options.empty()) { if (_midi_options.empty()) {
_midi_options.push_back (winmme_driver_name); _midi_options.push_back (winmme_driver_name);
_midi_options.push_back (_("None")); _midi_options.push_back (get_standard_device_name(DeviceNone));
} }
return _midi_options; return _midi_options;
} }
@ -403,7 +404,7 @@ PortAudioBackend::enumerate_midi_options () const
int int
PortAudioBackend::set_midi_option (const std::string& opt) PortAudioBackend::set_midi_option (const std::string& opt)
{ {
if (opt != _("None") && opt != winmme_driver_name) { if (opt != get_standard_device_name(DeviceNone) && opt != winmme_driver_name) {
return -1; return -1;
} }
DEBUG_MIDI (string_compose ("Setting midi option to %1\n", opt)); DEBUG_MIDI (string_compose ("Setting midi option to %1\n", opt));
@ -961,8 +962,8 @@ PortAudioBackend::register_system_audio_ports()
int int
PortAudioBackend::register_system_midi_ports() PortAudioBackend::register_system_midi_ports()
{ {
if (_midi_driver_option == _("None")) { if (_midi_driver_option == get_standard_device_name(DeviceNone)) {
DEBUG_MIDI ("No MIDI backend selected, not system midi ports available\n"); DEBUG_MIDI("No MIDI backend selected, not system midi ports available\n");
return 0; return 0;
} }