Removing old svn keywords.

[monky] / src / mixer.c

diff --git a/src/mixer.c b/src/mixer.c
index d5950de..3d72ba0 100644 (file)
--- a/src/mixer.c
+++ b/src/mixer.c
@@ -1,19 +1,35 @@
-/*
- * Conky, a system monitor, based on torsmo
+/* Conky, a system monitor, based on torsmo
  *
- * This program is licensed under BSD license, read COPYING
+ * Any original torsmo code is licensed under the BSD license
+ *
+ * All code written since the fork of torsmo is licensed under the GPL
+ *
+ * Please see COPYING for details
+ *
+ * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen
+ * Copyright (c) 2005-2008 Brenden Matthews, Philip Kovacs, et. al.
+ *     (see AUTHORS)
+ * All rights reserved.
+ *
+ * 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- *  $Id$
  */
 
+#include "conky.h"
 #include <sys/ioctl.h>
-
 #include <errno.h>
 #include <fcntl.h>
-#include <string.h>
-#include <stdlib.h>
 
-#include "conky.h"
 
 #ifdef HAVE_LINUX_SOUNDCARD_H
 #include <linux/soundcard.h>
@@ -22,8 +38,8 @@
 #include <soundcard.h>
 #else
 #include <sys/soundcard.h>
-#endif                         /* __OpenBSD__ */
-#endif                         /* HAVE_LINUX_SOUNDCARD_H */
+#endif /* __OpenBSD__ */
+#endif /* HAVE_LINUX_SOUNDCARD_H */
 
 #define MIXER_DEV "/dev/mixer"
 
@@ -34,15 +50,15 @@ int mixer_init(const char *name)
 {
        unsigned int i;
 
-       if (name == 0 || name[0] == '\0')
+       if (name == 0 || name[0] == '\0') {
                name = "vol";
+       }
 
        /* open mixer */
        if (mixer_fd <= 0) {
                mixer_fd = open(MIXER_DEV, O_RDONLY);
                if (mixer_fd == -1) {
-                       ERR("can't open %s: %s", MIXER_DEV,
-                           strerror(errno));
+                       ERR("can't open %s: %s", MIXER_DEV, strerror(errno));
                        return -1;
                }
        }
@@ -62,8 +78,9 @@ static int mixer_get(int i)
        int val = -1;
 
        if (ioctl(mixer_fd, MIXER_READ(i), &val) == -1) {
-               if (!rep)
+               if (!rep) {
                        ERR("mixer ioctl: %s", strerror(errno));
+               }
                rep = 1;
                return 0;
        }
@@ -75,6 +92,7 @@ static int mixer_get(int i)
 int mixer_get_avg(int i)
 {
        int v = mixer_get(i);
+
        return ((v >> 8) + (v & 0xFF)) / 2;
 }