Browse Source

Set complete NSM app nane when using special startup script

Fixes #490
tags/1.9.8
falkTX 7 years ago
parent
commit
d0ec1f701f
5 changed files with 21 additions and 3 deletions
  1. +12
    -2
      source/backend/CarlaStandaloneNSM.cpp
  2. +3
    -1
      source/carla-jack-multi
  3. +2
    -0
      source/carla-jack-single
  4. +2
    -0
      source/carla-patchbay
  5. +2
    -0
      source/carla-rack

+ 12
- 2
source/backend/CarlaStandaloneNSM.cpp View File

@@ -124,8 +124,13 @@ public:
fServerURL = lo_server_thread_get_url(fServerThread);
}

const char* appName = std::getenv("CARLA_NSM_NAME");

if (appName == nullptr)
appName = "Carla";

lo_send_from(nsmAddress, fServer, LO_TT_IMMEDIATE, "/nsm/server/announce", "sssiii",
"Carla", NSM_CLIENT_FEATURES, executableName, NSM_API_VERSION_MAJOR, NSM_API_VERSION_MINOR, pid);
appName, NSM_CLIENT_FEATURES, executableName, NSM_API_VERSION_MAJOR, NSM_API_VERSION_MINOR, pid);

lo_address_free(nsmAddress);

@@ -290,8 +295,13 @@ protected:
// Broadcast ourselves
if (fHasBroadcast)
{
const char* appName = std::getenv("CARLA_NSM_NAME");

if (appName == nullptr)
appName = "Carla";

lo_send_from(fReplyAddress, fServer, LO_TT_IMMEDIATE, "/nsm/server/broadcast", "sssss",
"/non/hello", fServerURL, "Carla", CARLA_VERSION_STRING, fClientNameId.buffer());
"/non/hello", fServerURL, appName, CARLA_VERSION_STRING, fClientNameId.buffer());
}

return 0;


+ 3
- 1
source/carla-jack-multi View File

@@ -33,7 +33,7 @@ if __name__ == '__main__':
# ------------------------------------------------------------------------------------------------------------------
# App initialization

app = CarlaApplication("Carla2-Single-Client", libPrefix)
app = CarlaApplication("Carla2-Multi-Client", libPrefix)

# ------------------------------------------------------------------------------------------------------------------
# Set-up custom signal handling
@@ -43,6 +43,8 @@ if __name__ == '__main__':
# ------------------------------------------------------------------------------------------------------------------
# Init host backend

os.environ["CARLA_NSM_NAME"] = "Carla-Multi-Client"

host = initHost(initName, libPrefix, False, False, True)
host.audioDriverForced = "JACK"
host.processMode = ENGINE_PROCESS_MODE_MULTIPLE_CLIENTS


+ 2
- 0
source/carla-jack-single View File

@@ -43,6 +43,8 @@ if __name__ == '__main__':
# ------------------------------------------------------------------------------------------------------------------
# Init host backend

os.environ["CARLA_NSM_NAME"] = "Carla-Single-Client"

host = initHost(initName, libPrefix, False, False, True)
host.audioDriverForced = "JACK"
host.processMode = ENGINE_PROCESS_MODE_SINGLE_CLIENT


+ 2
- 0
source/carla-patchbay View File

@@ -43,6 +43,8 @@ if __name__ == '__main__':
# ------------------------------------------------------------------------------------------------------------------
# Init host backend

os.environ["CARLA_NSM_NAME"] = "Carla-Patchbay"

host = initHost(initName, libPrefix, False, False, True)
host.processMode = ENGINE_PROCESS_MODE_PATCHBAY
host.processModeForced = True


+ 2
- 0
source/carla-rack View File

@@ -43,6 +43,8 @@ if __name__ == '__main__':
# ------------------------------------------------------------------------------------------------------------------
# Init host backend

os.environ["CARLA_NSM_NAME"] = "Carla-Rack"

host = initHost(initName, libPrefix, False, False, True)
host.processMode = ENGINE_PROCESS_MODE_CONTINUOUS_RACK
host.processModeForced = True


Loading…
Cancel
Save