*/
#include "disobedience.h"
+#include "mixer.h"
#include <getopt.h>
#include <locale.h>
/* 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 */
/** @brief Main client */
disorder_eclient *client;
+/** @brief Log client */
+disorder_eclient *logclient;
+
/** @brief Last reported state
*
* This is updated by log_state().
double goesupto = 10; /* volume upper bound */
-/** @brief Break up choose tab by initial letter */
-int choosealpha;
-
/** @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 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;
+ reset_callback *callback;
+} *resets;
+
/* Window creation --------------------------------------------------------- */
/* Note that all the client operations kicked off from here will only complete
/** @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_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_label_new("Queue"));
gtk_label_new("Recent"));
gtk_notebook_append_page(GTK_NOTEBOOK(tabs), choose_widget(),
gtk_label_new("Choose"));
+ gtk_notebook_append_page(GTK_NOTEBOOK(tabs), added_widget(),
+ gtk_label_new("Added"));
return tabs;
}
FALSE, /* expand */
FALSE, /* fill */
0);
- gtk_widget_set_name(toplevel, "disobedience");
+ gtk_widget_set_style(toplevel, tool_style);
}
#if MDEBUG
};
#endif
-/** @brief Called once every 10 minutes */
-static gboolean periodic(gpointer attribute((unused)) data) {
+/** @brief Called occasionally */
+static gboolean periodic_slow(gpointer attribute((unused)) data) {
D(("periodic"));
/* Expire cached data */
cache_expire();
return TRUE; /* don't remove me */
}
-/** @brief Called from time to time
- *
- * Used for debugging purposes
- */
-static gboolean heartbeat(gpointer attribute((unused)) data) {
+/** @brief Called frequently */
+static gboolean periodic_fast(gpointer attribute((unused)) data) {
+#if 0 /* debugging hack */
static struct timeval last;
struct timeval now;
double delta;
delta);
}
last = now;
+#endif
+ if(rtp_supported) {
+ int nl, nr;
+ if(!mixer_control(&nl, &nr, 0) && (nl != volume_l || nr != volume_r)) {
+ volume_l = nl;
+ volume_r = nr;
+ volume_update();
+ }
+ }
return TRUE;
}
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 */
}
+/** @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[] = {
{ "version", no_argument, 0, 'V' },
{ "config", required_argument, 0, 'c' },
{ "tufnel", no_argument, 0, 't' },
- { "choosealpha", no_argument, 0, 'C' },
{ "debug", no_argument, 0, 'd' },
{ 0, 0, 0, 0 }
};
exit(0);
}
+/* reset state */
+void reset(void) {
+ struct reset_callback_node *r;
+
+ /* 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;
+}
+
int main(int argc, char **argv) {
int n;
- disorder_eclient *logclient;
mem_init();
/* garbage-collect PCRE's memory */
#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:dtH", options, 0)) >= 0) {
+ while((n = getopt_long(argc, argv, "hVc:dtHC", options, 0)) >= 0) {
switch(n) {
case 'h': help();
case 'V': version();
case 'c': configfile = optarg; break;
case 'd': debugging = 1; break;
case 't': goesupto = 11; break;
- case 'C': choosealpha = 1; break; /* not well tested any more */
default: fatal(0, "invalid option");
}
}
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()) fatal(0, "cannot read configuration");
+ if(config_read(0)) fatal(0, "cannot read configuration");
/* create the clients */
if(!(client = gtkclient())
|| !(logclient = gtkclient()))
return 1; /* already reported an error */
- /* periodic operations (e.g. expiring the cache) */
-#if MDEBUG || MTRACK
- g_timeout_add(5000/*milliseconds*/, periodic, 0);
-#else
- g_timeout_add(600000/*milliseconds*/, periodic, 0);
-#endif
- /* The point of this is to try and get a handle on mysterious
- * unresponsiveness. It's not very useful in production use. */
- if(0)
- g_timeout_add(1000/*milliseconds*/, heartbeat, 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();
gtk_widget_show_all(toplevel);
/* issue a NOP every so often */
g_timeout_add_full(G_PRIORITY_LOW,
- 1000/*interval, ms*/,
+ 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);
+ /* See if RTP play supported */
+ check_rtp_address();
D(("enter main loop"));
MTAG("misc");
g_main_loop_run(mainloop);
~mdw / disorder / blobdiff