simplify open_audiod_pipe(), remove a trailing newline which caused
authorAndre <maan@p133.(none)>
Sun, 26 Feb 2006 16:17:05 +0000 (17:17 +0100)
committerAndre <maan@p133.(none)>
Sun, 26 Feb 2006 16:17:05 +0000 (17:17 +0100)
the top window to flicker if para_audiod is not running.

gui.c

diff --git a/gui.c b/gui.c
index 351748e..1e6739a 100644 (file)
--- a/gui.c
+++ b/gui.c
@@ -841,25 +841,17 @@ static void handle_signal(int sig)
        }
 }
 
-/* open pipe if last attempt to open was more than 2 secs ago */
 static int open_audiod_pipe(void)
 {
-       static time_t open_time, *p;
-       time_t now;
-       double diff;
-
-       if (p) {
-               time(&now);
-               diff = difftime(now, open_time);
-               if (diff < 2)
-                       return -1;
-       } else
-               p = &open_time;
-       time(&open_time);
+       static int init = 1;
+
+       if (init)
+               init = 0;
+       else
+               sleep(1);
        return para_open_audiod_pipe(conf.stat_cmd_arg);
 }
 
-
 /*
  * This is the core select loop. Besides the (internal) signal
  * pipe, the following other fds are checked according to the mode:
@@ -936,10 +928,9 @@ repeat:
                        audiod_pipe = -1;
                        clear_all_items();
                        free(stat_content[SI_STATUS_BAR]);
-                       stat_content[SI_STATUS_BAR] = 
-                               para_strdup("audiod not running!?\n");
+                       stat_content[SI_STATUS_BAR] =
+                               para_strdup("audiod not running!?");
                        print_all_items();
-                       sleep(1);
                }
 check_return:
        switch (mode) {