[Pkg-wmaker-commits] [wmrack] 28/97: lower polling frequency and don't assume X11 needs include/lib paths

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch master
in repository wmrack.

commit 5fdd74eea7a3d4f319b2319b67f560863f004310
Author: Chris Waters <xtifr.w at gmail.com>
Date:   Thu Mar 8 17:46:43 2012 -0800

    lower polling frequency and don't assume X11 needs include/lib paths
---
 CHANGES      |  6 ++++++
 configure.in |  4 ++--
 wmrack.c     | 11 ++++++-----
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/CHANGES b/CHANGES
index b874472..9efe3ad 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,9 @@
+1.3 -> 1.4
+- modify configure.in to not assume that X11 requires extra include
+  and library paths (X11R6 does; X11R7 usually does not).
+- change the main polling frequency from 5000 usec (1/200th sec) to a
+  more reasonable 50000 usec (1/20th sec), as suggested by Tim Connors.
+
 1.2 -> 1.3
 - rewrote the mixer settings file parsing logic almost completely to
   be more robust, and to fix the bug (reported by Knut Anders Hatlen)
diff --git a/configure.in b/configure.in
index c1e0c29..d15487a 100644
--- a/configure.in
+++ b/configure.in
@@ -54,8 +54,8 @@ AC_PATH_X
 if test "x$no_x" = "xyes"; then
   AC_MSG_ERROR([WMRack needs X Windows!!!])
 else
-  CFLAGS="$CFLAGS -I${x_includes}"
-  LIBS="$LIBS -L${x_libraries} -lX11"
+  CFLAGS="$CFLAGS ${x_includes:+-I$x_includes}"
+  LIBS="$LIBS ${x_libraries:+-L$x_libraries} -lX11"
 fi
 
 dnl check for Xpm
diff --git a/wmrack.c b/wmrack.c
index 9d9c856..ea49d40 100644
--- a/wmrack.c
+++ b/wmrack.c
@@ -1,5 +1,5 @@
 /*
- * $Id: wmrack.c,v 1.5 2006/04/25 19:48:09 xtifr Exp $
+ * $Id: wmrack.c,v 1.6 2007/11/25 23:24:15 xtifr Exp $
  *
  * WMRack - WindowMaker Sound Control Panel
  *
@@ -15,9 +15,7 @@
  * Should also work swallowed in any fvwm compatible button bar.
  */
 
-#define WMR_VERSION "1.3"
-
-#define MAXRCLINE 1024
+#define WMR_VERSION "1.4"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -39,6 +37,9 @@
 #include "mixer.h"
 #include "library.h"
 
+#define MAXRCLINE 1024
+#define POLLFREQ 50000L		/* microseconds between checking events */
+
 /* Functions *****************************************************************/
 void usage ();
 void parseCmdLine (int argc, char *argv[]);
@@ -951,7 +952,7 @@ mainLoop ()
 	}
 	/* do a redraw of the LED display */
 	redrawDisplay (force_win, force_disp);
-	usleep (5000L);
+	usleep (POLLFREQ);
 	force_win = force_disp = 0;
     }
 }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmrack.git