Add JACK_NETJACK_PORT and JACK_NETJACK_MULTICAST environment variables for NetJack2.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@4484 0c269be4-1314-0410-8aa9-9f06e86f4224

ChangeLog

@@ -35,6 +35,10 @@ Chris Caudle
   Jackdmp changes log
 ---------------------------
 
+2011-07-11 Stephane Letz  <letz@grame.fr>
+
+	* Add JACK_NETJACK_PORT and JACK_NETJACK_MULTICAST environment variables for NetJack2.
+
 2011-07-08 Stephane Letz  <letz@grame.fr>
 
 	* NetJack2 now only send data on network for connected ports.

common/JackNetDriver.cpp

@@ -28,11 +28,11 @@ using namespace std;
 namespace Jack
 {
     JackNetDriver::JackNetDriver(const char* name, const char* alias, JackLockedEngine* engine, JackSynchro* table,
-                                const char* ip, int port, int mtu, int midi_input_ports, int midi_output_ports,
+                                const char* ip, int udp_port, int mtu, int midi_input_ports, int midi_output_ports,
                                 char* net_name, uint transport_sync, char network_mode, int celt_encoding)
-            : JackAudioDriver(name, alias, engine, table), JackNetSlaveInterface(ip, port)
+            : JackAudioDriver(name, alias, engine, table), JackNetSlaveInterface(ip, udp_port)
     {
-        jack_log("JackNetDriver::JackNetDriver ip %s, port %d", ip, port);
+        jack_log("JackNetDriver::JackNetDriver ip %s, port %d", ip, udp_port);
 
         // Use the hostname if no name parameter was given
         if (strcmp(net_name, "") == 0)
@@ -659,9 +659,8 @@ namespace Jack
         SERVER_EXPORT Jack::JackDriverClientInterface* driver_initialize(Jack::JackLockedEngine* engine, Jack::JackSynchro* table, const JSList* params)
         {
             char multicast_ip[16];
-            strcpy(multicast_ip, DEFAULT_MULTICAST_IP);
             char net_name[JACK_CLIENT_NAME_SIZE + 1];
-            int udp_port = DEFAULT_PORT;
+            int udp_port;
             int mtu = DEFAULT_MTU;
             uint transport_sync = 1;
             jack_nframes_t period_size = 128;
@@ -678,6 +677,17 @@ namespace Jack
 
             net_name[0] = 0;
 
+            // Possibly use env variable
+            const char* default_udp_port = getenv("JACK_NETJACK_PORT");
+            udp_port = (default_udp_port) ? atoi(default_udp_port) : DEFAULT_PORT;
+
+            const char* default_multicast_ip = getenv("JACK_NETJACK_MULTICAST");
+            if (default_multicast_ip) {
+                strcpy(multicast_ip, default_multicast_ip);
+            } else {
+                strcpy(multicast_ip, DEFAULT_MULTICAST_IP);
+            }
+
             for (node = params; node; node = jack_slist_next(node)) {
                 param = (const jack_driver_param_t*) node->data;
                 switch (param->character)

common/JackNetManager.cpp

@@ -558,14 +558,24 @@ namespace Jack
 
         fManagerClient = client;
         fManagerName = jack_get_client_name ( fManagerClient );
-        strcpy(fMulticastIP, DEFAULT_MULTICAST_IP);
-        fSocket.SetPort ( DEFAULT_PORT );
         fGlobalID = 0;
         fRunning = true;
         fAutoConnect = false;
 
         const JSList* node;
         const jack_driver_param_t* param;
+
+        // Possibly use env variable
+        const char* default_udp_port = getenv("JACK_NETJACK_PORT");
+        fSocket.SetPort((default_udp_port) ? atoi(default_udp_port) : DEFAULT_PORT);
+
+        const char* default_multicast_ip = getenv("JACK_NETJACK_MULTICAST");
+        if (default_multicast_ip) {
+            strcpy(fMulticastIP, default_multicast_ip);
+        } else {
+            strcpy(fMulticastIP, DEFAULT_MULTICAST_IP);
+        }
+
         for ( node = params; node; node = jack_slist_next ( node ) )
         {
             param = ( const jack_driver_param_t* ) node->data;