~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
error/fatal/info -> disorder_error/fatal/info
[disorder]
/
disobedience
/
disobedience.c
diff --git
a/disobedience/disobedience.c
b/disobedience/disobedience.c
index
dea9d59
..
edffbb5
100644
(file)
--- a/
disobedience/disobedience.c
+++ b/
disobedience/disobedience.c
@@
-1,6
+1,6
@@
/*
* This file is part of DisOrder.
/*
* 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
* it under the terms of the GNU General Public License as published by
*
* 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
@@
-243,6
+243,7
@@
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();
/* Update everything to be sure that the connection to the server hasn't
* mysteriously gone stale on us. */
all_update();
+ event_raise("periodic-slow", 0);
/* Recheck RTP status too */
check_rtp_address(0, 0, 0);
return TRUE; /* don't remove me */
/* Recheck RTP status too */
check_rtp_address(0, 0, 0);
return TRUE; /* don't remove me */
@@
-285,6
+286,7
@@
static gboolean periodic_fast(gpointer attribute((unused)) data) {
recheck_rights = 0;
if(recheck_rights)
check_rights();
recheck_rights = 0;
if(recheck_rights)
check_rights();
+ event_raise("periodic-fast", 0);
return TRUE;
}
return TRUE;
}
@@
-435,7
+437,7
@@
int main(int argc, char **argv) {
/* garbage-collect PCRE's memory */
pcre_malloc = xmalloc;
pcre_free = xfree;
/* garbage-collect PCRE's memory */
pcre_malloc = xmalloc;
pcre_free = xfree;
- if(!setlocale(LC_CTYPE, "")) fatal(errno, "error calling setlocale");
+ if(!setlocale(LC_CTYPE, ""))
disorder_
fatal(errno, "error calling setlocale");
gtkok = gtk_init_check(&argc, &argv);
while((n = getopt_long(argc, argv, "hVc:dtHC", options, 0)) >= 0) {
switch(n) {
gtkok = gtk_init_check(&argc, &argv);
while((n = getopt_long(argc, argv, "hVc:dtHC", options, 0)) >= 0) {
switch(n) {
@@
-444,11
+446,11
@@
int main(int argc, char **argv) {
case 'c': configfile = optarg; break;
case 'd': debugging = 1; break;
case 't': goesupto = 11; break;
case 'c': configfile = optarg; break;
case 'd': debugging = 1; break;
case 't': goesupto = 11; break;
- default: fatal(0, "invalid option");
+ default:
disorder_
fatal(0, "invalid option");
}
}
if(!gtkok)
}
}
if(!gtkok)
- fatal(0, "failed to initialize GTK+");
+
disorder_
fatal(0, "failed to initialize GTK+");
/* gcrypt initialization */
if(!gcry_check_version(NULL))
disorder_fatal(0, "gcry_check_version failed");
/* gcrypt initialization */
if(!gcry_check_version(NULL))
disorder_fatal(0, "gcry_check_version failed");
@@
-460,9
+462,11
@@
int main(int argc, char **argv) {
/* 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);
- if(config_read(0
))
fatal(0, "cannot read configuration");
+ if(config_read(0
, NULL)) disorder_
fatal(0, "cannot read configuration");
/* we'll need mixer support */
backend = uaudio_apis[0];
/* 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(backend->open_mixer)
backend->open_mixer();
/* create the clients */
@@
-491,6
+495,9
@@
int main(int argc, char **argv) {
disorder_eclient_version(client, version_completed, 0);
event_register("log-connected", check_rtp_address, 0);
suppress_actions = 0;
disorder_eclient_version(client, version_completed, 0);
event_register("log-connected", check_rtp_address, 0);
suppress_actions = 0;
+#if PLAYLISTS
+ playlists_init();
+#endif
/* If no password is set yet pop up a login box */
if(!config->password)
login_box();
/* If no password is set yet pop up a login box */
if(!config->password)
login_box();