X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/229d327f85abd31e64c3b06741c14b8f9233bccd..e7eb3a2744aa45179daea235800753d3d1955338:/disobedience/disobedience.c diff --git a/disobedience/disobedience.c b/disobedience/disobedience.c index 80fd389..ab51bb3 100644 --- a/disobedience/disobedience.c +++ b/disobedience/disobedience.c @@ -2,20 +2,18 @@ * This file is part of DisOrder. * Copyright (C) 2006, 2007, 2008 Richard Kettlewell * - * This program is free software; you can redistribute it and/or modify + * 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 - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA + * along with this program. If not, see . */ /** @file disobedience/disobedience.c * @brief Main Disobedience program @@ -96,7 +94,15 @@ int rtp_supported; /** @brief True if RTP play is enabled */ int rtp_is_running; -static void check_rtp_address(void); +/** @brief Server version */ +const char *server_version; + +/** @brief Parsed server version */ +long server_version_bytes; + +static void check_rtp_address(const char *event, + void *eventdata, + void *callbackdata); /* Window creation --------------------------------------------------------- */ @@ -195,12 +201,12 @@ static void make_toplevel_window(void) { } static void userinfo_rights_completed(void attribute((unused)) *v, - const char *error, + const char *err, const char *value) { rights_type r; - if(error) { - popup_protocol_error(0, error); + if(err) { + popup_protocol_error(0, err); r = 0; } else { if(parse_rights(value, &r, 0)) @@ -216,6 +222,16 @@ static void userinfo_rights_completed(void attribute((unused)) *v, rights_lookup_in_flight = 0; } +static void check_rights(void) { + if(!rights_lookup_in_flight) { + rights_lookup_in_flight = 1; + disorder_eclient_userinfo(client, + userinfo_rights_completed, + config->username, "rights", + 0); + } +} + /** @brief Called occasionally */ static gboolean periodic_slow(gpointer attribute((unused)) data) { D(("periodic_slow")); @@ -224,16 +240,8 @@ static gboolean periodic_slow(gpointer attribute((unused)) data) { /* Update everything to be sure that the connection to the server hasn't * mysteriously gone stale on us. */ all_update(); - /* Periodically check what our rights are */ - if(!rights_lookup_in_flight) { - rights_lookup_in_flight = 1; - disorder_eclient_userinfo(client, - userinfo_rights_completed, - config->username, "rights", - 0); - } /* Recheck RTP status too */ - check_rtp_address(); + check_rtp_address(0, 0, 0); return TRUE; /* don't remove me */ } @@ -264,12 +272,22 @@ static gboolean periodic_fast(gpointer attribute((unused)) data) { event_raise("volume-changed", 0); } } + /* Periodically check what our rights are */ + int recheck_rights = 1; + if(server_version_bytes >= 0x04010000) + /* Server versions after 4.1 will send updates */ + recheck_rights = 0; + if((server_version_bytes & 0xFF) == 0x01) + /* Development servers might do regardless of their version number */ + recheck_rights = 0; + if(recheck_rights) + check_rights(); return TRUE; } /** @brief Called when a NOP completes */ static void nop_completed(void attribute((unused)) *v, - const char attribute((unused)) *error) { + const char attribute((unused)) *err) { /* TODO report the error somewhere */ nop_in_flight = 0; } @@ -295,7 +313,7 @@ static gboolean maybe_send_nop(gpointer attribute((unused)) data) { /** @brief Called when a rtp-address command succeeds */ static void got_rtp_address(void attribute((unused)) *v, - const char *error, + const char *err, int attribute((unused)) nvec, char attribute((unused)) **vec) { const int rtp_was_supported = rtp_supported; @@ -303,7 +321,7 @@ static void got_rtp_address(void attribute((unused)) *v, ++suppress_actions; rtp_address_in_flight = 0; - if(error) { + if(err) { /* An error just means that we're not using network play */ rtp_supported = 0; rtp_is_running = 0; @@ -311,6 +329,8 @@ static void got_rtp_address(void attribute((unused)) *v, rtp_supported = 1; rtp_is_running = rtp_running(); } + /*fprintf(stderr, "rtp supported->%d, running->%d\n", + rtp_supported, rtp_is_running);*/ if(rtp_supported != rtp_was_supported || rtp_is_running != rtp_was_running) event_raise("rtp-changed", 0); @@ -318,9 +338,13 @@ static void got_rtp_address(void attribute((unused)) *v, } /** @brief Called to check whether RTP play is available */ -static void check_rtp_address(void) { - if(!rtp_address_in_flight) +static void check_rtp_address(const char attribute((unused)) *event, + void attribute((unused)) *eventdata, + void attribute((unused)) *callbackdata) { + if(!rtp_address_in_flight) { + //fprintf(stderr, "checking rtp\n"); disorder_eclient_rtp_address(client, got_rtp_address, NULL); + } } /* main -------------------------------------------------------------------- */ @@ -351,6 +375,40 @@ static void help(void) { exit(0); } +static void version_completed(void attribute((unused)) *v, + const char attribute((unused)) *err, + const char *ver) { + long major, minor, patch, dev; + + if(!ver) { + server_version = 0; + server_version_bytes = 0; + return; + } + server_version = ver; + server_version_bytes = 0; + major = strtol(ver, (char **)&ver, 10); + if(*ver != '.') + return; + ++ver; + minor = strtol(ver, (char **)&ver, 10); + if(*ver == '.') { + ++ver; + patch = strtol(ver, (char **)&ver, 10); + } else + patch = 0; + if(*ver) { + if(*ver == '+') { + dev = 1; + ++ver; + } + if(*ver) + dev = 2; + } else + dev = 0; + server_version_bytes = (major << 24) + (minor << 16) + (patch << 8) + dev; +} + void logged_in(void) { /* reset the clients */ disorder_eclient_close(client); @@ -360,6 +418,10 @@ void logged_in(void) { /* Force the periodic checks */ periodic_slow(0); periodic_fast(0); + /* Recheck server version */ + disorder_eclient_version(client, version_completed, 0); + disorder_eclient_enable_connect(client); + disorder_eclient_enable_connect(logclient); } int main(int argc, char **argv) { @@ -396,7 +458,7 @@ int main(int argc, char **argv) { || !(logclient = gtkclient())) return 1; /* already reported an error */ /* periodic operations (e.g. expiring the cache, checking local volume) */ - g_timeout_add(10000/*milliseconds*/, periodic_slow, 0); + g_timeout_add(600000/*milliseconds*/, periodic_slow, 0); g_timeout_add(1000/*milliseconds*/, periodic_fast, 0); /* global tooltips */ tips = gtk_tooltips_new(); @@ -413,8 +475,9 @@ int main(int argc, char **argv) { /* Start monitoring the log */ disorder_eclient_log(logclient, &log_callbacks, 0); /* Initiate all the checks */ - periodic_slow(0); periodic_fast(0); + disorder_eclient_version(client, version_completed, 0); + event_register("log-connected", check_rtp_address, 0); suppress_actions = 0; /* If no password is set yet pop up a login box */ if(!config->password)