*/
#include "disobedience.h"
+#include "mixer.h"
#include <getopt.h>
#include <locale.h>
};
#endif
-/** @brief Called once every 10 minutes */
-static gboolean periodic(gpointer attribute((unused)) data) {
+/** @brief Called occasionally */
+static gboolean periodic_slow(gpointer attribute((unused)) data) {
D(("periodic"));
/* Expire cached data */
cache_expire();
return TRUE; /* don't remove me */
}
-/** @brief Called from time to time
- *
- * Used for debugging purposes
- */
-static gboolean heartbeat(gpointer attribute((unused)) data) {
+/** @brief Called frequently */
+static gboolean periodic_fast(gpointer attribute((unused)) data) {
+#if 0 /* debugging hack */
static struct timeval last;
struct timeval now;
double delta;
delta);
}
last = now;
+#endif
+ if(rtp_supported) {
+ int nl, nr;
+ if(!mixer_control(&nl, &nr, 0) && (nl != volume_l || nr != volume_r)) {
+ volume_l = nl;
+ volume_r = nr;
+ volume_update();
+ }
+ }
return TRUE;
}
static void got_rtp_address(void attribute((unused)) *v,
int attribute((unused)) nvec,
char attribute((unused)) **vec) {
+ ++suppress_actions;
rtp_address_in_flight = 0;
rtp_supported = 1;
rtp_is_running = rtp_running();
control_monitor(0);
+ --suppress_actions;
}
/** @brief Called when a rtp-address command fails */
static void no_rtp_address(struct callbackdata attribute((unused)) *cbd,
int attribute((unused)) code,
const char attribute((unused)) *msg) {
+ ++suppress_actions;
rtp_address_in_flight = 0;
rtp_supported = 0;
rtp_is_running = 0;
control_monitor(0);
+ --suppress_actions;
}
/** @brief Called to check whether RTP play is available */
}
}
signal(SIGPIPE, SIG_IGN);
- load_settings();
init_styles();
+ load_settings();
/* create the event loop */
D(("create main loop"));
mainloop = g_main_loop_new(0, 0);
if(!(client = gtkclient())
|| !(logclient = gtkclient()))
return 1; /* already reported an error */
- /* periodic operations (e.g. expiring the cache) */
-#if MDEBUG || MTRACK
- g_timeout_add(5000/*milliseconds*/, periodic, 0);
-#else
- g_timeout_add(600000/*milliseconds*/, periodic, 0);
-#endif
- /* The point of this is to try and get a handle on mysterious
- * unresponsiveness. It's not very useful in production use. */
- if(0)
- g_timeout_add(1000/*milliseconds*/, heartbeat, 0);
+ /* periodic operations (e.g. expiring the cache, checking local volume) */
+ g_timeout_add(600000/*milliseconds*/, periodic_slow, 0);
+ g_timeout_add(1000/*milliseconds*/, periodic_fast, 0);
/* global tooltips */
tips = gtk_tooltips_new();
make_toplevel_window();
gtk_widget_show_all(toplevel);
/* issue a NOP every so often */
g_timeout_add_full(G_PRIORITY_LOW,
- 1000/*interval, ms*/,
+ 2000/*interval, ms*/,
maybe_send_nop,
0/*data*/,
0/*notify*/);
disorder_eclient_log(logclient, &log_callbacks, 0);
/* See if RTP play supported */
check_rtp_address();
+ suppress_actions = 0;
D(("enter main loop"));
MTAG("misc");
g_main_loop_run(mainloop);