X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/f486ea184ba1d605110eab4862406c11554ed13e..b5b7e0bfda93e553c04fbf7340551a8cce1d9b44:/disobedience/disobedience.c diff --git a/disobedience/disobedience.c b/disobedience/disobedience.c index 2d7ab3e..d6aa599 100644 --- a/disobedience/disobedience.c +++ b/disobedience/disobedience.c @@ -1,6 +1,6 @@ /* * This file is part of DisOrder. - * Copyright (C) 2006, 2007 Richard Kettlewell + * Copyright (C) 2006, 2007, 2008 Richard Kettlewell * * 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 @@ -22,6 +22,8 @@ */ #include "disobedience.h" +#include "mixer.h" +#include "version.h" #include #include @@ -138,10 +140,7 @@ 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); + 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")); @@ -186,7 +185,7 @@ static void make_toplevel_window(void) { FALSE, /* expand */ FALSE, /* fill */ 0); - gtk_widget_modify_bg(toplevel, GTK_STATE_NORMAL, &tool_bg); + gtk_widget_set_style(toplevel, tool_style); } #if MDEBUG @@ -277,8 +276,8 @@ static const GMemVTable glib_memvtable = { }; #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(); @@ -295,11 +294,9 @@ static gboolean periodic(gpointer attribute((unused)) data) { 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; @@ -314,6 +311,16 @@ static gboolean heartbeat(gpointer attribute((unused)) data) { delta); } last = now; +#endif + if(rtp_supported && mixer_supported(DEFAULT_BACKEND)) { + int nl, nr; + if(!mixer_control(DEFAULT_BACKEND, &nl, &nr, 0) + && (nl != volume_l || nr != volume_r)) { + volume_l = nl; + volume_r = nr; + volume_update(); + } + } return TRUE; } @@ -345,20 +352,24 @@ static gboolean maybe_send_nop(gpointer attribute((unused)) data) { static void got_rtp_address(void attribute((unused)) *v, int attribute((unused)) nvec, char attribute((unused)) **vec) { + ++suppress_actions; rtp_address_in_flight = 0; rtp_supported = 1; rtp_is_running = rtp_running(); control_monitor(0); + --suppress_actions; } /** @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) { + ++suppress_actions; rtp_address_in_flight = 0; rtp_supported = 0; rtp_is_running = 0; control_monitor(0); + --suppress_actions; } /** @brief Called to check whether RTP play is available */ @@ -398,13 +409,6 @@ static void help(void) { exit(0); } -/* display version number and terminate */ -static void version(void) { - xprintf("disorder version %s\n", disorder_version_string); - xfclose(stdout); - exit(0); -} - /* reset state */ void reset(void) { struct reset_callback_node *r; @@ -430,6 +434,7 @@ void register_reset(reset_callback *callback) { int main(int argc, char **argv) { int n; + gboolean gtkok; mem_init(); /* garbage-collect PCRE's memory */ @@ -440,18 +445,21 @@ int main(int argc, char **argv) { g_mem_set_vtable((GMemVTable *)&glib_memvtable); #endif if(!setlocale(LC_CTYPE, "")) fatal(errno, "error calling setlocale"); - gtk_init(&argc, &argv); + gtkok = gtk_init_check(&argc, &argv); while((n = getopt_long(argc, argv, "hVc:dtHC", options, 0)) >= 0) { switch(n) { case 'h': help(); - case 'V': version(); + case 'V': version("disobedience"); case 'c': configfile = optarg; break; case 'd': debugging = 1; break; case 't': goesupto = 11; break; default: fatal(0, "invalid option"); } } + if(!gtkok) + fatal(0, "failed to initialize GTK+"); signal(SIGPIPE, SIG_IGN); + init_styles(); load_settings(); /* create the event loop */ D(("create main loop")); @@ -461,16 +469,9 @@ int main(int argc, char **argv) { 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(); @@ -479,7 +480,7 @@ int main(int argc, char **argv) { 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*/); @@ -488,6 +489,10 @@ int main(int argc, char **argv) { disorder_eclient_log(logclient, &log_callbacks, 0); /* See if RTP play supported */ check_rtp_address(); + suppress_actions = 0; + /* 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);