@@ -124,8 +124,13 @@ public: | |||||
fServerURL = lo_server_thread_get_url(fServerThread); | 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", | 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); | lo_address_free(nsmAddress); | ||||
@@ -290,8 +295,13 @@ protected: | |||||
// Broadcast ourselves | // Broadcast ourselves | ||||
if (fHasBroadcast) | 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", | 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; | return 0; | ||||
@@ -33,7 +33,7 @@ if __name__ == '__main__': | |||||
# ------------------------------------------------------------------------------------------------------------------ | # ------------------------------------------------------------------------------------------------------------------ | ||||
# App initialization | # App initialization | ||||
app = CarlaApplication("Carla2-Single-Client", libPrefix) | |||||
app = CarlaApplication("Carla2-Multi-Client", libPrefix) | |||||
# ------------------------------------------------------------------------------------------------------------------ | # ------------------------------------------------------------------------------------------------------------------ | ||||
# Set-up custom signal handling | # Set-up custom signal handling | ||||
@@ -43,6 +43,8 @@ if __name__ == '__main__': | |||||
# ------------------------------------------------------------------------------------------------------------------ | # ------------------------------------------------------------------------------------------------------------------ | ||||
# Init host backend | # Init host backend | ||||
os.environ["CARLA_NSM_NAME"] = "Carla-Multi-Client" | |||||
host = initHost(initName, libPrefix, False, False, True) | host = initHost(initName, libPrefix, False, False, True) | ||||
host.audioDriverForced = "JACK" | host.audioDriverForced = "JACK" | ||||
host.processMode = ENGINE_PROCESS_MODE_MULTIPLE_CLIENTS | host.processMode = ENGINE_PROCESS_MODE_MULTIPLE_CLIENTS | ||||
@@ -43,6 +43,8 @@ if __name__ == '__main__': | |||||
# ------------------------------------------------------------------------------------------------------------------ | # ------------------------------------------------------------------------------------------------------------------ | ||||
# Init host backend | # Init host backend | ||||
os.environ["CARLA_NSM_NAME"] = "Carla-Single-Client" | |||||
host = initHost(initName, libPrefix, False, False, True) | host = initHost(initName, libPrefix, False, False, True) | ||||
host.audioDriverForced = "JACK" | host.audioDriverForced = "JACK" | ||||
host.processMode = ENGINE_PROCESS_MODE_SINGLE_CLIENT | host.processMode = ENGINE_PROCESS_MODE_SINGLE_CLIENT | ||||
@@ -43,6 +43,8 @@ if __name__ == '__main__': | |||||
# ------------------------------------------------------------------------------------------------------------------ | # ------------------------------------------------------------------------------------------------------------------ | ||||
# Init host backend | # Init host backend | ||||
os.environ["CARLA_NSM_NAME"] = "Carla-Patchbay" | |||||
host = initHost(initName, libPrefix, False, False, True) | host = initHost(initName, libPrefix, False, False, True) | ||||
host.processMode = ENGINE_PROCESS_MODE_PATCHBAY | host.processMode = ENGINE_PROCESS_MODE_PATCHBAY | ||||
host.processModeForced = True | host.processModeForced = True | ||||
@@ -43,6 +43,8 @@ if __name__ == '__main__': | |||||
# ------------------------------------------------------------------------------------------------------------------ | # ------------------------------------------------------------------------------------------------------------------ | ||||
# Init host backend | # Init host backend | ||||
os.environ["CARLA_NSM_NAME"] = "Carla-Rack" | |||||
host = initHost(initName, libPrefix, False, False, True) | host = initHost(initName, libPrefix, False, False, True) | ||||
host.processMode = ENGINE_PROCESS_MODE_CONTINUOUS_RACK | host.processMode = ENGINE_PROCESS_MODE_CONTINUOUS_RACK | ||||
host.processModeForced = True | host.processModeForced = True | ||||