Browse Source

Merge commit 'a450cdcc4874028a52a82207c38b39ecb1ee1d64'

Partial merge from pr/77

Setting the JACK_NO_AUDIO_RESERVATION environment variable let one skip
the audio reservation bits.
tags/v1.9.11-RC1
Adrian Knoth 10 years ago
parent
commit
3c05a0b36e
1 changed files with 5 additions and 1 deletions
  1. +5
    -1
      common/Jackdmp.cpp

+ 5
- 1
common/Jackdmp.cpp View File

@@ -38,6 +38,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#endif

#if defined(JACK_DBUS) && defined(__linux__)
#include <stdlib.h>
#include <dbus/dbus.h>
#include "audio_reserve.h"
#endif
@@ -304,7 +305,10 @@ int main(int argc, char** argv)

copyright(stdout);
#if defined(JACK_DBUS) && defined(__linux__)
server_ctl = jackctl_server_create(audio_acquire, audio_release);
if (getenv("JACK_NO_AUDIO_RESERVATION"))
server_ctl = jackctl_server_create(NULL, NULL);
else
server_ctl = jackctl_server_create(audio_acquire, audio_release);
#else
server_ctl = jackctl_server_create(NULL, NULL);
#endif


Loading…
Cancel
Save