clients/, disobedience/: Add `-u' option to override user config file.

[disorder] / disobedience / disobedience.c

diff --git a/disobedience/disobedience.c b/disobedience/disobedience.c
index 7fcfc3c..75e5b97 100644 (file)
--- 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
@@ -71,9 +71,6 @@ int volume_l;
 /** @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 */
@@ -228,6 +225,37 @@ 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/*homogeneous*/, 1/*spacing*/);
@@ -245,7 +273,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 +303,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,
@@ -341,10 +376,9 @@ static gboolean periodic_fast(gpointer attribute((unused)) data) {
   }
   last = now;
 #endif
-  if(rtp_supported && backend && backend->get_volume) {
+  if(rtp_supported) {
     int nl, nr;
-    backend->get_volume(&nl, &nr);
-    if(nl != volume_l || nr != volume_r) {
+    if (!rtp_getvol(&nl, &nr) && (nl != volume_l || nr != volume_r)) {
       volume_l = nl;
       volume_r = nr;
       event_raise("volume-changed", 0);
@@ -432,13 +466,14 @@ static const struct option options[] = {
   { "help", no_argument, 0, 'h' },
   { "version", no_argument, 0, 'V' },
   { "config", required_argument, 0, 'c' },
+  { "user-config", required_argument, 0, 'u' },
   { "tufnel", no_argument, 0, 't' },
   { "debug", no_argument, 0, 'd' },
   { 0, 0, 0, 0 }
 };
 
 /* display usage message and terminate */
-static void help(void) {
+static void attribute((noreturn)) help(void) {
   xprintf("Disobedience - GUI client for DisOrder\n"
           "\n"
           "Usage:\n"
@@ -446,7 +481,8 @@ static void help(void) {
          "Options:\n"
          "  --help, -h              Display usage message\n"
          "  --version, -V           Display version number\n"
-         "  --config PATH, -c PATH  Set configuration file\n"
+         "  --config PATH, -c PATH  Set system configuration file\n"
+         "  --user-config PATH, -u PATH  Set user configuration file\n"
          "  --debug, -d             Turn on debugging\n"
           "\n"
           "Also GTK+ options will work.\n");
@@ -509,15 +545,15 @@ 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) {
+  while((n = getopt_long(argc, argv, "hVc:dtu:", options, 0)) >= 0) {
     switch(n) {
     case 'h': help();
     case 'V': version("disobedience");
     case 'c': configfile = optarg; break;
+    case 'u': userconfigfile = optarg; break;
     case 'd': debugging = 1; break;
     case 't': goesupto = 11; break;
     default: disorder_fatal(0, "invalid option");
@@ -537,12 +573,6 @@ int main(int argc, char **argv) {
   D(("create main loop"));
   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];
-  if(backend->configure)
-    backend->configure();
-  if(backend->open_mixer)
-    backend->open_mixer();
   /* create the clients */
   if(!(client = gtkclient())
      || !(logclient = gtkclient()))
@@ -569,7 +599,7 @@ int main(int argc, char **argv) {
   event_register("log-connected", check_rtp_address, 0);
   suppress_actions = 0;
   playlists_init();
-  filtering_init();
+  globals_init();
   /* If no password is set yet pop up a login box */
   if(!config->password)
     login_box();