audiod: Fix a memory leak.

[paraslash.git] / gui_theme.c

diff --git a/gui_theme.c b/gui_theme.c
index 87d8e050cf92ebe864b512016b572ad57dfbdcba..7844e605df8b942e26fd666503d939f2c024ef03 100644 (file)
--- a/gui_theme.c
+++ b/gui_theme.c
@@ -1,22 +1,11 @@
 /*
- * Copyright (C) 2005 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2007 Andre Noll <maan@systemlinux.org>
  *
- *     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
- *     (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, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 #include "para.h"
+#include "gui.h"
 #include <curses.h>
 
 #define NUM_THEMES 2
@@ -148,14 +137,14 @@ static void init_theme_colorful_blackness(struct gui_theme *t)
        d[SI_STATUS_FLAGS].y = 17;
        d[SI_STATUS_FLAGS].len = 10;
 
-       d[SI_DBTOOL].prefix = "dbtool: ";
-       d[SI_DBTOOL].postfix = "";
-       d[SI_DBTOOL].fg = COLOR_RED;
-       d[SI_DBTOOL].bg = COLOR_BLACK;
-       d[SI_DBTOOL].align = CENTER;
-       d[SI_DBTOOL].x = 21;
-       d[SI_DBTOOL].y = 17;
-       d[SI_DBTOOL].len = 20;
+       d[SI_SELECTOR].prefix = "selector: ";
+       d[SI_SELECTOR].postfix = "";
+       d[SI_SELECTOR].fg = COLOR_RED;
+       d[SI_SELECTOR].bg = COLOR_BLACK;
+       d[SI_SELECTOR].align = CENTER;
+       d[SI_SELECTOR].x = 21;
+       d[SI_SELECTOR].y = 17;
+       d[SI_SELECTOR].len = 21;
 
        d[SI_FORMAT].prefix = "format: ";
        d[SI_FORMAT].postfix = "";
@@ -164,8 +153,7 @@ static void init_theme_colorful_blackness(struct gui_theme *t)
        d[SI_FORMAT].align = CENTER;
        d[SI_FORMAT].x = 42;
        d[SI_FORMAT].y = 17;
-       d[SI_FORMAT].len = 14;
-
+       d[SI_FORMAT].len = 18;
 
        d[SI_NUM_PLAYED].prefix = "#";
        d[SI_NUM_PLAYED].postfix = "";
@@ -192,7 +180,7 @@ static void init_theme_colorful_blackness(struct gui_theme *t)
        d[SI_AUDIOD_STATUS].align = RIGHT;
        d[SI_AUDIOD_STATUS].x = 0;
        d[SI_AUDIOD_STATUS].y = 27;
-       d[SI_AUDIOD_STATUS].len = 13;
+       d[SI_AUDIOD_STATUS].len = 14;
 
 
        d[SI_DECODER_FLAGS].prefix = "[";
@@ -200,27 +188,27 @@ static void init_theme_colorful_blackness(struct gui_theme *t)
        d[SI_DECODER_FLAGS].fg = COLOR_MAGENTA;
        d[SI_DECODER_FLAGS].bg = COLOR_BLACK;
        d[SI_DECODER_FLAGS].align = LEFT;
-       d[SI_DECODER_FLAGS].x = 14;
+       d[SI_DECODER_FLAGS].x = 15;
        d[SI_DECODER_FLAGS].y = 27;
-       d[SI_DECODER_FLAGS].len = 8;
+       d[SI_DECODER_FLAGS].len = 10;
 
        d[SI_MTIME].prefix = "Mtime: ";
        d[SI_MTIME].postfix = "";
        d[SI_MTIME].fg = COLOR_MAGENTA;
        d[SI_MTIME].bg = COLOR_BLACK;
        d[SI_MTIME].align = CENTER;
-       d[SI_MTIME].x = 22;
+       d[SI_MTIME].x = 25;
        d[SI_MTIME].y = 27;
-       d[SI_MTIME].len = 30;
+       d[SI_MTIME].len = 29;
 
        d[SI_FILE_SIZE].prefix = "Size: ";
        d[SI_FILE_SIZE].postfix = " kb";
        d[SI_FILE_SIZE].fg = COLOR_MAGENTA;
        d[SI_FILE_SIZE].bg = COLOR_BLACK;
        d[SI_FILE_SIZE].align = CENTER;
-       d[SI_FILE_SIZE].x = 52;
+       d[SI_FILE_SIZE].x = 54;
        d[SI_FILE_SIZE].y = 27;
-       d[SI_FILE_SIZE].len = 26;
+       d[SI_FILE_SIZE].len = 24;
 
        d[SI_AUDIOD_UPTIME].prefix = "AUp: ";
        d[SI_AUDIOD_UPTIME].postfix = "";