summaryrefslogtreecommitdiff
path: root/common/JackServerGlobals.h
diff options
context:
space:
mode:
authorNedko Arnaudov <nedko@arnaudov.name>2009-07-07 21:18:39 +0300
committerNedko Arnaudov <nedko@arnaudov.name>2009-07-07 21:18:39 +0300
commit6db194b3548400cdfc63c2a8bd29d05cb07dc1a8 (patch)
treeed7de8c17ef144d779c5545561662e1065fbb90a /common/JackServerGlobals.h
parent8136926def1445562c91247218a4cd84223e5608 (diff)
parent00a05b846b308025bf67d742e3c1d58c98edad14 (diff)
downloadjack2-6db194b3548400cdfc63c2a8bd29d05cb07dc1a8.tar.gz
Merge branch 'master' into no-self-connect
Conflicts: common/JackControlAPI.cpp
Diffstat (limited to 'common/JackServerGlobals.h')
-rw-r--r--common/JackServerGlobals.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/common/JackServerGlobals.h b/common/JackServerGlobals.h
index 9f29e3c6..b0402522 100644
--- a/common/JackServerGlobals.h
+++ b/common/JackServerGlobals.h
@@ -38,6 +38,8 @@ struct SERVER_EXPORT JackServerGlobals
{
static JackServer* fInstance;
static unsigned int fUserCount;
+ static bool (* on_device_acquire)(const char * device_name);
+ static void (* on_device_release)(const char * device_name);
JackServerGlobals();
~JackServerGlobals();