~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Do some basic compatibility checking when installing a new server
[disorder]
/
disobedience
/
disobedience.c
diff --git
a/disobedience/disobedience.c
b/disobedience/disobedience.c
index
53aea56
..
a4e9d20
100644
(file)
--- a/
disobedience/disobedience.c
+++ b/
disobedience/disobedience.c
@@
-2,32
+2,30
@@
* This file is part of DisOrder.
* Copyright (C) 2006, 2007, 2008 Richard Kettlewell
*
* 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
* 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.
*
* (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
+ * G
NU G
eneral Public License for more details.
+ *
* You should have received a copy of the GNU General Public License
* 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"
*/
/** @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 "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. */
/* Apologies for the numerous de-consting casts, but GLib et al do not seem to
* have heard of const. */
@@
-70,6
+68,9
@@
int volume_l;
/** @brief Right channel volume */
int volume_r;
/** @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 */
double goesupto = 10; /* volume upper bound */
/** @brief True if a NOP is in flight */
@@
-265,10
+266,10
@@
static gboolean periodic_fast(gpointer attribute((unused)) data) {
}
last = now;
#endif
}
last = now;
#endif
- if(rtp_supported &&
mixer_supported(DEFAULT_BACKEND)
) {
+ if(rtp_supported &&
backend && backend->get_volume
) {
int nl, nr;
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);
volume_l = nl;
volume_r = nr;
event_raise("volume-changed", 0);
@@
-379,32
+380,32
@@
static void help(void) {
static void version_completed(void attribute((unused)) *v,
const char attribute((unused)) *err,
static void version_completed(void attribute((unused)) *v,
const char attribute((unused)) *err,
- const char *ver
sion
) {
+ const char *ver) {
long major, minor, patch, dev;
long major, minor, patch, dev;
- if(!ver
sion
) {
+ if(!ver) {
server_version = 0;
server_version_bytes = 0;
return;
}
server_version = 0;
server_version_bytes = 0;
return;
}
- server_version = ver
sion
;
+ server_version = ver;
server_version_bytes = 0;
server_version_bytes = 0;
- major = strtol(ver
sion, (char **)&version
, 10);
- if(*ver
sion
!= '.')
+ major = strtol(ver
, (char **)&ver
, 10);
+ if(*ver != '.')
return;
return;
- ++ver
sion
;
- minor = strtol(ver
sion, (char **)&version
, 10);
- if(*ver
sion
== '.') {
- ++ver
sion
;
- patch = strtol(ver
sion, (char **)&version
, 10);
+ ++ver;
+ minor = strtol(ver
, (char **)&ver
, 10);
+ if(*ver == '.') {
+ ++ver;
+ patch = strtol(ver
, (char **)&ver
, 10);
} else
patch = 0;
} else
patch = 0;
- if(*ver
sion
) {
- if(*ver
sion
== '+') {
+ if(*ver) {
+ if(*ver == '+') {
dev = 1;
dev = 1;
- ++ver
sion
;
+ ++ver;
}
}
- if(*ver
sion
)
+ if(*ver)
dev = 2;
} else
dev = 0;
dev = 2;
} else
dev = 0;
@@
-422,6
+423,8
@@
void logged_in(void) {
periodic_fast(0);
/* Recheck server version */
disorder_eclient_version(client, version_completed, 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) {
}
int main(int argc, char **argv) {
@@
-446,13
+449,22
@@
int main(int argc, char **argv) {
}
if(!gtkok)
fatal(0, "failed to initialize GTK+");
}
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);
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->open_mixer)
+ backend->open_mixer();
/* create the clients */
if(!(client = gtkclient())
|| !(logclient = gtkclient()))
/* create the clients */
if(!(client = gtkclient())
|| !(logclient = gtkclient()))