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

[Conor Curran]

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2011-06-22 19:19:49 +0000
+++ src/Makefile.am	2011-06-28 13:12:52 +0000
@@ -108,7 +108,7 @@
   $(music_bridge_VALASOURCES:.vala=.c)
 
 indicator_sound_service_CFLAGS = $(PULSEAUDIO_CFLAGS) $(SOUNDSERVICE_CFLAGS) $(GCONF_CFLAGS) -DLIBEXECDIR=\"$(libexecdir)\" -Wall
-indicator_sound_service_LDADD = $(PULSEAUDIO_LIBS) $(SOUNDSERVICE_LIBS) $(GCONF_LIBS)
+indicator_sound_service_LDADD = $(PULSEAUDIO_LIBS) $(SOUNDSERVICE_LIBS) $(GCONF_LIBS) -lnotify
 
 #########################
 # Service xml compilation

=== modified file 'src/device.c'
--- src/device.c	2011-06-27 16:58:31 +0000
+++ src/device.c	2011-06-28 13:12:52 +0000
@@ -442,6 +442,29 @@
                                        mute_menu_item_get_button (priv->mute_menuitem),
                                        DBUSMENU_MENUITEM (priv->volume_slider_menuitem),
                                        DBUSMENU_MENUITEM (priv->voip_input_menu_item));
+  
+  printf("<ME> device.c:device_new()\n");
+  
+  NotifyNotification *notify;
+
+  notify_init("soundNotify");
+
+  notify = notify_notification_new ("Audio Device Connected", 
+                                    "New device connected",
+                                    NULL);
+  
+  notify_notification_set_timeout (notify, 3000); //3 seconds
+
+  if (!notify_notification_show (notify, NULL)) {
+    fprintf(stderr, "failed to send notification\n");
+  }
+
+  g_object_unref(G_OBJECT(notify));
+  
   pm_establish_pulse_connection (sink);
   return sink; 
 }
+
+
+
+

=== modified file 'src/device.h'
--- src/device.h	2011-06-24 17:18:51 +0000
+++ src/device.h	2011-06-28 13:12:52 +0000
@@ -23,6 +23,8 @@
 #include <glib.h>
 #include <glib-object.h>
 
+#include <libnotify/notify.h>
+
 #include "common-defs.h"
 #include "sound-service-dbus.h"
 

=== 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:52 +0000
@@ -29,13 +29,15 @@
 #include <pulse/gccmacro.h>
 #include <pulse/glib-mainloop.h>
 #include <pulse/error.h>
+#include <pulse/ext-stream-restore.h>
 
 #include "pulseaudio-mgr.h"
 #include "config.h"
 
+#include <libnotify/notify.h>
+
 #define RECONNECT_DELAY 5
 
-
 static void pm_context_state_callback(pa_context *c, void *userdata);
 static void pm_subscribed_events_callback (pa_context *c,
                                            enum pa_subscription_event_type t,
@@ -101,9 +103,39 @@
                                         int eol,
                                         void *userdata);
 
+
+
+static const char* pm_default_sink_name = 0;
+static const char* pm_default_source_name = 0;
+
+static gint stream_restore_array_iter = 0;
+static gint stream_restore_array_size = 0;
+static gint stream_restore_array_contents_size = 0;
+
+static pa_ext_stream_restore_info *stream_restore_array = NULL;
+
+static gint pm_ext_stream_restore_counter = 0;
+
+static void pm_ext_stream_restore_read_callback(pa_context *c,const pa_ext_stream_restore_info *info,int eol,void *userdata);
+
+
+static void pm_ext_stream_restore_test_callback(pa_context *c, uint32_t version, void *userdata);
+static void pm_ext_stream_restore_subscribe_callback(pa_context *c, int success, void *userdata);
+static void pm_ext_stream_restore_action_callback(pa_context *c, void *userdata);
+
+static void pm_sink_input_info_hotplug_callback (pa_context *c,
+                                                 const pa_sink_input_info *info,
+                                                 int eol,
+                                                 void *userdata);
+
+
+
 static gboolean reconnect_to_pulse (gpointer user_data);
-
-
+<<<<<<< TREE
+
+
+=======
+>>>>>>> MERGE-SOURCE
 static gint connection_attempts = 0;
 static gint reconnect_idle_id = 0;
 static pa_context *pulse_context = NULL;
@@ -161,8 +193,10 @@
   }
 
   pa_proplist     *proplist;
-
+  
   proplist = pa_proplist_new ();
+  
+  
   pa_proplist_sets (proplist,
                     PA_PROP_APPLICATION_NAME,
                     "Indicator Sound");
@@ -215,6 +249,17 @@
 }
 
 void
+stream_moved_callback(pa_stream *s, void *userdata)
+{
+  g_debug("Stream moved");
+  
+  g_debug("Stream moved to device %s (%u, %ssuspended)",
+          pa_stream_get_device_name(s),
+          pa_stream_get_device_index(s),
+          (pa_stream_is_suspended(s) ? "" : "not "));
+}
+
+void
 pm_update_mute (gboolean update)
 {
   pa_operation_unref (pa_context_get_sink_info_list (pulse_context,
@@ -245,6 +290,99 @@
 //    Pulse-Audio asychronous call-backs
 /**********************************************************************************************************************/
 
+void pm_ext_stream_restore_test_callback(pa_context *c, uint32_t version, void *userdata)
+{
+  printf("pm_ext_stream_restore_test_callback: %i\n", version);
+  
+  if ( version != 0 )
+  {
+    // we have the stream restore module, so register callbacks
+    
+    // first "enable" our subscription to the stream database:
+    pa_operation_unref( pa_ext_stream_restore_subscribe(c,
+                                                        1, // int enable
+                                                        pm_ext_stream_restore_subscribe_callback,
+                                                        NULL // userdata
+                                                        ));
+    
+    // then set our subscription callback, which will provide info:
+    pa_ext_stream_restore_set_subscribe_cb (c,
+                                            pm_ext_stream_restore_action_callback,
+                                            NULL );
+    
+    // initialize array to an arbitrary size for now, <FIXME>
+    //pa_ext_stream_restore_info stream_database[100];
+    //stream_restore_array = &stream_database;
+    
+    // read the entire streams database,  
+    pa_operation_unref( pa_ext_stream_restore_read( c,
+                                                    pm_ext_stream_restore_read_callback,
+                                                    NULL // userdata
+                                                    ) );
+    
+  }
+  else
+    g_warning("ext_stream_restore module not available");
+  
+}
+
+static void pm_sink_input_info_hotplug_callback (pa_context *c,
+                                                 const pa_sink_input_info *info,
+                                                 int eol,
+                                                 void *userdata)
+{
+  if (info == NULL)
+  {
+    g_warning("hotplug_callback, info == NULL");
+    return;
+  }
+  
+  printf("sink input info: %i Client: %i and sink index %i\n", info->index, info->client, info->sink);
+}
+
+void pm_ext_stream_restore_read_callback(pa_context *c,const pa_ext_stream_restore_info *info,int eol,void *userdata)
+{
+  // this callback gets a "pa_ext_stream_restore_info" pointer, which
+  // corresponds to a stream's info. 
+  
+  return;
+  
+  if (eol)
+  {
+    // end of list, just return, we've had all entries in the database,
+    // this is final calling of the CB is to signal end-of-database
+    return;
+  }
+  
+  if ( info == NULL )
+  {
+    g_warning("pm_ext_stream_restore_read_callback: info == NULL");
+    return;
+  }
+  
+  printf("Id: %i\tName: %s\tDevice: %s\n", eol, info->name, info->device);
+  
+}
+
+static void pm_ext_stream_restore_action_callback(pa_context *c, void *userdata)
+{
+  // this callback gets called once per sink / source, when a stream_restore
+  // action occurs. 
+  //
+  //    Example: user plugs in a *previously used* soundcard, and this
+  //    callback will be called one time per active port in the graph.
+  //
+  //    Note: If an internal card is default, and a external card gets
+  //    plugged out, this callback will *not* be called.
+  
+  printf("Stream Restore Action!\n");
+  
+}
+
+static void pm_ext_stream_restore_subscribe_callback(pa_context *c, int success, void *userdata)
+{
+  printf("Subscribed to changes in stream database? %i\n",success);
+}
 
 static void 
 pm_subscribed_events_callback (pa_context *c,
@@ -257,6 +395,7 @@
     return;
   }
   Device* sink = DEVICE (userdata);
+<<<<<<< TREE
   
   switch (t & PA_SUBSCRIPTION_EVENT_FACILITY_MASK) {
   case PA_SUBSCRIPTION_EVENT_SINK:
@@ -287,9 +426,101 @@
     }
     else{
       pa_operation_unref (pa_context_get_source_info_by_index (c,
+=======
+  
+  
+  switch (t & PA_SUBSCRIPTION_EVENT_FACILITY_MASK)
+  {
+    
+    case PA_SUBSCRIPTION_EVENT_SINK:
+      // g_debug("SUBSCRIPTION_EVENT_SINK");
+      if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_NEW){
+         g_debug("NEW Event of sink %i", index);
+      }
+      if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_REMOVE){
+        g_debug("REMOVE Event of sink %i", index);
+      }
+      if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_CHANGE){
+        g_debug("CHANGE Event Change of sink %i", index);
+      }
+      
+      break;
+    
+    case PA_SUBSCRIPTION_EVENT_SINK_INPUT:
+      printf("SINK INPUT");
+      
+      if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_NEW)
+      {
+        // get info:
+        pa_operation_unref (pa_context_get_sink_input_info (c,
+                                                            index,
+                                                            pm_sink_input_info_hotplug_callback,
+                                                            userdata));
+      }
+      if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_REMOVE)
+      {
+        printf(" REMOVE");
+        pa_operation_unref (pa_context_get_sink_input_info (c,
+                                                            index,
+                                                            pm_sink_input_info_hotplug_callback,
+                                                            userdata));
+      }
+      if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_CHANGE)
+      {
+        printf(" CHANGE");
+        pa_operation_unref (pa_context_get_sink_input_info (c,
+                                                            index,
+                                                            pm_sink_input_info_hotplug_callback,
+                                                            userdata));
+      }
+      printf("\n");
+      break;
+      
+  }
+  
+  /*
+   * 
+   * ./// never triggers?
+   *     case PA_SUBSCRIPTION_EVENT_SINK_INPUT:
+      g_debug("SINK INPUT");
+      
+      if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_NEW)
+      {
+        g_debug("SINK INPUT: NEW");
+      }
+      if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_REMOVE)
+      {
+        g_debug("SINK INPUT: REMOVE");
+      }
+      break;
+   * 
+   * 
+   * 
+   * 
+   * 
+   * 
+  switch (t & PA_SUBSCRIPTION_EVENT_FACILITY_MASK)
+  {
+    case PA_SUBSCRIPTION_EVENT_SINK:
+      
+      // We don't care about any other sink other than the active one.
+      if (index != device_get_sink_index (sink))
+      {
+        g_debug("Sink event != current sink");
+        //return;
+      }
+      
+      if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_REMOVE) {
+        g_debug("Remove Event of sink %i", index);
+        device_sink_deactivated (sink);
+      }
+      else{
+        pa_operation_unref (pa_context_get_sink_info_by_index (c,
+>>>>>>> MERGE-SOURCE
                                                                index,
-                                                               pm_update_source_info_callback,
+                                                               pm_update_device,
                                                                userdata) );
+<<<<<<< TREE
     }
     break;
   case PA_SUBSCRIPTION_EVENT_SINK_INPUT:
@@ -341,24 +572,115 @@
       //g_debug ("some new source output event ? - index = %i", index);
       // Determine if its a VOIP app.
       pa_operation_unref (pa_context_get_source_output_info (c,
+=======
+      }
+      break;
+    
+    
+    case PA_SUBSCRIPTION_EVENT_SOURCE:
+      g_debug ("Looks like source event of some description - index = %i", index);
+      // We don't care about any other sink other than the active one.
+      if (index != device_get_source_index (sink))
+      {
+          g_debug("Source event != current Source");
+          //return;
+      }
+      if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_REMOVE)
+      {
+        g_debug ("Source removal event - index = %i", index);
+        device_deactivate_voip_source (sink, FALSE);
+      }
+      else
+      {
+        pa_operation_unref (pa_context_get_source_info_by_index (c,
+                                                                 index,
+                                                                 pm_update_source_info_callback,
+                                                                 userdata) );
+      }
+      break;
+     
+    
+    case PA_SUBSCRIPTION_EVENT_SINK_INPUT:
+        if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_NEW) {
+          g_debug("PA - Event New - Mask");
+          
+          // determine input client // get sync info callback on own fX
+          // 
+          // 
+          
+        }
+        else if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_REMOVE) {
+          g_debug("PA - Event Remove - Mask");
+        }
+        else if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_AUTOLOAD) {
+          g_debug("PA - Event AutoLoad - Mask");
+        }
+        else if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_CHANGE) {
+          g_debug("PA - Event Change - Mask");
+          
+        }
+        else if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_CLIENT) {
+          g_debug("PA - Event Client - Mask");
+        }
+        else if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_MODULE) {
+          g_debug("PA - Event Module - Mask");
+        }
+        else if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_SAMPLE_CACHE) {
+          g_debug("PA - Event Sample Cache - Mask");
+        }
+        else if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_SINK) {
+          g_debug("PA - Event Server - Mask");
+        }
+        else if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_SERVER) {
+          g_debug("PA - Event Server - Mask");
+        }
+        else {
+          g_debug("PA - SUBSCRIPTION_EVENT_SOURCE unknown type! ");
+        }
+        // Maybe blocking state ?.
+        pa_operation_unref (pa_context_get_sink_input_info (c,
+>>>>>>> MERGE-SOURCE
                                                             index,
-                                                            pm_source_output_info_callback, userdata));
-    }
-    break;
-  case PA_SUBSCRIPTION_EVENT_SERVER:
-    g_debug("PA_SUBSCRIPTION_EVENT_SERVER event triggered.");
-    pa_operation *o;
-    if (!(o = pa_context_get_server_info (c, pm_server_info_callback, userdata))) {
-      g_warning("subscribed_events_callback - pa_context_get_server_info() failed");
-      return;
-    }
-    pa_operation_unref(o);
-    break;
+                                                            pm_sink_input_info_callback, userdata));
+      break;
+    
+    
+    case PA_SUBSCRIPTION_EVENT_SOURCE_OUTPUT:
+      g_debug ("source output event");
+      if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_REMOVE) {
+        gint cached_source_output_index = device_get_voip_source_output_index (sink);
+        if (index == cached_source_output_index){
+          g_debug ("Just saw a source output removal event - index = %i and cached index = %i", index, cached_source_output_index);
+          device_deactivate_voip_client (sink);
+        }
+      }
+      else if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_NEW) {
+        g_debug ("some new source output event ? - index = %i", index);
+        // Determine if its a VOIP app.
+        pa_operation_unref (pa_context_get_source_output_info (c,
+                                                              index,
+                                                              pm_source_output_info_callback, userdata));
+      }
+      break;
+    
+    
+    case PA_SUBSCRIPTION_EVENT_SERVER:
+      g_debug("PA_SUBSCRIPTION_EVENT_SERVER event triggered.");
+      pa_operation *o;
+      if (!(o = pa_context_get_server_info (c, pm_server_info_callback, userdata))) {
+        g_warning("subscribed_events_callback - pa_context_get_server_info() failed");
+        return;
+      }
+      pa_operation_unref(o);
+      break;
+      
   }
+  */
 }
 
 
 
+
 static void
 pm_context_state_callback (pa_context *c, void *userdata)
 {
@@ -397,26 +719,34 @@
     pa_operation *o;
 
     pa_context_set_subscribe_callback(c, pm_subscribed_events_callback, userdata);
+    
+    pa_operation_unref( pa_ext_stream_restore_test (c,
+                                                    pm_ext_stream_restore_test_callback,
+                                                    NULL) );
 
-    if (!(o = pa_context_subscribe (c, (pa_subscription_mask_t)
+    if (!(o = pa_context_subscribe (c,
+                                   (pa_subscription_mask_t)
                                    (PA_SUBSCRIPTION_MASK_SINK|
                                     PA_SUBSCRIPTION_MASK_SOURCE|
-                                    PA_SUBSCRIPTION_MASK_SINK_INPUT|
-                                    PA_SUBSCRIPTION_MASK_SOURCE_OUTPUT|
-                                    PA_SUBSCRIPTION_MASK_SERVER), NULL, NULL))) {
+                                    PA_SUBSCRIPTION_MASK_SINK_INPUT),
+                                    NULL, NULL))) {
       g_warning("pa_context_subscribe() failed");
-    
     }
 
     if (!(o = pa_context_get_server_info (c, pm_server_info_callback, userdata))) {
       g_warning("Initial - pa_context_get_server_info() failed");
     }
     pa_operation_unref(o);
+<<<<<<< TREE
     
     // request a list of info on sink inputs, to store them in the client->sink hashtable
     pa_context_get_sink_input_info_list(c,
                                         pm_sink_input_info_store_callback,
                                         NULL);
+=======
+    
+    
+>>>>>>> MERGE-SOURCE
       
     break;
   }
@@ -433,26 +763,46 @@
                          void *userdata)
 {
   pa_operation *operation;
+<<<<<<< TREE
   //g_debug ("server info callback");
+=======
+  printf ("server info callback:\n\t");
+>>>>>>> MERGE-SOURCE
 
   if (info == NULL) {
     g_warning("No PA server - get the hell out of here");
     device_sink_deactivated (DEVICE (userdata));
     return;
   }
+  
+  
   // Go for the default sink
+<<<<<<< TREE
   if (info->default_sink_name != NULL) {
     //g_debug ("default sink name from the server ain't null'");
     if (!(operation = pa_context_get_sink_info_by_name (c,
+=======
+  if (info->default_sink_name != NULL)
+  {
+    printf ("default sink name: %s\n", info->default_sink_name );
+    pm_default_sink_name = info->default_sink_name;
+    
+    
+    if ( !(operation = pa_context_get_sink_info_by_name (c,
+>>>>>>> MERGE-SOURCE
                                                        info->default_sink_name,
                                                        pm_default_sink_info_callback,
-                                                       userdata) )) {
+                                                       userdata) )
+                                                       )
+    {
       g_warning("pa_context_get_sink_info_by_namet() failed");
       device_sink_deactivated (DEVICE (userdata));
       pa_operation_unref(operation);
       return;
     }
-  } // If there is no default sink, try to determine a sink from the list of sinks
+  }
+  
+  // If there is no default sink, try to determine a sink from the list of sinks
   else if (!(operation = pa_context_get_sink_info_list(c,
                                                        pm_sink_info_callback,
                                                        userdata))) {
@@ -461,9 +811,16 @@
     pa_operation_unref(operation);
     return;
   }
+  
+  
+  
   // And the source
   if (info->default_source_name != NULL) {
+<<<<<<< TREE
     //g_debug ("default source name from the server is not null'");
+=======
+    g_debug ("default source name from server: %s", info->default_source_name);
+>>>>>>> MERGE-SOURCE
     if (!(operation = pa_context_get_source_info_by_name (c,
                                                           info->default_source_name,
                                                           pm_default_source_info_callback,
@@ -481,6 +838,8 @@
     //  TODO: call some input deactivate method for the source
   }
   pa_operation_unref(operation);
+  
+  printf ("\n");
 }
 
 static void pm_get_client_name_callback(pa_context *c,
@@ -554,6 +913,13 @@
                        int eol,
                        void* userdata)
 {
+  printf("sink_info_callback() ");
+  if (sink != NULL)
+    printf("name: %s",sink->name);
+  
+  printf("\n");
+  
+  
   if (eol > 0) {
     return;
   }
@@ -578,14 +944,25 @@
                                int eol,
                                void *userdata)
 {
+  g_debug("Default sink info callback");
+  
   if (eol > 0) {
     return;
   } 
-  else {
+  else
+  {
     if (IS_DEVICE (userdata) == FALSE || info == NULL){
       g_warning ("Default sink info callback - our user data is not what we think it should be or the info parameter is null");
       return;
     }
+    
+    g_debug("Current default sink name:"); 
+    g_debug( pm_default_sink_name);
+    g_debug("New default sink name:");
+    g_debug( info->name );
+    
+    pm_default_sink_name = info->name;
+    
     // Only repopulate if there is a change with regards the index
     if (device_get_sink_index (DEVICE (userdata)) == info->index)
       return;
@@ -775,6 +1152,8 @@
                                 int eol,
                                 void *userdata)
 {
+  g_debug("SourceOutputInfoCallback");
+  
   if (eol > 0) {
     return;
   }
@@ -814,10 +1193,19 @@
     return;
   }
   else{
-    if (IS_DEVICE (userdata) == FALSE || info == NULL){
-      g_warning ("update_device - our user data is not what we think it should be or the info parameter is null");
-      return;
-    }
+    if (IS_DEVICE (userdata) == FALSE )
+    {
+      g_warning ("Update device:source info update callback - our user data is not what we think it should be");
+      return;
+    }
+    else if ( info == NULL )
+    {
+      g_warning ( "Update device: source info paramter is null" );
+      return;
+    }
+    
+    // maths converts from uint32_t to 0->1 float, and range scales from that to 0 - 150 %
+    //g_debug("Updating device with %f percent volume", (pa_cvolume_avg( &info->volume ) / 983.04f) * 6/4.f );
     device_sink_update (DEVICE(userdata), info);
   }
 }
@@ -828,6 +1216,7 @@
                                         int eol,
                                         void* userdata)
 {
+  g_debug("toggle_mute_for_every_sink_callback");
   if (eol > 0) {
     return;
   }
@@ -851,18 +1240,47 @@
                                  int eol,
                                  void *userdata)
 {
-  if (eol > 0) {
+  g_debug("default_source_info_callback");
+  if (eol > 0)
+  {
     return;
   }
   else {
-    if (IS_DEVICE (userdata) == FALSE || info == NULL){
-      g_warning ("Default source info callback - our user data is not what we think it should be or the source info parameter is null");
-      return;
-    }
+    if (IS_DEVICE (userdata) == FALSE)
+    {
+      g_warning ("Default source info callback - our user data is not what we think it should be");
+      return;
+    }
+    else if ( info == NULL )
+    { 
+      g_warning ("source info parameter is null");
+      return;
+    }
+    
     // If there is an index change we need to change our cached source
     if (device_get_source_index (DEVICE (userdata)) == info->index)
       return;
-    g_debug ("Pulse Server has handed us a new default source");
+    
+    pm_default_source_name = info->name;
+    
+    printf ("Pulse Server has handed us a new default source: %s\n", pm_default_source_name);
+    
+    // <ME> <MoveCode> out of the pulseaudio mgr into more suitable place
+    // notify of new default source:
+    NotifyNotification *not;
+    
+    not = notify_notification_new ( "New Default Output",
+                                  info->name,
+                                  NULL);
+    
+    notify_notification_set_timeout (not, 3000);
+    
+    if (!notify_notification_show(not, NULL)) {
+      g_debug("Notification sending failed");
+    }
+    g_object_unref(G_OBJECT(not));
+    // </MoveCode>
+    
     device_deactivate_voip_source (DEVICE (userdata), TRUE);
     device_update_voip_input_source (DEVICE (userdata), info);
   }
@@ -874,6 +1292,8 @@
                          int eol,
                          void *userdata)
 {
+  g_debug("source_info_callback");
+  
   if (eol > 0) {
     return;
   }
@@ -895,15 +1315,26 @@
                                 int eol,
                                 void *userdata)
 {
+  g_debug("update_source_info_callback");
   if (eol > 0) {
     return;
   }
   else {
-    if (IS_DEVICE (userdata) == FALSE || info == NULL ){
-      g_warning ("source info update callback - our user data is not what we think it should be or the source info paramter is null");
-      return;
-    }
-    g_debug ("Got a source update for %s , index %i", info->name, info->index);
+    if (IS_DEVICE (userdata) == FALSE )
+    {
+      g_warning ("Update source Callback:source info update callback - our user data is not what we think it should be");
+      return;
+    }
+    else if ( info == NULL )
+    {
+      g_warning ( "update source Callback: source info paramter is null" );
+      return;
+    }
+    
+    // this function gets called when things *sources* change, so when
+    // a new player connects / disconnects this will trigger
+    
+    g_debug ("Got a source update for index %i, name %s", info->index, info->name);
     device_update_voip_input_source (DEVICE (userdata), info);
   }
 }

=== modified file 'src/pulseaudio-mgr.h'
--- src/pulseaudio-mgr.h	2011-03-14 19:47:59 +0000
+++ src/pulseaudio-mgr.h	2011-06-28 13:12:52 +0000
@@ -30,4 +30,3 @@
 
 
 
-