Global update

1 files changed, 19 insertions, 20 deletions

diff --git a/backends/pulse/pulse-connection.c b/backends/pulse/pulse-connection.c
index cc39caf..7344d2e 100644
--- a/backends/pulse/pulse-connection.c
+++ b/backends/pulse/pulse-connection.c
@@ -31,14 +31,14 @@
 
 struct _PulseConnectionPrivate
 {
-    gchar                *server;
-    guint                 outstanding;
-    pa_context           *context;
-    pa_proplist          *proplist;
-    pa_glib_mainloop     *mainloop;
-    gboolean              ext_streams_loading;
-    gboolean              ext_streams_dirty;
-    PulseConnectionState  state;
+    gchar               *server;
+    guint                outstanding;
+    pa_context          *context;
+    pa_proplist         *proplist;
+    pa_glib_mainloop    *mainloop;
+    gboolean             ext_streams_loading;
+    gboolean             ext_streams_dirty;
+    PulseConnectionState state;
 };
 
 enum {
@@ -417,7 +417,7 @@ pulse_connection_new (const gchar *app_name,
     PulseConnection  *connection;
 
     mainloop = pa_glib_mainloop_new (g_main_context_get_thread_default ());
-    if (G_UNLIKELY (mainloop == NULL)) {
+    if G_UNLIKELY (mainloop == NULL) {
         g_warning ("Failed to create PulseAudio main loop");
         return NULL;
     }
@@ -468,7 +468,7 @@ pulse_connection_connect (PulseConnection *connection, gboolean wait_for_daemon)
     context  = pa_context_new_with_proplist (mainloop,
                                              NULL,
                                              connection->priv->proplist);
-    if (G_UNLIKELY (context == NULL)) {
+    if G_UNLIKELY (context == NULL) {
         g_warning ("Failed to create PulseAudio context");
         return FALSE;
     }
@@ -774,7 +774,6 @@ pulse_connection_create_monitor (PulseConnection *connection,
 
     return pulse_monitor_new (connection->priv->context,
                               connection->priv->proplist,
-                              NULL,
                               index_source,
                               index_sink_input);
 }
@@ -1227,7 +1226,7 @@ load_lists (PulseConnection *connection)
     GSList       *ops = NULL;
     pa_operation *op;
 
-    if (G_UNLIKELY (connection->priv->outstanding > 0)) {
+    if G_UNLIKELY (connection->priv->outstanding > 0) {
         g_warn_if_reached ();
         return FALSE;
     }
@@ -1235,7 +1234,7 @@ load_lists (PulseConnection *connection)
     op = pa_context_get_card_info_list (connection->priv->context,
                                         pulse_card_info_cb,
                                         connection);
-    if (G_UNLIKELY (op == NULL))
+    if G_UNLIKELY (op == NULL)
         goto error;
 
     ops = g_slist_prepend (ops, op);
@@ -1243,7 +1242,7 @@ load_lists (PulseConnection *connection)
     op = pa_context_get_sink_info_list (connection->priv->context,
                                         pulse_sink_info_cb,
                                         connection);
-    if (G_UNLIKELY (op == NULL))
+    if G_UNLIKELY (op == NULL)
         goto error;
 
     ops = g_slist_prepend (ops, op);
@@ -1251,7 +1250,7 @@ load_lists (PulseConnection *connection)
     op = pa_context_get_sink_input_info_list (connection->priv->context,
                                               pulse_sink_input_info_cb,
                                               connection);
-    if (G_UNLIKELY (op == NULL))
+    if G_UNLIKELY (op == NULL)
         goto error;
 
     ops = g_slist_prepend (ops, op);
@@ -1259,7 +1258,7 @@ load_lists (PulseConnection *connection)
     op = pa_context_get_source_info_list (connection->priv->context,
                                           pulse_source_info_cb,
                                           connection);
-    if (G_UNLIKELY (op == NULL))
+    if G_UNLIKELY (op == NULL)
         goto error;
 
     ops = g_slist_prepend (ops, op);
@@ -1267,7 +1266,7 @@ load_lists (PulseConnection *connection)
     op = pa_context_get_source_output_info_list (connection->priv->context,
                                                  pulse_source_output_info_cb,
                                                  connection);
-    if (G_UNLIKELY (op == NULL))
+    if G_UNLIKELY (op == NULL)
         goto error;
 
     ops = g_slist_prepend (ops, op);
@@ -1303,7 +1302,7 @@ load_list_finished (PulseConnection *connection)
      * as the final step in the connection process */
     connection->priv->outstanding--;
 
-    if (G_UNLIKELY (connection->priv->outstanding < 0)) {
+    if G_UNLIKELY (connection->priv->outstanding < 0) {
         g_warn_if_reached ();
         connection->priv->outstanding = 0;
     }
@@ -1311,7 +1310,7 @@ load_list_finished (PulseConnection *connection)
     if (connection->priv->outstanding == 0) {
         gboolean ret = pulse_connection_load_server_info (connection);
 
-        if (G_UNLIKELY (ret == FALSE)) {
+        if G_UNLIKELY (ret == FALSE) {
             pulse_connection_disconnect (connection);
             return FALSE;
         }
@@ -1640,7 +1639,7 @@ change_state (PulseConnection *connection, PulseConnectionState state)
 static gboolean
 process_pulse_operation (PulseConnection *connection, pa_operation *op)
 {
-    if (G_UNLIKELY (op == NULL)) {
+    if G_UNLIKELY (op == NULL) {
         g_warning ("PulseAudio operation failed: %s",
                    pa_strerror (pa_context_errno (connection->priv->context)));
         return FALSE;