whitespace cleanup

diff --git a/README b/README
index 70c91445fe5254f98d647051194996106a011e66..872a0fa0b5461bad3f45c19915005c39758cb050 100644 (file)
--- a/README
+++ b/README
@@ -27,7 +27,7 @@ It contains the following programs:
        para_server needs an  "audio file selector" to work, mainly
        to determine which song to stream next. There are three
        selectors available: random, playlist and mysql. The former
-       chooses audio files randomly and  playlist  can handle, well,
+       chooses audio files randomly and  playlist can handle, well,
        playlists. Both are always supported.
 
        The optional mysql selector connects to a mysql server which
@@ -80,18 +80,19 @@ It contains the following programs:
 
 - para_gui (optional, but recommended):
 
-        Themable ncurses-based gui. It calls para_audioc and presents
-        the obtained information in an ncurses window. para_gui
-        provides key-bindings for the most common commands and new
-        key-bindings can be added easily.
+       Themable ncurses-based gui. It calls para_audioc and presents
+       the obtained information in an ncurses window. para_gui
+       provides key-bindings for the most common commands and new
+       key-bindings can be added easily.
 
 - para_sdl_gui (optional):
 
-        SDL-based gui. Similar to para_gui but presents its output in
-        an X window (fullscreen mode is also available) and can display
-        jpg images on a per song basis. para_sdl_gui provides an input
-        prompt to enter arbitrary commands. However, it can also be used
-        non-interactively (e.g. as a screen saver) via the -i switch.
+       SDL-based gui. Similar to para_gui but presents its output
+       in an X window (fullscreen mode is also available) and can
+       display jpg images on a per song basis. para_sdl_gui provides
+       an input prompt to enter arbitrary commands. However, it
+       can also be used non-interactively (e.g. as a screen saver)
+       via the -i switch.
 
 - para_krell (optional, only useful in conjunction with the mysql selector):
 

diff --git a/slider.c b/slider.c
index 558f55bde07e4f5740fa128e32838ef73c42e2d8..d0bb6d8df8922d6a458d56f80e6b54775ded9bab 100644 (file)
--- a/slider.c
+++ b/slider.c
@@ -28,7 +28,7 @@
 #define VAL_2_SL_VAL(v) (v) * (SLIDER_RATIO - 1.0) / SLIDER_RATIO
 #define SL_VAL_2_VAL(v) (v) * SLIDER_RATIO / (SLIDER_RATIO - 1.0)
 #define VAL_2_SCORE(v) (v) > 0.5? 1 / (1.03 - (v)) / (1.03 - (v)) :\
-        - 1 / ((v) + 0.03) / ((v) + 0.03)
+       - 1 / ((v) + 0.03) / ((v) + 0.03)
 
 #define RGB(R,G,B) (((R)<<12) + ((G)<<6) + (B))
 
@@ -39,27 +39,11 @@
 #define NUMPLAYED_FORMULA(v)\
        10 * (v) + (v) / (1 - (v) * (1 - EPSILON))
 
-
 static int argc;
 static char **argv;
 char *streamname = NULL;
 static Zmw_Float_0_1 *slider_vals, lastplayed_val, numplayed_val;
 
-#if 0
-static void boxed_text(const char *text, int i)
-{
-  ZMW(zmw_decorator(Zmw_Decorator_Border_Embossed))
-    {
-      if (i == 2)
-        {
-          zmw_horizontal_expand(Zmw_False) ;
-          zmw_vertical_expand(Zmw_False) ;
-        }
-      zmw_label(text) ;
-    }
-}
-#endif
-
 void para_log(int ll, char* fmt,...) /* no logging */
 {
 }