249 |
} |
} |
250 |
|
|
251 |
String AudioOutputDeviceJack::Version() { |
String AudioOutputDeviceJack::Version() { |
252 |
String s = "$Revision: 1.22 $"; |
String s = "$Revision: 1.23 $"; |
253 |
return s.substr(11, s.size() - 13); // cut dollar signs, spaces and CVS macro keyword |
return s.substr(11, s.size() - 13); // cut dollar signs, spaces and CVS macro keyword |
254 |
} |
} |
255 |
|
|
291 |
{ |
{ |
292 |
config_t& config = Config.GetConfigForUpdate(); |
config_t& config = Config.GetConfigForUpdate(); |
293 |
config.AudioDevice = 0; |
config.AudioDevice = 0; |
294 |
|
#if HAVE_JACK_MIDI |
295 |
config.MidiDevice = 0; |
config.MidiDevice = 0; |
296 |
|
#endif |
297 |
} |
} |
298 |
{ |
{ |
299 |
config_t& config = Config.SwitchConfig(); |
config_t& config = Config.SwitchConfig(); |
300 |
config.AudioDevice = 0; |
config.AudioDevice = 0; |
301 |
|
#if HAVE_JACK_MIDI |
302 |
config.MidiDevice = 0; |
config.MidiDevice = 0; |
303 |
|
#endif |
304 |
} |
} |
305 |
audio = midi = false; |
audio = midi = false; |
306 |
if (Name.size() >= jack_client_name_size()) |
if (Name.size() >= jack_client_name_size()) |
322 |
Config.SwitchConfig().AudioDevice = device; |
Config.SwitchConfig().AudioDevice = device; |
323 |
} |
} |
324 |
|
|
325 |
|
#if HAVE_JACK_MIDI |
326 |
void JackClient::SetMidiInputDevice(MidiInputDeviceJack* device) { |
void JackClient::SetMidiInputDevice(MidiInputDeviceJack* device) { |
327 |
Config.GetConfigForUpdate().MidiDevice = device; |
Config.GetConfigForUpdate().MidiDevice = device; |
328 |
Config.SwitchConfig().MidiDevice = device; |
Config.SwitchConfig().MidiDevice = device; |
329 |
} |
} |
330 |
|
#endif |
331 |
|
|
332 |
JackClient* JackClient::CreateAudio(String Name) { // static |
JackClient* JackClient::CreateAudio(String Name) { // static |
333 |
JackClient* client; |
JackClient* client; |
369 |
|
|
370 |
void JackClient::ReleaseMidi(String Name) { // static |
void JackClient::ReleaseMidi(String Name) { // static |
371 |
JackClient* client = Clients[Name]; |
JackClient* client = Clients[Name]; |
372 |
|
#if HAVE_JACK_MIDI |
373 |
client->SetMidiInputDevice(0); |
client->SetMidiInputDevice(0); |
374 |
|
#endif |
375 |
client->midi = false; |
client->midi = false; |
376 |
if (!client->audio) { |
if (!client->audio) { |
377 |
Clients.erase(Name); |
Clients.erase(Name); |