Add documentation and administrivia about `disorder-gstdecode'.

[disorder] / disobedience / disobedience.c

diff --git a/disobedience/disobedience.c b/disobedience/disobedience.c
index 76ea604a87766140dd46278362a32da81b74d8e9..0b6e099d0145f9517f4d9478ab0644df13172574 100644 (file)
--- a/disobedience/disobedience.c
+++ b/disobedience/disobedience.c
@@ -1,33 +1,31 @@
 /*
  * This file is part of DisOrder.
 /*
  * This file is part of DisOrder.

- * Copyright (C) 2006, 2007, 2008 Richard Kettlewell
+ * Copyright (C) 2006-2009 Richard Kettlewell

  *
  *

- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify

  * it under the terms of the GNU General Public License as published by
  * it under the terms of the GNU General Public License as published by

- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or

  * (at your option) any later version.
  *
  * (at your option) any later version.
  *

- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 

  * You should have received a copy of the GNU General Public License
  * You should have received a copy of the GNU General Public License

- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.

  */
 /** @file disobedience/disobedience.c
  * @brief Main Disobedience program
  */
 
 #include "disobedience.h"
  */
 /** @file disobedience/disobedience.c
  * @brief Main Disobedience program
  */
 
 #include "disobedience.h"

-#include "mixer.h"

 #include "version.h"
 
 #include <getopt.h>
 #include <locale.h>
 #include <pcre.h>
 #include "version.h"
 
 #include <getopt.h>
 #include <locale.h>
 #include <pcre.h>

+#include <gcrypt.h>

 
 /* Apologies for the numerous de-consting casts, but GLib et al do not seem to
  * have heard of const. */
 
 /* Apologies for the numerous de-consting casts, but GLib et al do not seem to
  * have heard of const. */


@@ -46,6 +44,9 @@ GtkWidget *report_label;
 /** @brief Main tab group */
 GtkWidget *tabs;
 
 /** @brief Main tab group */
 GtkWidget *tabs;
 

+/** @brief Mini-mode widget for playing track */
+GtkWidget *playing_mini;
+

 /** @brief Main client */
 disorder_eclient *client;
 
 /** @brief Main client */
 disorder_eclient *client;
 


@@ -70,6 +71,9 @@ int volume_l;
 /** @brief Right channel volume */
 int volume_r;
 
 /** @brief Right channel volume */
 int volume_r;
 

+/** @brief Audio backend */
+const struct uaudio *backend;
+

 double goesupto = 10;                   /* volume upper bound */
 
 /** @brief True if a NOP is in flight */
 double goesupto = 10;                   /* volume upper bound */
 
 /** @brief True if a NOP is in flight */


@@ -78,8 +82,11 @@ static int nop_in_flight;
 /** @brief True if an rtp-address command is in flight */
 static int rtp_address_in_flight;
 
 /** @brief True if an rtp-address command is in flight */
 static int rtp_address_in_flight;
 

-/** @brief Global tooltip group */
-GtkTooltips *tips;
+/** @brief True if a rights lookup is in flight */
+static int rights_lookup_in_flight;
+
+/** @brief Current rights bitmap */
+rights_type last_rights;

 
 /** @brief True if RTP play is available
  *
 
 /** @brief True if RTP play is available
  *


@@ -90,11 +97,19 @@ int rtp_supported;
 /** @brief True if RTP play is enabled */
 int rtp_is_running;
 
 /** @brief True if RTP play is enabled */
 int rtp_is_running;
 

-/** @brief Linked list of functions to call when we reset login parameters */
-static struct reset_callback_node {
-  struct reset_callback_node *next;
-  reset_callback *callback;
-} *resets;
+/** @brief Server version */
+const char *server_version;
+
+/** @brief Parsed server version */
+long server_version_bytes;
+
+static GtkWidget *queue;
+
+static GtkWidget *notebook_box;
+
+static void check_rtp_address(const char *event,
+                              void *eventdata,
+                              void *callbackdata);

 
 /* Window creation --------------------------------------------------------- */
 
 
 /* Window creation --------------------------------------------------------- */
 


@@ -116,11 +131,15 @@ static gboolean delete_event(GtkWidget attribute((unused)) *widget,
  *
  * Updates the menu settings to correspond to the new page.
  */
  *
  * Updates the menu settings to correspond to the new page.
  */

-static void tab_switched(GtkNotebook attribute((unused)) *notebook,
+static void tab_switched(GtkNotebook *notebook,

                          GtkNotebookPage attribute((unused)) *page,
                          guint page_num,
                          gpointer attribute((unused)) user_data) {
                          GtkNotebookPage attribute((unused)) *page,
                          guint page_num,
                          gpointer attribute((unused)) user_data) {

-  menu_update(page_num);
+  GtkWidget *const tab = gtk_notebook_get_nth_page(notebook, page_num);
+  const struct tabtype *const t = g_object_get_data(G_OBJECT(tab), "type");
+  assert(t != 0);
+  if(t->selected)
+    t->selected();

 }
 
 /** @brief Create the report box */
 }
 
 /** @brief Create the report box */


@@ -142,7 +161,7 @@ static GtkWidget *notebook(void) {
    * produces not too dreadful appearance */
   gtk_widget_set_style(tabs, tool_style);
   g_signal_connect(tabs, "switch-page", G_CALLBACK(tab_switched), 0);
    * produces not too dreadful appearance */
   gtk_widget_set_style(tabs, tool_style);
   g_signal_connect(tabs, "switch-page", G_CALLBACK(tab_switched), 0);

-  gtk_notebook_append_page(GTK_NOTEBOOK(tabs), queue_widget(),
+  gtk_notebook_append_page(GTK_NOTEBOOK(tabs), queue = queue_widget(),

                            gtk_label_new("Queue"));
   gtk_notebook_append_page(GTK_NOTEBOOK(tabs), recent_widget(),
                            gtk_label_new("Recent"));
                            gtk_label_new("Queue"));
   gtk_notebook_append_page(GTK_NOTEBOOK(tabs), recent_widget(),
                            gtk_label_new("Recent"));


@@ -153,18 +172,78 @@ static GtkWidget *notebook(void) {
   return tabs;
 }
 
   return tabs;
 }
 

+/* Tracking of window sizes */
+static int toplevel_width = 640, toplevel_height = 480;
+static int mini_width = 480, mini_height = 140;
+static struct timeval last_mode_switch;
+
+static void main_minimode(const char attribute((unused)) *event,
+                          void attribute((unused)) *evendata,
+                          void attribute((unused)) *callbackdata) {
+  if(full_mode) {
+    gtk_window_resize(GTK_WINDOW(toplevel), toplevel_width, toplevel_height);
+    gtk_widget_show(tabs);
+    gtk_widget_hide(playing_mini);
+    /* Show the queue (bit confusing otherwise!) */
+    gtk_notebook_set_current_page(GTK_NOTEBOOK(tabs), 0);
+  } else {
+    gtk_window_resize(GTK_WINDOW(toplevel), mini_width, mini_height);
+    gtk_widget_hide(tabs);
+    gtk_widget_show(playing_mini);
+  }
+  xgettimeofday(&last_mode_switch, NULL);
+}
+
+/* Called when the window size is allocate */
+static void toplevel_size_allocate(GtkWidget attribute((unused)) *w,
+                                   GtkAllocation *a,
+                                   gpointer attribute((unused)) user_data) {
+  struct timeval now;
+  xgettimeofday(&now, NULL);
+  if(tvdouble(tvsub(now, last_mode_switch)) < 0.5) {
+    /* Suppress size-allocate signals that are within half a second of a mode
+     * switch: they are quite likely to be the result of re-arranging widgets
+     * within the old size, not the application of the new size.  Yes, this is
+     * a disgusting hack! */
+    return;                             /* OMG too soon! */
+  }
+  if(full_mode) {
+    toplevel_width = a->width;
+    toplevel_height = a->height;
+  } else {
+    mini_width = a->width;
+    mini_height = a->height;
+  }
+}
+
+/* Periodically check the toplevel's size
+ * (the hack in toplevel_size_allocate() means we could in principle
+ * miss a user-initiated resize)
+ */
+static void check_toplevel_size(const char attribute((unused)) *event,
+                                void attribute((unused)) *evendata,
+                                void attribute((unused)) *callbackdata) {
+  GtkAllocation a;
+  gtk_window_get_size(GTK_WINDOW(toplevel), &a.width, &a.height);
+  toplevel_size_allocate(NULL, &a, NULL);
+}
+

 /** @brief Create and populate the main window */
 static void make_toplevel_window(void) {
 /** @brief Create and populate the main window */
 static void make_toplevel_window(void) {

-  GtkWidget *const vbox = gtk_vbox_new(FALSE, 1);
+  GtkWidget *const vbox = gtk_vbox_new(FALSE/*homogeneous*/, 1/*spacing*/);

   GtkWidget *const rb = report_box();
 
   D(("top_window"));
   toplevel = gtk_window_new(GTK_WINDOW_TOPLEVEL);
   /* default size is too small */
   GtkWidget *const rb = report_box();
 
   D(("top_window"));
   toplevel = gtk_window_new(GTK_WINDOW_TOPLEVEL);
   /* default size is too small */

-  gtk_window_set_default_size(GTK_WINDOW(toplevel), 640, 480);
+  gtk_window_set_default_size(GTK_WINDOW(toplevel),
+                              toplevel_width, toplevel_height);

   /* terminate on close */
   g_signal_connect(G_OBJECT(toplevel), "delete_event",
                    G_CALLBACK(delete_event), NULL);
   /* terminate on close */
   g_signal_connect(G_OBJECT(toplevel), "delete_event",
                    G_CALLBACK(delete_event), NULL);

+  /* track size */
+  g_signal_connect(G_OBJECT(toplevel), "size-allocate",
+                   G_CALLBACK(toplevel_size_allocate), NULL);

   /* lay out the window */
   gtk_window_set_title(GTK_WINDOW(toplevel), "Disobedience");
   gtk_container_add(GTK_CONTAINER(toplevel), vbox);
   /* lay out the window */
   gtk_window_set_title(GTK_WINDOW(toplevel), "Disobedience");
   gtk_container_add(GTK_CONTAINER(toplevel), vbox);


@@ -179,118 +258,68 @@ static void make_toplevel_window(void) {
                      FALSE,             /* expand */
                      FALSE,             /* fill */
                      0);
                      FALSE,             /* expand */
                      FALSE,             /* fill */
                      0);

-  gtk_container_add(GTK_CONTAINER(vbox), notebook());
+  playing_mini = playing_widget();
+  gtk_box_pack_start(GTK_BOX(vbox),
+                     playing_mini,
+                     FALSE,
+                     FALSE,
+                     0);
+  notebook_box = gtk_vbox_new(FALSE, 0);
+  gtk_container_add(GTK_CONTAINER(notebook_box), notebook());
+  gtk_container_add(GTK_CONTAINER(vbox), notebook_box);

   gtk_box_pack_end(GTK_BOX(vbox),
                    rb,
                    FALSE,             /* expand */
                    FALSE,             /* fill */
                    0);
   gtk_widget_set_style(toplevel, tool_style);
   gtk_box_pack_end(GTK_BOX(vbox),
                    rb,
                    FALSE,             /* expand */
                    FALSE,             /* fill */
                    0);
   gtk_widget_set_style(toplevel, tool_style);

+  event_register("mini-mode-changed", main_minimode, 0);
+  event_register("periodic-fast", check_toplevel_size, 0);

 }
 
 }
 

-#if MDEBUG
-static int widget_count, container_count;
+static void userinfo_rights_completed(void attribute((unused)) *v,
+                                      const char *err,
+                                      const char *value) {
+  rights_type r;

 
 

-static void count_callback(GtkWidget *w,
-                           gpointer attribute((unused)) data) {
-  ++widget_count;
-  if(GTK_IS_CONTAINER(w)) {
-    ++container_count;
-    gtk_container_foreach(GTK_CONTAINER(w), count_callback, 0);
+  if(err) {
+    popup_protocol_error(0, err);
+    r = 0;
+  } else {
+    if(parse_rights(value, &r, 0))
+      r = 0;

   }
   }

-}
-
-static void count_widgets(void) {
-  widget_count = 0;
-  container_count = 1;
-  if(toplevel)
-    gtk_container_foreach(GTK_CONTAINER(toplevel), count_callback, 0);
-  fprintf(stderr, "widget count: %8d  container count: %8d\n",
-          widget_count, container_count);
-}
-#endif
-
-#if MTRACK
-const char *mtag = "init";
-static hash *mtrack_hash;
-
-static int *mthfind(const char *tag) {
-  static const int zero = 0;
-  int *cp = hash_find(mtrack_hash, tag);
-  if(!cp) {
-    hash_add(mtrack_hash, tag, &zero, HASH_INSERT);
-    cp = hash_find(mtrack_hash, tag);
+  /* If rights have changed, signal everything that cares */
+  if(r != last_rights) {
+    last_rights = r;
+    ++suppress_actions;
+    event_raise("rights-changed", 0);
+    --suppress_actions;

   }
   }

-  return cp;
-}
-
-static void *trap_malloc(size_t n) {
-  void *ptr = malloc(n + sizeof(char *));
-
-  *(const char **)ptr = mtag;
-  ++*mthfind(mtag);
-  return (char *)ptr + sizeof(char *);
+  rights_lookup_in_flight = 0;

 }
 
 }
 

-static void trap_free(void *ptr) {
-  const char *tag;
-  if(!ptr)
-    return;
-  ptr = (char *)ptr - sizeof(char *);
-  tag = *(const char **)ptr;
-  --*mthfind(tag);
-  free(ptr);
-}
-
-static void *trap_realloc(void *ptr, size_t n) {
-  if(!ptr)
-    return trap_malloc(n);
-  if(!n) {
-    trap_free(ptr);
-    return 0;
+static void check_rights(void) {
+  if(!rights_lookup_in_flight) {
+    rights_lookup_in_flight = 1;
+    disorder_eclient_userinfo(client,
+                              userinfo_rights_completed,
+                              config->username, "rights",
+                              0);

   }
   }

-  ptr = (char *)ptr - sizeof(char *);
-  ptr = realloc(ptr, n + sizeof(char *));
-  *(const char **)ptr = mtag;
-  return (char *)ptr + sizeof(char *);

 }
 
 }
 

-static int report_tags_callback(const char *key, void *value,
-                                void attribute((unused)) *u) {
-  fprintf(stderr, "%16s: %d\n", key, *(int *)value);
-  return 0;
-}
-
-static void report_tags(void) {
-  hash_foreach(mtrack_hash, report_tags_callback, 0);
-  fprintf(stderr, "\n");
-}
-
-static const GMemVTable glib_memvtable = {
-  trap_malloc,
-  trap_realloc,
-  trap_free,
-  0,
-  0,
-  0
-};
-#endif
-

 /** @brief Called occasionally */
 static gboolean periodic_slow(gpointer attribute((unused)) data) {
 /** @brief Called occasionally */
 static gboolean periodic_slow(gpointer attribute((unused)) data) {

-  D(("periodic"));
+  D(("periodic_slow"));

   /* Expire cached data */
   cache_expire();
   /* Update everything to be sure that the connection to the server hasn't
    * mysteriously gone stale on us. */
   all_update();
   /* Expire cached data */
   cache_expire();
   /* Update everything to be sure that the connection to the server hasn't
    * mysteriously gone stale on us. */
   all_update();

-#if MDEBUG
-  count_widgets();
-  fprintf(stderr, "cache size: %zu\n", cache_count());
-#endif
-#if MTRACK
-  report_tags();
-#endif
+  event_raise("periodic-slow", 0);
+  /* Recheck RTP status too */
+  check_rtp_address(0, 0, 0);

   return TRUE;                          /* don't remove me */
 }
 
   return TRUE;                          /* don't remove me */
 }
 


@@ -312,21 +341,32 @@ static gboolean periodic_fast(gpointer attribute((unused)) data) {
   }
   last = now;
 #endif
   }
   last = now;
 #endif

-  if(rtp_supported && mixer_supported(DEFAULT_BACKEND)) {
+  if(rtp_supported && backend && backend->get_volume) {

     int nl, nr;
     int nl, nr;

-    if(!mixer_control(DEFAULT_BACKEND, &nl, &nr, 0)
-       && (nl != volume_l || nr != volume_r)) {
+    backend->get_volume(&nl, &nr);
+    if(nl != volume_l || nr != volume_r) {

       volume_l = nl;
       volume_r = nr;
       event_raise("volume-changed", 0);
     }
   }
       volume_l = nl;
       volume_r = nr;
       event_raise("volume-changed", 0);
     }
   }

+  /* Periodically check what our rights are */
+  int recheck_rights = 1;
+  if(server_version_bytes >= 0x04010000)
+    /* Server versions after 4.1 will send updates */
+    recheck_rights = 0;
+  if((server_version_bytes & 0xFF) == 0x01)
+    /* Development servers might do regardless of their version number */
+    recheck_rights = 0;
+  if(recheck_rights)
+    check_rights();
+  event_raise("periodic-fast", 0);

   return TRUE;
 }
 
 /** @brief Called when a NOP completes */
 static void nop_completed(void attribute((unused)) *v,
   return TRUE;
 }
 
 /** @brief Called when a NOP completes */
 static void nop_completed(void attribute((unused)) *v,

-                          const char attribute((unused)) *error) {
+                          const char attribute((unused)) *err) {

   /* TODO report the error somewhere */
   nop_in_flight = 0;
 }
   /* TODO report the error somewhere */
   nop_in_flight = 0;
 }


@@ -342,38 +382,48 @@ static gboolean maybe_send_nop(gpointer attribute((unused)) data) {
     disorder_eclient_nop(client, nop_completed, 0);
   }
   if(rtp_supported) {
     disorder_eclient_nop(client, nop_completed, 0);
   }
   if(rtp_supported) {

-    const int old_state = rtp_is_running;
+    const int rtp_was_running = rtp_is_running;

     rtp_is_running = rtp_running();
     rtp_is_running = rtp_running();

-    if(old_state != rtp_is_running)
-      control_monitor(0);
+    if(rtp_was_running != rtp_is_running)
+      event_raise("rtp-changed", 0);

   }
   return TRUE;                          /* keep call me please */
 }
 
 /** @brief Called when a rtp-address command succeeds */
 static void got_rtp_address(void attribute((unused)) *v,
   }
   return TRUE;                          /* keep call me please */
 }
 
 /** @brief Called when a rtp-address command succeeds */
 static void got_rtp_address(void attribute((unused)) *v,

-                            const char *error,
+                            const char *err,

                             int attribute((unused)) nvec,
                             char attribute((unused)) **vec) {
                             int attribute((unused)) nvec,
                             char attribute((unused)) **vec) {

+  const int rtp_was_supported = rtp_supported;
+  const int rtp_was_running = rtp_is_running;
+

   ++suppress_actions;
   rtp_address_in_flight = 0;
   ++suppress_actions;
   rtp_address_in_flight = 0;

-  if(error) {
+  if(err) {

     /* An error just means that we're not using network play */
     rtp_supported = 0;
     rtp_is_running = 0;
   } else {
     rtp_supported = 1;
     rtp_is_running = rtp_running();
     /* An error just means that we're not using network play */
     rtp_supported = 0;
     rtp_is_running = 0;
   } else {
     rtp_supported = 1;
     rtp_is_running = rtp_running();

-    control_monitor(0);

   }
   }

-  control_monitor(0);
+  /*fprintf(stderr, "rtp supported->%d, running->%d\n",
+          rtp_supported, rtp_is_running);*/
+  if(rtp_supported != rtp_was_supported
+     || rtp_is_running != rtp_was_running)
+    event_raise("rtp-changed", 0);

   --suppress_actions;
 }
 
 /** @brief Called to check whether RTP play is available */
   --suppress_actions;
 }
 
 /** @brief Called to check whether RTP play is available */

-static void check_rtp_address(void) {
-  if(!rtp_address_in_flight)
+static void check_rtp_address(const char attribute((unused)) *event,
+                              void attribute((unused)) *eventdata,
+                              void attribute((unused)) *callbackdata) {
+  if(!rtp_address_in_flight) {
+    //fprintf(stderr, "checking rtp\n");

     disorder_eclient_rtp_address(client, got_rtp_address, NULL);
     disorder_eclient_rtp_address(client, got_rtp_address, NULL);

+  }

 }
 
 /* main -------------------------------------------------------------------- */
 }
 
 /* main -------------------------------------------------------------------- */


@@ -404,27 +454,53 @@ static void help(void) {
   exit(0);
 }
 
   exit(0);
 }
 

-/* reset state */
-void reset(void) {
-  struct reset_callback_node *r;
+static void version_completed(void attribute((unused)) *v,
+                              const char attribute((unused)) *err,
+                              const char *ver) {
+  long major, minor, patch, dev;
+
+  if(!ver) {
+    server_version = 0;
+    server_version_bytes = 0;
+    return;
+  }
+  server_version = ver;
+  server_version_bytes = 0;
+  major = strtol(ver, (char **)&ver, 10);
+  if(*ver != '.')
+    return;
+  ++ver;
+  minor = strtol(ver, (char **)&ver, 10);
+  if(*ver == '.') {
+    ++ver;
+    patch = strtol(ver, (char **)&ver, 10);
+  } else
+    patch = 0;
+  if(*ver) {
+    if(*ver == '+') {
+      dev = 1;
+      ++ver;
+    }
+    if(*ver)
+      dev = 2;
+  } else
+    dev = 0;
+  server_version_bytes = (major << 24) + (minor << 16) + (patch << 8) + dev;
+}

 
 

+void logged_in(void) {

   /* reset the clients */
   disorder_eclient_close(client);
   disorder_eclient_close(logclient);
   rtp_supported = 0;
   /* reset the clients */
   disorder_eclient_close(client);
   disorder_eclient_close(logclient);
   rtp_supported = 0;

-  for(r = resets; r; r = r->next)
-    r->callback();
-  /* Might be a new server so re-check */
-  check_rtp_address();
-}
-
-/** @brief Register a reset callback */
-void register_reset(reset_callback *callback) {
-  struct reset_callback_node *const r = xmalloc(sizeof *r);
-
-  r->next = resets;
-  r->callback = callback;
-  resets = r;
+  event_raise("logged-in", 0);
+  /* Force the periodic checks */
+  periodic_slow(0);
+  periodic_fast(0);
+  /* Recheck server version */
+  disorder_eclient_version(client, version_completed, 0);
+  disorder_eclient_enable_connect(client);
+  disorder_eclient_enable_connect(logclient);

 }
 
 int main(int argc, char **argv) {
 }
 
 int main(int argc, char **argv) {


@@ -435,11 +511,7 @@ int main(int argc, char **argv) {
   /* garbage-collect PCRE's memory */
   pcre_malloc = xmalloc;
   pcre_free = xfree;
   /* garbage-collect PCRE's memory */
   pcre_malloc = xmalloc;
   pcre_free = xfree;

-#if MTRACK
-  mtrack_hash = hash_new(sizeof (int));
-  g_mem_set_vtable((GMemVTable *)&glib_memvtable);
-#endif
-  if(!setlocale(LC_CTYPE, "")) fatal(errno, "error calling setlocale");
+  if(!setlocale(LC_CTYPE, "")) disorder_fatal(errno, "error calling setlocale");

   gtkok = gtk_init_check(&argc, &argv);
   while((n = getopt_long(argc, argv, "hVc:dtHC", options, 0)) >= 0) {
     switch(n) {
   gtkok = gtk_init_check(&argc, &argv);
   while((n = getopt_long(argc, argv, "hVc:dtHC", options, 0)) >= 0) {
     switch(n) {


@@ -448,18 +520,29 @@ int main(int argc, char **argv) {
     case 'c': configfile = optarg; break;
     case 'd': debugging = 1; break;
     case 't': goesupto = 11; break;
     case 'c': configfile = optarg; break;
     case 'd': debugging = 1; break;
     case 't': goesupto = 11; break;

-    default: fatal(0, "invalid option");
+    default: disorder_fatal(0, "invalid option");

     }
   }
   if(!gtkok)
     }
   }
   if(!gtkok)

-    fatal(0, "failed to initialize GTK+");
+    disorder_fatal(0, "failed to initialize GTK+");
+  /* gcrypt initialization */
+  if(!gcry_check_version(NULL))
+    disorder_fatal(0, "gcry_check_version failed");
+  gcry_control(GCRYCTL_INIT_SECMEM, 0);
+  gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0);

   signal(SIGPIPE, SIG_IGN);
   init_styles();
   load_settings();
   /* create the event loop */
   D(("create main loop"));
   mainloop = g_main_loop_new(0, 0);
   signal(SIGPIPE, SIG_IGN);
   init_styles();
   load_settings();
   /* create the event loop */
   D(("create main loop"));
   mainloop = g_main_loop_new(0, 0);

-  if(config_read(0)) fatal(0, "cannot read configuration");
+  if(config_read(0, NULL)) disorder_fatal(0, "cannot read configuration");
+  /* we'll need mixer support */
+  backend = uaudio_apis[0];
+  if(backend->configure)
+    backend->configure();
+  if(backend->open_mixer)
+    backend->open_mixer();

   /* create the clients */
   if(!(client = gtkclient())
      || !(logclient = gtkclient()))
   /* create the clients */
   if(!(client = gtkclient())
      || !(logclient = gtkclient()))


@@ -467,29 +550,30 @@ int main(int argc, char **argv) {
   /* periodic operations (e.g. expiring the cache, checking local volume) */
   g_timeout_add(600000/*milliseconds*/, periodic_slow, 0);
   g_timeout_add(1000/*milliseconds*/, periodic_fast, 0);
   /* periodic operations (e.g. expiring the cache, checking local volume) */
   g_timeout_add(600000/*milliseconds*/, periodic_slow, 0);
   g_timeout_add(1000/*milliseconds*/, periodic_fast, 0);

-  /* global tooltips */
-  tips = gtk_tooltips_new();

   make_toplevel_window();
   /* reset styles now everything has its name */
   gtk_rc_reset_styles(gtk_settings_get_for_screen(gdk_screen_get_default()));
   gtk_widget_show_all(toplevel);
   make_toplevel_window();
   /* reset styles now everything has its name */
   gtk_rc_reset_styles(gtk_settings_get_for_screen(gdk_screen_get_default()));
   gtk_widget_show_all(toplevel);

+  gtk_widget_hide(playing_mini);

   /* issue a NOP every so often */
   g_timeout_add_full(G_PRIORITY_LOW,
                      2000/*interval, ms*/,
                      maybe_send_nop,
                      0/*data*/,
                      0/*notify*/);
   /* issue a NOP every so often */
   g_timeout_add_full(G_PRIORITY_LOW,
                      2000/*interval, ms*/,
                      maybe_send_nop,
                      0/*data*/,
                      0/*notify*/);

-  register_reset(properties_reset);

   /* Start monitoring the log */
   disorder_eclient_log(logclient, &log_callbacks, 0);
   /* Start monitoring the log */
   disorder_eclient_log(logclient, &log_callbacks, 0);

-  /* See if RTP play supported */
-  check_rtp_address();
+  /* Initiate all the checks */
+  periodic_fast(0);
+  disorder_eclient_version(client, version_completed, 0);
+  event_register("log-connected", check_rtp_address, 0);

   suppress_actions = 0;
   suppress_actions = 0;

+  playlists_init();
+  globals_init();

   /* If no password is set yet pop up a login box */
   if(!config->password)
     login_box();
   D(("enter main loop"));
   /* If no password is set yet pop up a login box */
   if(!config->password)
     login_box();
   D(("enter main loop"));

-  MTAG("misc");

   g_main_loop_run(mainloop);
   return 0;
 }
   g_main_loop_run(mainloop);
   return 0;
 }