/*
* This file is part of DisOrder.
- * Copyright (C) 2006, 2007, 2008 Richard Kettlewell
+ * Copyright (C) 2006-2009 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 <http://www.gnu.org/licenses/>.
*/
/** @file disobedience/disobedience.c
* @brief Main Disobedience program
*/
#include "disobedience.h"
-#include "mixer.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
* have heard of const. */
/** @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 */
/** @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 --------------------------------------------------------- */
}
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))
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"));
/* 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 */
}
}
last = now;
#endif
- if(rtp_supported && mixer_supported(DEFAULT_BACKEND)) {
+ if(rtp_supported && backend && backend->get_volume) {
int nl, nr;
- if(!mixer_control(DEFAULT_BACKEND, &nl, &nr, 0)
- && (nl != volume_l || nr != volume_r)) {
+ backend->get_volume(&nl, &nr);
+ if(nl != volume_l || nr != volume_r) {
volume_l = nl;
volume_r = nr;
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;
}
/** @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;
++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;
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);
}
/** @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 -------------------------------------------------------------------- */
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);
/* 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) {
}
if(!gtkok)
fatal(0, "failed to initialize GTK+");
+ /* gcrypt initialization */
+ if(!gcry_check_version(NULL))
+ disorder_fatal(0, "gcry_check_version failed");
+ gcry_control(GCRYCTL_INIT_SECMEM, 0);
+ gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0);
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(0)) fatal(0, "cannot read configuration");
+ if(config_read(0, NULL)) 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()))
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();
/* 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)
~mdw / disorder / blobdiff