~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix the build fix. It turns out that Uint32 != uint32_t.
[disorder]
/
disobedience
/
disobedience.c
diff --git
a/disobedience/disobedience.c
b/disobedience/disobedience.c
index
ab51bb3
..
7fad2eb
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
@@
-20,12
+20,12
@@
*/
#include "disobedience.h"
*/
#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. */
@@
-68,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 */
@@
-240,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 */
@@
-263,10
+267,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);
@@
-282,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;
}
@@
-446,13
+451,24
@@
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->configure)
+ backend->configure();
+ if(backend->open_mixer)
+ backend->open_mixer();
/* create the clients */
if(!(client = gtkclient())
|| !(logclient = gtkclient()))
/* create the clients */
if(!(client = gtkclient())
|| !(logclient = gtkclient()))
@@
-479,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();