From e69a124e2783f5af6cfe81abbb46fe6f397a4600 Mon Sep 17 00:00:00 2001
From: Jonathan Moore Liles <j.liles@unix.net>
Date: Wed, 10 Apr 2013 17:23:20 -0700
Subject: [PATCH] jackpatch: Don't make unnecessary connection attempts on
 response to 'open'.

---
 session-manager/src/jackpatch.c | 36 ++++++++++++++++++---------------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/session-manager/src/jackpatch.c b/session-manager/src/jackpatch.c
index 7975d39..0a467c0 100644
--- a/session-manager/src/jackpatch.c
+++ b/session-manager/src/jackpatch.c
@@ -442,19 +442,6 @@ void remove_known_port ( const char *port )
     inactivate_patch ( port );
 }
 
-
-/**
- * Attempt to activate all connections in patch list
- */
-void
-activate_all_patches ( void )
-{
-    struct patch_record *pr;
-
-    for ( pr = patch_list; pr; pr = pr->next )
-        connect_path( pr );
-}
-
 /** called for every new port */
 void
 handle_new_port ( const char *portname )
@@ -466,6 +453,24 @@ handle_new_port ( const char *portname )
     activate_patch( portname );
 }
 
+void
+register_prexisting_ports ( void )
+{
+    const char **port;
+    const char **ports = jack_get_ports( client, NULL, NULL, 0 );
+
+    if ( ! ports )
+        return;
+    
+    for ( port = ports; *port; port++ )
+    {
+        handle_new_port( *port );
+    }
+            
+    free( ports );
+}
+
+
 void
 snapshot ( const char *file )
 {
@@ -601,12 +606,12 @@ osc_open ( const char *path, const char *types, lo_arg **argv, int argc, lo_mess
 
     if ( 0 == stat( new_filename, &st ) )
     {
+        printf( "Reading patch definitions from: %s\n", new_filename );
         if ( read_config( new_filename ) )
         {
-            printf( "Reading patch definitions from: %s\n", new_filename );
             /* wipe_ports(); */
             /* check_for_new_ports(); */
-            activate_all_patches();
+            register_prexisting_ports();
         }
         else
         {
@@ -698,7 +703,6 @@ port_registration_callback( jack_port_id_t id, int reg, void *arg )
 int
 main ( int argc, char **argv )
 {
-
     /* get_args( argc, argv ); */
 
     jack_status_t status;