Merge from disorder.dev.

[disorder] / lib / trackname.h

diff --git a/lib/trackname.h b/lib/trackname.h
index 943e866bdd0e30d687afb41a411d8e264fea99b0..63b881bb836c523ad962b81f26118e4d47129c9f 100644 (file)
--- a/lib/trackname.h
+++ b/lib/trackname.h
@@ -2,22 +2,22 @@
  * This file is part of DisOrder
  * Copyright (C) 2005-2008 Richard Kettlewell
  *
- * This program is free software; you can redistribute it and/or modify
+ * 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 2 of the License, or
+ * 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.
- *
+ * 
+ * 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, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+/** @file lib/trackname.h
+ * @brief Track name calculation
  */
-
 #ifndef TRACKNAME_H
 #define TRACKNAME_H
 
@@ -65,8 +65,6 @@ struct tracksort_data {
   const char *sort;
   /** @brief Display key */
   const char *display;
-  /** @brief Extra data for callers */
-  void *extra;
 };
 
 struct tracksort_data *tracksort_init(int nvec,