remove redundant color

[disorder] / disobedience / disobedience.c

diff --git a/disobedience/disobedience.c b/disobedience/disobedience.c
index 6271560a796887fec6cdac7e9622d65b7bfe1166..291d95531af9460cd55690a6d0db186b39c42a2d 100644 (file)
--- a/disobedience/disobedience.c
+++ b/disobedience/disobedience.c
@@ -30,8 +30,6 @@
 /* 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. */
 

-#include "style.h"                      /* generated style */
-

 /* Variables --------------------------------------------------------------- */
 
 /** @brief Event loop */
 /* Variables --------------------------------------------------------------- */
 
 /** @brief Event loop */


@@ -75,9 +73,21 @@ double goesupto = 10;                   /* volume upper bound */
 /** @brief True if a NOP is in flight */
 static int nop_in_flight;
 
 /** @brief True if a NOP is in flight */
 static int nop_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 Global tooltip group */
 GtkTooltips *tips;
 

+/** @brief True if RTP play is available
+ *
+ * This is a bit of a bodge...
+ */
+int rtp_supported;
+
+/** @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;
 /** @brief Linked list of functions to call when we reset login parameters */
 static struct reset_callback_node {
   struct reset_callback_node *next;


@@ -126,6 +136,12 @@ static GtkWidget *report_box(void) {
 /** @brief Create and populate the main tab group */
 static GtkWidget *notebook(void) {
   tabs = gtk_notebook_new();
 /** @brief Create and populate the main tab group */
 static GtkWidget *notebook(void) {
   tabs = gtk_notebook_new();

+  /* The current tab is _NORMAL, the rest are _ACTIVE, which is bizarre but
+   * produces not too dreadful appearance */
+  gtk_widget_modify_bg(tabs, GTK_STATE_NORMAL, &tool_bg);
+  gtk_widget_modify_bg(tabs, GTK_STATE_ACTIVE, &tool_active);
+  gtk_widget_modify_fg(tabs, GTK_STATE_NORMAL, &tool_fg);
+  gtk_widget_modify_fg(tabs, GTK_STATE_ACTIVE, &tool_fg);

   g_signal_connect(tabs, "switch-page", G_CALLBACK(tab_switched), 0);
   gtk_notebook_append_page(GTK_NOTEBOOK(tabs), queue_widget(),
                            gtk_label_new("Queue"));
   g_signal_connect(tabs, "switch-page", G_CALLBACK(tab_switched), 0);
   gtk_notebook_append_page(GTK_NOTEBOOK(tabs), queue_widget(),
                            gtk_label_new("Queue"));


@@ -170,7 +186,7 @@ static void make_toplevel_window(void) {
                    FALSE,             /* expand */
                    FALSE,             /* fill */
                    0);
                    FALSE,             /* expand */
                    FALSE,             /* fill */
                    0);

-  gtk_widget_set_name(toplevel, "disobedience");
+  gtk_widget_modify_bg(toplevel, GTK_STATE_NORMAL, &tool_bg);

 }
 
 #if MDEBUG
 }
 
 #if MDEBUG


@@ -316,9 +332,44 @@ static gboolean maybe_send_nop(gpointer attribute((unused)) data) {
     nop_in_flight = 1;
     disorder_eclient_nop(client, nop_completed, 0);
   }
     nop_in_flight = 1;
     disorder_eclient_nop(client, nop_completed, 0);
   }

+  if(rtp_supported) {
+    const int old_state = rtp_is_running;
+    rtp_is_running = rtp_running();
+    if(old_state != rtp_is_running)
+      control_monitor(0);
+  }

   return TRUE;                          /* keep call me please */
 }
 
   return TRUE;                          /* keep call me please */
 }
 

+/** @brief Called when a rtp-address command succeeds */
+static void got_rtp_address(void attribute((unused)) *v,
+                            int attribute((unused)) nvec,
+                            char attribute((unused)) **vec) {
+  rtp_address_in_flight = 0;
+  rtp_supported = 1;
+  rtp_is_running = rtp_running();
+  control_monitor(0);
+}
+
+/** @brief Called when a rtp-address command fails */
+static void no_rtp_address(struct callbackdata attribute((unused)) *cbd,
+                           int attribute((unused)) code,
+                           const char attribute((unused)) *msg) {
+  rtp_address_in_flight = 0;
+  rtp_supported = 0;
+  rtp_is_running = 0;
+  control_monitor(0);
+}
+
+/** @brief Called to check whether RTP play is available */
+static void check_rtp_address(void) {
+  if(!rtp_address_in_flight) {
+    struct callbackdata *const cbd = xmalloc(sizeof *cbd);
+    cbd->onerror = no_rtp_address;
+    disorder_eclient_rtp_address(client, got_rtp_address, cbd);
+  }
+}
+

 /* main -------------------------------------------------------------------- */
 
 static const struct option options[] = {
 /* main -------------------------------------------------------------------- */
 
 static const struct option options[] = {


@@ -361,8 +412,11 @@ void reset(void) {
   /* reset the clients */
   disorder_eclient_close(client);
   disorder_eclient_close(logclient);
   /* reset the clients */
   disorder_eclient_close(client);
   disorder_eclient_close(logclient);

+  rtp_supported = 0;

   for(r = resets; r; r = r->next)
     r->callback();
   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 */
 }
 
 /** @brief Register a reset callback */


@@ -387,7 +441,6 @@ int main(int argc, char **argv) {
 #endif
   if(!setlocale(LC_CTYPE, "")) fatal(errno, "error calling setlocale");
   gtk_init(&argc, &argv);
 #endif
   if(!setlocale(LC_CTYPE, "")) fatal(errno, "error calling setlocale");
   gtk_init(&argc, &argv);

-  gtk_rc_parse_string(style);

   while((n = getopt_long(argc, argv, "hVc:dtHC", options, 0)) >= 0) {
     switch(n) {
     case 'h': help();
   while((n = getopt_long(argc, argv, "hVc:dtHC", options, 0)) >= 0) {
     switch(n) {
     case 'h': help();


@@ -399,6 +452,7 @@ int main(int argc, char **argv) {
     }
   }
   signal(SIGPIPE, SIG_IGN);
     }
   }
   signal(SIGPIPE, SIG_IGN);

+  load_appearance();

   /* create the event loop */
   D(("create main loop"));
   mainloop = g_main_loop_new(0, 0);
   /* create the event loop */
   D(("create main loop"));
   mainloop = g_main_loop_new(0, 0);


@@ -432,6 +486,8 @@ int main(int argc, char **argv) {
   register_reset(properties_reset);
   /* Start monitoring the log */
   disorder_eclient_log(logclient, &log_callbacks, 0);
   register_reset(properties_reset);
   /* Start monitoring the log */
   disorder_eclient_log(logclient, &log_callbacks, 0);

+  /* See if RTP play supported */
+  check_rtp_address();

   D(("enter main loop"));
   MTAG("misc");
   g_main_loop_run(mainloop);
   D(("enter main loop"));
   MTAG("misc");
   g_main_loop_run(mainloop);