Unverified Commit de896f0d authored by ntonnaett's avatar ntonnaett Committed by GitHub
Browse files

Merge pull request #82 from madwort/disable-autopatch-output-nojackconnect

Improve end-user feedback for --nojackportsconnect in hub server mode
parents b5943ea5 91b93db4
......@@ -408,7 +408,7 @@ void Settings::printUsage()
cout << " -j, --jamlink Run in JamLink Mode (Connect to a JamLink Box)" << endl;
cout << " --clientname Change default client name (default: JackTrip)" << endl;
cout << " --localaddress Change default local host IP address (default: 127.0.0.1)" << endl;
cout << " --nojackportsconnect Don't connect default audio ports in jack" << endl;
cout << " --nojackportsconnect Don't connect default audio ports in jack, including not doing hub auto audio patch in HUB SERVER mode." << endl;
cout << endl;
cout << "ARGUMENTS TO USE JACKTRIP WITHOUT JACK:" << endl;
cout << " --rtaudio Use system's default sound system instead of Jack" << endl;
......
......@@ -134,7 +134,12 @@ void UdpHubListener::run()
while ( !mStopped )
{
cout << "JackTrip HUB SERVER: Waiting for client connections..." << endl;
cout << "JackTrip HUB SERVER: Hub auto audio patch setting = " << mHubPatch << endl;
if(m_connectDefaultAudioPorts)
{
cout << "JackTrip HUB SERVER: Hub auto audio patch setting = " << mHubPatch << endl;
} else {
cout << "JackTrip HUB SERVER: Hub auto audio patch disabled " << endl;
}
cout << "=======================================================" << endl;
while ( !TcpServer.hasPendingConnections() && !TcpServer.waitForNewConnection(1000) )
{ if (mStopped) { return; } } // block until a new connection is received
......@@ -460,7 +465,11 @@ void UdpHubListener::enumerateRunningThreadIDs()
#include "JMess.h"
void UdpHubListener::connectPatch(bool spawn)
{
cout << ((spawn)?"spawning":"releasing") << " jacktripWorker so change patch" << endl;
if(m_connectDefaultAudioPorts) {
cout << ((spawn)?"spawning":"releasing") << " jacktripWorker so change patch" << endl;
} else {
cout << ((spawn)?"spawning":"releasing") << " jacktripWorker" << endl;
}
JMess tmp;
// default is patch 0, which connects server audio to all clients
// these are the other cases:
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment