rpms/xmms/devel arts_output-0.6.0-buffer.patch, NONE, 1.1 rh_mp3.c, NONE, 1.1 xmms-1.2.6-audio.patch, NONE, 1.1 xmms-1.2.6-lazy.patch, NONE, 1.1 xmms-1.2.8-alsalib.patch, NONE, 1.1 xmms-1.2.8-arts.patch, NONE, 1.1 xmms-1.2.8-default-skin.patch, NONE, 1.1 xmms-1.2.9-nomp3.patch, NONE, 1.1 xmms-alsa-backport.patch, NONE, 1.1 xmms-underquoted.patch, NONE, 1.1 xmms.req, NONE, 1.1 xmms.spec, NONE, 1.1 xmms.xpm, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Elliot Lee (sopwith)
fedora-extras-commits at redhat.com
Mon Apr 4 17:59:14 UTC 2005
Author: sopwith
Update of /cvs/extras/rpms/xmms/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31599/devel
Modified Files:
.cvsignore sources
Added Files:
arts_output-0.6.0-buffer.patch rh_mp3.c xmms-1.2.6-audio.patch
xmms-1.2.6-lazy.patch xmms-1.2.8-alsalib.patch
xmms-1.2.8-arts.patch xmms-1.2.8-default-skin.patch
xmms-1.2.9-nomp3.patch xmms-alsa-backport.patch
xmms-underquoted.patch xmms.req xmms.spec xmms.xpm
Log Message:
auto-import xmms-1.2.10-11 on branch devel from xmms-1.2.10-11.src.rpm
arts_output-0.6.0-buffer.patch:
--- NEW FILE arts_output-0.6.0-buffer.patch ---
--- arts_output-0.6.0/audio.c.foo 2003-09-08 15:54:58.000000000 -0400
+++ arts_output-0.6.0/audio.c 2003-09-08 15:55:04.000000000 -0400
@@ -34,7 +34,7 @@
memset(&artsxmms_cfg, 0, sizeof (artsxmms_cfg));
- artsxmms_cfg.buffer_size = 400;
+ artsxmms_cfg.buffer_size = 1000;
cfgfile = xmms_cfg_open_default_file();
xmms_cfg_read_int(cfgfile, "arts", "buffer_size",
--- NEW FILE rh_mp3.c ---
#include "libxmms/configfile.h"
#include <gtk/gtk.h>
#include "xmms/plugin.h"
#include "xmms/i18n.h"
#include "libxmms/util.h"
static int enabled;
static gpointer foo;
static void init(void)
{
ConfigFile *cfg;
enabled = 1;
cfg = xmms_cfg_open_default_file();
xmms_cfg_read_boolean(cfg, "zzmp3", "enabled", &enabled);
xmms_cfg_free(cfg);
}
static int get_time(void)
{
return -1;
}
static void clicked_button()
{
ConfigFile *cfg;
gchar *filename;
filename = g_strconcat(g_get_home_dir(), "/.xmms/config", NULL);
cfg = xmms_cfg_open_file(filename);
if (!cfg)
cfg = xmms_cfg_new();
xmms_cfg_write_boolean(cfg, "zzmp3", "enabled", enabled);
xmms_cfg_write_file(cfg, filename);
xmms_cfg_free(cfg);
g_free(filename);
}
static void pref_toggled(void *button)
{
GtkWidget *check = GTK_WIDGET(button);
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(check)))
enabled = 0;
else
enabled = 1;
}
static void play_file(char *filename)
{
GtkWidget *dialog, *vbox, *label, *checkbox, *bbox, *button;
dialog = gtk_dialog_new();
gtk_window_set_title(GTK_WINDOW(dialog), _("MPEG Layer 1/2/3 Not Supported"));
vbox = gtk_vbox_new(FALSE, 0);
gtk_container_set_border_width(GTK_CONTAINER(vbox), 15);
gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), vbox, TRUE, TRUE, 0);
label = gtk_label_new(_("Due to patent licensing, and conflicts between\n"
"such patent licenses and the licenses of application\n"
"source code, MPEG-1/2 audio layer 3 (mp3) support has\n"
"been removed from this application by Red Hat, Inc.\n\n"
"We apologize for the inconvenience."));
gtk_box_pack_start(GTK_BOX(vbox), label, TRUE, TRUE, 0);
checkbox = gtk_check_button_new_with_label (_("Do not show this dialog again"));
gtk_signal_connect_object(GTK_OBJECT(checkbox), "toggled", GTK_SIGNAL_FUNC(pref_toggled), GTK_OBJECT(checkbox));
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbox), TRUE);
gtk_box_pack_start(GTK_BOX(vbox), checkbox, TRUE, TRUE, 0);
gtk_widget_show(label);
gtk_widget_show(checkbox);
gtk_widget_show(vbox);
bbox = gtk_hbutton_box_new();
gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_SPREAD);
gtk_button_box_set_spacing(GTK_BUTTON_BOX(bbox), 5);
gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->action_area), bbox, FALSE, FALSE, 0);
button = gtk_button_new_with_label(_("Ok"));
gtk_signal_connect(GTK_OBJECT(button), "clicked", clicked_button, button);
gtk_signal_connect_object(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(gtk_widget_destroy), GTK_OBJECT(dialog));
gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0);
GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
gtk_widget_grab_default(button);
gtk_widget_show(button);
gtk_widget_show(bbox);
gtk_widget_show(dialog);
gtk_signal_connect(GTK_OBJECT(dialog), "destroy",
GTK_SIGNAL_FUNC(gtk_widget_destroyed), &dialog);
}
static int is_our_file(char *filename)
{
char *ext;
guint16 wavid;
if (!enabled) return FALSE;
if (!strncasecmp(filename, "http://", 7))
{ /* We assume all http:// (except those ending in .ogg) are mpeg -- why do we do that? */
ext = strrchr(filename, '.');
if (ext)
{
if (!strncasecmp(ext, ".ogg", 4))
return FALSE;
if (!strncasecmp(ext, ".rm", 3) ||
!strncasecmp(ext, ".ra", 3) ||
!strncasecmp(ext, ".rpm", 4) ||
!strncasecmp(ext, ".ram", 4))
return FALSE;
}
return TRUE;
}
ext = strrchr(filename, '.');
if (ext)
{
if (!strncasecmp(ext, ".mp2", 4) || !strncasecmp(ext, ".mp3", 4))
{
return TRUE;
}
}
return FALSE;
}
static void aboutbox(void) {
static GtkWidget *aboutbox;
if (aboutbox != NULL)
return;
aboutbox = xmms_show_message(
_("MPEG Layer 1/2/3 Placeholder plugin"),
_("Placeholder for MPEG Layer 1/2/3, explaining patent issues\n"
"Red Hat, Inc."),
_("Ok"), FALSE, NULL, NULL);
gtk_signal_connect(GTK_OBJECT(aboutbox), "destroy",
GTK_SIGNAL_FUNC(gtk_widget_destroyed), &aboutbox);
}
InputPlugin zzmp3_ip =
{
NULL,
NULL,
NULL, /* description */
init,
aboutbox,
NULL, /* configure */
is_our_file,
NULL,
play_file,
NULL, /* stop */
NULL, /* pause */
NULL, /* seek */
NULL, /* set eq */
get_time, /* get time */
NULL, NULL, NULL,
NULL, NULL, NULL, NULL,
NULL, /* get_song_info */
NULL, /* file_info_box */
NULL
};
InputPlugin *get_iplugin_info(void)
{
zzmp3_ip.description =
g_strdup(_("MPEG Layer 1/2/3 Placeholder Plugin"));
return &zzmp3_ip;
}
xmms-1.2.6-audio.patch:
--- NEW FILE xmms-1.2.6-audio.patch ---
--- xmms-1.2.4/xmms/main.c.audio Mon Nov 20 10:45:10 2000
+++ xmms-1.2.4/xmms/main.c Tue Nov 28 19:39:51 2000
@@ -469,7 +469,7 @@
if (cfg.outputplugin == NULL)
{
#ifdef HAVE_OSS
- cfg.outputplugin = g_strdup_printf("%s/%s/libOSS.so", PLUGIN_DIR, plugin_dir_list[0]);
+ cfg.outputplugin = g_strdup_printf("%s/%s/libALSA.so", PLUGIN_DIR, plugin_dir_list[0]);
#elif defined(sun)
cfg.outputplugin = g_strdup_printf("%s/%s/libSolaris.so", PLUGIN_DIR, plugin_dir_list[0]);
#else
--- xmms-1.2.4/Output/OSS/audio.c.audio Fri Jul 28 20:19:41 2000
+++ xmms-1.2.4/Output/OSS/audio.c Tue Nov 28 19:36:19 2000
@@ -592,7 +592,7 @@
else
device_name = g_strdup(DEV_DSP);
}
- fd = open(device_name, O_WRONLY);
+ fd = open(device_name, O_WRONLY|O_NONBLOCK);
if (fd == -1)
{
g_warning("oss_open(): Failed to open audio device (%s): %s",
@@ -600,7 +600,8 @@
g_free(device_name);
return 0;
}
-
+ fcntl(fd,F_SETFL,fcntl(fd,F_GETFL) &~ O_NONBLOCK);
+
input.format.xmms = fmt;
input.frequency = rate;
input.channels = nch;
xmms-1.2.6-lazy.patch:
--- NEW FILE xmms-1.2.6-lazy.patch ---
--- xmms-1.2.6/xmms/pluginenum.c.lazy Tue Jan 15 17:14:24 2002
+++ xmms-1.2.6/xmms/pluginenum.c Tue Jan 15 17:14:33 2002
@@ -229,7 +229,7 @@
*/
return shl_load(filename, BIND_DEFERRED, 0);
#else
- return dlopen(filename, RTLD_NOW);
+ return dlopen(filename, RTLD_LAZY);
#endif
}
xmms-1.2.8-alsalib.patch:
--- NEW FILE xmms-1.2.8-alsalib.patch ---
--- xmms-1.2.8/configure.alsalib 2003-09-04 17:00:38.000000000 -0400
+++ xmms-1.2.8/configure 2003-12-12 18:21:24.000000000 -0500
@@ -11930,8 +11930,6 @@
#define $ac_tr_lib 1
EOF
- LIBS="-lasound $LIBS"
-
else
echo "$ac_t""no" 1>&6
@@ -11944,7 +11942,6 @@
have_alsa=yes
LIBS=`echo $LIBS | sed 's/-lasound//g'`
LIBS=`echo $LIBS | sed 's/ //'`
- LIBS="-lasound $LIBS"
fi
if test "x$alsa_found" = "xno" ; then
have_alsa=no
xmms-1.2.8-arts.patch:
--- NEW FILE xmms-1.2.8-arts.patch ---
--- xmms-1.2.8/xmms/main.c.orig 2003-09-10 12:35:02.000000000 +0200
+++ xmms-1.2.8/xmms/main.c 2003-10-07 16:38:28.000000000 +0200
@@ -303,6 +303,39 @@
sizeof(mainwin_general_menu_entries) /
sizeof(mainwin_general_menu_entries[0]);
+#include <kde/artsc/artsc.h>
+#include <dlfcn.h>
+
+/* dlopen libarts, for seeing if we should use this as the default plugin. */
+static int arts_running(void) {
+ void *arts_handle;
+ int (*a_init)(void);
+ void (*a_close)(void);
+ int ret = 0;
+
+ arts_handle = dlopen("libartsc.so.0", RTLD_NOW);
+ if (!arts_handle)
+ return 0;
+
+ a_init = dlsym(arts_handle, "arts_init");
+ a_close = dlsym(arts_handle, "arts_free");
+ if (!a_init || !a_close) {
+ dlclose(arts_handle);
+ return 0;
+ }
+ signal(SIGPIPE, SIG_DFL);
+ if ((*a_init)() == 0) {
+ ret = 1;
+ /* there are problems with library unloading in conjunction with X11, */
+ /* (Arts::X11GlobalComm), so we don't unload stuff here */
+ /* (*a_close)(); */
+ }
+ signal(SIGPIPE, SIG_IGN);
+ dlclose(arts_handle);
+ return ret;
+}
+
+
static void make_xmms_dir(void)
{
gchar *filename;
@@ -499,6 +532,19 @@
cfg.skin = g_strdup("/usr/share/xmms/Skins/Bluecurve-xmms.zip");
if (cfg.outputplugin == NULL)
{
+ /* If aRts is running and the plugin is there, use that... */
+ if (arts_running())
+ {
+ cfg.outputplugin = g_strdup_printf("%s/%s/libarts.so", PLUGIN_DIR, plugin_dir_list[0]);
+ if (access(cfg.outputplugin, X_OK))
+ {
+ g_free(cfg.outputplugin);
+ cfg.outputplugin = NULL;
+ }
+ }
+ }
+ if (cfg.outputplugin == NULL)
+ {
#ifdef HAVE_OSS
cfg.outputplugin = g_strdup_printf("%s/%s/libesdout.so", PLUGIN_DIR, plugin_dir_list[0]);
#elif defined(sun)
@@ -511,6 +557,13 @@
cfg.outputplugin = g_strdup("");
#endif
}
+ /* Migrate users of the previous arts plugin */
+ if (!strcmp(g_basename(cfg.outputplugin),"libartsout.so")) {
+ if (access(cfg.outputplugin,X_OK)) {
+ g_free(cfg.outputplugin);
+ cfg.outputplugin = g_strdup_printf("%s/%s/libarts.so", PLUGIN_DIR, plugin_dir_list[0]);
+ }
+ }
if (cfg.eqpreset_default_file == NULL)
cfg.eqpreset_default_file = g_strdup("dir_default.preset");
if (cfg.eqpreset_extension == NULL)
xmms-1.2.8-default-skin.patch:
--- NEW FILE xmms-1.2.8-default-skin.patch ---
--- xmms-1.2.8/xmms/main.c.foo 2003-09-08 15:07:13.000000000 -0400
+++ xmms-1.2.8/xmms/main.c 2003-09-08 15:07:55.000000000 -0400
@@ -495,6 +495,8 @@
cfg.mainwin_font = g_strdup("-adobe-helvetica-medium-r-*-*-8-*");
if (cfg.gentitle_format == NULL)
cfg.gentitle_format = g_strdup("%p - %t");
+ if (cfg.skin == NULL && !cfgfile && !access("/usr/share/xmms/Skins/Bluecurve-xmms.zip",R_OK))
+ cfg.skin = g_strdup("/usr/share/xmms/Skins/Bluecurve-xmms.zip");
if (cfg.outputplugin == NULL)
{
#ifdef HAVE_OSS
xmms-1.2.9-nomp3.patch:
--- NEW FILE xmms-1.2.9-nomp3.patch ---
--- xmms-1.2.8/xmms/input.c.nomp3 2003-07-14 09:24:28.000000000 -0400
+++ xmms-1.2.8/xmms/input.c 2003-09-08 15:11:43.000000000 -0400
@@ -17,6 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#define _GNU_SOURCE 1
#include "xmms.h"
#include "fft.h"
#include "libxmms/titlestring.h"
@@ -228,16 +229,22 @@
{
GList *node;
InputPlugin *ip;
+ InputPlugin *rhmp3 = NULL;
node = get_input_list();
while (node)
{
ip = (InputPlugin *) node->data;
- if (ip && !g_list_find(disabled_iplugins, ip) &&
+ if (ip && !strcmp(basename(ip->filename),"librh_mp3.so"))
+ rhmp3 = ip;
+ else if (ip && !g_list_find(disabled_iplugins, ip) &&
ip->is_our_file(filename))
return TRUE;
node = node->next;
}
+ if (rhmp3 && !g_list_find(disabled_iplugins, rhmp3) &&
+ rhmp3->is_our_file(filename))
+ return TRUE;
return FALSE;
}
@@ -245,6 +252,7 @@
{
GList *node;
InputPlugin *ip;
+ InputPlugin *rhmp3 = NULL;
node = get_input_list();
if (get_current_output_plugin() == NULL)
@@ -258,7 +266,9 @@
while (node)
{
ip = node->data;
- if (ip && !g_list_find(disabled_iplugins, ip) &&
+ if (ip && !strcmp(basename(ip->filename),"librh_mp3.so"))
+ rhmp3 = ip;
+ else if (ip && !g_list_find(disabled_iplugins, ip) &&
ip->is_our_file(filename))
{
set_current_input_plugin(ip);
@@ -270,6 +280,15 @@
}
node = node->next;
}
+ if (rhmp3 && !g_list_find(disabled_iplugins, rhmp3) &&
+ rhmp3->is_our_file(filename))
+ {
+ set_current_input_plugin(rhmp3);
+ rhmp3->output = get_current_output_plugin();
+ rhmp3->play_file(filename);
+ ip_data->playing = TRUE;
+ return;
+ }
/* We set the playing flag even if no inputplugin
recognizes the file. This way we are sure it will be skipped. */
ip_data->playing = TRUE;
--- xmms-1.2.8/Input/Makefile.am.nomp3 2002-03-18 09:29:42.000000000 -0500
+++ xmms-1.2.8/Input/Makefile.am 2003-09-08 15:12:24.000000000 -0400
@@ -1,3 +1,3 @@
-ALL_PLUGINS = wav mpg123 mikmod cdaudio tonegen vorbis
+ALL_PLUGINS = wav mikmod cdaudio tonegen vorbis
SUBDIRS = @INPUT_PLUGINS@
--- xmms-1.2.8/Input/Makefile.in.nomp3 2003-09-04 17:01:25.000000000 -0400
+++ xmms-1.2.8/Input/Makefile.in 2003-09-08 15:12:40.000000000 -0400
@@ -169,7 +169,7 @@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
xmmsdir = @xmmsdir@
-ALL_PLUGINS = wav mpg123 mikmod cdaudio tonegen vorbis
+ALL_PLUGINS = wav mikmod cdaudio tonegen vorbis
SUBDIRS = @INPUT_PLUGINS@
subdir = Input
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--- xmms-1.2.8/po/POTFILES.in.nomp3 2003-08-13 08:59:04.000000000 -0400
+++ xmms-1.2.8/po/POTFILES.in 2003-09-08 15:13:06.000000000 -0400
@@ -19,11 +19,6 @@
Input/cdaudio/http.c
Input/mikmod/drv_xmms.c
Input/mikmod/plugin.c
-Input/mpg123/common.c
-Input/mpg123/configure.c
-Input/mpg123/fileinfo.c
-Input/mpg123/http.c
-Input/mpg123/mpg123.c
Input/tonegen/tonegen.c
Input/vorbis/configure.c
Input/vorbis/fileinfo.c
--- xmms-1.2.9/configure.cow 2004-01-28 21:14:46.418517318 -0500
+++ xmms-1.2.9/configure 2004-01-28 21:14:57.290123348 -0500
@@ -19192,7 +19192,7 @@
- ac_config_files="$ac_config_files Makefile xmms.1 wmxmms.1 xmms.spec xmms-config xmms/Makefile xmms/defskin/Makefile Output/Makefile Output/OSS/Makefile Output/esd/Makefile Output/disk_writer/Makefile Output/solaris/Makefile Output/sun/Makefile Output/alsa/Makefile Input/Makefile Input/wav/Makefile Input/mpg123/Makefile Input/mikmod/Makefile Input/cdaudio/Makefile Input/tonegen/Makefile Input/vorbis/Makefile Effect/Makefile Effect/voice/Makefile Effect/echo_plugin/Makefile Effect/stereo_plugin/Makefile General/Makefile General/ir/Makefile General/joystick/Makefile General/song_change/Makefile Visualization/Makefile Visua!
lization/blur_scope/Makefile Visualization/sanalyzer/Makefile Visualization/opengl_spectrum/Makefile wmxmms/Makefile po/Makefile.in intl/Makefile"
+ ac_config_files="$ac_config_files Makefile xmms.1 wmxmms.1 xmms.spec xmms-config xmms/Makefile xmms/defskin/Makefile Output/Makefile Output/OSS/Makefile Output/esd/Makefile Output/disk_writer/Makefile Output/solaris/Makefile Output/sun/Makefile Output/alsa/Makefile Input/Makefile Input/wav/Makefile Input/mikmod/Makefile Input/cdaudio/Makefile Input/tonegen/Makefile Input/vorbis/Makefile Effect/Makefile Effect/voice/Makefile Effect/echo_plugin/Makefile Effect/stereo_plugin/Makefile General/Makefile General/ir/Makefile General/joystick/Makefile General/song_change/Makefile Visualization/Makefile Visualization/blur_scope/Ma!
kefile Visualization/sanalyzer/Makefile Visualization/opengl_spectrum/Makefile wmxmms/Makefile po/Makefile.in intl/Makefile"
ac_config_commands="$ac_config_commands default"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -19863,7 +19863,6 @@
"Output/alsa/Makefile" ) CONFIG_FILES="$CONFIG_FILES Output/alsa/Makefile" ;;
"Input/Makefile" ) CONFIG_FILES="$CONFIG_FILES Input/Makefile" ;;
"Input/wav/Makefile" ) CONFIG_FILES="$CONFIG_FILES Input/wav/Makefile" ;;
- "Input/mpg123/Makefile" ) CONFIG_FILES="$CONFIG_FILES Input/mpg123/Makefile" ;;
"Input/mikmod/Makefile" ) CONFIG_FILES="$CONFIG_FILES Input/mikmod/Makefile" ;;
"Input/cdaudio/Makefile" ) CONFIG_FILES="$CONFIG_FILES Input/cdaudio/Makefile" ;;
"Input/tonegen/Makefile" ) CONFIG_FILES="$CONFIG_FILES Input/tonegen/Makefile" ;;
xmms-alsa-backport.patch:
--- NEW FILE xmms-alsa-backport.patch ---
Index: Output/alsa/audio.c
===================================================================
RCS file: /cvs/xmms/Output/alsa/audio.c,v
retrieving revision 1.28
retrieving revision 1.34
diff -u -r1.28 -r1.34
--- Output/alsa/audio.c 27 Jan 2004 22:36:45 -0000 1.28
+++ Output/alsa/audio.c 24 Aug 2004 18:30:08 -0000 1.34
@@ -36,12 +36,14 @@
static snd_mixer_elem_t *pcm_element = NULL;
static snd_mixer_t *mixer = NULL;
-static gboolean mmap, force_start, going, paused;
+static gboolean mmap, force_start, going = FALSE, paused, mixer_start = TRUE;
static gpointer buffer;
static int alsa_can_pause;
+static guint mixer_timeout;
+
struct snd_format {
unsigned int rate;
unsigned int channels;
@@ -108,6 +110,7 @@
int alsa_playing(void)
{
+ debug("Alsa playing: %i %i\n", going, paused);
if (!going || paused)
return FALSE;
@@ -183,14 +186,34 @@
void alsa_pause(short p)
{
+ int err;
debug("alsa_pause");
if (p)
paused = TRUE;
- if (alsa_can_pause)
- snd_pcm_pause(alsa_pcm, p);
- else if (p)
- snd_pcm_drop(alsa_pcm);
+ if (alsa_pcm && going)
+ {
+ if (alsa_can_pause)
+ {
+ if ((err = snd_pcm_pause (alsa_pcm, p)) < 0)
+ g_warning("snd_pcm_pause() failed: %s",
+ snd_strerror(-err));
+ }
+ else
+ {
+ if (p)
+ {
+ if ((err = snd_pcm_drop (alsa_pcm)) < 0)
+ g_warning("snd_pcm_drop() failed: %s",
+ snd_strerror(-err));
+ }
+ else
+ if ((err = snd_pcm_prepare (alsa_pcm)) < 0)
+ g_warning("snd_pcm_prepare() failed: %s",
+ snd_strerror(-err));
+ force_start = FALSE;
+ }
+ }
if (!p)
paused = FALSE;
@@ -205,14 +228,6 @@
started = going;
going = 0;
- pcm_element = NULL;
-
- if (mixer)
- {
- snd_mixer_close(mixer);
- mixer = NULL;
- }
-
if (alsa_pcm != NULL)
{
if (started)
@@ -406,28 +421,45 @@
return 0;
}
+static int alsa_mixer_timeout(void *data)
+{
+ if (mixer)
+ {
+ snd_mixer_close(mixer);
+ mixer = NULL;
+ pcm_element = NULL;
+ }
+ mixer_timeout = 0;
+ mixer_start = TRUE;
+
+ g_message("alsa mixer timed out");
+ return FALSE;
+}
+
+
+
void alsa_get_volume(int *l, int *r)
{
- static gboolean first = TRUE;
long ll = *l, lr = *r;
- if (first)
+ if (mixer_start)
{
alsa_setup_mixer();
- first = !first;
+ mixer_start = FALSE;
}
- if (!pcm_element)
- return;
-
- snd_mixer_handle_events(mixer);
-
if (alsa_cfg.soft_volume)
{
*l = alsa_cfg.vol.left;
*r = alsa_cfg.vol.right;
}
- else
+
+ if (!pcm_element)
+ return;
+
+ snd_mixer_handle_events(mixer);
+
+ if (!alsa_cfg.soft_volume)
{
snd_mixer_selem_get_playback_volume(pcm_element,
SND_MIXER_SCHN_FRONT_LEFT,
@@ -438,26 +470,28 @@
*l = ll;
*r = lr;
}
+ if (mixer_timeout)
+ gtk_timeout_remove(mixer_timeout);
+ mixer_timeout = gtk_timeout_add(5000, alsa_mixer_timeout, NULL);
}
void alsa_set_volume(int l, int r)
{
- if (!pcm_element)
- return;
-
if (alsa_cfg.soft_volume)
{
alsa_cfg.vol.left = l;
alsa_cfg.vol.right = r;
+ return;
}
- else
- {
- snd_mixer_selem_set_playback_volume(pcm_element,
- SND_MIXER_SCHN_FRONT_LEFT, l);
- snd_mixer_selem_set_playback_volume(pcm_element,
- SND_MIXER_SCHN_FRONT_RIGHT, r);
- }
+
+ if (!pcm_element)
+ return;
+
+ snd_mixer_selem_set_playback_volume(pcm_element,
+ SND_MIXER_SCHN_FRONT_LEFT, l);
+ snd_mixer_selem_set_playback_volume(pcm_element,
+ SND_MIXER_SCHN_FRONT_RIGHT, r);
}
@@ -499,7 +533,7 @@
#define MONO_ADJUST(type, type2, endian) \
do { \
type *ptr = data; \
- for (i = 0; i < length; i += 4) \
+ for (i = 0; i < length; i += 2) \
{ \
*ptr = type2##_TO_##endian(type2##_FROM_## endian(*ptr) * \
vol / 100); \
@@ -530,7 +564,7 @@
#define MONO_ADJUST8(type) \
do { \
type *ptr = data; \
- for (i = 0; i < length; i += 4) \
+ for (i = 0; i < length; i++) \
{ \
*ptr = *ptr * vol / 100; \
ptr++; \
@@ -727,6 +761,14 @@
alsa_total_written += cnt;
length -= cnt;
+
+ if (length > 0 &&
+ snd_pcm_state(alsa_pcm) == SND_PCM_STATE_PREPARED)
+ {
+ if ((err = snd_pcm_start(alsa_pcm)) < 0)
+ g_warning("alsa_mmap_audio(): snd_pcm_start() "
+ "failed: %s", snd_strerror(-err));
+ }
}
}
@@ -747,7 +789,8 @@
return 0;
}
- alsa_setup_mixer();
+ if (!mixer)
+ alsa_setup_mixer();
convertb = xmms_convert_buffers_new();
Index: Output/alsa/configure.c
===================================================================
RCS file: /cvs/xmms/Output/alsa/configure.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Output/alsa/configure.c 17 Jan 2004 12:37:19 -0000 1.16
+++ Output/alsa/configure.c 25 Apr 2004 22:33:26 -0000 1.17
@@ -21,10 +21,12 @@
static GtkWidget *configure_win = NULL;
static GtkWidget *buffer_time_spin, *period_time_spin;
-static GtkWidget *mmap_button, *mixer_card_spin, *softvolume_toggle_button;
+static GtkWidget *mmap_button, *softvolume_toggle_button;
static GtkWidget *devices_combo, *mixer_devices_combo;
+static int current_mixer_card;
+
#define GET_SPIN_INT(spin) \
gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(spin))
#define GET_TOGGLE(tb) gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(tb))
@@ -38,7 +40,7 @@
alsa_cfg.period_time = GET_SPIN_INT(period_time_spin);
alsa_cfg.mmap = GET_TOGGLE(mmap_button);
alsa_cfg.soft_volume = GET_TOGGLE(softvolume_toggle_button);
- alsa_cfg.mixer_card = GET_SPIN_INT(mixer_card_spin);
+ alsa_cfg.mixer_card = current_mixer_card;
alsa_cfg.mixer_device = GET_CHARS(GTK_COMBO(mixer_devices_combo)->entry);
alsa_save_config();
@@ -63,10 +65,50 @@
xmms_cfg_free(cfgfile);
}
+static int get_cards(GtkOptionMenu *omenu, GtkSignalFunc cb, int active)
+{
+ GtkWidget *menu, *item;
+ int card = -1, err, set = 0, curr = -1;
+
+ menu = gtk_menu_new();
+ if ((err = snd_card_next(&card)) != 0)
+ g_warning("snd_next_card() failed: %s", snd_strerror(-err));
+
+ while (card > -1)
+ {
+ char *label;
+
+ curr++;
+ if (card == active)
+ set = curr;
+ if ((err = snd_card_get_name(card, &label)) != 0)
+ {
+ g_warning("snd_carg_get_name() failed: %s",
+ snd_strerror(-err));
+ break;
+ }
+
+ item = gtk_menu_item_new_with_label(label);
+ gtk_signal_connect(GTK_OBJECT(item), "activate", cb,
+ GINT_TO_POINTER(card));
+ gtk_widget_show(item);
+ gtk_menu_append(GTK_MENU(menu), item);
+ if ((err = snd_card_next(&card)) != 0)
+ {
+ g_warning("snd_next_card() failed: %s",
+ snd_strerror(-err));
+ break;
+ }
+ }
+
+ gtk_option_menu_set_menu(omenu, menu);
+ return set;
+}
+
static int get_mixer_devices(GtkCombo *combo, int card)
{
GList *items = NULL;
- int err = 0;
+ int err;
snd_mixer_t *mixer;
snd_mixer_elem_t *current;
@@ -92,12 +134,10 @@
static void get_devices_for_card(GtkCombo *combo, int card)
{
GtkWidget *item;
- int pcm_device = -1;
- int err = 0;
+ int pcm_device = -1, err;
snd_pcm_info_t *pcm_info;
snd_ctl_t *ctl;
- char dev[64];
- char *card_name;
+ char dev[64], *card_name;
sprintf(dev, "hw:%i", card);
@@ -192,29 +232,32 @@
static void mixer_card_cb(GtkWidget * widget, gpointer card)
{
- if (get_mixer_devices(GTK_COMBO(mixer_devices_combo),
- gtk_spin_button_get_value_as_int(
- GTK_SPIN_BUTTON(mixer_card_spin))) < 0)
- gtk_spin_button_set_value(GTK_SPIN_BUTTON(mixer_card_spin),
- 0);
+ if (current_mixer_card == GPOINTER_TO_INT(card))
+ return;
+ current_mixer_card = GPOINTER_TO_INT(card);
+ get_mixer_devices(GTK_COMBO(mixer_devices_combo),
+ current_mixer_card);
}
static void softvolume_toggle_cb(GtkToggleButton * widget, gpointer data)
{
gboolean softvolume = gtk_toggle_button_get_active(widget);
- gtk_widget_set_sensitive(GTK_WIDGET(mixer_card_spin), !softvolume);
- gtk_widget_set_sensitive(GTK_WIDGET(mixer_devices_combo), !softvolume);
+ gtk_widget_set_sensitive(GTK_WIDGET(data), !softvolume);
+ gtk_widget_set_sensitive(mixer_devices_combo, !softvolume);
}
void alsa_configure(void)
{
GtkWidget *vbox, *notebook;
GtkWidget *dev_vbox, *adevice_frame, *adevice_box;
- GtkWidget *mixer_frame, *mixer_box, *mixer_card_box;
+ GtkWidget *mixer_frame, *mixer_box, *mixer_table, *mixer_card_om;
+ GtkWidget *mixer_card_label, *mixer_device_label;
GtkWidget *buffer_frame, *buffer_vbox, *buffer_table;
GtkWidget *buffer_time_label, *period_time_label;
- GtkObject *buffer_time_adj, *period_time_adj, *mixer_card_adj;
+ GtkObject *buffer_time_adj, *period_time_adj;
GtkWidget *bbox, *ok, *cancel;
+
+ int mset;
if (configure_win)
{
@@ -229,7 +272,7 @@
gtk_window_set_title(GTK_WINDOW(configure_win),
_("ALSA Driver configuration"));
gtk_window_set_policy(GTK_WINDOW(configure_win),
- FALSE, FALSE, FALSE);
+ FALSE, TRUE, FALSE);
gtk_container_border_width(GTK_CONTAINER(configure_win), 10);
vbox = gtk_vbox_new(FALSE, 10);
@@ -264,42 +307,46 @@
softvolume_toggle_button = gtk_check_button_new_with_label(
_("Use software volume control"));
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(softvolume_toggle_button),
- alsa_cfg.soft_volume);
-
- gtk_signal_connect(GTK_OBJECT(softvolume_toggle_button), "toggled",
- softvolume_toggle_cb, NULL);
gtk_box_pack_start(GTK_BOX(mixer_box), softvolume_toggle_button,
FALSE, FALSE, 0);
- mixer_card_box = gtk_hbox_new(FALSE, 5);
- gtk_box_pack_start(GTK_BOX(mixer_box), mixer_card_box,
- FALSE, FALSE, 0);
- gtk_box_pack_start(GTK_BOX(mixer_card_box),
- gtk_label_new(_("Mixer card:")), FALSE, FALSE, 0);
-
- mixer_card_adj = gtk_adjustment_new(alsa_cfg.mixer_card,
- 0, 50, 1, 100, 100);
- mixer_card_spin = gtk_spin_button_new(GTK_ADJUSTMENT(mixer_card_adj),
- 8, 0);
-
- gtk_signal_connect(GTK_OBJECT(mixer_card_spin), "changed",
- mixer_card_cb, NULL);
+ mixer_table = gtk_table_new(2, 2, FALSE);
+ gtk_table_set_row_spacings(GTK_TABLE(mixer_table), 5);
+ gtk_table_set_col_spacings(GTK_TABLE(mixer_table), 5);
+ gtk_box_pack_start(GTK_BOX(mixer_box), mixer_table, FALSE, FALSE, 0);
+
+ mixer_card_label = gtk_label_new(_("Mixer card:"));
+ gtk_label_set_justify(GTK_LABEL(mixer_card_label), GTK_JUSTIFY_LEFT);
+ gtk_misc_set_alignment(GTK_MISC(mixer_card_label), 0, 0.5);
+ gtk_table_attach(GTK_TABLE(mixer_table), mixer_card_label,
+ 0, 1, 0, 1, GTK_FILL, 0, 0, 0);
- gtk_box_pack_start(GTK_BOX(mixer_card_box), mixer_card_spin,
- FALSE, FALSE, 0);
-
- gtk_box_pack_start(GTK_BOX(mixer_card_box),
- gtk_label_new(_("Mixer device:")), FALSE, FALSE, 0);
-
+ mixer_card_om = gtk_option_menu_new();
+ mset = get_cards(GTK_OPTION_MENU(mixer_card_om),
+ mixer_card_cb, alsa_cfg.mixer_card);
+
+ gtk_table_attach(GTK_TABLE(mixer_table), mixer_card_om,
+ 1, 2, 0, 1, GTK_FILL | GTK_EXPAND, GTK_FILL, 0, 0);
+
+ mixer_device_label = gtk_label_new(_("Mixer device:"));
+ gtk_label_set_justify(GTK_LABEL(mixer_device_label), GTK_JUSTIFY_LEFT);
+ gtk_misc_set_alignment(GTK_MISC(mixer_device_label), 0, 0.5);
+ gtk_table_attach(GTK_TABLE(mixer_table), mixer_device_label,
+ 0, 1, 1, 2, GTK_FILL, 0, 0, 0);
mixer_devices_combo = gtk_combo_new();
+ gtk_option_menu_set_history(GTK_OPTION_MENU(mixer_card_om), mset);
get_mixer_devices(GTK_COMBO(mixer_devices_combo), alsa_cfg.mixer_card);
gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(mixer_devices_combo)->entry),
alsa_cfg.mixer_device);
- gtk_box_pack_start(GTK_BOX(mixer_card_box),
- mixer_devices_combo, TRUE, TRUE, 0);
+ gtk_table_attach(GTK_TABLE(mixer_table), mixer_devices_combo,
+ 1, 2, 1, 2, GTK_FILL | GTK_EXPAND, 0, 0, 0);
+
+ gtk_signal_connect(GTK_OBJECT(softvolume_toggle_button), "toggled",
+ softvolume_toggle_cb, mixer_card_om);
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(softvolume_toggle_button),
+ alsa_cfg.soft_volume);
gtk_notebook_append_page(GTK_NOTEBOOK(notebook), dev_vbox,
gtk_label_new(_("Device settings")));
@@ -371,6 +418,4 @@
gtk_box_pack_start(GTK_BOX(bbox), cancel, TRUE, TRUE, 0);
gtk_widget_show_all(configure_win);
-
- softvolume_toggle_cb(GTK_TOGGLE_BUTTON(softvolume_toggle_button), NULL);
}
xmms-underquoted.patch:
--- NEW FILE xmms-underquoted.patch ---
--- xmms-1.2.10/xmms.m4 2004-07-15 13:08:21.824795751 +0100
+++ xmms-1.2.10/xmms.m4 2004-08-15 22:13:25.298410035 +0100
@@ -14,7 +14,7 @@
dnl
dnl XMMS_TEST_VERSION(AVAILABLE-VERSION, NEEDED-VERSION [, ACTION-IF-OKAY [, ACTION-IF-NOT-OKAY]])
-AC_DEFUN(XMMS_TEST_VERSION, [
+AC_DEFUN([XMMS_TEST_VERSION], [
# Determine which version number is greater. Prints 2 to stdout if
# the second number is greater, 1 if the first number is greater,
@@ -59,7 +59,7 @@
fi
])
-AC_DEFUN(AM_PATH_XMMS,
+AC_DEFUN([AM_PATH_XMMS],
[
AC_ARG_WITH(xmms-prefix,[ --with-xmms-prefix=PFX Prefix where XMMS is installed (optional)],
xmms_config_prefix="$withval", xmms_config_prefix="")
--- NEW FILE xmms.req ---
#!/bin/sh
filelist=`sed "s/['\"]/\\\&/g"`
{ echo $filelist | tr [:blank:] \\n | /usr/lib/rpm/find-requires | \
grep -v artsc | grep -v esd | grep -v audiofile | grep -v asound
} | sort -u
--- NEW FILE xmms.spec ---
%define arts_plugin 1
%define artsplugin_ver 0.6.0
Summary: A media player for X which resembles Winamp.
Name: xmms
Version: 1.2.10
Release: 11
Epoch: 1
License: GPL
Group: Applications/Multimedia
URL: http://www.xmms.org/
Source: http://www.xmms.org/files/1.2.x/%{name}-%{version}.patched.tar.bz2
Source4: arts_output-%{artsplugin_ver}.tar.gz
Source5: xmms.req
Source6: xmms.xpm
Source7: xmmsskins-1.0.tar.gz
Source8: rh_mp3.c
Patch1: xmms-1.2.6-audio.patch
Patch2: xmms-1.2.6-lazy.patch
Patch3: xmms-1.2.8-default-skin.patch
Patch4: xmms-1.2.9-nomp3.patch
Patch5: xmms-1.2.8-arts.patch
Patch6: xmms-1.2.8-alsalib.patch
#Patch8: http://www3.big.or.jp/~sian/linux/products/xmms/xmms-1.2.5pre1j_20010601.diff.bz2
Patch10: arts_output-0.6.0-buffer.patch
Patch11: xmms-underquoted.patch
Patch12: xmms-alsa-backport.patch
Requires: gtk+ >= 1:1.2.2, unzip
# the desktop file and redhat-menus are redundant requires really
Requires: /usr/share/desktop-menu-patches/redhat-audio-player.desktop
Requires: redhat-menus >= 0.11
BuildRequires: arts-devel >= 1.0.1 gtk+-devel esound-devel mikmod-devel
BuildRequires: /usr/bin/automake-1.4 /usr/bin/autoconf-2.13 libvorbis-devel
BuildRequires: alsa-lib-devel glib2-devel
PreReq: desktop-file-utils >= 0.9
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Obsoletes: x11amp0.7-1-1 x11amp xmms-esd xmms-gl xmms-mikmod xmms-gnome
Conflicts: arts < 1.2.0-1.5
%define _use_internal_dependency_generator 0
%define __find_requires %{SOURCE5}
%description
Xmms is a multimedia (Ogg Vorbis, CDs) player for the X Window System with
an interface similar to Winamp's. Xmms supports playlists and
streaming content and has a configurable interface.
%package devel
Summary: Static libraries and header files for Xmms plug-in development.
Group: Development/Libraries
Obsoletes: x11amp-devel
Requires: %{name} = %{epoch}:%{version} gtk+-devel
%description devel
The static libraries and header files needed for building plug-ins for
the Xmms multimedia player.
%package skins
Summary: Skins for the xmms multimedia player.
Group: Applications/Multimedia
Obsoletes: xmmsskins
Requires: %{name}
%description skins
This is a collection of skins for the xmms multimedia player. The
skins were obtained from http://www.xmms.org/skins.html .
%prep
%setup -q -a 4
# Set default output plugin to ALSA
%patch1 -p1 -b .audio
# Use RTLD_LAZY, not RTLD_NOW
%patch2 -p1 -b .lazy
# Change the default skin
%patch3 -p1 -b .default-skin
# Don't build MP3 support, support bits for MP3 placeholder
%patch4 -p1 -b .nomp3
%if %{arts_plugin}
# Link arts dynamically and detect its presence for choosing output plugin
%patch5 -p1 -b .arts
# bump up the default buffer size to avoid audio artifacts
%patch10 -p0 -b .buffer
%endif
# Don't link *everything* against alsa-lib
%patch6 -p1 -b .alsalib
%patch11 -p1 -b .underquoted
%patch12 -p0 -b .alsa-backport
#%patch8 -p1 -b .ja
%build
%configure \
--enable-kanji \
--enable-texthack \
%if %{arts_plugin}
--enable-arts-shared \
%endif
--enable-ipv6
make
ln -snf ../libxmms/configfile.h xmms/configfile.h
%if %{arts_plugin}
export XMMS_CONFIG=`pwd`/xmms-config
cd arts_output-%{artsplugin_ver}
CFLAGS="$RPM_OPT_FLAGS -I.." %configure
make
cd ..
%endif
gcc -fPIC $RPM_OPT_FLAGS -shared -Wl,-soname -Wl,librh_mp3.so -o librh_mp3.so \
%{SOURCE8} -I. `gtk-config --cflags gtk`
%install
rm -rf %{buildroot}
mkdir %{buildroot}
make install DESTDIR=%{buildroot}
%if %{arts_plugin}
cd arts_output-%{artsplugin_ver}
make install DESTDIR=%{buildroot}
cd ..
%endif
install -m 755 librh_mp3.so %{buildroot}%{_libdir}/xmms/Input
mkdir -p %{buildroot}%{_datadir}/xmms/Skins
pushd %{buildroot}%{_datadir}/xmms/Skins
tar xvfz %{SOURCE7}
popd
mkdir -pv %{buildroot}%{_datadir}/applications
(cd $RPM_BUILD_ROOT%{_datadir}/applications && ln -sf \
%{_datadir}/desktop-menu-patches/redhat-audio-player.desktop)
mkdir -p %{buildroot}%{_datadir}/pixmaps/mini
install xmms/xmms_logo.xpm %{buildroot}%{_datadir}/pixmaps
install xmms/xmms_mini.xpm %{buildroot}%{_datadir}/pixmaps/mini
install -m 644 $RPM_SOURCE_DIR/xmms.xpm %{buildroot}%{_datadir}/pixmaps
# unpackaged files
rm -f %{buildroot}/%{_datadir}/xmms/*/lib*.{a,la} \
%{buildroot}/%{_libdir}/libxmms.la \
%{buildroot}/%{_libdir}/xmms/*/*.la \
%{buildroot}/%{_mandir}/man1/gnomexmms*
%find_lang %{name}
%post
/sbin/ldconfig
update-desktop-database %{_datadir}/desktop-menu-patches
%postun
/sbin/ldconfig
update-desktop-database %{_datadir}/desktop-menu-patches
%clean
rm -rf %{buildroot}
%files -f %{name}.lang
%defattr(-,root,root)
%doc AUTHORS COPYING ChangeLog FAQ INSTALL NEWS TODO README
%{_bindir}/xmms
%{_bindir}/wmxmms
%{_libdir}/libxmms.so.1*
%dir %{_libdir}/xmms
%{_libdir}/xmms/Effect
%{_libdir}/xmms/General
%{_libdir}/xmms/Input
%{_libdir}/xmms/Output
%{_libdir}/xmms/Visualization
%{_datadir}/applications/*
%{_datadir}/pixmaps/xmms.xpm
%{_datadir}/pixmaps/xmms_logo.xpm
%{_datadir}/pixmaps/mini/xmms_mini.xpm
%dir %{_datadir}/xmms
%{_datadir}/xmms/*.xpm
%{_mandir}/man1/[wx]*
%files devel
%defattr(-,root,root)
%{_includedir}/xmms
%{_bindir}/xmms-config
%{_datadir}/aclocal/xmms.m4
%{_libdir}/lib*.a
%{_libdir}/lib*.so
%files skins
%defattr(-,root,root)
%{_datadir}/xmms/Skins
%changelog
* Wed Jan 05 2005 Colin Walters <walters at redhat.com> 1:1.2.10-11
- Change BR on mikmod to mikmod-devel (138057)
* Tue Nov 23 2004 Colin Walters <walters at redhat.com> 1:1.2.10-10
- Add xmms-alsa-backport.patch (bug 140565, John Haxby)
* Wed Oct 13 2004 Colin Walters <walters at redhat.com> 1:1.2.10-9
- Correct update-desktop-database correction for postun
* Wed Oct 13 2004 Colin Walters <walters at redhat.com> 1:1.2.10-8
- Call update-desktop-database on correct directory
* Mon Oct 04 2004 Colin Walters <walters at redhat.com> 1:1.2.10-7
- PreReq desktop-file-utils 0.9
- Run update-desktop-database
* Sun Aug 15 2004 Tim Waugh <twaugh at redhat.com> 1:1.2.10-6
- Fixed another underquoted m4 definition.
* Thu Jul 15 2004 Tim Waugh <twaugh at redhat.com> 1:1.2.10-5
- Fixed warnings in shipped m4 file.
* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt
* Mon May 31 2004 Warren Togami <wtogami at redhat.com> 1:1.2.10-3.p
- #124701 -devel req gtk+-devel
* Thu Mar 11 2004 Bill Nottingham <notting at redhat.com> 1:1.2.10-2.p
- update to 1.2.10
- fix buildreqs (#114857)
- switch default output plugin to ALSA
* Tue Mar 02 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt
* Mon Feb 23 2004 Than Ngo <than at redhat.com> 1:1.2.9-5.p
- enable arts plugin, it should work with arts-1.2.0-1.5 or newer.
* Sat Feb 14 2004 Than Ngo <than at redhat.com> 1:1.2.9-4.p
- disable xmms-1.2.8-arts.patch
* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt
* Wed Jan 28 2004 Bill Nottingham <notting at redhat.com> 1:1.2.9-2.p
- enable ipv6 (#105774)
* Wed Jan 28 2004 Bill Nottingham <notting at redhat.com> 1:1.2.9-1.p
- update to 1.2.9
* Fri Dec 12 2003 Bill Nottingham <notting at redhat.com> 1:1.2.8-4.p
- rebuild, pick up alsa plugin
* Wed Oct 22 2003 Bill Nottingham <notting at redhat.com> 1:1.2.8-3.p
- fix dependency blacklisting (corollary of #100917)
* Mon Oct 13 2003 Than Ngo <than at redhat.com> 1:1.2.8-2.p
- workaround to fix arts crash
* Mon Sep 8 2003 Bill Nottingham <notting at redhat.com> 1:1.2.8-1.p
- update to 1.2.8
- clean out now-upstream stuff (Welsh po file, other patches)
- switch to HÃ¥vard's arts plugin, tweak it's default buffer size
- don't explicitly require trademarked skin name (#84554)
* Mon Jun 30 2003 Bill Nottingham <notting at redhat.com> 1:1.2.7-23.p
- add welsh po file (#98244)
* Sun Jun 8 2003 Tim Powers <timp at redhat.com> 1:1.2.7-22.1.p
- built for RHEL
* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
- rebuilt
* Tue Jun 3 2003 Jeff Johnson <jbj at redhat.com>
- add explicit epoch's where needed.
* Mon Feb 24 2003 Elliot Lee <sopwith at redhat.com>
- rebuilt
* Fri Feb 21 2003 Havoc Pennington <hp at redhat.com> 1:1.2.7-20.p
- patch to fix session management which may prevent gnome-session hangs
* Wed Feb 5 2003 Bill Nottingham <notting at redhat.com> 1.2.7-19.p
- rename zz_mp3 to rh_mp3
- fix rh_mp3 taking precedence over other plugins (#81002)
- nuke .la files (#68341)
* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
- rebuilt
* Tue Jan 14 2003 Owen Taylor <otaylor at redhat.com> 1.2.7-17.p
- Add patch from havardk at netcom.no to fix problem with file browser not
updating in CDROM directories (#65173)
* Tue Nov 12 2002 Bill Nottingham <notting at redhat.com> 1.2.7-16.p
- rebuild on more arches
* Wed Oct 2 2002 Bill Nottingham <notting at redhat.com> 1.2.7-15.p
- fix zz_mp3 plugin, tweak some buildprereqs
* Tue Oct 1 2002 Bill Nottingham <notting at redhat.com> 1.2.7-14.p
- fix arts config code (#72440, #74708, #74717)
- fix selection of 'no skin' (#73799)
* Mon Sep 2 2002 Bill Nottingham <notting at redhat.com> 1.2.7-13.p
- placeholder mp3 plugin
* Thu Aug 22 2002 Bill Nottingham <notting at redhat.com> 1.2.7-12.p
- absolute symlinks
* Wed Aug 21 2002 Bill Nottingham <notting at redhat.com> 1.2.7-11.p
- add mikmod buildprereq to insure plugin actually gets built (#70088)
* Tue Aug 20 2002 Bill Nottingham <notting at redhat.com> 1.2.7-10.p
- take out mpg123 plugin
* Sat Aug 10 2002 Than Ngo <than at redhat.com> 1.2.7-10
- Fix to use Bluecurve
* Sat Aug 3 2002 Havoc Pennington <hp at redhat.com>
- add a patch to default to redhat-artwork skin
* Wed Jul 31 2002 Havoc Pennington <hp at redhat.com> 1.2.7-8
- use override desktop file from redhat-menus so we can translate it
- desktop file is not a config file
* Tue Jul 30 2002 Bill Nottingham <notting at redhat.com> 1.2.7-7
- desktop file tweaks (#69549)
* Thu Jul 25 2002 Bill Nottingham <notting at redhat.com> 1.2.7-6
- desktop file tweaks (#69549)
* Fri Jul 18 2002 Bill Nottingham <notting at redhat.com> 1.2.7-5
- build against current libvorbis
* Wed Jun 27 2002 Karsten Hopp <karsten at redhat.de> 1.2.7-4
- fix buildprereq (arts-devel instead of kdelibs-sound-devel)
- added patch to avoid dynamic linkage against libarts (static libarts is no
longer available), use dlopen instead
* Sun May 26 2002 Tim Powers <timp at redhat.com>
- automated rebuild
* Thu May 16 2002 Bill Nottingham <notting at redhat.com> 1.2.7-2
- kill -gnome subpackage
* Mon Mar 4 2002 Bill Nottingham <notting at redhat.com> 1.2.7-1
- update to 1.2.7
* Tue Feb 26 2002 Bill Nottingham <notting at redhat.com> 1.2.6-2
- don't strip libs
* Tue Jan 15 2002 Bill Nottingham <notting at redhat.com> 1.2.6-0.7
- update to 1.2.6
* Tue Sep 4 2001 Bill Nottingham <notting at redhat.com>
- ship man pages (#53095)
* Mon Aug 20 2001 Bill Nottingham <notting at redhat.com>
- add patch to fix vorbis on big-endian machines (<havardk at xmms.org>)
- fix double ownership of files that made xmms-skins irrelevant (#51581)
* Mon Jul 23 2001 Bill Nottingham <notting at redhat.com>
- buildrequire gnome-libs-devel (#44849)
* Tue Jul 17 2001 Bill Nottingham <notting at redhat.com>
- own %%{_datadir}/xmms
- take out the realtime patch for now
- remove other obsoleted patches
* Tue Jul 17 2001 Preston Brown <pbrown at redhat.com>
- add audio/mpegurl to list of acceptable MimeTypes
* Tue Jun 26 2001 Florian La Roche <Florian.LaRoche at redhat.de>
- change filelist to include link from lib major version number
* Wed Jun 20 2001 Preston Brown <pbrown at redhat.com>
- 1.2.5
- italian i18n patch disabled until a newer one available
- japanese patch disabled until there is one available for 1.2.5
- add OGG mimetype to .desktop file
* Wed Jun 6 2001 Bill Nottingham <notting at redhat.com>
- make it build
* Mon May 21 2001 Tim Powers <timp at redhat.com>
- added skins subpackage
* Mon May 14 2001 Bill Nottingham <notting at redhat.com>
- remove extraneous printf in tmpdir patch
- add prototype for mpg123_munge_sample in downsample_vis patch
* Thu Apr 11 2001 Bill Nottingham <notting at redhat.com>
- rebuild to fix dependencies on ia64
* Tue Mar 20 2001 Bill Nottingham <notting at redhat.com>
- remove a couple of patches that are no longer needed (<havardk at xmms.org>)
* Tue Mar 20 2001 Harald Hoyer <harald at redhat.de>
- added euro patch to fix font loading
* Tue Mar 13 2001 Bernhard Rosenkraenzer <bero at redhat.com>
- Fix arts plugin installation
* Mon Mar 05 2001 Owen Taylor <otaylor at redhat.com>
- Rebuild for GTK+-1.2.9 include dirs
* Thu Mar 1 2001 Bill Nottingham <notting at redhat.com>
- fix arts pluging build to be self hosting (#30049)
* Thu Feb 22 2001 Bill Nottingham <notting at redhat.com>
- add recommended bugfixes from the XMMS team (<havardk at xmms.org>)
* Thu Feb 8 2001 Bill Nottingham <notting at redhat.com>
- fix tmpdir patch & skin saving (#26494)
* Thu Feb 1 2001 Bill Nottingham <notting at redhat.com>
- hack to fix visualization scope when downsampling (#19642)
- install xmms.xpm and fix icon entry in desktop,
add some #include fixes (#20944, <tothwolf at concentric.net>)
- make realtime not make xmms perform *worse* (#23951)
* Thu Jan 18 2001 Bill Nottingham <notting at redhat.com>
- don't segfault on skin change (#24284)
* Mon Jan 8 2001 Bill Nottingham <notting at redhat.com>
- kill separate kde package
* Mon Jan 8 2001 Bernhard Rosenkraenzer <bero at redhat.com>
- Add arts backend (new kde subpackage)
- Add a hack to determine whether arts, esd or oss should be used
- Fix requires
- Mark locale files
* Tue Jan 2 2001 Bill Nottingham <notting at redhat.com>
- clean up japanese support patch some
- don't enable transparenthack; it's broken
- fix possible temp race
* Mon Dec 25 2000 Yukihiro Nakai <ynakai at redhat.com>
- Add Japanese resources.
* Tue Nov 28 2000 Bill Nottingham <notting at redhat.com>
- update to 1.2.4
* Mon Nov 13 2000 Bill Nottingham <notting at redhat.com>
- fix some compiler warnings (#20135)
- add Ogg Vorbis plugin
* Mon Oct 30 2000 Preston Brown <pbrown at redhat.com>
- even better .desktop file handling streaming MP3 types
* Mon Oct 16 2000 Bill Nottingham <notting at redhat.com>
- um, if we're going to ship a japanese translation, we should probably
ship the .mo files
- add a patch for small files from Thomas Woller
- add alpha patches (#19141)
* Fri Oct 13 2000 Preston Brown <pbrown at redhat.com>
- improved .desktop file
- 1.2.3
* Thu Aug 31 2000 Satoru Sato <ssato at redhat.com>
- fix SPEC
* Wed Aug 30 2000 Satoru Sato <ssato at redhat.com>
- apply nls patch (by Hiroshi Takekawa <sian at big.or.jp>)
* Fri Aug 11 2000 Jonathan Blandford <jrb at redhat.com>
- Up Epoch and release
* Mon Aug 7 2000 Bill Nottingham <notting at redhat.com>
- rebuild against new DGA
* Fri Aug 4 2000 Bill Nottingham <notting at redhat.com>
- add translation to desktop entry
* Wed Jul 19 2000 Bill Nottingham <notting at redhat.com>
- version 1.2.2
* Thu Jul 13 2000 Prospector <bugzilla at redhat.com>
- automatic rebuild
* Fri Jul 7 2000 Bill Nottingham <notting at redhat.com>
- use lazy symbol resolution in the plugin loader
* Mon Jun 18 2000 Bill Nottingham <notting at redhat.com>
- 1.2.1
* Fri Jun 16 2000 Preston Brown <pbrown at redhat.com>
- some fixes to the .desktop entry
* Mon Jun 12 2000 Preston Brown <pbrown at redhat.com>
- 1.2.0
- use rpm macros
- fix gnomexmms buildroot breakage
* Sun Jun 11 2000 Bill Nottingham <notting at redhat.com>
- rebuild in new environment
- work around some toolchain madness
* Mon Mar 27 2000 Bill Nottingham <notting at redhat.com>
- include /usr/share/xmmms/wmxmms.xpm
* Tue Feb 22 2000 Bill Nottingham <notting at redhat.com>
- use /usr prefix to be consistent with xmms.org (why not?)
- find something more appropriate than the disk writer to use
as output plugin if configured one doesn't exist
* Wed Feb 16 2000 Matt Wilson <msw at redhat.com>
- include /usr/X11R6/bin/wmxmms
* Thu Feb 3 2000 Bill Nottingham <notting at redhat.com>
- some cleanups
* Mon Jan 31 2000 Bill Nottingham <notting at redhat.com>
- update to 1.0.1
* Fri Jan 28 2000 Bill Nottingham <notting at redhat.com>
- update to 1.0.0
* Tue Sep 28 1999 Bill Nottingham <notting at redhat.com>
- update to 0.9.5.1
* Wed Sep 23 1999 Preston Brown <pbrown at redhat.com>
- latest stable release (0.9.5)
* Wed Sep 22 1999 Bill Nottingham <notting at redhat.com>
- open in non-blocking mode, then reset
- make esd the default
* Mon Sep 13 1999 Bill Nottingham <notting at redhat.com>
- fix binaries
* Thu Sep 9 1999 Bill Nottingham <notting at redhat.com>
- fix gtk+ requirements
* Wed Aug 18 1999 Bill Nottingham <notting at redhat.com>
- fix a /0 in the disk writer
* Tue Jul 20 1999 Bill Nottingham <notting at redhat.com>
- 0.9.1
* Mon Jun 21 1999 Bill Nottingham <notting at redhat.com>
- use other fallback patch
- obsolete x11amp-devel
* Fri Jun 11 1999 Matt Wilson <msw at redhat.com>
- updated to xmms 0.9 final
* Thu Apr 8 1999 The Rasterman <raster at redhat.com>
- patched to have plugin fallback to other plugins for output if plugin fails.
* Mon Mar 29 1999 Michael Maher <mike at redhat.com>
- added desktop entry.
* Mon Mar 22 1999 Michael Maher <mike at redhat.com>
- made some changes to the spec file.
- has 'esd' support now.
- stripped executables.
* Mon Feb 15 1999 Michael Maher <mike at redhat.com>
- built pacakge for 6.0
- changed spec file, added mp3 licenses.
* Mon Feb 15 1999 Ryan Weaver <ryanw at infohwy.com>
[x11amp-0.9-alpha3-1]
- Updated to alpha3 see ChangLog for changes.
* Wed Jan 13 1999 Ryan Weaver <ryanw at infohwy.com>
[x11amp-0.9-alpha2-1]
- fixed close button in PL/EQ windows
- fixed shuffel/randomize functions
- removed imlib, no need for imlib anymore
- mpg123 plugin now works on SMP machines, also reduced cpu usage
- fixed so mainwindow will be positioned correct at startup in some windowmanagers
- fixed the playlistwindow buttons that ended up behind the window
- added mikmod plugin into the source tree
- now you can configure the OSS drivers and mpg123 plugin
- SKINSDIR variable can be used again
- added bars as analyzer mode
- in playlistwindow the player control buttons now work, also time window works
--- NEW FILE xmms.xpm ---
/* XPM */
static char * xmms2_xpm[] = {
"48 48 1727 2",
" c None",
". c #252852",
"+ c #242752",
"@ c #242652",
"# c #262955",
"$ c #272A56",
"% c #282B58",
"& c #2B2E5B",
"* c #2C2F5D",
"= c #2B2E5D",
"- c #2B2E5E",
"; c #2B2F5F",
"> c #2E3161",
", c #303364",
"' c #333668",
") c #36396B",
"! c #373A6D",
"~ c #383C6F",
"{ c #393C70",
"] c #373A6F",
"^ c #35396D",
"/ c #32366B",
"( c #31346A",
"_ c #34376E",
": c #363A70",
"< c #393D74",
"[ c #373A72",
"} c #32366D",
"| c #2D3169",
"1 c #292D65",
"2 c #2A2D66",
"3 c #292C66",
"4 c #292D66",
"5 c #2E326C",
"6 c #343872",
"7 c #3C407A",
"8 c #3C407B",
"9 c #3D407B",
"0 c #3C3F7A",
"a c #3A3E79",
"b c #383C77",
"c c #363A75",
"d c #353974",
"e c #333772",
"f c #323671",
"g c #262953",
"h c #262954",
"i c #262854",
"j c #252854",
"k c #262956",
"l c #2A2D5B",
"m c #2E315F",
"n c #2D305F",
"o c #2C2F5F",
"p c #2D3060",
"q c #2C2F60",
"r c #2D3062",
"s c #2F3364",
"t c #323567",
"u c #35386B",
"v c #373B6E",
"w c #393C71",
"x c #3A3E72",
"y c #393D72",
"z c #373A70",
"A c #35386F",
"B c #32366C",
"C c #363971",
"D c #393D75",
"E c #3A3E76",
"F c #353871",
"G c #30336D",
"H c #2B2F68",
"I c #2A2E68",
"J c #292D67",
"K c #2A2D68",
"L c #2E326D",
"M c #343873",
"N c #3D417D",
"O c #3B3F7C",
"P c #3A3D7A",
"Q c #383C78",
"R c #363A76",
"S c #353975",
"T c #333773",
"U c #272A55",
"V c #282A56",
"W c #252855",
"X c #272A57",
"Y c #282B59",
"Z c #292C5B",
"` c #2A2D5C",
" . c #2B2E5F",
".. c #2E3264",
"+. c #303466",
"@. c #323669",
"#. c #34386C",
"$. c #363A6E",
"%. c #373B70",
"&. c #373B71",
"*. c #353870",
"=. c #34376F",
"-. c #33376F",
";. c #353971",
">. c #363A73",
",. c #363973",
"'. c #343771",
"). c #30346E",
"!. c #2D316B",
"~. c #2B2F6A",
"{. c #2A2E69",
"]. c #2A2E6A",
"^. c #2D316E",
"/. c #323673",
"(. c #373B77",
"_. c #3A3E7B",
":. c #3B3F7D",
"<. c #3B3E7C",
"[. c #393D7B",
"}. c #383C79",
"|. c #373A78",
"1. c #353977",
"2. c #343876",
"3. c #292B57",
"4. c #292C58",
"5. c #262957",
"6. c #272A58",
"7. c #2A2D5D",
"8. c #2D3163",
"9. c #2F3366",
"0. c #313568",
"a. c #33376B",
"b. c #35386D",
"c. c #36396F",
"d. c #373A71",
"e. c #363A71",
"f. c #353972",
"g. c #353973",
"h. c #353873",
"i. c #343772",
"j. c #323570",
"k. c #2F326E",
"l. c #2D306B",
"m. c #2B2F6B",
"n. c #2B2F6C",
"o. c #2C306E",
"p. c #313573",
"q. c #3C3F7E",
"r. c #3B3E7D",
"s. c #3A3E7D",
"t. c #393C7C",
"u. c #373B7B",
"v. c #353979",
"w. c #282B57",
"x. c #2A2D59",
"y. c #2C2F5E",
"z. c #2E3263",
"A. c #2F3265",
"B. c #313468",
"C. c #33366A",
"D. c #37396F",
"E. c #383B71",
"F. c #393B72",
"G. c #393B73",
"H. c #383B73",
"I. c #373A73",
"J. c #373973",
"K. c #363974",
"L. c #363875",
"M. c #343672",
"N. c #32346F",
"O. c #2D306C",
"P. c #2C306C",
"Q. c #2C306F",
"R. c #313572",
"S. c #363977",
"T. c #3A3D7C",
"U. c #3D407F",
"V. c #3D3F80",
"W. c #3B3F7F",
"X. c #3A3E7F",
"Y. c #393D7E",
"Z. c #383C7D",
"`. c #373B7C",
" + c #292B58",
".+ c #292B59",
"++ c #2A2C5A",
"@+ c #2B2E5C",
"#+ c #2D2F5C",
"$+ c #2E315E",
"%+ c #2F325F",
"&+ c #303361",
"*+ c #303362",
"=+ c #313467",
"-+ c #343669",
";+ c #36396C",
">+ c #383B6F",
",+ c #3A3C71",
"'+ c #3C3D73",
")+ c #3C3D74",
"!+ c #3C3D75",
"~+ c #3B3C74",
"{+ c #393B75",
"]+ c #373B75",
"^+ c #383B75",
"/+ c #393A75",
"(+ c #3A3976",
"_+ c #393873",
":+ c #363670",
"<+ c #31346D",
"[+ c #2E326B",
"}+ c #2D316D",
"|+ c #383A76",
"1+ c #3C3E7F",
"2+ c #3F4081",
"3+ c #404181",
"4+ c #3F4182",
"5+ c #3E4082",
"6+ c #3C3F82",
"7+ c #3A3E81",
"8+ c #383C7F",
"9+ c #2B2B5A",
"0+ c #2C2C5A",
"a+ c #2E2D5A",
"b+ c #2D2E59",
"c+ c #2C2D59",
"d+ c #2D2C59",
"e+ c #2D2E5A",
"f+ c #2D2F5B",
"g+ c #2F315C",
"h+ c #32345D",
"i+ c #34355F",
"j+ c #343560",
"k+ c #333561",
"l+ c #343664",
"m+ c #343565",
"n+ c #363767",
"o+ c #393B6B",
"p+ c #3B3D70",
"q+ c #3F3E72",
"r+ c #403E72",
"s+ c #413E75",
"t+ c #413E76",
"u+ c #403D76",
"v+ c #3D3D76",
"w+ c #3A3C77",
"x+ c #393C76",
"y+ c #3D3C74",
"z+ c #403B74",
"A+ c #413A75",
"B+ c #3B396F",
"C+ c #36366B",
"D+ c #313369",
"E+ c #34366C",
"F+ c #3A3B73",
"G+ c #433E7D",
"H+ c #454080",
"I+ c #464282",
"J+ c #444284",
"K+ c #404285",
"L+ c #3E4185",
"M+ c #3C4084",
"N+ c #3B3F83",
"O+ c #393D81",
"P+ c #282A5A",
"Q+ c #2F2C5D",
"R+ c #3E2E60",
"S+ c #402F5E",
"T+ c #41305B",
"U+ c #423159",
"V+ c #433257",
"W+ c #443458",
"X+ c #47365A",
"Y+ c #48375B",
"Z+ c #49375A",
"`+ c #49385C",
" @ c #4C395D",
".@ c #4B395E",
"+@ c #4E3C60",
"@@ c #4E3C61",
"#@ c #4E3C62",
"$@ c #4F3D63",
"%@ c #513F65",
"&@ c #534167",
"*@ c #524066",
"=@ c #523F66",
"-@ c #533F68",
";@ c #513F6D",
">@ c #403F75",
",@ c #3D3F7E",
"'@ c #3C3E7B",
")@ c #4D3E6F",
"!@ c #4E3D6C",
"~@ c #4C3C69",
"{@ c #4C3B66",
"]@ c #4A3A62",
"^@ c #45385F",
"/@ c #45375F",
"(@ c #44385F",
"_@ c #483A62",
":@ c #4C3C67",
"<@ c #4F3E6B",
"[@ c #51406E",
"}@ c #524273",
"|@ c #474488",
"1@ c #434489",
"2@ c #404388",
"3@ c #3E4287",
"4@ c #3D4187",
"5@ c #3B3F85",
"6@ c #242755",
"7@ c #252857",
"8@ c #2B2A5D",
"9@ c #4A2C6F",
"0@ c #4D3066",
"a@ c #513163",
"b@ c #523460",
"c@ c #503559",
"d@ c #4D3654",
"e@ c #4C3854",
"f@ c #4D3954",
"g@ c #4E3A54",
"h@ c #4F3B54",
"i@ c #503C54",
"j@ c #523D54",
"k@ c #533E54",
"l@ c #523E54",
"m@ c #533F54",
"n@ c #543F54",
"o@ c #544054",
"p@ c #564056",
"q@ c #574057",
"r@ c #564057",
"s@ c #524059",
"t@ c #43427B",
"u@ c #424285",
"v@ c #62429B",
"w@ c #5A4066",
"x@ c #594062",
"y@ c #59405F",
"z@ c #563F5C",
"A@ c #523D57",
"B@ c #4F3C54",
"C@ c #4C3B54",
"D@ c #4E3C55",
"E@ c #523F58",
"F@ c #57405C",
"G@ c #56405C",
"H@ c #52415C",
"I@ c #49468C",
"J@ c #45468D",
"K@ c #42458C",
"L@ c #40448B",
"M@ c #3E438A",
"N@ c #3C4188",
"O@ c #252856",
"P@ c #2A295B",
"Q@ c #552B7B",
"R@ c #5D2E7F",
"S@ c #613180",
"T@ c #643380",
"U@ c #593669",
"V@ c #563957",
"W@ c #523A54",
"X@ c #513A54",
"Y@ c #503B54",
"Z@ c #513C54",
"`@ c #533D54",
" # c #543E54",
".# c #553F54",
"+# c #554054",
"@# c #564054",
"## c #564055",
"$# c #7C4EA2",
"%# c #8B50BD",
"&# c #454683",
"*# c #464583",
"=# c #454689",
"-# c #7B49B4",
";# c #7845AE",
"># c #7948AA",
",# c #6B4691",
"'# c #62447B",
")# c #58405B",
"!# c #513E54",
"~# c #513E58",
"{# c #554164",
"]# c #644687",
"^# c #734FA4",
"/# c #4B4991",
"(# c #4A4A93",
"_# c #464992",
":# c #444891",
"<# c #424790",
"[# c #40458E",
"}# c #3E438C",
"|# c #272859",
"1# c #2E2A5F",
"2# c #372C67",
"3# c #3F2F6E",
"4# c #5C3283",
"5# c #663782",
"6# c #593B61",
"7# c #563C54",
"8# c #543D54",
"9# c #5A4360",
"0# c #474885",
"a# c #47498C",
"b# c #46488A",
"c# c #47488E",
"d# c #46488D",
"e# c #47448D",
"f# c #5A489A",
"g# c #6749A5",
"h# c #794DAD",
"i# c #604475",
"j# c #4F3E58",
"k# c #553E7A",
"l# c #4E418F",
"m# c #514694",
"n# c #4D4A96",
"o# c #4D4C98",
"p# c #494C97",
"q# c #474B96",
"r# c #454A95",
"s# c #434893",
"t# c #424792",
"u# c #404590",
"v# c #252858",
"w# c #252859",
"x# c #26295A",
"y# c #272B5C",
"z# c #2E2D60",
"A# c #403071",
"B# c #65358A",
"C# c #633C79",
"D# c #573C5B",
"E# c #563D54",
"F# c #594775",
"G# c #484889",
"H# c #494A8C",
"I# c #474A8E",
"J# c #46498E",
"K# c #44488D",
"L# c #43458B",
"M# c #4D4895",
"N# c #6B4CA6",
"O# c #63467C",
"P# c #564059",
"Q# c #503F59",
"R# c #513E7D",
"S# c #393B7F",
"T# c #383C87",
"U# c #404591",
"V# c #484B97",
"W# c #4A4D9A",
"X# c #4A4E9B",
"Y# c #494E9B",
"Z# c #474C99",
"`# c #454A98",
" $ c #434896",
".$ c #414694",
"+$ c #262959",
"@$ c #25285A",
"#$ c #26295B",
"$$ c #272A5C",
"%$ c #282B5E",
"&$ c #312E65",
"*$ c #4B337A",
"=$ c #69388C",
"-$ c #5E3B6A",
";$ c #563C57",
">$ c #553D54",
",$ c #534054",
"'$ c #514B85",
")$ c #4B4A8E",
"!$ c #4A4B90",
"~$ c #484B91",
"{$ c #464A91",
"]$ c #444890",
"^$ c #484891",
"/$ c #674CA0",
"($ c #5B456A",
"_$ c #55405D",
":$ c #50407D",
"<$ c #3B3E82",
"[$ c #373C85",
"}$ c #363B88",
"|$ c #3F4491",
"1$ c #4A4E9D",
"2$ c #4B509F",
"3$ c #494E9E",
"4$ c #474C9C",
"5$ c #464B9B",
"6$ c #444999",
"7$ c #252959",
"8$ c #26295C",
"9$ c #272A5D",
"0$ c #282B5F",
"a$ c #292C61",
"b$ c #352F6A",
"c$ c #5C3589",
"d$ c #693A89",
"e$ c #583C5F",
"f$ c #553E54",
"g$ c #554460",
"h$ c #514C8C",
"i$ c #4E4D93",
"j$ c #4B4E95",
"k$ c #4A4C94",
"l$ c #484A93",
"m$ c #47488C",
"n$ c #5B467B",
"o$ c #564060",
"p$ c #58487D",
"q$ c #42438A",
"r$ c #3A3F8A",
"s$ c #393E8B",
"t$ c #393E8D",
"u$ c #3F4494",
"v$ c #4B51A1",
"w$ c #4E53A4",
"x$ c #4D52A4",
"y$ c #4C51A3",
"z$ c #4A4FA1",
"A$ c #484D9F",
"B$ c #454A9C",
"C$ c #292C5C",
"D$ c #272A5E",
"E$ c #292C62",
"F$ c #2B2E64",
"G$ c #3E3173",
"H$ c #693793",
"I$ c #633C7B",
"J$ c #563C5A",
"K$ c #563E54",
"L$ c #554055",
"M$ c #594874",
"N$ c #4F5093",
"O$ c #505098",
"P$ c #504F9A",
"Q$ c #4C4B93",
"R$ c #5F4A8E",
"S$ c #5A487B",
"T$ c #504E98",
"U$ c #474893",
"V$ c #3E4392",
"W$ c #3B4191",
"X$ c #3A3F91",
"Y$ c #3E4396",
"Z$ c #464C9E",
"`$ c #4E53A6",
" % c #4F54A7",
".% c #4F54A8",
"+% c #4D53A7",
"@% c #4C51A6",
"#% c #4B50A4",
"$% c #484DA2",
"%% c #2D3061",
"&% c #2B2F60",
"*% c #292C5F",
"=% c #272B5E",
"-% c #282B60",
";% c #2B2E65",
">% c #312F69",
",% c #4F3480",
"'% c #6D3997",
")% c #5E3C6C",
"!% c #563E57",
"~% c #564058",
"{% c #594E88",
"]% c #52529A",
"^% c #54529C",
"/% c #5E4F9A",
"(% c #564061",
"_% c #564469",
":% c #534C94",
"<% c #5052A1",
"[% c #4A4D9D",
"}% c #434999",
"|% c #3C4295",
"1% c #3F4498",
"2% c #4A4FA5",
"3% c #5055AA",
"4% c #5157AC",
"5% c #5156AD",
"6% c #5055AC",
"7% c #4E54AB",
"8% c #4D53AA",
"9% c #4A50A7",
"0% c #313466",
"a% c #303365",
"b% c #2D3063",
"c% c #2B2E62",
"d% c #292D62",
"e% c #2A2D63",
"f% c #2A2E65",
"g% c #2C2F68",
"h% c #35306F",
"i% c #623892",
"j% c #6F3E95",
"k% c #58405D",
"l% c #574564",
"m% c #595194",
"n% c #5A549D",
"o% c #5A466B",
"p% c #56415F",
"q% c #544D97",
"r% c #4E519F",
"s% c #5154A7",
"t% c #5256A8",
"u% c #4A4EA3",
"v% c #444A9B",
"w% c #454A9D",
"x% c #6567AF",
"y% c #585CAC",
"z% c #5459AE",
"A% c #5459B2",
"B% c #5359B2",
"C% c #5258B2",
"D% c #5157B1",
"E% c #5055AF",
"F% c #4D53AC",
"G% c #373A6C",
"H% c #2E3166",
"I% c #2D3065",
"J% c #2C2F65",
"K% c #2B2E66",
"L% c #2E316A",
"M% c #3E3478",
"N% c #7742A6",
"O% c #704F8C",
"P% c #675367",
"Q% c #574155",
"R% c #634F62",
"S% c #5C4B75",
"T% c #624C7B",
"U% c #564260",
"V% c #5E5495",
"W% c #5254A4",
"X% c #565BAF",
"Y% c #5F62B6",
"Z% c #6B6EBB",
"`% c #9896CB",
" & c #B9B4D7",
".& c #7476B7",
"+& c #5A5EAF",
"@& c #555AB1",
"#& c #555BB6",
"$& c #555BB7",
"%& c #5359B6",
"&& c #5258B5",
"*& c #4E54B1",
"=& c #393D70",
"-& c #34376B",
";& c #323569",
">& c #313469",
",& c #30336A",
"'& c #2E3169",
")& c #2D3168",
"!& c #343372",
"~& c #5D4592",
"{& c #B4A5D3",
"]& c #A498A5",
"^& c #584357",
"/& c #756374",
"(& c #827280",
"_& c #574255",
":& c #665593",
"<& c #5C62B0",
"[& c #5B60B2",
"}& c #595CB0",
"|& c #9797D1",
"1& c #CCC7E1",
"2& c #DBD4DC",
"3& c #D7D3E0",
"4& c #BCBBD6",
"5& c #585EAE",
"6& c #4B51AB",
"7& c #5359B5",
"8& c #585EBC",
"9& c #585EBD",
"0& c #565CBD",
"a& c #555BBC",
"b& c #5158B8",
"c& c #34386D",
"d& c #35386E",
"e& c #363970",
"f& c #373B72",
"g& c #8F8AB3",
"h& c #333770",
"i& c #353874",
"j& c #8181B5",
"k& c #DCD7E0",
"l& c #D0C8D5",
"m& c #594458",
"n& c #594357",
"o& c #C3BCC3",
"p& c #877886",
"q& c #584256",
"r& c #5E5EAF",
"s& c #7679C3",
"t& c #B7B4E1",
"u& c #D7D1E3",
"v& c #E4DFE3",
"w& c #E4E1E4",
"x& c #E4E2E5",
"y& c #CECDDD",
"z& c #5F63B3",
"A& c #494FAC",
"B& c #474DAD",
"C& c #5157B8",
"D& c #595FC1",
"E& c #5A61C3",
"F& c #5A60C4",
"G& c #5960C3",
"H& c #585FC2",
"I& c #545BBE",
"J& c #33376A",
"K& c #36396E",
"L& c #35396E",
"M& c #3A3D74",
"N& c #3C4077",
"O& c #8687BC",
"P& c #D7D2DE",
"Q& c #3D3F77",
"R& c #464883",
"S& c #CDC9E3",
"T& c #E9E6EA",
"U& c #DDD6E3",
"V& c #674980",
"W& c #665265",
"X& c #867684",
"Y& c #564154",
"Z& c #998C98",
"`& c #E8E5E8",
" * c #897A87",
".* c #695A90",
"+* c #A7A8ED",
"@* c #E3DFE8",
"#* c #EAE8EA",
"$* c #ECEAEC",
"%* c #E7E5E7",
"&* c #BEBEDD",
"** c #6167C2",
"=* c #4F56B5",
"-* c #484EB1",
";* c #474DB1",
">* c #5258BD",
",* c #5B62C8",
"'* c #5E64CB",
")* c #5D63CA",
"!* c #5B62C9",
"~* c #575EC5",
"{* c #3B3E76",
"]* c #4D5089",
"^* c #CBC8EE",
"/* c #E7E5E8",
"(* c #A29DC3",
"_* c #3E427B",
":* c #AFACD9",
"<* c #E5E2E6",
"[* c #EBE9EB",
"}* c #DCD6E4",
"|* c #8447B9",
"1* c #59425F",
"2* c #978A96",
"3* c #A79CA6",
"4* c #665365",
"5* c #D9D5D9",
"6* c #EBE8EB",
"7* c #574157",
"8* c #A7A4D7",
"9* c #E6E4ED",
"0* c #ECEAEE",
"a* c #EBE9EC",
"b* c #E8E6E8",
"c* c #B1B2E0",
"d* c #676CCF",
"e* c #545BC0",
"f* c #4C53B9",
"g* c #4A50B8",
"h* c #535AC3",
"i* c #5D63CD",
"j* c #6168D2",
"k* c #6067D2",
"l* c #5B62CD",
"m* c #6C6EA8",
"n* c #DDD9E7",
"o* c #E2DDE5",
"p* c #7072AE",
"q* c #DFDBE4",
"r* c #E5E1E6",
"s* c #7B46B6",
"t* c #7245A2",
"u* c #B9B0B8",
"v* c #EAE6EA",
"w* c #8A7A88",
"x* c #5C4866",
"y* c #BABDFA",
"z* c #E9E7ED",
"A* c #E9E7EA",
"B* c #DCD9E4",
"C* c #7075D8",
"D* c #5D64CD",
"E* c #4F56C0",
"F* c #4E55C0",
"G* c #535AC7",
"H* c #5C63D1",
"I* c #636BD9",
"J* c #646BDA",
"K* c #636ADA",
"L* c #5F66D6",
"M* c #313569",
"N* c #33366C",
"O* c #33376D",
"P* c #373B74",
"Q* c #9597D3",
"R* c #E7E4E7",
"S* c #EDEBED",
"T* c #E0D9E5",
"U* c #EAE8EC",
"V* c #4A3F8E",
"W* c #7F47BB",
"X* c #654882",
"Y* c #E9E6E9",
"Z* c #AA9FA9",
"`* c #796878",
" = c #72659F",
".= c #CED0F8",
"+= c #EBE9ED",
"@= c #A3A4E5",
"#= c #6A6FD7",
"$= c #565ECC",
"%= c #5158C8",
"&= c #535ACB",
"*= c #5D64D6",
"== c #676EE1",
"-= c #676FE2",
";= c #686FE3",
">= c #636ADF",
",= c #303469",
"'= c #32356C",
")= c #33366E",
"!= c #383B74",
"~= c #CCCAF2",
"{= c #EEECEF",
"]= c #EBE8EC",
"^= c #424589",
"/= c #6244A5",
"(= c #8E69CF",
"_= c #948696",
":= c #8381D7",
"<= c #CDCFF8",
"[= c #EBE9EF",
"}= c #E9E7EB",
"|= c #CFCBE6",
"1= c #797FE0",
"2= c #6067D8",
"3= c #565DD1",
"4= c #545BD0",
"5= c #5F66DB",
"6= c #676FE5",
"7= c #6B72E9",
"8= c #6C74EB",
"9= c #6D75EE",
"0= c #676FE8",
"a= c #31356B",
"b= c #343871",
"c= c #6668A3",
"d= c #DAD6EA",
"e= c #DCDBF4",
"f= c #EDEBEF",
"g= c #DDDCF0",
"h= c #ECEAEF",
"i= c #E7E5EA",
"j= c #4B4F93",
"k= c #454891",
"l= c #9D8DE2",
"m= c #D5CFDB",
"n= c #C8C2C8",
"o= c #CCC6CC",
"p= c #E9E7E9",
"q= c #CAC4CA",
"r= c #B9AFB8",
"s= c #5C4867",
"t= c #A4AAFE",
"u= c #DADBF1",
"v= c #DDDAE9",
"w= c #9A9DEA",
"x= c #6E75E1",
"y= c #5B62DB",
"z= c #575FDA",
"A= c #6169E1",
"B= c #6A73E9",
"C= c #6F76ED",
"D= c #7179F1",
"E= c #727AF9",
"F= c #6C74F3",
"G= c #353872",
"H= c #8485BE",
"I= c #E3E0E7",
"J= c #ABAAC4",
"K= c #C3C3FE",
"L= c #EEECEE",
"M= c #8F91BC",
"N= c #CDCDF8",
"O= c #ECEBEF",
"P= c #E5E4E9",
"Q= c #585B9F",
"R= c #51559C",
"S= c #B2B1EB",
"T= c #D3CED8",
"U= c #827182",
"V= c #90808E",
"W= c #E2DEE2",
"X= c #D3CED3",
"Y= c #6F5D6E",
"Z= c #AAA0A9",
"`= c #B8AFB7",
" - c #6E61A0",
".- c #AEB2F8",
"+- c #E1DEE9",
"@- c #E2E0EA",
"#- c #BFBDEA",
"$- c #7F85EB",
"%- c #636BE5",
"&- c #5D65E4",
"*- c #656DE7",
"=- c #6E76EC",
"-- c #747CF1",
";- c #767FF6",
">- c #7780FF",
",- c #7179FE",
"'- c #393D76",
")- c #BDBAED",
"!- c #E6E4E9",
"~- c #4C4F85",
"{- c #8587C6",
"]- c #D0CEE7",
"^- c #BABAD0",
"/- c #434789",
"(- c #B2B3F6",
"_- c #E8E5ED",
":- c #E3E1E8",
"<- c #5A5FA1",
"[- c #6D70B5",
"}- c #ACA5C2",
"|- c #BBB4C2",
"1- c #705986",
"2- c #736284",
"3- c #C8C1CA",
"4- c #5D475B",
"5- c #7B6A7A",
"6- c #B7AEB6",
"7- c #C2B9C7",
"8- c #E3E1EA",
"9- c #D4D1EC",
"0- c #8D93EE",
"a- c #6F77EB",
"b- c #626BEB",
"c- c #656EEC",
"d- c #7179F0",
"e- c #7A83F4",
"f- c #7D85F9",
"g- c #7E87FF",
"h- c #767FFF",
"i- c #3B3F76",
"j- c #3B3F77",
"k- c #3B3E77",
"l- c #5B5D97",
"m- c #C7C4E2",
"n- c #C4C2D4",
"o- c #383C7A",
"p- c #575A9A",
"q- c #6D70A3",
"r- c #50538D",
"s- c #414588",
"t- c #8789CC",
"u- c #D6D5EE",
"v- c #DFDDE6",
"w- c #5D5E9F",
"x- c #847CBB",
"y- c #9E94A9",
"z- c #8D7D99",
"A- c #8162BA",
"B- c #8B70C9",
"C- c #85728B",
"D- c #5E495D",
"E- c #614B5F",
"F- c #D0C9D0",
"G- c #B5ACB4",
"H- c #897987",
"I- c #DCD8DC",
"J- c #EAE8EB",
"K- c #CBCBEE",
"L- c #8B94EF",
"M- c #7A82EE",
"N- c #6972EF",
"O- c #6871F0",
"P- c #757EF3",
"Q- c #818AF6",
"R- c #838DFA",
"S- c #868FFF",
"T- c #7D86FF",
"U- c #3A3D75",
"V- c #3D4179",
"W- c #40447D",
"X- c #7D7FB8",
"Y- c #CFCCDF",
"Z- c #646797",
"`- c #3D417F",
" ; c #3C4180",
".; c #3C4081",
"+; c #3C4083",
"@; c #3E4286",
"#; c #5E62A6",
"$; c #C1C1F1",
"%; c #D9D7E4",
"&; c #6A60A0",
"*; c #675776",
"=; c #A198AD",
"-; c #6A61A4",
";; c #6660B6",
">; c #8B65D5",
",; c #775BA8",
"'; c #5B435F",
"); c #5C475A",
"!; c #A296A1",
"~; c #B1A7B0",
"{; c #594457",
"]; c #EEEBEE",
"^; c #CFCCD9",
"/; c #A9AAEE",
"(; c #8B94F2",
"_; c #8A93F0",
":; c #8089F0",
"<; c #737CF1",
"[; c #6E78F3",
"}; c #7B85F5",
"|; c #8791F7",
"1; c #8B95FB",
"2; c #8D97FF",
"3; c #848EFF",
"4; c #34386F",
"5; c #8889C7",
"6; c #C0BED5",
"7; c #424684",
"8; c #404484",
"9; c #3F4485",
"0; c #3F4386",
"a; c #3F4488",
"b; c #454A8F",
"c; c #A6A7EB",
"d; c #CFCCDC",
"e; c #6D5A7C",
"f; c #685872",
"g; c #8A81AB",
"h; c #575BA7",
"i; c #595BAE",
"j; c #6E5FC1",
"k; c #8C66D6",
"l; c #685188",
"m; c #58405A",
"n; c #786777",
"o; c #ACA1AB",
"p; c #988B97",
"q; c #EFEDEF",
"r; c #DDD9DD",
"s; c #A99EA8",
"t; c #574256",
"u; c #8785CE",
"v; c #8C95F0",
"w; c #8A93F1",
"x; c #7F89F2",
"y; c #7580F4",
"z; c #808AF6",
"A; c #8E99F8",
"B; c #949FFB",
"C; c #97A1FF",
"D; c #8C96FF",
"E; c #2F336B",
"F; c #32356F",
"G; c #393C75",
"H; c #9998C4",
"I; c #7072A2",
"J; c #404482",
"K; c #3E4281",
"L; c #404485",
"M; c #404486",
"N; c #414589",
"O; c #44488C",
"P; c #484C93",
"Q; c #807FC4",
"R; c #A197AF",
"S; c #67556C",
"T; c #857998",
"U; c #5557A0",
"V; c #5053A5",
"W; c #5157AB",
"X; c #5A5CB4",
"Y; c #7860CE",
"Z; c #8262C7",
"`; c #5F4870",
" > c #574158",
".> c #5E485C",
"+> c #594557",
"@> c #C5BFC5",
"#> c #C7C1C7",
"$> c #5F4D68",
"%> c #999FEB",
"&> c #8F96F0",
"*> c #9099F0",
"=> c #8A94F2",
"-> c #7F8AF4",
";> c #828DF7",
">> c #96A1F9",
",> c #A0ABFC",
"'> c #A0ACFF",
")> c #95A0FF",
"!> c #2C3068",
"~> c #2D316A",
"{> c #575994",
"]> c #9C9ABB",
"^> c #383B77",
"/> c #3A3E7E",
"(> c #3D4182",
"_> c #3F4486",
":> c #43488C",
"<> c #48498E",
"[> c #4D5092",
"}> c #705E9D",
"|> c #76657D",
"1> c #81748F",
"2> c #918FBB",
"3> c #5256A1",
"4> c #4D52A5",
"5> c #5056AB",
"6> c #5359B1",
"7> c #605EBE",
"8> c #7F62D6",
"9> c #755CB0",
"0> c #594261",
"a> c #5C465C",
"b> c #887887",
"c> c #5B4659",
"d> c #A0959F",
"e> c #776576",
"f> c #78709F",
"g> c #9DA6EA",
"h> c #98A2EF",
"i> c #9DA9F1",
"j> c #8B96F4",
"k> c #8B96F7",
"l> c #9EAAF9",
"m> c #AAB6FC",
"n> c #ACB8FF",
"o> c #9EAAFF",
"p> c #2D3069",
"q> c #555892",
"r> c #646691",
"s> c #333776",
"t> c #363A7A",
"u> c #393D7F",
"v> c #3C4082",
"w> c #414386",
"x> c #47468A",
"y> c #5B4B94",
"z> c #564360",
"A> c #5B4A66",
"B> c #8584B3",
"C> c #7577B1",
"D> c #5156A5",
"E> c #4F54AB",
"F> c #5258B1",
"G> c #575CB8",
"H> c #6A5FC7",
"I> c #8364D9",
"J> c #69548E",
"K> c #5C4660",
"L> c #796778",
"M> c #715E6F",
"N> c #7D6D7B",
"O> c #584356",
"P> c #574159",
"Q> c #9597C5",
"R> c #A1ABE9",
"S> c #A7B3F1",
"T> c #9EAAF3",
"U> c #95A1F6",
"V> c #A6B2F9",
"W> c #B5C2FB",
"X> c #BAC7FF",
"Y> c #AAB7FF",
"Z> c #2D306A",
"`> c #2F336E",
" , c #303470",
"., c #323674",
"+, c #333777",
"@, c #34387B",
"#, c #4B4284",
"$, c #524261",
"%, c #54405C",
"&, c #5A5081",
"*, c #575B9E",
"=, c #565CA8",
"-, c #565BAA",
";, c #5258AC",
">, c #5358B0",
",, c #5359B3",
"', c #565CB9",
"), c #5B5FC0",
"!, c #7462D5",
"~, c #8063D6",
"{, c #614A76",
"], c #59445B",
"^, c #564155",
"/, c #64556E",
"(, c #B1BAE1",
"_, c #ADB8ED",
":, c #B4C0F3",
"<, c #A1AFF5",
"[, c #ADBAF7",
"}, c #C2CFFB",
"|, c #CBD8FF",
"1, c #B7C5FF",
"2, c #2F326D",
"3, c #2F336F",
"4, c #303471",
"5, c #313571",
"6, c #323672",
"7, c #333774",
"8, c #343976",
"9, c #463E79",
"0, c #4F3F60",
"a, c #504056",
"b, c #50405B",
"c, c #474886",
"d, c #4C4F97",
"e, c #4E53A0",
"f, c #5155A8",
"g, c #565BB1",
"h, c #565CB5",
"i, c #575DB9",
"j, c #5A5FBE",
"k, c #5A60C2",
"l, c #5F62C8",
"m, c #7C65DC",
"n, c #7760C0",
"o, c #594363",
"p, c #88829E",
"q, c #BAC3E6",
"r, c #C6D2F1",
"s, c #B1BFF3",
"t, c #B3C0F4",
"u, c #D1DFF8",
"v, c #DEEDFF",
"w, c #C6D5FF",
"x, c #323670",
"y, c #363870",
"z, c #393A72",
"A, c #4A3C6F",
"B, c #4F3D5F",
"C, c #503E54",
"D, c #513F54",
"E, c #4F4058",
"F, c #46447D",
"G, c #43478B",
"H, c #474C95",
"I, c #4D509D",
"J, c #5254A8",
"K, c #5559B3",
"L, c #5C62BF",
"M, c #5D63C3",
"N, c #5F64C6",
"O, c #6564CA",
"P, c #6C65D2",
"Q, c #7F68DD",
"R, c #685598",
"S, c #56405B",
"T, c #5A495D",
"U, c #B9B9C5",
"V, c #C5CEE4",
"W, c #C2CCEA",
"X, c #B9C4ED",
"Y, c #E0E7F3",
"Z, c #F5FFFF",
"`, c #D9E9FF",
" ' c #383B78",
".' c #453B71",
"+' c #473B6A",
"@' c #4D3C67",
"#' c #4E3D5E",
"$' c #4F3E56",
"%' c #524056",
"&' c #514161",
"*' c #4E4378",
"=' c #4F467F",
"-' c #504882",
";' c #504D91",
">' c #4E52A5",
",' c #5358B4",
"'' c #585DBD",
")' c #6562B9",
"!' c #675AAC",
"~' c #6A5AAD",
"{' c #6A57A3",
"]' c #5B4767",
"^' c #6C5A6B",
"/' c #A6A4AF",
"(' c #AAA6B2",
"_' c #A8A9C6",
":' c #E1E2E8",
"<' c #FFFFFF",
"[' c #EEFFFF",
"}' c #3D417B",
"|' c #3D417C",
"1' c #3F3F7E",
"2' c #504089",
"3' c #564065",
"4' c #584062",
"5' c #584060",
"6' c #58405F",
"7' c #57405F",
"8' c #584061",
"9' c #574061",
"0' c #574063",
"a' c #574066",
"b' c #564165",
"c' c #564161",
"d' c #514164",
"e' c #494FA0",
"f' c #4B51AF",
"g' c #5057B9",
"h' c #5E5AC1",
"i' c #635292",
"j' c #5B4670",
"k' c #5B4770",
"l' c #5B476E",
"m' c #5B4766",
"n' c #5A4561",
"o' c #594560",
"p' c #59445F",
"q' c #584460",
"r' c #58445E",
"s' c #59455F",
"t' c #5A485F",
"u' c #5C485E",
"v' c #5B475E",
"w' c #5A465D",
"x' c #59465C",
"y' c #5A455B",
"z' c #59465A",
"A' c #5A4759",
"B' c #614E60",
"C' c #685868",
"D' c #706272",
"E' c #817284",
"F' c #E2E0E5",
"G' c #3E427E",
"H' c #424281",
"I' c #7447A8",
"J' c #6B4893",
"K' c #69478E",
"L' c #6A488F",
"M' c #6A4A90",
"N' c #69498F",
"O' c #684A91",
"P' c #674A91",
"Q' c #674B92",
"R' c #664A92",
"S' c #664B95",
"T' c #654995",
"U' c #644998",
"V' c #624A97",
"W' c #524D94",
"X' c #4A50A3",
"Y' c #4C52AF",
"Z' c #4F55B8",
"`' c #6156C7",
" ) c #6855BA",
".) c #6453AB",
"+) c #6654AE",
"@) c #6858B0",
"#) c #6C5FAE",
"$) c #7066AE",
"%) c #6D65AC",
"&) c #6B64AD",
"*) c #6A63A9",
"=) c #6C65A8",
"-) c #6E6AA8",
";) c #7675A8",
">) c #8381A8",
",) c #8280A7",
"') c #8580A7",
")) c #8882A9",
"!) c #8A8BA7",
"~) c #9595A7",
"{) c #A29FA9",
"]) c #AAA2AA",
"^) c #AAA3AA",
"/) c #AEA6AE",
"() c #C3BEC4",
"_) c #E3E5E6",
":) c #3B3E79",
"<) c #3C407C",
"[) c #404280",
"}) c #51448F",
"|) c #564592",
"1) c #564693",
"2) c #584796",
"3) c #58489A",
"4) c #59499C",
"5) c #5B4B9E",
"6) c #5E4EA1",
"7) c #5D4EA3",
"8) c #5C4CA4",
"9) c #5C4DA7",
"0) c #5C4CA9",
"a) c #5B4DAC",
"b) c #584EAB",
"c) c #514FA5",
"d) c #4F51AA",
"e) c #4F54B2",
"f) c #5056BA",
"g) c #5A57BF",
"h) c #5F58C0",
"i) c #6159C3",
"j) c #625CC5",
"k) c #655FCD",
"l) c #6865D1",
"m) c #6C6AD7",
"n) c #6F6FD9",
"o) c #757AD8",
"p) c #7B81D7",
"q) c #7B82D3",
"r) c #7F84D3",
"s) c #8891D8",
"t) c #939ED8",
"u) c #A6B1D7",
"v) c #BBC3D6",
"w) c #AFB5D8",
"x) c #B4B8DB",
"y) c #C5CEDA",
"z) c #D7D8DB",
"A) c #D9D9DB",
"B) c #DDDCDD",
"C) c #E0DFE0",
"D) c #E6E6E6",
"E) c #EEEEEE",
"F) c #3A3D78",
"G) c #3A3E7A",
"H) c #3C407E",
"I) c #414384",
"J) c #434488",
"K) c #44458B",
"L) c #46478F",
"M) c #484993",
"N) c #4A4A97",
"O) c #4C4C9B",
"P) c #4F4C9F",
"Q) c #514DA3",
"R) c #544DA5",
"S) c #564EA8",
"T) c #564FAB",
"U) c #5450AC",
"V) c #5251AD",
"W) c #5153B0",
"X) c #5255B5",
"Y) c #5558BC",
"Z) c #595AC1",
"`) c #5D5CC5",
" ! c #5D5EC9",
".! c #5F62CE",
"+! c #6166D2",
"@! c #666BD7",
"#! c #6A70DB",
"$! c #7076DD",
"%! c #767DDD",
"&! c #7C84DE",
"*! c #838CDD",
"=! c #8F9ADE",
"-! c #94A0DF",
";! c #A0ABE0",
">! c #AEBADF",
",! c #BDC9E0",
"'! c #D0D7E2",
")! c #D7DDE4",
"!! c #D8DCE5",
"~! c #E5E6E6",
"{! c #E9E9E9",
"]! c #ECECEC",
"^! c #F0F0F0",
"/! c #F6F6F6",
"(! c #3C407D",
"_! c #3D4180",
":! c #3E4182",
"<! c #3F4285",
"[! c #414489",
"}! c #43458C",
"|! c #454690",
"1! c #474894",
"2! c #494998",
"3! c #4B4B9C",
"4! c #4E4CA0",
"5! c #504DA3",
"6! c #514EA6",
"7! c #524FAA",
"8! c #5253B0",
"9! c #5355B4",
"0! c #5457B9",
"a! c #575ABE",
"b! c #5B5DC4",
"c! c #5E60CA",
"d! c #6163CF",
"e! c #6467D4",
"f! c #676CD9",
"g! c #6B71DD",
"h! c #7077E0",
"i! c #727BE2",
"j! c #7781E3",
"k! c #7F89E4",
"l! c #8792E5",
"m! c #919CE5",
"n! c #9BA7E6",
"o! c #A7B4E6",
"p! c #B6C3E7",
"q! c #C4CEE7",
"r! c #D2DBE9",
"s! c #DFE3EA",
"t! c #E3E6EB",
"u! c #E8E9ED",
"v! c #ECEDEE",
"w! c #EFF0F0",
"x! c #F2F2F2",
"y! c #F5F5F6",
"z! c #FAFAFA",
"A! c #3E427D",
"B! c #404380",
"C! c #3C407F",
"D! c #3D4184",
"E! c #3F4287",
"F! c #41438B",
"G! c #43458F",
"H! c #454693",
"I! c #474897",
"J! c #49499A",
"K! c #4B4B9E",
"L! c #4D4DA2",
"M! c #4F4EA6",
"N! c #5050AA",
"O! c #5152AE",
"P! c #5355B2",
"Q! c #5457B7",
"R! c #575ABC",
"S! c #5A5DC2",
"T! c #5D60C9",
"U! c #6164CF",
"V! c #6568D5",
"W! c #696DDB",
"X! c #6D72E0",
"Y! c #7278E3",
"Z! c #777FE7",
"`! c #7C85E8",
" ~ c #828CE9",
".~ c #8993EA",
"+~ c #8D98EB",
"@~ c #94A0EB",
"#~ c #9FABEC",
"$~ c #ACB9EC",
"%~ c #BCC8ED",
"&~ c #CAD4ED",
"*~ c #D8DFEF",
"=~ c #E1E6EF",
"-~ c #E8EBF0",
";~ c #EDEEF1",
">~ c #F0F1F3",
",~ c #F3F3F4",
"'~ c #F8F8F8",
")~ c #FBFBFB",
"!~ c #414580",
"~~ c #434783",
"{~ c #3B3F7E",
"]~ c #3B3F80",
"^~ c #3E4186",
"/~ c #40428A",
"(~ c #42448E",
"_~ c #444692",
":~ c #464896",
"<~ c #484999",
"[~ c #4A4B9D",
"}~ c #4C4DA2",
"|~ c #4E4FA6",
"1~ c #5154AF",
"2~ c #5357B4",
"3~ c #565ABA",
"4~ c #595DC0",
"5~ c #5C61C7",
"6~ c #6064CE",
"7~ c #6469D5",
"8~ c #696EDC",
"9~ c #6E73E2",
"0~ c #7379E7",
"a~ c #7880EB",
"b~ c #7F87EE",
"c~ c #868FEF",
"d~ c #8D97F0",
"e~ c #949FF1",
"f~ c #9CA7F1",
"g~ c #A6B1F2",
"h~ c #B1BDF2",
"i~ c #BBC8F2",
"j~ c #C2CEF3",
"k~ c #D1DCF3",
"l~ c #DFE7F4",
"m~ c #E8ECF4",
"n~ c #EEF0F5",
"o~ c #F2F3F6",
"p~ c #F4F5F7",
"q~ c #F7F7F8",
"r~ c #F9F9F9",
"s~ c #FAFAFB",
"t~ c #FCFCFD",
"u~ c #3A3E7C",
"v~ c #393D7D",
"w~ c #3B3F82",
"x~ c #3D4085",
"y~ c #3F4289",
"z~ c #41448D",
"A~ c #434691",
"B~ c #454895",
"C~ c #474A99",
"D~ c #494C9D",
"E~ c #4B4FA2",
"F~ c #4D51A6",
"G~ c #5053AB",
"H~ c #5256B1",
"I~ c #5559B7",
"J~ c #5B61C4",
"K~ c #5F65CB",
"L~ c #6369D3",
"M~ c #686EDC",
"N~ c #6D73E4",
"O~ c #7379EC",
"P~ c #7980F1",
"Q~ c #7F87F4",
"R~ c #8790F6",
"S~ c #8F99F6",
"T~ c #99A3F7",
"U~ c #A2ADF7",
"V~ c #AAB5F8",
"W~ c #B6C2F8",
"X~ c #C4D0F8",
"Y~ c #D0DCF8",
"Z~ c #DCE5F8",
"`~ c #E6ECF9",
" { c #EDF1F9",
".{ c #F2F5F9",
"+{ c #F5F7F9",
"@{ c #F8F9FA",
"#{ c #F9FAFA",
"${ c #FAFBFB",
"%{ c #FCFCFC",
"&{ c #FDFDFD",
"*{ c #FEFEFE",
"={ c #363A78",
"-{ c #3E4288",
";{ c #40458C",
">{ c #444994",
",{ c #464B99",
"'{ c #4B50A2",
"){ c #4E53A7",
"!{ c #5056AD",
"~{ c #5459B3",
"{{ c #5A60C1",
"]{ c #5E65C8",
"^{ c #6269D0",
"/{ c #686FDA",
"({ c #6C73E3",
"_{ c #7279ED",
":{ c #7880F9",
"<{ c #7F87FF",
"[{ c #8F98FF",
"}{ c #9AA3FF",
"|{ c #A4AEFF",
"1{ c #B2BCFF",
"2{ c #C0CCFF",
"3{ c #CCD8FF",
"4{ c #D9E6FF",
"5{ c #E7F4FF",
"6{ c #F7FFFF",
"7{ c #303472",
"8{ c #313575",
"9{ c #323677",
"0{ c #35397D",
"a{ c #363A80",
"b{ c #383D84",
"c{ c #393E87",
"d{ c #3B408B",
"e{ c #3C418F",
"f{ c #3E4393",
"g{ c #404597",
"h{ c #43489D",
"i{ c #444AA1",
"j{ c #474DA6",
"k{ c #484EAB",
"l{ c #4B52B2",
"m{ c #4E55B8",
"n{ c #5158BF",
"o{ c #545BC6",
"p{ c #575ECE",
"q{ c #5B62D7",
"r{ c #5F67E0",
"s{ c #646CEB",
"t{ c #6971F6",
"u{ c #6D76FF",
"v{ c #747DFF",
"w{ c #7A84FF",
"x{ c #818BFF",
"y{ c #8A95FF",
"z{ c #929EFF",
"A{ c #9DAAFF",
"B{ c #A9B7FF",
"C{ c #B7C6FF",
"D{ c #C8D8FF",
"E{ c #DCEEFF",
"F{ c #F4FFFF",
". . + @ # $ % & * * * = - ; > , ' ) ! ! ~ { ] ^ / ( _ : < [ } | 1 2 3 4 5 6 7 8 9 0 a b c d e f ",
"g h i j j k % l = m n o p q r s t u v { w x y z A B _ C D E F G H I J K L M 8 N N N O P Q R S T ",
"U V # W W k X Y Z ` = - .q r ..+. at .#.$.] %.&.: *.=.-.;.>.,.'.).!.~.{.].^./.(._.O :.<.[.}.|.1.2.",
"3.4.$ k k k 5.6.Y Z ` 7.- q r 8.9.0.a.b.c.z d.d.e.;.F f.g.h.i.j.k.l.m.n.o.p.1.[.:.q.r.s.t.u.u.v.",
"w.x.X X X X X 6.Y Z ` = y.p > z.A.B.C.b.D.E.F.G.H.I.J.,.K.K.L.M.N.L O.P.Q.R.S.T.q.U.V.W.X.Y.Z.`.",
"$ % % % + + +% .+++ at +#+$+%+&+*+, =+-+;+>+,+'+)+!+~+{+]+^+/+(+_+:+<+[+!.}+j.|+1+2+3+4+5+6+7+7+8+",
"W % .+9+0+a+b+c+d+e+f+g+h+i+j+k+l+m+n+o+p+q+r+s+t+u+v+w+x+y+z+A+B+C+B.B.D+E+F+G+H+I+J+K+L+M+N+O+",
"W 6.P+Q+R+S+T+U+V+W+X+Y+Z+`+ @. at +@@@#@$@%@&@*@=@-@;@>@,@'@)@!@~@{@]@^@/@(@_@:@<@[@}@|@1 at 2@3 at 4@5@",
"6 at 7@8 at 9@0 at a@b at c@d at e@e at f@g at g@h at i@j at k@l at m@n at o@p at q@r at s@t at u@v at w@x at y@z at A@B at C@C at D@E at F@G at H@I at J@K at L@M at N@",
"6 at O@P at Q@R at S@T at U@V at W@X at Y@Z at Z@j@`@ #.#+#+#@#@###$#%#&#*#=#-#;#>#,#'#)#n@!#!#~#{#]#^#/#(#_#:#<#[#}#",
"O at 7@|#1#2#3#4#5#6#7#8#`@`@`@k@ #.#+#@#@#@#@#@#9#0#a#b#c#d#e#f#g#h#i#p at m@j#k#l#m#n#o#p#q#r#s#t#u#",
"7 at v#w#x#y#z#A#B#C#D#E#8#`@`@k@ #.#+#@#@#@#+#@#o at F#G#H#I#J#K#L#M#N#O#P#Q#R#S#T#U#V#W#X#Y#Z#`# $.$",
"v#+$@$#$$$%$&$*$=$-$;$>$ # # # #.#+#@#@#@#+#+#+#,$'$)$!$~${$]$^$/$($_$:$<$[$}$|$`#1$2$2$3$4$5$6$",
"7$x##$8$9$0$a$b$c$d$e$E#f$ # # #.#+#@#@#@#+#+#+#o at g$h$i$j$k$l$m$n$o$p$q$r$s$t$u$5$v$w$x$y$z$A$B$",
"C$$$$$9$D$0$E$F$G$H$I$J$K$f$ # #.#+#@#@#@#+#+#+#+#L$M$N$O$P$Q$R$o$S$T$U$V$W$X$Y$Z$`$ %.%+%@%#%$%",
"%%&%*%=%0$-%E$;%>%,%'%)%!%.#.#.#.#+#@#@#@#+#+#+#+#@#~%{%]%^%/%(%_%:%<%[%}%Y$|%1%2%3%4%5%6%7%8%9%",
"0%a%b%c%a$d%e%f%g%h%i%j%k%@#@#.#+#+#@#@#@#+#+#+#@#@###l%m%n%o%p%q%r%s%t%u%v%w%x%y%z%A%B%C%D%E%F%",
"G%u B.H%I%J%f%K%g%L%M%N%O%P%Q%@#@#@#@#@#@#@#@#@#Q%R%@#p at S%T%U%V%W%+%X%Y%Z%`% &.&+&@&#&$&$&%&&&*&",
"! =&-&;&>&,&'&)&[+!.!&~&{&]&^&@#@#@#@#@#@#@#@#Q%/&(&_&@#@#P#:&<&[&}&|&1&2&3&4&5&6&7&8&9&9&0&a&b&",
"u >+b.c&d&e&f&g&h&L i&j&k&l&m&@#@#@#@#@#@#@#@#n&o&p&q&@#@#~%r&s&t&u&v&w&x&y&z&A&B&C&D&E&F&G&H&I&",
"J&K&L&c.M&N&O&P&Q&h.R&S&T&U&V&@#@#@#W&X&@#@#Y&Z&`& *_&@#@###.*+*@*#*$*%*&***=*-*;*>*,*'*'*)*!*~*",
";&#.d&d.{*]*^*/*(*_*:*<*[*}*|*1*@#@#2*3*@#@#4*5*6* *Q%@#@#@#7*8*9*0*a*b*c*d*e*f*g*h*i*j*k*k*k*l*",
">&/ _ C D m*n*[*o*p*q*[*[*r*s*t*##Q%u*v*W&@#u*$*#*w*Q%@#@#@#@#x*y*z*0*A*B*C*D*E*F*G*H*I*J*J*K*L*",
"M*N*O**.P*Q*R*S*$*T*[*S*S*U*V*W*X*m&Y*$*Z*`*[*$*$*u*@#@#@#@#@#@# =.=S*+=/*@=#=$=%=&=*===-=;=;=>=",
",='=)=;.!=~=[*{=S*]=$*0*0*A*^=/=(=_=`&[*#*5*[*$*[*u*@#@#@#@#@#@#@#:=<=[=}=|=1=2=3=4=5=6=7=8=9=0=",
"( a=)=b=c=d=$*e=f=$*$*g=h=i=j=k=l=m=n=o=#*p=q=o=#*r=Q%@#@#@#@#@#@#s=t=u=z*v=w=x=y=z=A=B=C=D=E=F=",
"_ _ -.G=H=I=J=K=L=S*M=N=O=P=Q=R=S=T=U=V=W=X=Y=Z=b*`=Q%@#@#@#@#@#@#@# -.-+- at -#-$-%-&-*-=---;->-,-",
"&.[ >.'-)-!-~-{-]-^-/-(-_-:-<-[-}-|-1-2-3-w*4-5-w&6-q&@#@#@#@#@#@#@###7-R*8-9-0-a-b-c-d-e-f-g-h-",
"i-j-k-l-m-n-o-p-q-r-s-t-u-v-w-x-y-z-A-B-C-D-Q%E-F-G-q&@#@#@#@#@#@#@#H-I-J- at -K-L-M-N-O-P-Q-R-S-T-",
"U-V-W-X-Y-Z-`- ;.;+;@;#;$;%;&;*;=;-;;;>;,;';@#);!;~;{;@#@#@#@#@#W&o=];[*^;/;(;_;:;<;[;};|;1;2;3;",
"4;!=7 5;6;7;7;8;9;0;a;b;c;d;e;f;g;h;i;j;k;l;m;n&n;o;{;@#@#@#@#p;q;r;s;4*t;u;v;w;w;x;y;z;A;B;C;D;",
"E;F;G;H;I;J;K;L;M;N;O;P;Q;R;S;T;U;V;W;X;Y;Z;`; >.>2*+>@#@#W&@>#>H-@#@#@#@#$>%>&>*>=>->;>>>,>'>)>",
"!>~>{>]>^>[./>(>_>:><>[>}>|>1>2>3>4>5>6>7>8>9>0>a>b>c>Q%V=d>e>Q%@#@#@#@#@#@#f>g>h>i>j>k>l>m>n>o>",
"p>!.q>r>R.s>t>u>v>w>x>y>z>A>B>C>D>+%E>F>G>H>I>J>K>L>M>N>O>Y&@#@#@#@#@#@#@#@#P>Q>R>S>T>U>V>W>X>Y>",
"Z>5 `> ,p..,+,@,Z.:.#,$,%,&,*,=,-,;,>,,,',),!,~,{,],n&Y&@#@#@#@#@#@#@#@#@#@#^,/,(,_,:,<,[,},|,1,",
"[+2,3,4,5,6,7,8,(.9,0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,##@#@#@#@#@#@#@#@#@#@#@#@#t;p,q,r,s,t,u,v,w,",
"x,e 6,6,f =.y,z,A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,@#@#@#@#@#@#@#@#@#@#@#@#@#T,U,V,W,X,Y,Z,`,",
"]+b ']+.'+'@'#'$'l at n@m@%'&'*'='-';'>','''N,)'!'~'{']'@#@#@#@#@#@#@#@#@#@#@#@#@#Q%^'/'('_':'<'['",
"}'|'1'2'3'4'5'6'7'7'8'5'9'0'a'b'c'd'e'f'g'h'i'j'k'l'm'n'o'p'q'r's't'u'v'w'x'y'z'A'B'C'D'E'F'<'<'",
"8 G'H'I'J'K'L'M'N'O'P'Q'R'S'T'U'V'W'X'Y'Z'`' ).)+)@)#)$)%)&)*)=)-);)>),)')))!)~){)])^)/)()_)<'<'",
":)<)[)})|)1)2)3)4)5)6)7)8)9)0)a)b)c)d)e)f)g)h)i)j)k)l)m)n)o)p)q)r)s)t)u)v)w)x)y)z)A)B)C)D)E)<'<'",
"F)G)H)K;I)J)K)L)M)N)O)P)Q)R)S)T)U)V)W)X)Y)Z)`) !.!+!@!#!$!%!&!*!=!-!;!>!,!'!)!!!~!{!{!]!^!/!<'<'",
"8 (!H)_!:!<![!}!|!1!2!3!4!5!6!7!V)8!9!0!a!b!c!d!e!f!g!h!i!j!k!l!m!n!o!p!q!r!s!t!u!v!w!x!y!z!<'<'",
"A!B!`-C!.;D!E!F!G!H!I!J!K!L!M!N!O!P!Q!R!S!T!U!V!W!X!Y!Z!`! ~.~+~@~#~$~%~&~*~=~-~;~>~,~/!'~)~<'<'",
"!~~~H){~]~+;^~/~(~_~:~<~[~}~|~d)1~2~3~4~5~6~7~8~9~0~a~b~c~d~e~f~g~h~i~j~k~l~m~n~o~p~q~r~s~t~<'<'",
"a <)u~v~X.w~x~y~z~A~B~C~D~E~F~G~H~I~''J~K~L~M~N~O~P~Q~R~S~T~U~V~W~X~Y~Z~`~ {.{+{@{#{${%{&{*{<'<'",
"M S ={u.Y.w~M+-{;{<#>{,{3$'{){!{~{',{{]{^{/{({_{:{<{S-[{}{|{1{2{3{4{5{6{<'<'<'<'<'<'<'<'<'<'<'<'",
"L 3,7{8{9{@,0{a{b{c{d{e{f{g{h{i{j{k{l{m{n{o{p{q{r{s{t{u{v{w{x{y{z{A{B{C{D{E{F{<'<'<'<'<'<'<'<'<'"};
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xmms/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 4 Apr 2005 17:56:36 -0000 1.1
+++ .cvsignore 4 Apr 2005 17:59:12 -0000 1.2
@@ -0,0 +1,3 @@
+arts_output-0.6.0.tar.gz
+xmms-1.2.10.patched.tar.bz2
+xmmsskins-1.0.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xmms/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 4 Apr 2005 17:56:36 -0000 1.1
+++ sources 4 Apr 2005 17:59:12 -0000 1.2
@@ -0,0 +1,3 @@
+6539123bd1dbebcf57073392da13d992 arts_output-0.6.0.tar.gz
+16414f1c15f0b87c3ee6362a7dcf4e7e xmms-1.2.10.patched.tar.bz2
+f625e06f82d8132209ed947c6d8502a4 xmmsskins-1.0.tar.gz
More information about the fedora-extras-commits
mailing list