X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/f4d62fc806f03876a422a1369e4ce42c1d758705..05fd0aa117566503026dbedfe4d9b0485da2d5ed:/disobedience/disobedience.c

diff --git a/disobedience/disobedience.c b/disobedience/disobedience.c
index 6511b13..3b5461f 100644
--- a/disobedience/disobedience.c
+++ b/disobedience/disobedience.c
@@ -20,11 +20,11 @@
  */
 
 #include "disobedience.h"
+#include "regexp.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
@@ -228,9 +228,40 @@ static void check_toplevel_size(const char attribute((unused)) *event,
   toplevel_size_allocate(NULL, &a, NULL);
 }
 
+static void hack_window_title(const char attribute((unused)) *event,
+                              void attribute((unused)) *eventdata,
+                              void attribute((unused)) *callbackdata) {
+  char *p;
+  const char *note;
+  static const char *last_note = 0;
+
+  if(!(last_state & DISORDER_CONNECTED))
+    note = "(disconnected)";
+  else if(last_state & DISORDER_TRACK_PAUSED)
+    note = "(paused)";
+  else if(playing_track) {
+    byte_asprintf(&p, "'%s' by %s, from '%s'",
+                  namepart(playing_track->track, "display", "title"),
+                  namepart(playing_track->track, "display", "artist"),
+                  namepart(playing_track->track, "display", "album"));
+    note = p;
+  } else if(!(last_state & DISORDER_PLAYING_ENABLED))
+    note = "(playing disabled)";
+  else if(!(last_state & DISORDER_RANDOM_ENABLED))
+    note = "(random play disabled)";
+  else
+    note = "(nothing to play for unknown reason)";
+
+  if(last_note && !strcmp(note, last_note))
+    return;
+  last_note = xstrdup(note);
+  byte_asprintf(&p, "Disobedience: %s", note);
+  gtk_window_set_title(GTK_WINDOW(toplevel), p);
+}
+
 /** @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"));
@@ -245,7 +276,7 @@ static void make_toplevel_window(void) {
   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");
+  hack_window_title(0, 0, 0);
   gtk_container_add(GTK_CONTAINER(toplevel), vbox);
   /* lay out the vbox */
   gtk_box_pack_start(GTK_BOX(vbox),
@@ -275,6 +306,13 @@ static void make_toplevel_window(void) {
   gtk_widget_set_style(toplevel, tool_style);
   event_register("mini-mode-changed", main_minimode, 0);
   event_register("periodic-fast", check_toplevel_size, 0);
+  event_register("playing-track-changed", hack_window_title, 0);
+  event_register("enabled-changed", hack_window_title, 0);
+  event_register("random-changed", hack_window_title, 0);
+  event_register("pause-changed", hack_window_title, 0);
+  event_register("playing-changed", hack_window_title, 0);
+  event_register("connected-changed", hack_window_title, 0);
+  event_register("lookups-completed", hack_window_title, 0);
 }
 
 static void userinfo_rights_completed(void attribute((unused)) *v,
@@ -509,8 +547,7 @@ int main(int argc, char **argv) {
 
   mem_init();
   /* garbage-collect PCRE's memory */
-  pcre_malloc = xmalloc;
-  pcre_free = xfree;
+  regexp_setup();
   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) {
@@ -538,7 +575,7 @@ int main(int argc, char **argv) {
   mainloop = g_main_loop_new(0, 0);
   if(config_read(0, NULL)) disorder_fatal(0, "cannot read configuration");
   /* we'll need mixer support */
-  backend = uaudio_apis[0];
+  backend = uaudio_default(uaudio_apis, UAUDIO_API_CLIENT);
   if(backend->configure)
     backend->configure();
   if(backend->open_mixer)
@@ -569,6 +606,7 @@ int main(int argc, char **argv) {
   event_register("log-connected", check_rtp_address, 0);
   suppress_actions = 0;
   playlists_init();
+  globals_init();
   /* If no password is set yet pop up a login box */
   if(!config->password)
     login_box();