Merge lp:~cjcurran/indicator-sound/hotplug-client-index-fix into lp:~harryhaaren/indicator-sound/hotplug-client-index

[Conor Curran]

=== modified file 'src/pulseaudio-mgr.c'
--- src/pulseaudio-mgr.c	2011-06-27 16:58:31 +0000
+++ src/pulseaudio-mgr.c	2011-06-28 13:12:45 +0000
@@ -109,10 +109,15 @@
 static pa_context *pulse_context = NULL;
 static pa_glib_mainloop *pa_main_loop = NULL;
 
+<<<<<<< TREE
 static GHashTable *client_index_to_sink_index_hash = NULL;
 static GHashTable *sink_input_index_to_sink_index_hash = NULL;
 
 static gboolean auto_stream_change_new_hardware_detected = FALSE;
+=======
+static GHashTable *client_index_to_sink_index_hash = NULL;
+static GHashTable *sink_input_index_to_sink_index_hash = NULL;
+>>>>>>> MERGE-SOURCE
 
 /**
  Entry Point
@@ -629,6 +634,7 @@
   }
   
   printf("SinkInput: %i\tClientIndex: %i\t SinkIndex: %i\n", info->index, info->client, info->sink);
+<<<<<<< TREE
 }
 
 
@@ -729,6 +735,43 @@
                                   info,
                                   eol,
                                   userdata);
+=======
+  
+  
+  // Sink input change: check if the (client_index == old_client_index &&
+  //                                  sink_input == old_sink_input     &&
+  //                                  sink_index != old_sink_index)
+  // if that condition is true, we have the same stream (client & sink_input)
+  // playing back on a different output (sink).
+  
+  gint client_index   = (gint)info->client;
+  gint sink_input     = (gint)info->index;
+  gint sink_index     = (gint)info->sink;
+
+  gint old_sink_index_from_client = -1;
+  gint old_sink_index_from_sink_input = -1;
+
+  // get current client number's  sink_index from table. Not found = new client number?
+  g_debug ("here 1 %i", client_index_to_sink_index_hash == NULL);
+  gpointer old_sink_index_pointer_from_client = g_hash_table_lookup(client_index_to_sink_index_hash, GINT_TO_POINTER(client_index));
+  g_debug ("here 2");
+
+  if (old_sink_index_pointer_from_client !=  NULL){
+    old_sink_index_from_client = GPOINTER_TO_INT (old_sink_index_pointer_from_client);
+  }
+
+
+  gpointer old_sink_index_pointer_from_sink_input = g_hash_table_lookup(sink_input_index_to_sink_index_hash, GINT_TO_POINTER (sink_input));
+
+  if (old_sink_index_pointer_from_sink_input != NULL){
+    old_sink_index_from_sink_input = GPOINTER_TO_INT (old_sink_index_pointer_from_sink_input);
+  }
+    
+  if ( old_sink_index_from_client == old_sink_index_from_sink_input  )
+  {
+    // we have a stream switch
+    g_debug("\tSTREAM SWITCH!\n");
+>>>>>>> MERGE-SOURCE
     
     // Get information about a client by its index.
     pa_context_get_client_info (c, client_index, pm_get_client_name_callback, userdata);
@@ -764,8 +807,13 @@
   gint sink_input  =  (gint)info->index;
   
   // store client index, sink index and sink input index
+<<<<<<< TREE
   //g_hash_table_insert( client_index_to_sink_index_hash, GINT_TO_POINTER(client), GINT_TO_POINTER(sink));
   g_hash_table_insert( sink_input_index_to_sink_index_hash, GINT_TO_POINTER(sink_input), GINT_TO_POINTER(sink));
+=======
+  g_hash_table_insert( client_index_to_sink_index_hash, GINT_TO_POINTER(client), GINT_TO_POINTER(sink));
+  g_hash_table_insert( sink_input_index_to_sink_index_hash, GINT_TO_POINTER(sink_input), GINT_TO_POINTER(sink));
+>>>>>>> MERGE-SOURCE
   
 }