Packman Build Service PMBS

Changes of Revision 36

audacious-plugins.changes Changed

audacious-plugins.spec Changed

@@ -1,37 +1,37 @@
-# norootforbuild
+# vim: set ts=4 sw=4 et:
 
 %define		grp		Productivity/Multimedia/Sound/Players
 
-Name:		audacious-plugins
-Version:	3.0.3
-Release:	1
+Name: audacious-plugins
+Version: 3.1
+Release: 1
 
-Summary:	Plugins for Audacious
-License:	GNU General Public License (GPL)
-Group:		%{grp}
-URL:		http://audacious-media-player.org/
+Summary: Plugins for Audacious
+License: GNU General Public License (GPL)
+Group: %{grp}
+URL: http://audacious-media-player.org/
 
-Source0:	http://distfiles.atheme.org/%{name}-%{version}.tar.bz2
+Source0: http://distfiles.atheme.org/%{name}-%{version}.tar.bz2
 
-BuildRoot:	%{_tmppath}/%{name}-%{version}-build
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
 
-BuildRequires:	audacious-devel = %{version}
-BuildRequires:	bluez-devel bs2b-devel esound-devel flac-devel gtkglext-devel
-BuildRequires:	libbinio-devel libcddb-devel libcdio-devel libcue-devel
-BuildRequires:	libcurl-devel libfaad-devel libffmpeg_oldabi-devel
-BuildRequires:	libfluidsynth-devel libmad-devel libmms-devel libmodplug-devel
-BuildRequires:	libmp3lame-devel libmpcdec-devel libmtp-devel libnotify-devel
-BuildRequires:	libprojectM-devel libshout-devel libsmbclient-devel libusb-devel
-BuildRequires:	wavpack-devel neon-devel SDL-devel libsndfile-devel libtag-devel
-BuildRequires:	update-desktop-files libmpg123-devel
+BuildRequires: audacious-devel = %{version}
+BuildRequires: bluez-devel bs2b-devel esound-devel flac-devel gtkglext-devel
+BuildRequires: libbinio-devel libcddb-devel libcdio-devel libcue-devel
+BuildRequires: libcurl-devel libfaad-devel libffmpeg_oldabi-devel
+BuildRequires: libfluidsynth-devel libmad-devel libmms-devel libmodplug-devel
+BuildRequires: libmp3lame-devel libmpcdec-devel libmtp-devel libnotify-devel
+BuildRequires: libprojectM-devel libshout-devel libsmbclient-devel libusb-devel
+BuildRequires: wavpack-devel neon-devel SDL-devel libsndfile-devel libtag-devel
+BuildRequires: update-desktop-files libmpg123-devel
 
 %if %suse_version >= 1120
-BuildRequires:	libpulse-devel
+BuildRequires: libpulse-devel
 %endif
 %if %suse_version >= 1110
-BuildRequires:	sidplay-libs-devel
+BuildRequires: sidplay-libs-devel
 %else
-BuildRequires:	libsidplay-devel
+BuildRequires: libsidplay-devel
 %endif
 
 %description
@@ -39,73 +39,64 @@
 The plugins contained in this package only have minimal dependencies
 on other packages (beyond what is required for Audacious).
 
-
 %if %suse_version >= 1120
 %package output-pulse
-Summary:	Pulseaudio Sound Daemon output support for Audacious
-Group:		%{grp}
+Summary: Pulseaudio Sound Daemon output support for Audacious
+Group: %{grp}
 
 %description output-pulse
 Pulseaudio support plugins for Audacious.
 %endif
 
-
 %package input-adplug
-Summary:	AdPlug input support for Audacious
-Group:		%{grp}
+Summary: AdPlug input support for Audacious
+Group: %{grp}
 
 %description input-adplug
 AdPlug (AdLib files) support plugins for Audacious.
 
-
 %package input-sid
-Summary:	SID (C64 music) input support for Audacious
-Group:		%{grp}
+Summary: SID (C64 music) input support for Audacious
+Group: %{grp}
 
 %description input-sid
 SID (C64 music files) support plugins for Audacious.
 
-
 %package input-fluidsynth
-Summary:	Fluidsynth input support for Audacious
-Group:		%{grp}
+Summary: Fluidsynth input support for Audacious
+Group: %{grp}
 
 %description input-fluidsynth
 Fluidsynth MIDI support plugins for Audacious.
 
-
 %package transport-mms
-Summary:	MMS protocol transport support for Audacious
-Group:		%{grp}
+Summary: MMS protocol transport support for Audacious
+Group: %{grp}
 
 %description transport-mms
 MMS (Microsoft Media Streaming) protocol transport support for Audacious.
 
-
 %package transport-http
-Summary:	HTTP and WebDAV protocol transport support for Audacious
-Group:		%{grp}
+Summary: HTTP and WebDAV protocol transport support for Audacious
+Group: %{grp}
 
 %description transport-http
 HTTP and WebDAV protocol transport support for Audacious, using the
 neon library.
 
-
 %package transport-smb
-Summary:	SMB protocol transport support for Audacious
-Group:		%{grp}
+Summary: SMB protocol transport support for Audacious
+Group: %{grp}
 
 %description transport-smb
 SMB protocol transport support for Audacious, using the smbclient library.
 
-
 %prep
-%setup -q -n %{name}-%{version}
-
+%setup -q
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
-export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
+export CXXFLAGS="$CFLAGS"
 
 %__sed -i -e "s|_mm_setzero_pd|ssegehtnichtaufathlonxp|g" configure
 
@@ -114,6 +105,10 @@
 --enable-debug \
 --disable-filewriter_vorbis \
 --enable-amidiplug \
+ --enable-smb \
+ --enable-ipv6 \
+ --enable-openal \
+ --enable-waveout \
 %if %suse_version <= 1110
 --disable-pulse \
 %endif
@@ -122,17 +117,14 @@
 %endif
 
 export SUSE_ASNEEDED=0
-%__make %{?jobs:-j%{jobs}}
-
+%__make %{?_smp_mflags}
 
 %install
 %makeinstall
 %find_lang %{name}
 
-
 %clean
-[ -d %{buildroot} -a -n "%{buildroot}" ] && %__rm -rf "%{buildroot}"
-
+%{?buildroot:%__rm -rf "%{buildroot}"}
 
 %files -f "%{name}.lang"
 %defattr(-,root,root)
@@ -149,12 +141,15 @@
 %{_libdir}/audacious/Effect/crystalizer.so
 %{_libdir}/audacious/Effect/bs2b.so
 %{_libdir}/audacious/Effect/echo.so
-%{_libdir}/audacious/Effect/mixdown.so
+# %{_libdir}/audacious/Effect/mixdown.so
 %{_libdir}/audacious/Effect/resample.so
 %{_libdir}/audacious/Effect/sndstretch.so
 %{_libdir}/audacious/Effect/stereo.so
 %{_libdir}/audacious/Effect/voice_removal.so
+%{_libdir}/audacious/Effect/ladspa.so
+%{_libdir}/audacious/Effect/mixer.so
 %dir %{_libdir}/audacious/General
+%{_libdir}/audacious/General/alarm.so
 %{_libdir}/audacious/General/albumart.so
 %{_libdir}/audacious/General/aosd.so
 %{_libdir}/audacious/General/cd-menu-items.so
@@ -189,18 +184,19 @@
 %{_libdir}/audacious/Input/psf2.so
 %{_libdir}/audacious/Input/xsf.so
 %dir %{_libdir}/audacious/Output
-%{_libdir}/audacious/Output/OSS.so
+# %{_libdir}/audacious/Output/OSS.so
 %{_libdir}/audacious/Output/alsa.so
 %{_libdir}/audacious/Output/filewriter.so
 %{_libdir}/audacious/Output/null.so
 %{_libdir}/audacious/Output/sdlout.so
+%{_libdir}/audacious/Output/jackout.so
 %dir %{_libdir}/audacious/Transport
 %{_libdir}/audacious/Transport/unix-io.so
 %dir %{_libdir}/audacious/Visualization
 %{_libdir}/audacious/Visualization/cairo-spectrum.so
 %{_libdir}/audacious/Visualization/blur_scope.so
-%{_libdir}/audacious/Visualization/moodbar.so
-%{_libdir}/audacious/Visualization/rocklight.so
+# %{_libdir}/audacious/Visualization/moodbar.so
+# %{_libdir}/audacious/Visualization/rocklight.so
 %dir %{_datadir}/audacious/
 %dir %{_datadir}/audacious/Skins
 %dir %{_datadir}/audacious/Skins/Classic
@@ -254,5 +250,4 @@
 %dir %{_libdir}/audacious/Transport
 %{_libdir}/audacious/Transport/smb.so
 
-
 %changelog

audacious-plugins-3.0.3.tar.bz2/src/daemon Deleted

audacious-plugins-3.0.3.tar.bz2/src/daemon/Makefile Deleted

audacious-plugins-3.0.3.tar.bz2/src/daemon/daemon.c Deleted

@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 2010 William Pitcock <nenolod@dereferenced.org>.
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice is present in all copies.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <glib/gi18n.h>
-#include <audacious/plugin.h>
-#include <audacious/interface.h>
-
-static gboolean daemon_initialize(InterfaceCbs * cbs)
-{
-	gint i;
-
-#if 0
-	i = fork();
-	if (i < 0)
-	{
-		g_print("cannot fork into background.\n");
-		return FALSE;
-	}
-	else if (i > 0)
-	{
-		g_print("forked as pid %d\n", i);
-		exit(EXIT_FAILURE);
-	}
-
-	if (setsid() < 0)
-	{
-		g_print("unable to create new session: %s\n", strerror(errno));
-		return FALSE;
-	}
-#endif
-
-	return TRUE;
-}
-
-static gboolean daemon_finalize(void)
-{
-	return TRUE;
-}
-
-Interface daemon_interface = {
- .id = "daemon",
- .desc = N_("Daemon Interface (like old headless mode)"),
- .init = daemon_initialize,
- .fini = daemon_finalize,
-};
-
-SIMPLE_INTERFACE_PLUGIN(daemon, &daemon_interface);

audacious-plugins-3.0.3.tar.bz2/src/gtkui/gtkui_cfg.c Deleted

@@ -1,165 +0,0 @@
-/* Audacious - Cross-platform multimedia player
- * Copyright (C) 2005-2009 Audacious development team
- *
- * 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; under version 3 of the License.
- *
- * 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>.
- *
- * The Audacious team does not consider modular code linking to
- * Audacious or using our public API to be a derived work.
- */
-
-#include <audacious/configdb.h>
-#include <audacious/plugin.h>
-
-#include "gtkui_cfg.h"
-
-gtkui_cfg_t config;
-
-gtkui_cfg_t gtkui_default_config = {
- .player_x = MAINWIN_DEFAULT_POS_X,
- .player_y = MAINWIN_DEFAULT_POS_Y,
- .player_width = MAINWIN_DEFAULT_WIDTH,
- .player_height = MAINWIN_DEFAULT_HEIGHT,
- .save_window_position = TRUE,
- .player_visible = TRUE,
- .infoarea_visible = TRUE,
- .menu_visible = TRUE,
- .statusbar_visible = TRUE,
- .show_song_titles = TRUE,
- .playlist_columns = NULL,
- .playlist_headers = TRUE,
- .custom_playlist_colors = FALSE,
- .playlist_fg = NULL,
- .playlist_bg = NULL,
- .playlist_font = NULL,
- .autoscroll = TRUE,
-};
-
-typedef struct gtkui_cfg_boolent_t
-{
- gchar const *be_vname;
- gboolean *be_vloc;
- gboolean be_wrt;
-} gtkui_cfg_boolent;
-
-static gtkui_cfg_boolent gtkui_boolents[] = {
- {"save_window_position", &config.save_window_position, TRUE},
- {"player_visible", &config.player_visible, TRUE},
- {"infoarea_visible", &config.infoarea_visible, TRUE},
- {"menu_visible", &config.menu_visible, TRUE},
- {"statusbar_visible", &config.statusbar_visible, TRUE},
- {"show_song_titles", &config.show_song_titles, TRUE},
- {"playlist_headers", &config.playlist_headers, TRUE},
- {"custom_playlist_colors", &config.custom_playlist_colors, TRUE},
- {"always_on_top", &config.always_on_top, TRUE},
- {"autoscroll", &config.autoscroll, TRUE},
-};
-
-static gint ncfgbent = G_N_ELEMENTS(gtkui_boolents);
-
-typedef struct gtkui_cfg_nument_t
-{
- gchar const *ie_vname;
- gint *ie_vloc;
- gboolean ie_wrt;
-} gtkui_cfg_nument;
-
-static gtkui_cfg_nument gtkui_numents[] = {
- {"player_x", &config.player_x, TRUE},
- {"player_y", &config.player_y, TRUE},
- {"player_width", &config.player_width, TRUE},
- {"player_height", &config.player_height, TRUE},
-};
-
-static gint ncfgient = G_N_ELEMENTS(gtkui_numents);
-
-typedef struct gtkui_cfg_strent_t
-{
- gchar const *se_vname;
- gchar **se_vloc;
- gboolean se_wrt;
-} gtkui_cfg_strent;
-
-static gtkui_cfg_strent gtkui_strents[] = {
- {"playlist_columns", &config.playlist_columns, TRUE},
- {"playlist_bg", &config.playlist_bg, TRUE},
- {"playlist_fg", &config.playlist_fg, TRUE},
- {"playlist_font", &config.playlist_font, TRUE},
-};
-
-static gint ncfgsent = G_N_ELEMENTS(gtkui_strents);
-
-void gtkui_cfg_free()
-{
- gint i;
-
- for (i = 0; i < ncfgsent; ++i)
- {
- if (*(gtkui_strents[i].se_vloc) != NULL)
- {
- g_free(*(gtkui_strents[i].se_vloc));
- *(gtkui_strents[i].se_vloc) = NULL;
- }
- }
-}
-
-void gtkui_cfg_load()
-{
- memcpy(&config, &gtkui_default_config, sizeof(gtkui_cfg_t));
-
- mcs_handle_t *cfgfile = aud_cfg_db_open();
- if (! cfgfile)
- return;
-
- gint i;
-
- for (i = 0; i < ncfgbent; ++i)
- aud_cfg_db_get_bool(cfgfile, "gtkui", gtkui_boolents[i].be_vname, gtkui_boolents[i].be_vloc);
-
- for (i = 0; i < ncfgient; ++i)
- aud_cfg_db_get_int(cfgfile, "gtkui", gtkui_numents[i].ie_vname, gtkui_numents[i].ie_vloc);
-
- for (i = 0; i < ncfgsent; ++i)
- aud_cfg_db_get_string(cfgfile, "gtkui", gtkui_strents[i].se_vname, gtkui_strents[i].se_vloc);
-
- aud_cfg_db_close(cfgfile);
-}
-
-
-void gtkui_cfg_save()
-{
- mcs_handle_t *cfgfile = aud_cfg_db_open();
- if (! cfgfile)
- return;
-
- gint i;
-
- for (i = 0; i < ncfgsent; ++i)
- {
- if (gtkui_strents[i].se_wrt)
- aud_cfg_db_set_string(cfgfile, "gtkui", gtkui_strents[i].se_vname, *gtkui_strents[i].se_vloc);
- }
-
- for (i = 0; i < ncfgbent; ++i)
- {
- if (gtkui_boolents[i].be_wrt)
- aud_cfg_db_set_bool(cfgfile, "gtkui", gtkui_boolents[i].be_vname, *gtkui_boolents[i].be_vloc);
- }
-
- for (i = 0; i < ncfgient; ++i)
- {
- if (gtkui_numents[i].ie_wrt)
- aud_cfg_db_set_int(cfgfile, "gtkui", gtkui_numents[i].ie_vname, *gtkui_numents[i].ie_vloc);
- }
-
- aud_cfg_db_close(cfgfile);
-}

audacious-plugins-3.0.3.tar.bz2/src/gtkui/gtkui_cfg.h Deleted

@@ -1,56 +0,0 @@
-/* Audacious - Cross-platform multimedia player
- * Copyright (C) 2005-2009 Audacious development team
- *
- * 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; under version 3 of the License.
- *
- * 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>.
- *
- * The Audacious team does not consider modular code linking to
- * Audacious or using our public API to be a derived work.
- */
-
-#ifndef UI_CFG_H
-#define UI_CFG_H
-
-#include <glib.h>
-
-#define MAINWIN_DEFAULT_WIDTH 600
-#define MAINWIN_DEFAULT_HEIGHT 400
-#define MAINWIN_DEFAULT_POS_X 100
-#define MAINWIN_DEFAULT_POS_Y 100
-
-typedef struct
-{
- gint player_x, player_y;
- gint player_width, player_height;
- gboolean save_window_position;
- gboolean player_visible;
- gboolean infoarea_visible;
- gboolean menu_visible;
- gboolean statusbar_visible;
- gboolean show_song_titles;
- gchar * playlist_columns;
- gboolean playlist_headers;
- gboolean custom_playlist_colors;
- gchar * playlist_bg;
- gchar * playlist_fg;
- gchar * playlist_font;
- gboolean always_on_top;
- gboolean autoscroll;
-} gtkui_cfg_t;
-
-extern gtkui_cfg_t config;
-
-void gtkui_cfg_free();
-void gtkui_cfg_load();
-void gtkui_cfg_save();
-
-#endif

audacious-plugins-3.0.3.tar.bz2/src/mixdown Deleted

audacious-plugins-3.0.3.tar.bz2/src/mixdown/Makefile Deleted

audacious-plugins-3.0.3.tar.bz2/src/mixdown/mixdown.c Deleted

@@ -1,84 +0,0 @@
-/*
- * Copyright (c) 2011 William Pitcock <nenolod@dereferenced.org>
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice is present in all copies.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-
-#include <gtk/gtk.h>
-
-#include <audacious/configdb.h>
-#include <audacious/i18n.h>
-#include <audacious/plugin.h>
-
-#include <libaudgui/libaudgui.h>
-#include <libaudgui/libaudgui-gtk.h>
-
-static gint in_channel_count = 0;
-
-static void mixdown_start (gint *channels, gint *rate)
-{
-	in_channel_count = *channels;
-	*channels = 1;
-}
-
-static void mixdown_process(gfloat **data, gint *samples)
-{
-	gfloat *x, *y, *end;
-	gfloat avg;
-
-	if (in_channel_count != 2 || *samples == 0)
-		return;
-
-	for (x = y = *data, end = *data + *samples; x < end; x += 2, y++)
-	{
-		avg = (x[0] + x[1]) / 2;
-		*y = avg;
-	}
-
-	*samples /= 2;
-}
-
-static void mixdown_flush(void)
-{
-}
-
-static void mixdown_finish(gfloat **data, gint *samples)
-{
-	mixdown_process(data, samples);
-}
-
-static gint mixdown_decoder_to_output_time (gint time)
-{
-	return time;
-}
-
-static gint mixdown_output_to_decoder_time (gint time)
-{
-	return time;
-}
-
-AUD_EFFECT_PLUGIN
-(
-	.name = "Mixdown",
-	.start = mixdown_start,
-	.process = mixdown_process,
-	.finish = mixdown_finish,
-	.flush = mixdown_flush,
-	.decoder_to_output_time = mixdown_decoder_to_output_time,
-	.output_to_decoder_time = mixdown_output_to_decoder_time,
-)

audacious-plugins-3.0.3.tar.bz2/src/moodbar Deleted

audacious-plugins-3.0.3.tar.bz2/src/moodbar/Makefile Deleted

audacious-plugins-3.0.3.tar.bz2/src/moodbar/draw-compat.h Deleted

@@ -1,49 +0,0 @@
-/*
- * draw-compat.h
- * Copyright 2011 John Lindgren
- *
- * This file is part of Audacious.
- *
- * Audacious 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, version 2 or version 3 of the License.
- *
- * Audacious 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
- * Audacious. If not, see <http://www.gnu.org/licenses/>.
- *
- * The Audacious team does not consider modular code linking to Audacious or
- * using our public API to be a derived work.
- */
-
-#ifndef SKINS_DRAW_COMPAT_H
-#define SKINS_DRAW_COMPAT_H
-
-#include <gdk/gdk.h>
-#include <gtk/gtk.h>
-
-#include <audacious/gtk-compat.h>
-
-#if GTK_CHECK_VERSION (3, 0, 0)
-
-#define DRAW_SIGNAL "draw"
-#define DRAW_FUNC_BEGIN(n) static gboolean n (GtkWidget * wid, cairo_t * cr) { \
- g_return_val_if_fail (wid && cr, FALSE);
-#define DRAW_FUNC_END return TRUE; }
-
-#else
-
-#define DRAW_SIGNAL "expose-event"
-#define DRAW_FUNC_BEGIN(n) static gboolean n (GtkWidget * wid, GdkEventExpose * ev) { \
- g_return_val_if_fail (wid, FALSE); \
- cairo_t * cr = gdk_cairo_create (gtk_widget_get_window (wid)); \
- g_return_val_if_fail (cr, FALSE);
-#define DRAW_FUNC_END cairo_destroy (cr); \
- return TRUE; }
-
-#endif
-
-#endif

audacious-plugins-3.0.3.tar.bz2/src/moodbar/moodbar.c Deleted

@@ -1,244 +0,0 @@
-/*
- * Copyright (c) 2011 William Pitcock <nenolod@dereferenced.org>
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <gtk/gtk.h>
-#include <audacious/plugin.h>
-#include <audacious/playlist.h>
-#include <audacious/drct.h>
-#include <libaudcore/hook.h>
-
-#include "draw-compat.h"
-
-static GdkColor *parse_mood_file(const gchar *filename)
-{
-	gchar *data, *it;
-	gint64 size;
-	GdkColor *ret, *col;
-
-	g_return_val_if_fail(filename != NULL, NULL);
-
-	ret = g_new0(GdkColor, 1000);
-
-	if (! vfs_file_test (filename, G_FILE_TEST_EXISTS))
-		return ret;
-
-	vfs_file_get_contents(filename, (void **) &data, &size);
-	if (! data)
-		return ret;
-
-	for (it = data, col = ret; (it - data) < size; it += 3, col++)
-	{
-		gint16 c = *it;
-		col->red = c * 256;
-
-		c = *(it + 1);
-		col->green = c * 256;
-
-		c = *(it + 2);
-		col->blue = c * 256;
-	}
-
-	g_free(data);
-
-	return ret;
-}
-
-static void render_text (GtkWidget * widget, cairo_t * cr, gint x, gint y, gint
- width, gfloat r, gfloat g, gfloat b, gfloat a, const gchar * font, const
- gchar * text)
-{
-	PangoLayout *pl;
-	PangoFontDescription *desc;
-	gchar *str;
-
-	str = g_markup_escape_text(text, -1);
-
-	cairo_move_to(cr, x, y);
-	cairo_set_operator(cr, CAIRO_OPERATOR_ATOP);
-	cairo_set_source_rgba(cr, r, g, b, a);
-
-	desc = pango_font_description_from_string(font);
-	pl = gtk_widget_create_pango_layout (widget, NULL);
-	pango_layout_set_markup(pl, str, -1);
-	pango_layout_set_font_description(pl, desc);
-	pango_font_description_free(desc);
-	pango_layout_set_width (pl, width * PANGO_SCALE);
-	pango_layout_set_ellipsize (pl, PANGO_ELLIPSIZE_END);
-
-	pango_cairo_show_layout(cr, pl);
-
-	g_object_unref(pl);
-	g_free(str);
-}
-
-static void render_mood (GtkWidget * widget, cairo_t * cr, const gchar * filename)
-{
-	gint i;
-	GdkColor *mbdata;
-	GtkAllocation a;
-
-	gint time = aud_drct_get_time () / 1000;
-	gint length = aud_drct_get_length () / 1000;
-
-	mbdata = parse_mood_file(filename);
-
-	gtk_widget_get_allocation(widget, &a);
-
-	for (i = 0; i < a.width; i++)
-	{
-		gdk_cairo_set_source_color(cr, &mbdata[(i * 1000) / a.width]);
-
-		cairo_move_to(cr, i, 0);
-		cairo_line_to(cr, i, a.height);
-		cairo_stroke(cr);
-	}
-
-	if (mowgli_global_storage_get("gtkui.shbox"))
-	{
-		gchar *buf;
-
-		buf = g_strdup_printf("%d:%02d / %d:%02d",
-				 time / 60, time % 60,
-				 length / 60, length % 60);
-
-		render_text (widget, cr, (a.width / 2) - 20, (a.height / 2) - 10,
-		 a.width, 1.0, 1.0, 1.0, 1.0, "Sans 9", buf);
-
-		g_free(buf);
-	}
-}
-
-DRAW_FUNC_BEGIN (expose_event)
-	gint playlist, pos;
-	gchar *file, *ext;
-	gchar *moodfile;
-
-	playlist = aud_playlist_get_playing();
-	pos = aud_playlist_get_position(playlist);
-	file = aud_playlist_entry_get_filename(playlist, pos);
-	g_return_val_if_fail (file, FALSE);
-
-	ext = strrchr(file, '.');
-	if (ext != NULL)
-		*ext = '\0';
-
-	moodfile = g_strconcat(file, ".mood", NULL);
-
-	render_mood (wid, cr, moodfile);
-
-	g_free(file);
-	g_free(moodfile);
-DRAW_FUNC_END
-
-static gint update_song_timeout_source = 0;
-
-static gboolean time_counter_cb(gpointer userdata)
-{
-	GtkWidget *area = userdata;
-
-	gtk_widget_queue_draw(area);
-
-	return TRUE;
-}
-
-static void playback_begin(gpointer unused, gpointer userdata)
-{
-	GtkWidget *area = userdata;
-
-	gtk_widget_queue_draw(area);
-
-	if (mowgli_global_storage_get("gtkui.shbox"))
-	{
-		GtkWidget *shbox = mowgli_global_storage_get("gtkui.shbox");
-		GtkWidget *slider = mowgli_global_storage_get("gtkui.slider");
-		GtkWidget *label_time = mowgli_global_storage_get("gtkui.label_time");
-
-		gtk_container_remove(GTK_CONTAINER(shbox), g_object_ref(slider));
-		gtk_container_remove(GTK_CONTAINER(shbox), g_object_ref(label_time));
-
-		gtk_box_pack_end(GTK_BOX(shbox), area, TRUE, TRUE, 6);
-
-	 /* update time counter 4 times a second */
-		if (!update_song_timeout_source)
-			update_song_timeout_source = g_timeout_add(250, (GSourceFunc) time_counter_cb, area);
-	}
-}
-
-static void playback_end(gpointer unused, gpointer userdata)
-{
-	GtkWidget *area = userdata;
-
-	if (mowgli_global_storage_get("gtkui.shbox"))
-	{
-		GtkWidget *shbox = mowgli_global_storage_get("gtkui.shbox");
-		GtkWidget *slider = mowgli_global_storage_get("gtkui.slider");
-		GtkWidget *label_time = mowgli_global_storage_get("gtkui.label_time");
-
-		gtk_container_remove(GTK_CONTAINER(shbox), area);
-
-		gtk_container_add(GTK_CONTAINER(shbox), slider);
-		gtk_container_add(GTK_CONTAINER(shbox), label_time);
-
-		g_source_remove(update_song_timeout_source);
-		update_song_timeout_source = 0;
-	}
-}
-
-GtkWidget *area;
-
-extern VisPlugin moodbar_vp;
-
-static gboolean moodbar_init(void)
-{
-	area = gtk_drawing_area_new();
-	g_object_ref (area);
-	gtk_widget_show(area);
-
-	hook_associate("playback begin", (HookFunction) playback_begin, area);
-	hook_associate("playback end", (HookFunction) playback_end, area);
-
-	g_signal_connect(area, DRAW_SIGNAL, (GCallback) expose_event, NULL);
-
-	return TRUE;
-}
-
-static gpointer moodbar_widget(void)
-{
-	if (mowgli_global_storage_get("gtkui.shbox"))
-		return NULL;
-
-	return area;
-}
-
-static void moodbar_done(void)
-{
-	hook_dissociate("playback begin", (HookFunction) playback_begin);
-	hook_dissociate("playback end", (HookFunction) playback_end);
-
-	g_object_unref(area);
-}
-
-AUD_VIS_PLUGIN
-(
-	.name = "Moodbar",
-	.init = moodbar_init,
-	.cleanup = moodbar_done,
-	.get_widget = moodbar_widget,
-)

audacious-plugins-3.0.3.tar.bz2/src/rocklight Deleted

audacious-plugins-3.0.3.tar.bz2/src/rocklight/Makefile Deleted

audacious-plugins-3.0.3.tar.bz2/src/rocklight/b43led.c Deleted

@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2006 Tony Vroon <chainsaw@gentoo.org>
- * Copyright (C) 2007 Michael Hanselmann <audacious@hansmi.ch>
- * Copyright (C) 2009 William Pitcock <nenolod@dereferenced.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 Library 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
- 
-#include <unistd.h>
-#include <stdlib.h>
-
-#include "rocklight.h"
-
-int b43led_set(int fd, int state) {
-	if (state) {
-		return write(fd, "0\n", 2);
-	} else {
-		return write(fd, "255\n", 4);
-	}
-}
-
-int b43led_get(int fd) {
-	char buf[256];
-	int ret = read(fd, &buf, sizeof(buf));
- if(!ret)
- return 0; //dummy
-
-	return (strtol(buf, NULL, 10) == 0);
-}

audacious-plugins-3.0.3.tar.bz2/src/rocklight/rocklight.c Deleted

@@ -1,150 +0,0 @@
-/*
- * Copyright (C) 2004 Benedikt 'Hunz' Heinz <rocklight@hunz.org>
- * Copyright (C) 2006 Tony Vroon <chainsaw@gentoo.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 Library 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-
-#include <audacious/plugin.h>
-#include "rocklight.h"
-
-enum type {
-	NONE = 0,
-	THINKLIGHT,
-	SYSLED,
-	B43LED,
-};
-
-static int fd, last, state;
-static enum type type;
-
-static gboolean rocklight_init (void)
-{
-	type = NONE;
-
-	fd = open("/proc/acpi/ibm/light", O_RDWR);
-	if (fd >= 0) {
-		type = THINKLIGHT;
-		return TRUE;
-	}
-
-	fd = open("/sys/class/leds/pmu-front-led/brightness", O_RDWR);
-	if (fd >= 0) {
-		type = SYSLED;
-		return TRUE;
-	}
-
-	fd = open("/sys/class/leds/smu-front-led/brightness", O_RDWR);
-	if (fd >= 0) {
-		type = SYSLED;
-		return TRUE;
-	}
-
-	fd = open("/sys/class/leds/b43-phy0::tx/brightness", O_RDWR);
-	if (fd >= 0) {
-		type = B43LED;
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-static void rocklight_cleanup(void) {
-	close(fd);
-}
-
-static void rocklight_playback_start(void) {
-	/* Get original value */
-	switch (type) {
-		case THINKLIGHT:
-			last = state = thinklight_get(fd);
-			break;
-
-		case SYSLED:
-			last = state = sysled_get(fd);
-			break;
-
-		case B43LED:
-			last = state = b43led_get(fd);
-			break;
-
-		default:
-			break;
-	}
-}
-
-static void rocklight_playback_stop(void) {
-	if (last == state) return;
-
-	/* Reset to original value */
-	switch (type) {
-		case THINKLIGHT:
-			thinklight_set(fd, state);
-			break;
-
-		case SYSLED:
-			sysled_set(fd, state);
-			break;
-
-		case B43LED:
-			b43led_set(fd, state);
-			break;
-
-		default:
-			break;
-	}
-}
-
-static void rocklight_render_freq(gint16 data[2][256]) {
-	int new = ((data[0][0] + data[1][0]) >> 7) >= 80? 1:0;
-
-	if (new == last) return;
-	last = new;
-
-	switch (type) {
-		case THINKLIGHT:
-			thinklight_set(fd, new);
-			break;
-
-		case SYSLED:
-			sysled_set(fd, new);
-			break;
-
-		case B43LED:
-			b43led_set(fd, new);
-			break;
-
-		default:
-			break;
-	}
-}
-
-AUD_VIS_PLUGIN
-(
-	.name = "RockLight",
-
-	.num_pcm_chs_wanted = 0,
-	.num_freq_chs_wanted = 2,
-
-	.init = rocklight_init,
-	.cleanup = rocklight_cleanup,
-	.playback_start = rocklight_playback_start,
-	.playback_stop = rocklight_playback_stop,
-	.render_freq = rocklight_render_freq
-)

audacious-plugins-3.0.3.tar.bz2/src/rocklight/rocklight.h Deleted

@@ -1,31 +0,0 @@
-/*
- * Copyright (C) 2004 Benedikt 'Hunz' Heinz <rocklight@hunz.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 Library 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
- 
-#ifndef _ROCKLIGHT_H
-#define _ROCKLIGHT_H
-
-int thinklight_set(int fd, int state);
-int thinklight_get(int fd);
-
-int sysled_set(int fd, int state);
-int sysled_get(int fd);
-
-int b43led_set(int fd, int state);
-int b43led_get(int fd);
-
-#endif

audacious-plugins-3.0.3.tar.bz2/src/rocklight/sysled.c Deleted

@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2006 Tony Vroon <chainsaw@gentoo.org>
- * Copyright (C) 2007 Michael Hanselmann <audacious@hansmi.ch>
- *
- * 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 Library 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
- 
-#include <unistd.h>
-#include <stdlib.h>
-
-#include "rocklight.h"
-
-int sysled_set(int fd, int state) {
-	if (state) {
-		return write(fd, "255\n", 4);
-	} else {
-		return write(fd, "0\n", 2);
-	}
-}
-
-int sysled_get(int fd) {
-	char buf[256];
-	int ret = read(fd, &buf, sizeof(buf));
- if(!ret)
- return 0; //dummy
-
-	return (strtol(buf, NULL, 10) == 255);
-}

audacious-plugins-3.0.3.tar.bz2/src/rocklight/thinklight.c Deleted

@@ -1,55 +0,0 @@
-/***************************************************************************
- * thinklight.c
- *
- * Sun Dec 26 17:02:38 2004
- * Copyright 2004 Benedikt 'Hunz' Heinz
- * rocklight@hunz.org
- * $Id: thinklight.c,v 1.2 2005/03/26 21:29:17 hunz Exp $
- ****************************************************************************/
-
-/*
- * 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 Library 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
- 
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-
-#include "rocklight.h"
-
-int thinklight_set(int fd, int state) {
-	if (state) {
-		return write(fd, "on\n", 3);
-	} else {
-		return write(fd, "off\n", 4);
-	}
-}
-
-int thinklight_get(int fd) {
-	char buf[256];
-	int ret = read(fd, &buf, sizeof(buf));
-
-	if (ret < 0)
-		return ret;
-	else if (ret < 11)
-		return -23;
-	else if (buf[10] == 'f')
-		return 0;
-	else if (buf[10] == 'n')
-		return 1;
-	else
-		return -42;
-}

audacious-plugins-3.0.3.tar.bz2/src/sid/xmms-sid.glade Deleted

@@ -1,4177 +0,0 @@
-<?xml version="1.0" standalone="no"?> 
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
-<glade-interface>
-
-<widget class="GtkWindow" id="xs_configwin">
- <property name="visible">True</property>
- <property name="title" translatable="yes">Audacious-SID configuration</property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_NONE</property>
- <property name="modal">False</property>
- <property name="resizable">True</property>
- <property name="destroy_with_parent">False</property>
- <property name="decorated">True</property>
- <property name="skip_taskbar_hint">False</property>
- <property name="skip_pager_hint">False</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
- <property name="focus_on_map">True</property>
- <property name="urgency_hint">False</property>
- <signal name="delete_event" handler="xs_configwin_delete"/>
-
- <child>
- <widget class="GtkVBox" id="w_vbox1">
- <property name="border_width">8</property>
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
-	<widget class="GtkNotebook" id="cfg_notebook">
-	 <property name="visible">True</property>
-	 <property name="can_focus">True</property>
-	 <property name="show_tabs">True</property>
-	 <property name="show_border">False</property>
-	 <property name="tab_pos">GTK_POS_TOP</property>
-	 <property name="scrollable">False</property>
-	 <property name="enable_popup">False</property>
-
-	 <child>
-	 <widget class="GtkVBox" id="w_vbox6">
-	 <property name="visible">True</property>
-	 <property name="homogeneous">False</property>
-	 <property name="spacing">0</property>
-
-	 <child>
-		<widget class="GtkHBox" id="w_hbox2">
-		 <property name="visible">True</property>
-		 <property name="homogeneous">False</property>
-		 <property name="spacing">0</property>
-
-		 <child>
-		 <widget class="GtkFrame" id="cfg_sndres_frame">
-		 <property name="border_width">4</property>
-		 <property name="visible">True</property>
-		 <property name="label_xalign">0</property>
-		 <property name="label_yalign">0.5</property>
-		 <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-
-		 <child>
-			<widget class="GtkVBox" id="w_vbox9">
-			 <property name="border_width">2</property>
-			 <property name="visible">True</property>
-			 <property name="homogeneous">False</property>
-			 <property name="spacing">2</property>
-
-			 <child>
-			 <widget class="GtkRadioButton" id="cfg_res_8bit">
-			 <property name="visible">True</property>
-			 <property name="can_focus">True</property>
-			 <property name="label" translatable="yes">8-bit</property>
-			 <property name="use_underline">True</property>
-			 <property name="relief">GTK_RELIEF_NORMAL</property>
-			 <property name="focus_on_click">True</property>
-			 <property name="active">False</property>
-			 <property name="inconsistent">False</property>
-			 <property name="draw_indicator">True</property>
-			 </widget>
-			 <packing>
-			 <property name="padding">0</property>
-			 <property name="expand">False</property>
-			 <property name="fill">False</property>
-			 </packing>
-			 </child>
-
-			 <child>
-			 <widget class="GtkRadioButton" id="cfg_res_16bit">
-			 <property name="visible">True</property>
-			 <property name="can_focus">True</property>
-			 <property name="label" translatable="yes">16-bit</property>
-			 <property name="use_underline">True</property>
-			 <property name="relief">GTK_RELIEF_NORMAL</property>
-			 <property name="focus_on_click">True</property>
-			 <property name="active">False</property>
-			 <property name="inconsistent">False</property>
-			 <property name="draw_indicator">True</property>
-			 <property name="group">cfg_res_8bit</property>
-			 </widget>
-			 <packing>
-			 <property name="padding">0</property>
-			 <property name="expand">False</property>
-			 <property name="fill">False</property>
-			 </packing>
-			 </child>
-			</widget>
-		 </child>
-
-		 <child>
-			<widget class="GtkLabel" id="label1">
-			 <property name="visible">True</property>
-			 <property name="label" translatable="yes">Resolution:</property>
-			 <property name="use_underline">False</property>
-			 <property name="use_markup">False</property>
-			 <property name="justify">GTK_JUSTIFY_LEFT</property>
-			 <property name="wrap">False</property>
-			 <property name="selectable">False</property>
-			 <property name="xalign">0.5</property>
-			 <property name="yalign">0.5</property>
-			 <property name="xpad">0</property>
-			 <property name="ypad">0</property>
-			 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			 <property name="width_chars">-1</property>
-			 <property name="single_line_mode">False</property>
-			 <property name="angle">0</property>
-			</widget>
-			<packing>
-			 <property name="type">label_item</property>
-			</packing>
-		 </child>
-		 </widget>
-		 <packing>
-		 <property name="padding">0</property>
-		 <property name="expand">True</property>
-		 <property name="fill">True</property>
-		 </packing>
-		 </child>
-
-		 <child>
-		 <widget class="GtkFrame" id="cfg_channels_frame">
-		 <property name="border_width">4</property>
-		 <property name="visible">True</property>
-		 <property name="label_xalign">0</property>
-		 <property name="label_yalign">0.5</property>
-		 <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-
-		 <child>
-			<widget class="GtkVBox" id="w_vbox10">
-			 <property name="border_width">2</property>
-			 <property name="visible">True</property>
-			 <property name="homogeneous">False</property>
-			 <property name="spacing">2</property>
-
-			 <child>
-			 <widget class="GtkRadioButton" id="cfg_chn_mono">
-			 <property name="visible">True</property>
-			 <property name="can_focus">True</property>
-			 <property name="label" translatable="yes">Mono</property>
-			 <property name="use_underline">True</property>
-			 <property name="relief">GTK_RELIEF_NORMAL</property>
-			 <property name="focus_on_click">True</property>
-			 <property name="active">False</property>
-			 <property name="inconsistent">False</property>
-			 <property name="draw_indicator">True</property>
-			 </widget>
-			 <packing>
-			 <property name="padding">0</property>
-			 <property name="expand">False</property>
-			 <property name="fill">False</property>
-			 </packing>
-			 </child>
-
-			 <child>
-			 <widget class="GtkRadioButton" id="cfg_chn_stereo">
-			 <property name="visible">True</property>
-			 <property name="can_focus">True</property>
-			 <property name="label" translatable="yes">Stereo</property>
-			 <property name="use_underline">True</property>
-			 <property name="relief">GTK_RELIEF_NORMAL</property>
-			 <property name="focus_on_click">True</property>
-			 <property name="active">False</property>
-			 <property name="inconsistent">False</property>
-			 <property name="draw_indicator">True</property>
-			 <property name="group">cfg_chn_mono</property>
-			 </widget>
-			 <packing>
-			 <property name="padding">0</property>
-			 <property name="expand">False</property>
-			 <property name="fill">False</property>
-			 </packing>
-			 </child>
-
-			 <child>
-			 <widget class="GtkRadioButton" id="cfg_chn_autopan">
-			 <property name="visible">True</property>
-			 <property name="can_focus">True</property>
-			 <property name="label" translatable="yes">Autopanning</property>
-			 <property name="use_underline">True</property>
-			 <property name="relief">GTK_RELIEF_NORMAL</property>
-			 <property name="focus_on_click">True</property>
-			 <property name="active">False</property>
-			 <property name="inconsistent">False</property>
-			 <property name="draw_indicator">True</property>
-			 <property name="group">cfg_chn_mono</property>
-			 </widget>
-			 <packing>
-			 <property name="padding">0</property>
-			 <property name="expand">False</property>
-			 <property name="fill">False</property>
-			 </packing>
-			 </child>
-			</widget>
-		 </child>
-
-		 <child>
-			<widget class="GtkLabel" id="label2">
-			 <property name="visible">True</property>
-			 <property name="label" translatable="yes">Channels:</property>
-			 <property name="use_underline">False</property>
-			 <property name="use_markup">False</property>
-			 <property name="justify">GTK_JUSTIFY_LEFT</property>
-			 <property name="wrap">False</property>
-			 <property name="selectable">False</property>
-			 <property name="xalign">0.5</property>
-			 <property name="yalign">0.5</property>
-			 <property name="xpad">0</property>
-			 <property name="ypad">0</property>
-			 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			 <property name="width_chars">-1</property>
-			 <property name="single_line_mode">False</property>
-			 <property name="angle">0</property>
-			</widget>
-			<packing>
-			 <property name="type">label_item</property>
-			</packing>
-		 </child>
-		 </widget>
-		 <packing>
-		 <property name="padding">0</property>
-		 <property name="expand">True</property>
-		 <property name="fill">True</property>
-		 </packing>
-		 </child>
-		</widget>
-		<packing>
-		 <property name="padding">0</property>
-		 <property name="expand">False</property>
-		 <property name="fill">True</property>
-		</packing>
-	 </child>
-
-	 <child>
-		<widget class="GtkFrame" id="cfg_samplerate_frame">
-		 <property name="border_width">4</property>
-		 <property name="visible">True</property>
-		 <property name="label_xalign">0</property>
-		 <property name="label_yalign">0.5</property>
-		 <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-
-		 <child>
-		 <widget class="GtkHBox" id="w_hbox4">
-		 <property name="border_width">4</property>
-		 <property name="visible">True</property>
-		 <property name="homogeneous">False</property>
-		 <property name="spacing">0</property>
-
-		 <child>
-			<widget class="GtkCombo" id="cfg_samplerate_combo">
-			 <property name="visible">True</property>
-			 <property name="value_in_list">False</property>
-			 <property name="allow_empty">False</property>
-			 <property name="case_sensitive">False</property>
-			 <property name="enable_arrow_keys">True</property>
-			 <property name="enable_arrows_always">False</property>
-
-			 <child internal-child="entry">
-			 <widget class="GtkEntry" id="cfg_samplerate">
-			 <property name="visible">True</property>
-			 <property name="can_focus">True</property>
-			 <property name="editable">True</property>
-			 <property name="visibility">True</property>
-			 <property name="max_length">0</property>
-			 <property name="text" translatable="yes"></property>
-			 <property name="has_frame">True</property>
-			 <property name="invisible_char">●</property>
-			 <property name="activates_default">False</property>
-			 </widget>
-			 </child>
-
-			 <child internal-child="list">
-			 <widget class="GtkList" id="convertwidget1">
-			 <property name="visible">True</property>
-			 <property name="selection_mode">GTK_SELECTION_BROWSE</property>
-
-			 <child>
-				<widget class="GtkListItem" id="convertwidget2">
-				 <property name="visible">True</property>
-
-				 <child>
-				 <widget class="GtkLabel" id="convertwidget3">
-				 <property name="visible">True</property>
-				 <property name="label" translatable="yes"></property>
-				 <property name="use_underline">False</property>
-				 <property name="use_markup">False</property>
-				 <property name="justify">GTK_JUSTIFY_LEFT</property>
-				 <property name="wrap">False</property>
-				 <property name="selectable">False</property>
-				 <property name="xalign">0</property>
-				 <property name="yalign">0.5</property>
-				 <property name="xpad">0</property>
-				 <property name="ypad">0</property>
-				 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-				 <property name="width_chars">-1</property>
-				 <property name="single_line_mode">False</property>
-				 <property name="angle">0</property>
-				 </widget>
-				 </child>
-				</widget>
-			 </child>
-			 </widget>
-			 </child>
-			</widget>
-			<packing>
-			 <property name="padding">0</property>
-			 <property name="expand">False</property>
-			 <property name="fill">False</property>
-			</packing>
-		 </child>
-
-		 <child>
-			<widget class="GtkLabel" id="w_label8">
-			 <property name="visible">True</property>
-			 <property name="label" translatable="yes">Hz</property>
-			 <property name="use_underline">False</property>
-			 <property name="use_markup">False</property>
-			 <property name="justify">GTK_JUSTIFY_CENTER</property>
-			 <property name="wrap">False</property>
-			 <property name="selectable">False</property>
-			 <property name="xalign">0.5</property>
-			 <property name="yalign">0.5</property>
-			 <property name="xpad">0</property>
-			 <property name="ypad">0</property>
-			 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			 <property name="width_chars">-1</property>
-			 <property name="single_line_mode">False</property>
-			 <property name="angle">0</property>
-			</widget>
-			<packing>
-			 <property name="padding">4</property>
-			 <property name="expand">False</property>
-			 <property name="fill">True</property>
-			</packing>
-		 </child>
-
-		 <child>
-			<widget class="GtkLabel" id="w_label54">
-			 <property name="visible">True</property>
-			 <property name="label" translatable="yes"></property>
-			 <property name="use_underline">False</property>
-			 <property name="use_markup">False</property>
-			 <property name="justify">GTK_JUSTIFY_CENTER</property>
-			 <property name="wrap">False</property>
-			 <property name="selectable">False</property>
-			 <property name="xalign">0.5</property>
-			 <property name="yalign">0.5</property>
-			 <property name="xpad">0</property>
-			 <property name="ypad">0</property>
-			 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			 <property name="width_chars">-1</property>
-			 <property name="single_line_mode">False</property>
-			 <property name="angle">0</property>
-			</widget>
-			<packing>
-			 <property name="padding">0</property>
-			 <property name="expand">False</property>
-			 <property name="fill">True</property>
-			</packing>
-		 </child>
-		 </widget>
-		 </child>
-
-		 <child>
-		 <widget class="GtkLabel" id="label3">
-		 <property name="visible">True</property>
-		 <property name="label" translatable="yes">Samplerate:</property>
-		 <property name="use_underline">False</property>
-		 <property name="use_markup">False</property>
-		 <property name="justify">GTK_JUSTIFY_LEFT</property>
-		 <property name="wrap">False</property>
-		 <property name="selectable">False</property>
-		 <property name="xalign">0.5</property>
-		 <property name="yalign">0.5</property>
-		 <property name="xpad">0</property>
-		 <property name="ypad">0</property>
-		 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		 <property name="width_chars">-1</property>
-		 <property name="single_line_mode">False</property>
-		 <property name="angle">0</property>
-		 </widget>
-		 <packing>
-		 <property name="type">label_item</property>
-		 </packing>
-		 </child>
-		</widget>
-		<packing>
-		 <property name="padding">0</property>
-		 <property name="expand">False</property>
-		 <property name="fill">True</property>
-		</packing>
-	 </child>
-
-	 <child>
-		<widget class="GtkFrame" id="cfg_oversample_frame">
-		 <property name="border_width">4</property>
-		 <property name="visible">True</property>
-		 <property name="label_xalign">0</property>
-		 <property name="label_yalign">0.5</property>
-		 <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-
-		 <child>
-		 <widget class="GtkVBox" id="w_vbox27">
-		 <property name="border_width">2</property>
-		 <property name="visible">True</property>
-		 <property name="homogeneous">False</property>
-		 <property name="spacing">2</property>
-
-		 <child>
-			<widget class="GtkCheckButton" id="cfg_oversample">
-			 <property name="visible">True</property>
-			 <property name="can_focus">True</property>
-			 <property name="label" translatable="yes">Use oversampling</property>
-			 <property name="use_underline">True</property>
-			 <property name="relief">GTK_RELIEF_NORMAL</property>
-			 <property name="focus_on_click">True</property>
-			 <property name="active">False</property>
-			 <property name="inconsistent">False</property>
-			 <property name="draw_indicator">True</property>
-			 <signal name="toggled" handler="xs_cfg_oversample_toggled"/>
-			</widget>
-			<packing>
-			 <property name="padding">0</property>
-			 <property name="expand">False</property>
-			 <property name="fill">False</property>
-			</packing>
-		 </child>
-
-		 <child>
-			<widget class="GtkHBox" id="cfg_oversample_box">
-			 <property name="border_width">2</property>
-			 <property name="visible">True</property>
-			 <property name="homogeneous">False</property>
-			 <property name="spacing">4</property>
-
-			 <child>
-			 <widget class="GtkLabel" id="cfg_oversample_label1">
-			 <property name="visible">True</property>
-			 <property name="label" translatable="yes">Factor:</property>
-			 <property name="use_underline">False</property>
-			 <property name="use_markup">False</property>
-			 <property name="justify">GTK_JUSTIFY_CENTER</property>
-			 <property name="wrap">False</property>
-			 <property name="selectable">False</property>
-			 <property name="xalign">0.5</property>
-			 <property name="yalign">0.5</property>
-			 <property name="xpad">0</property>
-			 <property name="ypad">0</property>
-			 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			 <property name="width_chars">-1</property>
-			 <property name="single_line_mode">False</property>
-			 <property name="angle">0</property>
-			 </widget>
-			 <packing>
-			 <property name="padding">0</property>
-			 <property name="expand">False</property>
-			 <property name="fill">False</property>
-			 </packing>
-			 </child>
-
-			 <child>
-			 <widget class="GtkSpinButton" id="cfg_oversample_factor">
-			 <property name="visible">True</property>
-			 <property name="can_focus">True</property>
-			 <property name="climb_rate">1</property>
-			 <property name="digits">0</property>
-			 <property name="numeric">False</property>
-			 <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-			 <property name="snap_to_ticks">False</property>
-			 <property name="wrap">False</property>
-			 <property name="adjustment">2 2 8 1 1 1</property>
-			 </widget>
-			 <packing>
-			 <property name="padding">0</property>
-			 <property name="expand">False</property>
-			 <property name="fill">True</property>
-			 </packing>
-			 </child>
-
-			 <child>
-			 <widget class="GtkLabel" id="cfg_oversample_label2">
-			 <property name="visible">True</property>
-			 <property name="label" translatable="yes">Large factors require more CPU-power</property>
-			 <property name="use_underline">False</property>
-			 <property name="use_markup">False</property>
-			 <property name="justify">GTK_JUSTIFY_CENTER</property>
-			 <property name="wrap">False</property>
-			 <property name="selectable">False</property>
-			 <property name="xalign">0.5</property>
-			 <property name="yalign">0.5</property>
-			 <property name="xpad">0</property>
-			 <property name="ypad">0</property>
-			 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			 <property name="width_chars">-1</property>
-			 <property name="single_line_mode">False</property>
-			 <property name="angle">0</property>
-			 </widget>
-			 <packing>
-			 <property name="padding">0</property>
-			 <property name="expand">False</property>
-			 <property name="fill">False</property>
-			 </packing>
-			 </child>
-			</widget>
-			<packing>
-			 <property name="padding">0</property>
-			 <property name="expand">False</property>
-			 <property name="fill">True</property>
-			</packing>
-		 </child>
-		 </widget>
-		 </child>
-
-		 <child>
-		 <widget class="GtkLabel" id="label4">
-		 <property name="visible">True</property>
-		 <property name="label" translatable="yes">Oversampling:</property>
-		 <property name="use_underline">False</property>
-		 <property name="use_markup">False</property>
-		 <property name="justify">GTK_JUSTIFY_LEFT</property>
-		 <property name="wrap">False</property>
-		 <property name="selectable">False</property>
-		 <property name="xalign">0.5</property>
-		 <property name="yalign">0.5</property>
-		 <property name="xpad">0</property>
-		 <property name="ypad">0</property>
-		 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		 <property name="width_chars">-1</property>
-		 <property name="single_line_mode">False</property>
-		 <property name="angle">0</property>
-		 </widget>
-		 <packing>
-		 <property name="type">label_item</property>
-		 </packing>
-		 </child>
-		</widget>
-		<packing>
-		 <property name="padding">0</property>
-		 <property name="expand">False</property>
-		 <property name="fill">True</property>
-		</packing>
-	 </child>
-	 </widget>
-	 <packing>
-	 <property name="tab_expand">False</property>
-	 <property name="tab_fill">True</property>
-	 </packing>
-	 </child>
-
-	 <child>
-	 <widget class="GtkLabel" id="w_label1">
-	 <property name="visible">True</property>
-	 <property name="label" translatable="yes">Audio</property>
-	 <property name="use_underline">False</property>
-	 <property name="use_markup">False</property>
-	 <property name="justify">GTK_JUSTIFY_CENTER</property>
-	 <property name="wrap">False</property>
-	 <property name="selectable">False</property>
-	 <property name="xalign">0.5</property>
-	 <property name="yalign">0.5</property>
-	 <property name="xpad">0</property>
-	 <property name="ypad">0</property>
-	 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-	 <property name="width_chars">-1</property>
-	 <property name="single_line_mode">False</property>
-	 <property name="angle">0</property>
-	 </widget>
-	 <packing>
-	 <property name="type">tab</property>
-	 </packing>
-	 </child>
-
-	 <child>
-	 <widget class="GtkVBox" id="w_vbox2">
-	 <property name="visible">True</property>
-	 <property name="homogeneous">False</property>
-	 <property name="spacing">0</property>
-
-	 <child>
-		<widget class="GtkHBox" id="w_hbox1">
-		 <property name="visible">True</property>
-		 <property name="homogeneous">False</property>
-		 <property name="spacing">0</property>
-
-		 <child>
-		 <widget class="GtkFrame" id="cfg_clock_frame">
-		 <property name="border_width">4</property>
-		 <property name="visible">True</property>
-		 <property name="label_xalign">0</property>
-		 <property name="label_yalign">0.5</property>
-		 <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-
-		 <child>
-			<widget class="GtkVBox" id="w_vbox4">
-			 <property name="border_width">2</property>
-			 <property name="visible">True</property>
-			 <property name="homogeneous">False</property>
-			 <property name="spacing">2</property>
-
-			 <child>
-			 <widget class="GtkCheckButton" id="cfg_emu_clock_force">
-			 <property name="visible">True</property>
-			 <property name="tooltip" translatable="yes">If enabled, this option &quot;forces&quot; the emulation engine to use the selected clock speed/frequency. Otherwise the speed is determined from played file itself.</property>
-			 <property name="can_focus">True</property>
-			 <property name="label" translatable="yes">Force speed</property>
-			 <property name="use_underline">True</property>
-			 <property name="relief">GTK_RELIEF_NORMAL</property>
-			 <property name="focus_on_click">True</property>
-			 <property name="active">False</property>
-			 <property name="inconsistent">False</property>
-			 <property name="draw_indicator">True</property>
-			 </widget>
-			 <packing>
-			 <property name="padding">0</property>
-			 <property name="expand">False</property>
-			 <property name="fill">False</property>
-			 </packing>
-			 </child>
-
-			 <child>
-			 <widget class="GtkRadioButton" id="cfg_emu_clock_pal">
-			 <property name="visible">True</property>
-			 <property name="tooltip" translatable="yes">PAL is the european TV standard, which uses 50Hz vertical refresh frequency. Most of SID-tunes have been made for PAL computers.</property>
-			 <property name="can_focus">True</property>
-			 <property name="label" translatable="yes">PAL (50 Hz)</property>
-			 <property name="use_underline">True</property>
-			 <property name="relief">GTK_RELIEF_NORMAL</property>
-			 <property name="focus_on_click">True</property>
-			 <property name="active">False</property>
-			 <property name="inconsistent">False</property>
-			 <property name="draw_indicator">True</property>
-			 </widget>
-			 <packing>
-			 <property name="padding">0</property>
-			 <property name="expand">False</property>
-			 <property name="fill">False</property>
-			 </packing>
-			 </child>
-
-			 <child>
-			 <widget class="GtkRadioButton" id="cfg_emu_clock_ntsc">
-			 <property name="visible">True</property>
-			 <property name="tooltip" translatable="yes">NTSC is the TV standard with 60Hz vertical refresh rate (and other features that differ from PAL). It is mainly used in United States, Japan and certain other countries.</property>
-			 <property name="can_focus">True</property>
-			 <property name="label" translatable="yes">NTSC (60 Hz)</property>
-			 <property name="use_underline">True</property>
-			 <property name="relief">GTK_RELIEF_NORMAL</property>
-			 <property name="focus_on_click">True</property>
-			 <property name="active">False</property>
-			 <property name="inconsistent">False</property>
-			 <property name="draw_indicator">True</property>
-			 <property name="group">cfg_emu_clock_pal</property>
-			 </widget>
-			 <packing>
-			 <property name="padding">0</property>
-			 <property name="expand">False</property>
-			 <property name="fill">False</property>
-			 </packing>
-			 </child>
-			</widget>
-		 </child>
-
-		 <child>
-			<widget class="GtkLabel" id="label5">
-			 <property name="visible">True</property>
-			 <property name="label" translatable="yes">Clock speed:</property>
-			 <property name="use_underline">False</property>
-			 <property name="use_markup">False</property>
-			 <property name="justify">GTK_JUSTIFY_LEFT</property>
-			 <property name="wrap">False</property>
-			 <property name="selectable">False</property>
-			 <property name="xalign">0.5</property>
-			 <property name="yalign">0.5</property>
-			 <property name="xpad">0</property>
-			 <property name="ypad">0</property>
-			 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			 <property name="width_chars">-1</property>
-			 <property name="single_line_mode">False</property>
-			 <property name="angle">0</property>
-			</widget>
-			<packing>
-			 <property name="type">label_item</property>
-			</packing>
-		 </child>
-		 </widget>
-		 <packing>
-		 <property name="padding">0</property>
-		 <property name="expand">True</property>
-		 <property name="fill">True</property>
-		 </packing>
-		 </child>
-
-		 <child>
-		 <widget class="GtkFrame" id="cfg_sid_model_frame">
-		 <property name="border_width">4</property>
-		 <property name="visible">True</property>
-		 <property name="label_xalign">0</property>
-		 <property name="label_yalign">0.5</property>
-		 <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-
-		 <child>
-			<widget class="GtkVBox" id="w_vbox3">
-			 <property name="border_width">2</property>
-			 <property name="visible">True</property>
-			 <property name="homogeneous">False</property>
-			 <property name="spacing">2</property>
-
-			 <child>
-			 <widget class="GtkCheckButton" id="cfg_emu_sid_force">
-			 <property name="visible">True</property>
-			 <property name="tooltip" translatable="yes">If enabled, this option &quot;forces&quot; the emulation engine to use the selected SID-chip model. Otherwise the preferred SID model is determined from the file (if PSIDv2NG type) or if not available, this setting is used.</property>
-			 <property name="can_focus">True</property>
-			 <property name="label" translatable="yes">Force model</property>
-			 <property name="use_underline">True</property>
-			 <property name="relief">GTK_RELIEF_NORMAL</property>
-			 <property name="focus_on_click">True</property>
-			 <property name="active">False</property>
-			 <property name="inconsistent">False</property>
-			 <property name="draw_indicator">True</property>
-			 </widget>
-			 <packing>
-			 <property name="padding">0</property>
-			 <property name="expand">False</property>
-			 <property name="fill">False</property>
-			 </packing>
-			 </child>
-
-			 <child>
-			 <widget class="GtkRadioButton" id="cfg_emu_mos6581">
-			 <property name="visible">True</property>
-			 <property name="tooltip" translatable="yes">MOS/CSG 6581 is the earlier major version of SID chip. It differs from 8580 in few ways, having much fuller filter (which, due to design error, is never same between two different SID-chips) and has the &quot;volume adjustment bug&quot;, which enables playing of digital samples.</property>
-			 <property name="can_focus">True</property>
-			 <property name="label" translatable="yes">MOS 6581</property>
-			 <property name="use_underline">True</property>
-			 <property name="relief">GTK_RELIEF_NORMAL</property>
-			 <property name="focus_on_click">True</property>
-			 <property name="active">False</property>
-			 <property name="inconsistent">False</property>
-			 <property name="draw_indicator">True</property>
-			 </widget>
-			 <packing>
-			 <property name="padding">0</property>
-			 <property name="expand">False</property>
-			 <property name="fill">False</property>
-			 </packing>
-			 </child>
-
-			 <child>
-			 <widget class="GtkRadioButton" id="cfg_emu_mos8580">
-			 <property name="visible">True</property>
-			 <property name="can_focus">True</property>
-			 <property name="label" translatable="yes">MOS 8580</property>
-			 <property name="use_underline">True</property>
-			 <property name="relief">GTK_RELIEF_NORMAL</property>
-			 <property name="focus_on_click">True</property>
-			 <property name="active">False</property>
-			 <property name="inconsistent">False</property>
-			 <property name="draw_indicator">True</property>
-			 <property name="group">cfg_emu_mos6581</property>
-			 </widget>
-			 <packing>
-			 <property name="padding">0</property>
-			 <property name="expand">False</property>
-			 <property name="fill">False</property>
-			 </packing>
-			 </child>
-			</widget>
-		 </child>
-
-		 <child>
-			<widget class="GtkLabel" id="label6">
-			 <property name="visible">True</property>
-			 <property name="label" translatable="yes">SID model:</property>
-			 <property name="use_underline">False</property>
-			 <property name="use_markup">False</property>
-			 <property name="justify">GTK_JUSTIFY_LEFT</property>
-			 <property name="wrap">False</property>
-			 <property name="selectable">False</property>
-			 <property name="xalign">0.5</property>
-			 <property name="yalign">0.5</property>
-			 <property name="xpad">0</property>
-			 <property name="ypad">0</property>
-			 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			 <property name="width_chars">-1</property>
-			 <property name="single_line_mode">False</property>
-			 <property name="angle">0</property>
-			</widget>
-			<packing>
-			 <property name="type">label_item</property>
-			</packing>
-		 </child>
-		 </widget>
-		 <packing>
-		 <property name="padding">0</property>
-		 <property name="expand">True</property>
-		 <property name="fill">True</property>
-		 </packing>
-		 </child>
-		</widget>
-		<packing>
-		 <property name="padding">0</property>
-		 <property name="expand">False</property>
-		 <property name="fill">True</property>
-		</packing>
-	 </child>
-
-	 <child>
-		<widget class="GtkFrame" id="cfg_emulib_frame">
-		 <property name="border_width">4</property>
-		 <property name="visible">True</property>
-		 <property name="label_xalign">0</property>
-		 <property name="label_yalign">0.5</property>
-		 <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-
-		 <child>
-		 <widget class="GtkVBox" id="w_vbox26">
-		 <property name="border_width">2</property>
-		 <property name="visible">True</property>
-		 <property name="homogeneous">False</property>
-		 <property name="spacing">2</property>
-
-		 <child>
-			<widget class="GtkRadioButton" id="cfg_emu_sidplay1">
-			 <property name="visible">True</property>
-			 <property name="tooltip" translatable="yes">Use libSIDPlay 1.x emulation, faster but not so accurate. Good in most cases, though.</property>
-			 <property name="can_focus">True</property>
-			 <property name="label" translatable="yes">SIDPlay 1 (frame-based)</property>
-			 <property name="use_underline">True</property>
-			 <property name="relief">GTK_RELIEF_NORMAL</property>
-			 <property name="focus_on_click">True</property>
-			 <property name="active">False</property>
-			 <property name="inconsistent">False</property>
-			 <property name="draw_indicator">True</property>
-			 <signal name="toggled" handler="xs_cfg_emu_sidplay1_toggled"/>
-			</widget>
-			<packing>
-			 <property name="padding">0</property>
-			 <property name="expand">False</property>
-			 <property name="fill">False</property>
-			</packing>
-		 </child>
-
-		 <child>
-			<widget class="GtkRadioButton" id="cfg_emu_sidplay2">
-			 <property name="visible">True</property>
-			 <property name="tooltip" translatable="yes">Use libSIDPlay 2.x emulation, which requires powerful CPU due to more exact emulation.</property>
-			 <property name="can_focus">True</property>
-			 <property name="label" translatable="yes">SIDPlay 2 (cycle-based)</property>
-			 <property name="use_underline">True</property>
-			 <property name="relief">GTK_RELIEF_NORMAL</property>
-			 <property name="focus_on_click">True</property>
-			 <property name="active">False</property>
-			 <property name="inconsistent">False</property>
-			 <property name="draw_indicator">True</property>
-			 <property name="group">cfg_emu_sidplay1</property>
-			 <signal name="toggled" handler="xs_cfg_emu_sidplay2_toggled"/>
-			</widget>
-			<packing>
-			 <property name="padding">0</property>
-			 <property name="expand">False</property>
-			 <property name="fill">False</property>
-			</packing>
-		 </child>
-		 </widget>
-		 </child>
-
-		 <child>
-		 <widget class="GtkLabel" id="label7">
-		 <property name="visible">True</property>
-		 <property name="label" translatable="yes">Emulation library selection:</property>
-		 <property name="use_underline">False</property>
-		 <property name="use_markup">False</property>
-		 <property name="justify">GTK_JUSTIFY_LEFT</property>
-		 <property name="wrap">False</property>
-		 <property name="selectable">False</property>
-		 <property name="xalign">0.5</property>
-		 <property name="yalign">0.5</property>
-		 <property name="xpad">0</property>
-		 <property name="ypad">0</property>
-		 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		 <property name="width_chars">-1</property>
-		 <property name="single_line_mode">False</property>
-		 <property name="angle">0</property>
-		 </widget>
-		 <packing>
-		 <property name="type">label_item</property>
-		 </packing>
-		 </child>
-		</widget>
-		<packing>
-		 <property name="padding">0</property>
-		 <property name="expand">False</property>
-		 <property name="fill">False</property>
-		</packing>
-	 </child>
-
-	 <child>
-		<widget class="GtkFrame" id="cfg_memmode_frame">
-		 <property name="border_width">4</property>
-		 <property name="visible">True</property>
-		 <property name="label_xalign">0</property>
-		 <property name="label_yalign">0.5</property>
-		 <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-
-		 <child>
-		 <widget class="GtkVBox" id="w_vbox5">
-		 <property name="border_width">2</property>
-		 <property name="visible">True</property>
-		 <property name="homogeneous">False</property>
-		 <property name="spacing">2</property>
-
-		 <child>
-			<widget class="GtkRadioButton" id="cfg_emu_mem_real">
-			 <property name="visible">True</property>
-			 <property name="can_focus">True</property>
-			 <property name="label" translatable="yes">Real C64 (SIDPlay 2 only)</property>
-			 <property name="use_underline">True</property>
-			 <property name="relief">GTK_RELIEF_NORMAL</property>
-			 <property name="focus_on_click">True</property>
-			 <property name="active">False</property>
-			 <property name="inconsistent">False</property>
-			 <property name="draw_indicator">True</property>
-			</widget>
-			<packing>
-			 <property name="padding">0</property>
-			 <property name="expand">False</property>
-			 <property name="fill">False</property>
-			</packing>
-		 </child>
-
-		 <child>
-			<widget class="GtkRadioButton" id="cfg_emu_mem_banksw">
-			 <property name="visible">True</property>
-			 <property name="can_focus">True</property>
-			 <property name="label" translatable="yes">Bank switching</property>
-			 <property name="use_underline">True</property>
-			 <property name="relief">GTK_RELIEF_NORMAL</property>
-			 <property name="focus_on_click">True</property>
-			 <property name="active">False</property>
-			 <property name="inconsistent">False</property>
-			 <property name="draw_indicator">True</property>
-			 <property name="group">cfg_emu_mem_real</property>
-			</widget>
-			<packing>
-			 <property name="padding">0</property>
-			 <property name="expand">False</property>
-			 <property name="fill">False</property>
-			</packing>
-		 </child>
-
-		 <child>
-			<widget class="GtkRadioButton" id="cfg_emu_mem_transrom">
-			 <property name="visible">True</property>
-			 <property name="can_focus">True</property>
-			 <property name="label" translatable="yes">Transparent ROM</property>
-			 <property name="use_underline">True</property>
-			 <property name="relief">GTK_RELIEF_NORMAL</property>
-			 <property name="focus_on_click">True</property>
-			 <property name="active">False</property>
-			 <property name="inconsistent">False</property>
-			 <property name="draw_indicator">True</property>
-			 <property name="group">cfg_emu_mem_real</property>
-			</widget>
-			<packing>
-			 <property name="padding">0</property>
-			 <property name="expand">False</property>
-			 <property name="fill">False</property>
-			</packing>
-		 </child>
-
-		 <child>
-			<widget class="GtkRadioButton" id="cfg_emu_mem_playsid">
-			 <property name="visible">True</property>
-			 <property name="can_focus">True</property>
-			 <property name="label" translatable="yes">PlaySID environment</property>
-			 <property name="use_underline">True</property>
-			 <property name="relief">GTK_RELIEF_NORMAL</property>
-			 <property name="focus_on_click">True</property>
-			 <property name="active">False</property>
-			 <property name="inconsistent">False</property>
-			 <property name="draw_indicator">True</property>
-			 <property name="group">cfg_emu_mem_real</property>
-			</widget>
-			<packing>
-			 <property name="padding">0</property>
-			 <property name="expand">False</property>
-			 <property name="fill">False</property>
-			</packing>
-		 </child>
-		 </widget>
-		 </child>
-
-		 <child>
-		 <widget class="GtkLabel" id="label8">
-		 <property name="visible">True</property>
-		 <property name="label" translatable="yes">Memory mode:</property>
-		 <property name="use_underline">False</property>
-		 <property name="use_markup">False</property>
-		 <property name="justify">GTK_JUSTIFY_LEFT</property>
-		 <property name="wrap">False</property>
-		 <property name="selectable">False</property>
-		 <property name="xalign">0.5</property>
-		 <property name="yalign">0.5</property>
-		 <property name="xpad">0</property>
-		 <property name="ypad">0</property>
-		 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		 <property name="width_chars">-1</property>
-		 <property name="single_line_mode">False</property>
-		 <property name="angle">0</property>
-		 </widget>
-		 <packing>
-		 <property name="type">label_item</property>
-		 </packing>
-		 </child>
-		</widget>
-		<packing>
-		 <property name="padding">0</property>
-		 <property name="expand">False</property>
-		 <property name="fill">False</property>
-		</packing>
-	 </child>
-	 </widget>
-	 <packing>
-	 <property name="tab_expand">False</property>
-	 <property name="tab_fill">True</property>
-	 </packing>
-	 </child>
-
-	 <child>
-	 <widget class="GtkLabel" id="w_label2">
-	 <property name="visible">True</property>
-	 <property name="label" translatable="yes">Emu#1</property>
-	 <property name="use_underline">False</property>
-	 <property name="use_markup">False</property>
-	 <property name="justify">GTK_JUSTIFY_CENTER</property>
-	 <property name="wrap">False</property>
-	 <property name="selectable">False</property>
-	 <property name="xalign">0.5</property>
-	 <property name="yalign">0.5</property>
-	 <property name="xpad">0</property>
-	 <property name="ypad">0</property>
-	 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-	 <property name="width_chars">-1</property>
-	 <property name="single_line_mode">False</property>
-	 <property name="angle">0</property>
-	 </widget>
-	 <packing>
-	 <property name="type">tab</property>
-	 </packing>
-	 </child>
-
-	 <child>
-	 <widget class="GtkVBox" id="w_vbox29">
-	 <property name="visible">True</property>
-	 <property name="homogeneous">False</property>
-	 <property name="spacing">0</property>
-
-	 <child>
-		<widget class="GtkFrame" id="cfg_sidplay2_frame">
-		 <property name="border_width">4</property>
-		 <property name="visible">True</property>
-		 <property name="label_xalign">0</property>
-		 <property name="label_yalign">0.5</property>
-		 <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-
-		 <child>
-		 <widget class="GtkVBox" id="w_vbox30">
-		 <property name="border_width">2</property>
-		 <property name="visible">True</property>
-		 <property name="homogeneous">False</property>
-		 <property name="spacing">2</property>
-
-		 <child>
-			<widget class="GtkCheckButton" id="cfg_emu_sp2_opt">
-			 <property name="visible">True</property>
-			 <property name="tooltip" translatable="yes">This setting can be used to enable libSIDPlay2's &quot;optimization mode&quot;, which in downgrades the emulation from cycle-exact to something similar to frame-exact. The result is lower CPU usage, but worse accuracy.</property>
-			 <property name="can_focus">True</property>
-			 <property name="label" translatable="yes">Optimization mode (faster, inaccurate)</property>
-			 <property name="use_underline">True</property>
-			 <property name="relief">GTK_RELIEF_NORMAL</property>
-			 <property name="focus_on_click">True</property>
-			 <property name="active">False</property>
-			 <property name="inconsistent">False</property>
-			 <property name="draw_indicator">True</property>
-			</widget>
-			<packing>
-			 <property name="padding">0</property>
-			 <property name="expand">False</property>
-			 <property name="fill">False</property>
-			</packing>
-		 </child>
-
-		 <child>
-			<widget class="GtkRadioButton" id="cfg_emu_sp2_resid">
-			 <property name="visible">True</property>
-			 <property name="tooltip" translatable="yes">reSID is the software SID-chip simulator based on SID reverse-engineering, created by Dag Lem. It is probably the closest thing to real SID available as software-only emulation.</property>
-			 <property name="can_focus">True</property>
-			 <property name="label" translatable="yes">reSID-emulation</property>
-			 <property name="use_underline">True</property>
-			 <property name="relief">GTK_RELIEF_NORMAL</property>
-			 <property name="focus_on_click">True</property>
-			 <property name="active">False</property>
-			 <property name="inconsistent">False</property>
-			 <property name="draw_indicator">True</property>
-			</widget>
-			<packing>
-			 <property name="padding">0</property>
-			 <property name="expand">False</property>
-			 <property name="fill">False</property>
-			</packing>
-		 </child>
-
-		 <child>
-			<widget class="GtkRadioButton" id="cfg_emu_sp2_hardsid">
-			 <property name="visible">True</property>
-			 <property name="tooltip" translatable="yes">HardSID is a EISA/PCI card for PC-compatibles, which can be fitted with a real SID-chip. Software can be used to control the HardSID and combined with software emulation of rest of C64 via libSIDPlay2 HardSID can be used to achieve &quot;near 100%&quot; similarity to real C64. For more information, see http://www.hardsid.com/</property>
-			 <property name="can_focus">True</property>
-			 <property name="label" translatable="yes">HardSID</property>
-			 <property name="use_underline">True</property>
-			 <property name="relief">GTK_RELIEF_NORMAL</property>
-			 <property name="focus_on_click">True</property>
-			 <property name="active">False</property>
-			 <property name="inconsistent">False</property>
-			 <property name="draw_indicator">True</property>
-			 <property name="group">cfg_emu_sp2_resid</property>
-			</widget>
-			<packing>
-			 <property name="padding">0</property>
-			 <property name="expand">False</property>
-			 <property name="fill">False</property>
-			</packing>
-		 </child>
-		 </widget>
-		 </child>
-
-		 <child>
-		 <widget class="GtkLabel" id="label9">
-		 <property name="visible">True</property>
-		 <property name="label" translatable="yes">SIDPlay 2 options:</property>
-		 <property name="use_underline">False</property>
-		 <property name="use_markup">False</property>
-		 <property name="justify">GTK_JUSTIFY_LEFT</property>
-		 <property name="wrap">False</property>
-		 <property name="selectable">False</property>
-		 <property name="xalign">0.5</property>
-		 <property name="yalign">0.5</property>
-		 <property name="xpad">0</property>
-		 <property name="ypad">0</property>
-		 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		 <property name="width_chars">-1</property>
-		 <property name="single_line_mode">False</property>
-		 <property name="angle">0</property>
-		 </widget>
-		 <packing>
-		 <property name="type">label_item</property>
-		 </packing>
-		 </child>
-		</widget>
-		<packing>
-		 <property name="padding">0</property>
-		 <property name="expand">False</property>
-		 <property name="fill">True</property>
-		</packing>
-	 </child>
-
-	 <child>
-		<widget class="GtkFrame" id="cfg_resid_frame">
-		 <property name="border_width">4</property>
-		 <property name="visible">True</property>
-		 <property name="label_xalign">0</property>
-		 <property name="label_yalign">0.5</property>
-		 <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-
-		 <child>
-		 <widget class="GtkVBox" id="w_vbox37">
-		 <property name="border_width">2</property>
-		 <property name="visible">True</property>
-		 <property name="homogeneous">False</property>
-		 <property name="spacing">2</property>
-
-		 <child>
-			<widget class="GtkRadioButton" id="cfg_emu_resid_fast">
-			 <property name="visible">True</property>
-			 <property name="tooltip" translatable="yes">Fastest and also worst sounding sampling method, simply picks nearest neighbouring sample.</property>
-			 <property name="can_focus">True</property>
-			 <property name="label" translatable="yes">Fast (nearest neighbour)</property>
-			 <property name="use_underline">True</property>
-			 <property name="relief">GTK_RELIEF_NORMAL</property>
-			 <property name="focus_on_click">True</property>
-			 <property name="active">False</property>
-			 <property name="inconsistent">False</property>
-			 <property name="draw_indicator">True</property>
-			</widget>
-			<packing>
-			 <property name="padding">0</property>
-			 <property name="expand">False</property>
-			 <property name="fill">False</property>
-			</packing>
-		 </child>
-
-		 <child>
-			<widget class="GtkRadioButton" id="cfg_emu_resid_int">
-			 <property name="visible">True</property>
-			 <property name="tooltip" translatable="yes">Uses linear interpolation between samples, yielding higher audio quality with less sampling noise.</property>
-			 <property name="can_focus">True</property>
-			 <property name="label" translatable="yes">Linear interpolation</property>
-			 <property name="use_underline">True</property>
-			 <property name="relief">GTK_RELIEF_NORMAL</property>
-			 <property name="focus_on_click">True</property>
-			 <property name="active">False</property>
-			 <property name="inconsistent">False</property>
-			 <property name="draw_indicator">True</property>
-			 <property name="group">cfg_emu_resid_fast</property>
-			</widget>
-			<packing>
-			 <property name="padding">0</property>
-			 <property name="expand">False</property>
-			 <property name="fill">False</property>
-			</packing>
-		 </child>
-
-		 <child>
-			<widget class="GtkRadioButton" id="cfg_emu_resid_res_fast">
-			 <property name="visible">True</property>
-			 <property name="can_focus">True</property>
-			 <property name="label" translatable="yes">Resampling</property>
-			 <property name="use_underline">True</property>
-			 <property name="relief">GTK_RELIEF_NORMAL</property>
-			 <property name="focus_on_click">True</property>
-			 <property name="active">False</property>
-			 <property name="inconsistent">False</property>
-			 <property name="draw_indicator">True</property>
-			 <property name="group">cfg_emu_resid_fast</property>
-			</widget>
-			<packing>
-			 <property name="padding">0</property>
-			 <property name="expand">False</property>
-			 <property name="fill">False</property>
-			</packing>
-		 </child>
-
-		 <child>
-			<widget class="GtkRadioButton" id="cfg_emu_resid_res_int">
-			 <property name="visible">True</property>
-			 <property name="can_focus">True</property>
-			 <property name="label" translatable="yes">Resampling (FIR)</property>
-			 <property name="use_underline">True</property>
-			 <property name="relief">GTK_RELIEF_NORMAL</property>
-			 <property name="focus_on_click">True</property>
-			 <property name="active">False</property>
-			 <property name="inconsistent">False</property>
-			 <property name="draw_indicator">True</property>
-			 <property name="group">cfg_emu_resid_fast</property>
-			</widget>
-			<packing>
-			 <property name="padding">0</property>
-			 <property name="expand">False</property>
-			 <property name="fill">False</property>
-			</packing>
-		 </child>
-		 </widget>
-		 </child>
-
-		 <child>
-		 <widget class="GtkLabel" id="label10">
-		 <property name="visible">True</property>
-		 <property name="label" translatable="yes">reSID sampling options:</property>
-		 <property name="use_underline">False</property>
-		 <property name="use_markup">False</property>
-		 <property name="justify">GTK_JUSTIFY_LEFT</property>
-		 <property name="wrap">False</property>
-		 <property name="selectable">False</property>
-		 <property name="xalign">0.5</property>
-		 <property name="yalign">0.5</property>
-		 <property name="xpad">0</property>
-		 <property name="ypad">0</property>
-		 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		 <property name="width_chars">-1</property>
-		 <property name="single_line_mode">False</property>
-		 <property name="angle">0</property>
-		 </widget>
-		 <packing>
-		 <property name="type">label_item</property>
-		 </packing>
-		 </child>
-		</widget>
-		<packing>
-		 <property name="padding">0</property>
-		 <property name="expand">False</property>
-		 <property name="fill">True</property>
-		</packing>
-	 </child>
-	 </widget>
-	 <packing>
-	 <property name="tab_expand">False</property>
-	 <property name="tab_fill">True</property>
-	 </packing>
-	 </child>
-
-	 <child>
-	 <widget class="GtkLabel" id="w_label48">
-	 <property name="visible">True</property>
-	 <property name="label" translatable="yes">Emu#2</property>
-	 <property name="use_underline">False</property>
-	 <property name="use_markup">False</property>
-	 <property name="justify">GTK_JUSTIFY_CENTER</property>
-	 <property name="wrap">False</property>
-	 <property name="selectable">False</property>
-	 <property name="xalign">0.5</property>
-	 <property name="yalign">0.5</property>
-	 <property name="xpad">0</property>
-	 <property name="ypad">0</property>
-	 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-	 <property name="width_chars">-1</property>
-	 <property name="single_line_mode">False</property>
-	 <property name="angle">0</property>
-	 </widget>
-	 <packing>
-	 <property name="type">tab</property>
-	 </packing>
-	 </child>
-
-	 <child>
-	 <widget class="GtkVBox" id="w_vbox25">
-	 <property name="border_width">4</property>
-	 <property name="visible">True</property>
-	 <property name="homogeneous">False</property>
-	 <property name="spacing">2</property>
-
-	 <child>
-		<widget class="GtkCheckButton" id="cfg_emu_filters">
-		 <property name="visible">True</property>
-		 <property name="tooltip" translatable="yes">This option enables emulation of SID filter. The filter is an essential part of SID's sound capacity, but accurate emulation of it may require quite much CPU power. However, if filter emulation is disabled, tunes won't sound authentic at all if they utilize the filter.</property>
-		 <property name="can_focus">True</property>
-		 <property name="label" translatable="yes">Emulate filters</property>
-		 <property name="use_underline">True</property>
-		 <property name="relief">GTK_RELIEF_NORMAL</property>
-		 <property name="focus_on_click">True</property>
-		 <property name="active">False</property>
-		 <property name="inconsistent">False</property>
-		 <property name="draw_indicator">True</property>
-		 <signal name="toggled" handler="xs_cfg_emu_filters_toggled"/>
-		</widget>
-		<packing>
-		 <property name="padding">0</property>
-		 <property name="expand">False</property>
-		 <property name="fill">False</property>
-		</packing>
-	 </child>
-
-	 <child>
-		<widget class="GtkNotebook" id="cfg_filters_notebook">
-		 <property name="visible">True</property>
-		 <property name="can_focus">True</property>
-		 <property name="show_tabs">True</property>
-		 <property name="show_border">True</property>
-		 <property name="tab_pos">GTK_POS_TOP</property>
-		 <property name="scrollable">False</property>
-		 <property name="enable_popup">False</property>
-
-		 <child>
-		 <widget class="GtkHBox" id="cfg_box_filter_sidplay1">
-		 <property name="border_width">4</property>
-		 <property name="visible">True</property>
-		 <property name="homogeneous">False</property>
-		 <property name="spacing">0</property>
-
-		 <child>
-			<widget class="GtkFrame" id="cfg_sp1_frm_fs">
-			 <property name="border_width">2</property>
-			 <property name="visible">True</property>
-			 <property name="label_xalign">0</property>
-			 <property name="label_yalign">0.5</property>
-			 <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-
-			 <child>
-			 <widget class="GtkVScale" id="cfg_sp1_filter_fs">
-			 <property name="visible">True</property>
-			 <property name="can_focus">True</property>
-			 <property name="draw_value">True</property>
-			 <property name="value_pos">GTK_POS_TOP</property>
-			 <property name="digits">2</property>
-			 <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
-			 <property name="inverted">False</property>
-			 <property name="adjustment">0 0 1000 1 100 0</property>
-			 </widget>
-			 </child>
-
-			 <child>
-			 <widget class="GtkLabel" id="label11">
-			 <property name="visible">True</property>
-			 <property name="label" translatable="yes">FS</property>
-			 <property name="use_underline">False</property>
-			 <property name="use_markup">False</property>
-			 <property name="justify">GTK_JUSTIFY_LEFT</property>
-			 <property name="wrap">False</property>
-			 <property name="selectable">False</property>
-			 <property name="xalign">0.5</property>
-			 <property name="yalign">0.5</property>
-			 <property name="xpad">0</property>
-			 <property name="ypad">0</property>
-			 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			 <property name="width_chars">-1</property>
-			 <property name="single_line_mode">False</property>
-			 <property name="angle">0</property>
-			 </widget>
-			 <packing>
-			 <property name="type">label_item</property>
-			 </packing>
-			 </child>
-			</widget>
-			<packing>
-			 <property name="padding">0</property>
-			 <property name="expand">True</property>
-			 <property name="fill">True</property>
-			</packing>
-		 </child>
-
-		 <child>
-			<widget class="GtkFrame" id="cfg_sp1_frm_fm">
-			 <property name="border_width">2</property>
-			 <property name="visible">True</property>
-			 <property name="label_xalign">0</property>
-			 <property name="label_yalign">0.5</property>
-			 <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-
-			 <child>
-			 <widget class="GtkVScale" id="cfg_sp1_filter_fm">
-			 <property name="visible">True</property>
-			 <property name="can_focus">True</property>
-			 <property name="draw_value">True</property>
-			 <property name="value_pos">GTK_POS_TOP</property>
-			 <property name="digits">2</property>
-			 <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
-			 <property name="inverted">False</property>
-			 <property name="adjustment">0 0 100 1 10 0</property>
-			 </widget>
-			 </child>
-
-			 <child>
-			 <widget class="GtkLabel" id="label12">
-			 <property name="visible">True</property>
-			 <property name="label" translatable="yes">FM</property>
-			 <property name="use_underline">False</property>
-			 <property name="use_markup">False</property>
-			 <property name="justify">GTK_JUSTIFY_LEFT</property>
-			 <property name="wrap">False</property>
-			 <property name="selectable">False</property>
-			 <property name="xalign">0.5</property>
-			 <property name="yalign">0.5</property>
-			 <property name="xpad">0</property>
-			 <property name="ypad">0</property>
-			 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			 <property name="width_chars">-1</property>
-			 <property name="single_line_mode">False</property>
-			 <property name="angle">0</property>
-			 </widget>
-			 <packing>
-			 <property name="type">label_item</property>
-			 </packing>
-			 </child>
-			</widget>
-			<packing>
-			 <property name="padding">0</property>
-			 <property name="expand">True</property>
-			 <property name="fill">True</property>
-			</packing>
-		 </child>
-
-		 <child>
-			<widget class="GtkFrame" id="cfg_sp1_frm_ft">
-			 <property name="border_width">2</property>
-			 <property name="visible">True</property>
-			 <property name="label_xalign">0</property>
-			 <property name="label_yalign">0.5</property>
-			 <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-
-			 <child>
-			 <widget class="GtkVScale" id="cfg_sp1_filter_ft">
-			 <property name="visible">True</property>
-			 <property name="can_focus">True</property>
-			 <property name="draw_value">True</property>
-			 <property name="value_pos">GTK_POS_TOP</property>
-			 <property name="digits">2</property>
-			 <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
-			 <property name="inverted">False</property>
-			 <property name="adjustment">0 0 1 0.01 0.1 0</property>
-			 </widget>
-			 </child>
-
-			 <child>
-			 <widget class="GtkLabel" id="label13">
-			 <property name="visible">True</property>
-			 <property name="label" translatable="yes">FT</property>
-			 <property name="use_underline">False</property>
-			 <property name="use_markup">False</property>
-			 <property name="justify">GTK_JUSTIFY_LEFT</property>
-			 <property name="wrap">False</property>
-			 <property name="selectable">False</property>
-			 <property name="xalign">0.5</property>
-			 <property name="yalign">0.5</property>
-			 <property name="xpad">0</property>
-			 <property name="ypad">0</property>
-			 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			 <property name="width_chars">-1</property>
-			 <property name="single_line_mode">False</property>
-			 <property name="angle">0</property>
-			 </widget>
-			 <packing>
-			 <property name="type">label_item</property>
-			 </packing>
-			 </child>
-			</widget>
-			<packing>
-			 <property name="padding">0</property>
-			 <property name="expand">True</property>
-			 <property name="fill">True</property>
-			</packing>
-		 </child>
-
-		 <child>
-			<widget class="GtkVBox" id="w_vbox17">
-			 <property name="border_width">4</property>
-			 <property name="visible">True</property>
-			 <property name="homogeneous">False</property>
-			 <property name="spacing">8</property>
-
-			 <child>
-			 <widget class="GtkButton" id="cfg_sp1_filter_reset">
-			 <property name="visible">True</property>
-			 <property name="can_focus">True</property>
-			 <property name="label" translatable="yes">Reset values</property>
-			 <property name="use_underline">True</property>
-			 <property name="relief">GTK_RELIEF_NORMAL</property>
-			 <property name="focus_on_click">True</property>
-			 <signal name="clicked" handler="xs_cfg_sp1_filter_reset"/>
-			 </widget>
-			 <packing>
-			 <property name="padding">0</property>
-			 <property name="expand">False</property>
-			 <property name="fill">False</property>
-			 </packing>
-			 </child>
-			</widget>
-			<packing>
-			 <property name="padding">0</property>
-			 <property name="expand">True</property>
-			 <property name="fill">True</property>
-			</packing>
-		 </child>
-		 </widget>
-		 <packing>
-		 <property name="tab_expand">False</property>
-		 <property name="tab_fill">True</property>
-		 </packing>
-		 </child>
-
-		 <child>
-		 <widget class="GtkLabel" id="w_label55">
-		 <property name="visible">True</property>
-		 <property name="label" translatable="yes">SIDPlay1</property>
-		 <property name="use_underline">False</property>
-		 <property name="use_markup">False</property>
-		 <property name="justify">GTK_JUSTIFY_CENTER</property>
-		 <property name="wrap">False</property>
-		 <property name="selectable">False</property>
-		 <property name="xalign">0.5</property>
-		 <property name="yalign">0.5</property>
-		 <property name="xpad">0</property>
-		 <property name="ypad">0</property>
-		 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		 <property name="width_chars">-1</property>
-		 <property name="single_line_mode">False</property>
-		 <property name="angle">0</property>
-		 </widget>
-		 <packing>
-		 <property name="type">tab</property>
-		 </packing>
-		 </child>
-
-		 <child>
-		 <widget class="GtkVBox" id="cfg_box_filter_sidplay2">
-		 <property name="visible">True</property>
-		 <property name="homogeneous">False</property>
-		 <property name="spacing">0</property>
-
-		 <child>
-			<widget class="GtkHBox" id="cfg_sp_filter_controlbox">
-			 <property name="border_width">2</property>
-			 <property name="visible">True</property>
-			 <property name="homogeneous">False</property>
-			 <property name="spacing">0</property>
-
-			 <child>
-			 <widget class="GtkCombo" id="cfg_sp2_filter_combo">
-			 <property name="border_width">2</property>
-			 <property name="visible">True</property>
-			 <property name="value_in_list">False</property>
-			 <property name="allow_empty">False</property>
-			 <property name="case_sensitive">False</property>
-			 <property name="enable_arrow_keys">True</property>
-			 <property name="enable_arrows_always">False</property>
-
-			 <child internal-child="entry">
-				<widget class="GtkEntry" id="cfg_sp2_filter_combo_entry">
-				 <property name="visible">True</property>
-				 <property name="can_focus">True</property>
-				 <property name="editable">True</property>
-				 <property name="visibility">True</property>
-				 <property name="max_length">0</property>
-				 <property name="text" translatable="yes"></property>
-				 <property name="has_frame">True</property>
-				 <property name="invisible_char">●</property>
-				 <property name="activates_default">False</property>
-				</widget>
-			 </child>
-
-			 <child internal-child="list">
-				<widget class="GtkList" id="convertwidget4">
-				 <property name="visible">True</property>
-				 <property name="selection_mode">GTK_SELECTION_BROWSE</property>
-
-				 <child>
-				 <widget class="GtkListItem" id="convertwidget5">
-				 <property name="visible">True</property>
-
-				 <child>
-					<widget class="GtkLabel" id="convertwidget6">
-					 <property name="visible">True</property>
-					 <property name="label" translatable="yes"></property>
-					 <property name="use_underline">False</property>
-					 <property name="use_markup">False</property>
-					 <property name="justify">GTK_JUSTIFY_LEFT</property>
-					 <property name="wrap">False</property>
-					 <property name="selectable">False</property>
-					 <property name="xalign">0</property>
-					 <property name="yalign">0.5</property>
-					 <property name="xpad">0</property>
-					 <property name="ypad">0</property>
-					 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-					 <property name="width_chars">-1</property>
-					 <property name="single_line_mode">False</property>
-					 <property name="angle">0</property>
-					</widget>
-				 </child>
-				 </widget>
-				 </child>
-				</widget>
-			 </child>
-			 </widget>
-			 <packing>
-			 <property name="padding">0</property>
-			 <property name="expand">True</property>
-			 <property name="fill">True</property>
-			 </packing>
-			 </child>
-
-			 <child>
-			 <widget class="GtkTable" id="table3">
-			 <property name="border_width">2</property>
-			 <property name="visible">True</property>
-			 <property name="n_rows">2</property>
-			 <property name="n_columns">3</property>
-			 <property name="homogeneous">True</property>
-			 <property name="row_spacing">4</property>
-			 <property name="column_spacing">4</property>
-
-			 <child>
-				<widget class="GtkButton" id="cfg_sp2_filter_export">
-				 <property name="visible">True</property>
-				 <property name="can_default">True</property>
-				 <property name="can_focus">True</property>
-				 <property name="label" translatable="yes">Export</property>
-				 <property name="use_underline">True</property>
-				 <property name="relief">GTK_RELIEF_NORMAL</property>
-				 <property name="focus_on_click">True</property>
-				 <signal name="clicked" handler="xs_cfg_sp2_filter_export"/>
-				</widget>
-				<packing>
-				 <property name="left_attach">2</property>
-				 <property name="right_attach">3</property>
-				 <property name="top_attach">1</property>
-				 <property name="bottom_attach">2</property>
-				 <property name="x_options">fill</property>
-				 <property name="y_options"></property>
-				</packing>
-			 </child>
-
-			 <child>
-				<widget class="GtkButton" id="cfg_sp2_filter_load">
-				 <property name="visible">True</property>
-				 <property name="can_default">True</property>
-				 <property name="can_focus">True</property>
-				 <property name="label" translatable="yes">Use</property>
-				 <property name="use_underline">True</property>
-				 <property name="relief">GTK_RELIEF_NORMAL</property>
-				 <property name="focus_on_click">True</property>
-				 <signal name="clicked" handler="xs_cfg_sp2_filter_load"/>
-				</widget>
-				<packing>
-				 <property name="left_attach">0</property>
-				 <property name="right_attach">1</property>
-				 <property name="top_attach">0</property>
-				 <property name="bottom_attach">1</property>
-				 <property name="x_options">fill</property>
-				 <property name="y_options"></property>
-				</packing>
-			 </child>
-
-			 <child>
-				<widget class="GtkButton" id="cfg_sp2_filter_save">
-				 <property name="visible">True</property>
-				 <property name="can_default">True</property>
-				 <property name="can_focus">True</property>
-				 <property name="label" translatable="yes">Save</property>
-				 <property name="use_underline">True</property>
-				 <property name="relief">GTK_RELIEF_NORMAL</property>
-				 <property name="focus_on_click">True</property>
-				 <signal name="clicked" handler="xs_cfg_sp2_filter_save"/>
-				</widget>
-				<packing>
-				 <property name="left_attach">1</property>
-				 <property name="right_attach">2</property>
-				 <property name="top_attach">0</property>
-				 <property name="bottom_attach">1</property>
-				 <property name="x_options">fill</property>
-				 <property name="y_options"></property>
-				</packing>
-			 </child>
-
-			 <child>
-				<widget class="GtkButton" id="cfg_sp2_filter_import">
-				 <property name="visible">True</property>
-				 <property name="can_default">True</property>
-				 <property name="can_focus">True</property>
-				 <property name="label" translatable="yes">Import</property>
-				 <property name="use_underline">True</property>
-				 <property name="relief">GTK_RELIEF_NORMAL</property>
-				 <property name="focus_on_click">True</property>
-				 <signal name="clicked" handler="xs_cfg_sp2_filter_import"/>
-				</widget>
-				<packing>
-				 <property name="left_attach">1</property>
-				 <property name="right_attach">2</property>
-				 <property name="top_attach">1</property>
-				 <property name="bottom_attach">2</property>
-				 <property name="x_options">fill</property>
-				 <property name="y_options"></property>
-				</packing>
-			 </child>
-
-			 <child>
-				<widget class="GtkButton" id="cfg_sp2_filter_delete">
-				 <property name="visible">True</property>
-				 <property name="can_default">True</property>
-				 <property name="can_focus">True</property>
-				 <property name="label" translatable="yes">Delete</property>
-				 <property name="use_underline">True</property>
-				 <property name="relief">GTK_RELIEF_NORMAL</property>
-				 <property name="focus_on_click">True</property>
-				 <signal name="clicked" handler="xs_cfg_sp2_filter_delete"/>
-				</widget>
-				<packing>
-				 <property name="left_attach">2</property>
-				 <property name="right_attach">3</property>
-				 <property name="top_attach">0</property>
-				 <property name="bottom_attach">1</property>
-				 <property name="x_options">fill</property>
-				 <property name="y_options"></property>
-				</packing>
-			 </child>
-			 </widget>
-			 <packing>
-			 <property name="padding">0</property>
-			 <property name="expand">False</property>
-			 <property name="fill">True</property>
-			 </packing>
-			 </child>
-			</widget>
-			<packing>
-			 <property name="padding">0</property>
-			 <property name="expand">False</property>
-			 <property name="fill">False</property>
-			</packing>
-		 </child>
-
-		 <child>
-			<widget class="GtkFrame" id="cfg_sp2_filter_frame">
-			 <property name="border_width">2</property>
-			 <property name="visible">True</property>
-			 <property name="label_xalign">0</property>
-			 <property name="label_yalign">0.5</property>
-			 <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-
-			 <child>
-			 <placeholder/>
-			 </child>
-
-			 <child>
-			 <widget class="GtkLabel" id="label14">
-			 <property name="visible">True</property>
-			 <property name="label" translatable="yes">Filter curve:</property>
-			 <property name="use_underline">False</property>
-			 <property name="use_markup">False</property>
-			 <property name="justify">GTK_JUSTIFY_LEFT</property>
-			 <property name="wrap">False</property>
-			 <property name="selectable">False</property>
-			 <property name="xalign">0.5</property>
-			 <property name="yalign">0.5</property>
-			 <property name="xpad">0</property>
-			 <property name="ypad">0</property>
-			 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			 <property name="width_chars">-1</property>
-			 <property name="single_line_mode">False</property>
-			 <property name="angle">0</property>
-			 </widget>
-			 <packing>
-			 <property name="type">label_item</property>
-			 </packing>
-			 </child>
-			</widget>
-			<packing>
-			 <property name="padding">0</property>
-			 <property name="expand">True</property>
-			 <property name="fill">True</property>
-			</packing>
-		 </child>
-		 </widget>
-		 <packing>
-		 <property name="tab_expand">False</property>
-		 <property name="tab_fill">True</property>
-		 </packing>
-		 </child>
-
-		 <child>
-		 <widget class="GtkLabel" id="w_label56">
-		 <property name="visible">True</property>
-		 <property name="label" translatable="yes">SIDPlay2</property>
-		 <property name="use_underline">False</property>
-		 <property name="use_markup">False</property>
-		 <property name="justify">GTK_JUSTIFY_CENTER</property>
-		 <property name="wrap">False</property>
-		 <property name="selectable">False</property>
-		 <property name="xalign">0.5</property>
-		 <property name="yalign">0.5</property>
-		 <property name="xpad">0</property>
-		 <property name="ypad">0</property>
-		 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		 <property name="width_chars">-1</property>
-		 <property name="single_line_mode">False</property>
-		 <property name="angle">0</property>
-		 </widget>
-		 <packing>
-		 <property name="type">tab</property>
-		 </packing>
-		 </child>
-		</widget>
-		<packing>
-		 <property name="padding">0</property>
-		 <property name="expand">True</property>
-		 <property name="fill">True</property>
-		</packing>
-	 </child>
-	 </widget>
-	 <packing>
-	 <property name="tab_expand">False</property>
-	 <property name="tab_fill">True</property>
-	 </packing>
-	 </child>
-
-	 <child>
-	 <widget class="GtkLabel" id="w_label24">
-	 <property name="visible">True</property>
-	 <property name="label" translatable="yes">Filters</property>
-	 <property name="use_underline">False</property>
-	 <property name="use_markup">False</property>
-	 <property name="justify">GTK_JUSTIFY_CENTER</property>
-	 <property name="wrap">False</property>
-	 <property name="selectable">False</property>
-	 <property name="xalign">0.5</property>
-	 <property name="yalign">0.5</property>
-	 <property name="xpad">0</property>
-	 <property name="ypad">0</property>
-	 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-	 <property name="width_chars">-1</property>
-	 <property name="single_line_mode">False</property>
-	 <property name="angle">0</property>
-	 </widget>
-	 <packing>
-	 <property name="type">tab</property>
-	 </packing>
-	 </child>
-
-	 <child>
-	 <widget class="GtkVBox" id="w_vbox20">
-	 <property name="visible">True</property>
-	 <property name="homogeneous">False</property>
-	 <property name="spacing">0</property>
-
-	 <child>
-		<widget class="GtkFrame" id="w_frame29">
-		 <property name="border_width">4</property>
-		 <property name="visible">True</property>
-		 <property name="label_xalign">0</property>
-		 <property name="label_yalign">0.5</property>
-		 <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-
-		 <child>
-		 <widget class="GtkVBox" id="w_vbox32">
-		 <property name="border_width">2</property>
-		 <property name="visible">True</property>
-		 <property name="homogeneous">False</property>
-		 <property name="spacing">2</property>
-
-		 <child>
-			<widget class="GtkCheckButton" id="cfg_mintime_enable">
-			 <property name="visible">True</property>
-			 <property name="tooltip" translatable="yes">If enabled, the tune is played at least for the specified time, adding silence to the end if necessary.</property>
-			 <property name="can_focus">True</property>
-			 <property name="label" translatable="yes">Play at least for specified time</property>
-			 <property name="use_underline">True</property>
-			 <property name="relief">GTK_RELIEF_NORMAL</property>
-			 <property name="focus_on_click">True</property>
-			 <property name="active">False</property>
-			 <property name="inconsistent">False</property>
-			 <property name="draw_indicator">True</property>
-			 <signal name="toggled" handler="xs_cfg_mintime_enable_toggled"/>
-			</widget>
-			<packing>
-			 <property name="padding">0</property>
-			 <property name="expand">False</property>
-			 <property name="fill">False</property>
-			</packing>
-		 </child>
-
-		 <child>
-			<widget class="GtkHBox" id="cfg_mintime_box">
-			 <property name="visible">True</property>
-			 <property name="homogeneous">False</property>
-			 <property name="spacing">2</property>
-
-			 <child>
-			 <widget class="GtkLabel" id="cfg_mintime_label1">
-			 <property name="visible">True</property>
-			 <property name="label" translatable="yes">Playtime:</property>
-			 <property name="use_underline">False</property>
-			 <property name="use_markup">False</property>
-			 <property name="justify">GTK_JUSTIFY_CENTER</property>
-			 <property name="wrap">False</property>
-			 <property name="selectable">False</property>
-			 <property name="xalign">0</property>
-			 <property name="yalign">0.5</property>
-			 <property name="xpad">0</property>
-			 <property name="ypad">0</property>
-			 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			 <property name="width_chars">-1</property>
-			 <property name="single_line_mode">False</property>
-			 <property name="angle">0</property>
-			 </widget>
-			 <packing>
-			 <property name="padding">0</property>
-			 <property name="expand">False</property>
-			 <property name="fill">False</property>
-			 </packing>
-			 </child>
-
-			 <child>
-			 <widget class="GtkSpinButton" id="cfg_mintime">
-			 <property name="visible">True</property>
-			 <property name="can_focus">True</property>
-			 <property name="climb_rate">1</property>
-			 <property name="digits">0</property>
-			 <property name="numeric">False</property>
-			 <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-			 <property name="snap_to_ticks">False</property>
-			 <property name="wrap">False</property>
-			 <property name="adjustment">15 1 32767 1 60 60</property>
-			 <signal name="changed" handler="xs_cfg_mintime_changed"/>
-			 </widget>
-			 <packing>
-			 <property name="padding">0</property>
-			 <property name="expand">False</property>
-			 <property name="fill">True</property>
-			 </packing>
-			 </child>
-
-			 <child>
-			 <widget class="GtkLabel" id="cfg_mintime_label2">
-			 <property name="visible">True</property>
-			 <property name="label" translatable="yes">seconds</property>
-			 <property name="use_underline">False</property>
-			 <property name="use_markup">False</property>
-			 <property name="justify">GTK_JUSTIFY_CENTER</property>
-			 <property name="wrap">False</property>
-			 <property name="selectable">False</property>
-			 <property name="xalign">0</property>
-			 <property name="yalign">0.5</property>
-			 <property name="xpad">0</property>
-			 <property name="ypad">0</property>
-			 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			 <property name="width_chars">-1</property>
-			 <property name="single_line_mode">False</property>
-			 <property name="angle">0</property>
-			 </widget>
-			 <packing>
-			 <property name="padding">0</property>
-			 <property name="expand">False</property>
-			 <property name="fill">False</property>
-			 </packing>
-			 </child>
-			</widget>
-			<packing>
-			 <property name="padding">2</property>
-			 <property name="expand">False</property>
-			 <property name="fill">True</property>
-			</packing>
-		 </child>
-		 </widget>
-		 </child>
-
-		 <child>
-		 <widget class="GtkLabel" id="label15">
-		 <property name="visible">True</property>
-		 <property name="label" translatable="yes">Minimum playtime:</property>
-		 <property name="use_underline">False</property>
-		 <property name="use_markup">False</property>
-		 <property name="justify">GTK_JUSTIFY_LEFT</property>
-		 <property name="wrap">False</property>
-		 <property name="selectable">False</property>
-		 <property name="xalign">0.5</property>
-		 <property name="yalign">0.5</property>
-		 <property name="xpad">0</property>
-		 <property name="ypad">0</property>
-		 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		 <property name="width_chars">-1</property>
-		 <property name="single_line_mode">False</property>
-		 <property name="angle">0</property>
-		 </widget>
-		 <packing>
-		 <property name="type">label_item</property>
-		 </packing>
-		 </child>
-		</widget>
-		<packing>
-		 <property name="padding">0</property>
-		 <property name="expand">False</property>
-		 <property name="fill">False</property>
-		</packing>
-	 </child>
-
-	 <child>
-		<widget class="GtkFrame" id="w_frame21">
-		 <property name="border_width">4</property>
-		 <property name="visible">True</property>
-		 <property name="label_xalign">0</property>
-		 <property name="label_yalign">0.5</property>
-		 <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-
-		 <child>
-		 <widget class="GtkVBox" id="w_vbox21">
-		 <property name="border_width">2</property>
-		 <property name="visible">True</property>
-		 <property name="homogeneous">False</property>
-		 <property name="spacing">2</property>
-
-		 <child>
-			<widget class="GtkCheckButton" id="cfg_maxtime_enable">
-			 <property name="visible">True</property>
-			 <property name="tooltip" translatable="yes">If enabled, tune is played until specified duration is reached (aka maximum playtime).</property>
-			 <property name="can_focus">True</property>
-			 <property name="label" translatable="yes">Play for specified time maximum</property>
-			 <property name="use_underline">True</property>
-			 <property name="relief">GTK_RELIEF_NORMAL</property>
-			 <property name="focus_on_click">True</property>
-			 <property name="active">False</property>
-			 <property name="inconsistent">False</property>
-			 <property name="draw_indicator">True</property>
-			 <signal name="toggled" handler="xs_cfg_maxtime_enable_toggled"/>
-			</widget>
-			<packing>
-			 <property name="padding">0</property>
-			 <property name="expand">False</property>
-			 <property name="fill">False</property>
-			</packing>
-		 </child>
-
-		 <child>
-			<widget class="GtkCheckButton" id="cfg_maxtime_unknown">
-			 <property name="visible">True</property>
-			 <property name="tooltip" translatable="yes">If enabled, the maximum playtime is applied only if song/tune length is not known.</property>
-			 <property name="can_focus">True</property>
-			 <property name="label" translatable="yes">Only when song length is unknown</property>
-			 <property name="use_underline">True</property>
-			 <property name="relief">GTK_RELIEF_NORMAL</property>
-			 <property name="focus_on_click">True</property>
-			 <property name="active">False</property>
-			 <property name="inconsistent">False</property>
-			 <property name="draw_indicator">True</property>
-			</widget>
-			<packing>
-			 <property name="padding">0</property>
-			 <property name="expand">False</property>
-			 <property name="fill">False</property>
-			</packing>
-		 </child>
-
-		 <child>
-			<widget class="GtkHBox" id="cfg_maxtime_box">
-			 <property name="visible">True</property>
-			 <property name="homogeneous">False</property>
-			 <property name="spacing">2</property>
-
-			 <child>
-			 <widget class="GtkLabel" id="cfg_maxtime_label1">
-			 <property name="visible">True</property>
-			 <property name="label" translatable="yes">Playtime:</property>
-			 <property name="use_underline">False</property>
-			 <property name="use_markup">False</property>
-			 <property name="justify">GTK_JUSTIFY_CENTER</property>
-			 <property name="wrap">False</property>
-			 <property name="selectable">False</property>
-			 <property name="xalign">0</property>
-			 <property name="yalign">0.5</property>
-			 <property name="xpad">0</property>
-			 <property name="ypad">0</property>
-			 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			 <property name="width_chars">-1</property>
-			 <property name="single_line_mode">False</property>
-			 <property name="angle">0</property>
-			 </widget>
-			 <packing>
-			 <property name="padding">0</property>
-			 <property name="expand">False</property>
-			 <property name="fill">False</property>
-			 </packing>
-			 </child>
-
-			 <child>
-			 <widget class="GtkSpinButton" id="cfg_maxtime">
-			 <property name="visible">True</property>
-			 <property name="can_focus">True</property>
-			 <property name="climb_rate">1</property>
-			 <property name="digits">0</property>
-			 <property name="numeric">False</property>
-			 <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-			 <property name="snap_to_ticks">False</property>
-			 <property name="wrap">False</property>
-			 <property name="adjustment">150 1 32767 1 60 60</property>
-			 <signal name="changed" handler="xs_cfg_maxtime_changed"/>
-			 </widget>
-			 <packing>
-			 <property name="padding">0</property>
-			 <property name="expand">False</property>
-			 <property name="fill">True</property>
-			 </packing>
-			 </child>
-
-			 <child>
-			 <widget class="GtkLabel" id="cfg_maxtime_label2">
-			 <property name="visible">True</property>
-			 <property name="label" translatable="yes">seconds</property>
-			 <property name="use_underline">False</property>
-			 <property name="use_markup">False</property>
-			 <property name="justify">GTK_JUSTIFY_CENTER</property>
-			 <property name="wrap">False</property>
-			 <property name="selectable">False</property>
-			 <property name="xalign">0</property>
-			 <property name="yalign">0.5</property>
-			 <property name="xpad">0</property>
-			 <property name="ypad">0</property>
-			 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			 <property name="width_chars">-1</property>
-			 <property name="single_line_mode">False</property>
-			 <property name="angle">0</property>
-			 </widget>
-			 <packing>
-			 <property name="padding">0</property>
-			 <property name="expand">False</property>
-			 <property name="fill">False</property>
-			 </packing>
-			 </child>
-			</widget>
-			<packing>
-			 <property name="padding">2</property>
-			 <property name="expand">False</property>
-			 <property name="fill">True</property>
-			</packing>
-		 </child>
-		 </widget>
-		 </child>
-
-		 <child>
-		 <widget class="GtkLabel" id="label16">
-		 <property name="visible">True</property>
-		 <property name="label" translatable="yes">Maximum playtime:</property>
-		 <property name="use_underline">False</property>
-		 <property name="use_markup">False</property>
-		 <property name="justify">GTK_JUSTIFY_LEFT</property>
-		 <property name="wrap">False</property>
-		 <property name="selectable">False</property>
-		 <property name="xalign">0.5</property>
-		 <property name="yalign">0.5</property>
-		 <property name="xpad">0</property>
-		 <property name="ypad">0</property>
-		 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		 <property name="width_chars">-1</property>
-		 <property name="single_line_mode">False</property>
-		 <property name="angle">0</property>
-		 </widget>
-		 <packing>
-		 <property name="type">label_item</property>
-		 </packing>
-		 </child>
-		</widget>
-		<packing>
-		 <property name="padding">0</property>
-		 <property name="expand">False</property>
-		 <property name="fill">True</property>
-		</packing>
-	 </child>
-
-	 <child>
-		<widget class="GtkFrame" id="w_frame18">
-		 <property name="border_width">4</property>
-		 <property name="visible">True</property>
-		 <property name="label_xalign">0</property>
-		 <property name="label_yalign">0.5</property>
-		 <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-
-		 <child>
-		 <widget class="GtkVBox" id="w_vbox18">
-		 <property name="border_width">2</property>
-		 <property name="visible">True</property>
-		 <property name="homogeneous">False</property>
-		 <property name="spacing">2</property>
-
-		 <child>
-			<widget class="GtkCheckButton" id="cfg_sld_enable">
-			 <property name="visible">True</property>
-			 <property name="tooltip" translatable="yes">This option enables using of XSIDPLAY compatible song length database. (Refer to Audacious-SID documentation for more information)</property>
-			 <property name="can_focus">True</property>
-			 <property name="label" translatable="yes">Use XSIDPLAY-compatible database</property>
-			 <property name="use_underline">True</property>
-			 <property name="relief">GTK_RELIEF_NORMAL</property>
-			 <property name="focus_on_click">True</property>
-			 <property name="active">False</property>
-			 <property name="inconsistent">False</property>
-			 <property name="draw_indicator">True</property>
-			 <signal name="toggled" handler="xs_cfg_sldb_enable_toggled"/>
-			</widget>
-			<packing>
-			 <property name="padding">0</property>
-			 <property name="expand">False</property>
-			 <property name="fill">False</property>
-			</packing>
-		 </child>
-
-		 <child>
-			<widget class="GtkHBox" id="cfg_sld_box">
-			 <property name="visible">True</property>
-			 <property name="homogeneous">False</property>
-			 <property name="spacing">4</property>
-
-			 <child>
-			 <widget class="GtkLabel" id="cfg_sld_label1">
-			 <property name="visible">True</property>
-			 <property name="label" translatable="yes">DB-file:</property>
-			 <property name="use_underline">False</property>
-			 <property name="use_markup">False</property>
-			 <property name="justify">GTK_JUSTIFY_CENTER</property>
-			 <property name="wrap">False</property>
-			 <property name="selectable">False</property>
-			 <property name="xalign">0.5</property>
-			 <property name="yalign">0.5</property>
-			 <property name="xpad">0</property>
-			 <property name="ypad">0</property>
-			 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			 <property name="width_chars">-1</property>
-			 <property name="single_line_mode">False</property>
-			 <property name="angle">0</property>
-			 </widget>
-			 <packing>
-			 <property name="padding">0</property>
-			 <property name="expand">False</property>
-			 <property name="fill">True</property>
-			 </packing>
-			 </child>
-
-			 <child>
-			 <widget class="GtkEntry" id="cfg_sld_dbpath">
-			 <property name="visible">True</property>
-			 <property name="tooltip" translatable="yes">Database path and filename</property>
-			 <property name="can_focus">True</property>
-			 <property name="editable">True</property>
-			 <property name="visibility">True</property>
-			 <property name="max_length">0</property>
-			 <property name="text" translatable="yes"></property>
-			 <property name="has_frame">True</property>
-			 <property name="invisible_char">●</property>
-			 <property name="activates_default">False</property>
-			 </widget>
-			 <packing>
-			 <property name="padding">0</property>
-			 <property name="expand">True</property>
-			 <property name="fill">True</property>
-			 </packing>
-			 </child>
-
-			 <child>
-			 <widget class="GtkButton" id="cfg_sld_dbbrowse">
-			 <property name="visible">True</property>
-			 <property name="tooltip" translatable="yes">Browse for song length-database file</property>
-			 <property name="can_focus">True</property>
-			 <property name="relief">GTK_RELIEF_NORMAL</property>
-			 <property name="focus_on_click">True</property>
-			 <signal name="clicked" handler="xs_cfg_sldb_browse"/>
-
-			 <child>
-				<widget class="GtkAlignment" id="alignment1">
-				 <property name="visible">True</property>
-				 <property name="xalign">0.5</property>
-				 <property name="yalign">0.5</property>
-				 <property name="xscale">0</property>
-				 <property name="yscale">0</property>
-				 <property name="top_padding">0</property>
-				 <property name="bottom_padding">0</property>
-				 <property name="left_padding">0</property>
-				 <property name="right_padding">0</property>
-
-				 <child>
-				 <widget class="GtkHBox" id="hbox1">
-				 <property name="visible">True</property>
-				 <property name="homogeneous">False</property>
-				 <property name="spacing">2</property>
-
-				 <child>
-					<widget class="GtkImage" id="image1">
-					 <property name="visible">True</property>
-					 <property name="stock">gtk-open</property>
-					 <property name="icon_size">4</property>
-					 <property name="xalign">0.5</property>
-					 <property name="yalign">0.5</property>
-					 <property name="xpad">0</property>
-					 <property name="ypad">0</property>
-					</widget>
-					<packing>
-					 <property name="padding">0</property>
-					 <property name="expand">False</property>
-					 <property name="fill">False</property>
-					</packing>
-				 </child>
-
-				 <child>
-					<widget class="GtkLabel" id="label30">
-					 <property name="visible">True</property>
-					 <property name="label" translatable="yes">Browse</property>
-					 <property name="use_underline">True</property>
-					 <property name="use_markup">False</property>
-					 <property name="justify">GTK_JUSTIFY_LEFT</property>
-					 <property name="wrap">False</property>
-					 <property name="selectable">False</property>
-					 <property name="xalign">0.5</property>
-					 <property name="yalign">0.5</property>
-					 <property name="xpad">0</property>
-					 <property name="ypad">0</property>
-					 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-					 <property name="width_chars">-1</property>
-					 <property name="single_line_mode">False</property>
-					 <property name="angle">0</property>
-					</widget>
-					<packing>
-					 <property name="padding">0</property>
-					 <property name="expand">False</property>
-					 <property name="fill">False</property>
-					</packing>
-				 </child>
-				 </widget>
-				 </child>
-				</widget>
-			 </child>
-			 </widget>
-			 <packing>
-			 <property name="padding">0</property>
-			 <property name="expand">False</property>
-			 <property name="fill">False</property>
-			 </packing>
-			 </child>
-			</widget>
-			<packing>
-			 <property name="padding">0</property>
-			 <property name="expand">False</property>
-			 <property name="fill">True</property>
-			</packing>
-		 </child>
-		 </widget>
-		 </child>
-
-		 <child>
-		 <widget class="GtkLabel" id="label17">
-		 <property name="visible">True</property>
-		 <property name="label" translatable="yes">Song length database:</property>
-		 <property name="use_underline">False</property>
-		 <property name="use_markup">False</property>
-		 <property name="justify">GTK_JUSTIFY_LEFT</property>
-		 <property name="wrap">False</property>
-		 <property name="selectable">False</property>
-		 <property name="xalign">0.5</property>
-		 <property name="yalign">0.5</property>
-		 <property name="xpad">0</property>
-		 <property name="ypad">0</property>
-		 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		 <property name="width_chars">-1</property>
-		 <property name="single_line_mode">False</property>
-		 <property name="angle">0</property>
-		 </widget>
-		 <packing>
-		 <property name="type">label_item</property>
-		 </packing>
-		 </child>
-		</widget>
-		<packing>
-		 <property name="padding">0</property>
-		 <property name="expand">False</property>
-		 <property name="fill">True</property>
-		</packing>
-	 </child>
-	 </widget>
-	 <packing>
-	 <property name="tab_expand">False</property>
-	 <property name="tab_fill">True</property>
-	 </packing>
-	 </child>
-
-	 <child>
-	 <widget class="GtkLabel" id="w_label26">
-	 <property name="visible">True</property>
-	 <property name="label" translatable="yes">Songlength</property>
-	 <property name="use_underline">False</property>
-	 <property name="use_markup">False</property>
-	 <property name="justify">GTK_JUSTIFY_CENTER</property>
-	 <property name="wrap">False</property>
-	 <property name="selectable">False</property>
-	 <property name="xalign">0.5</property>
-	 <property name="yalign">0.5</property>
-	 <property name="xpad">0</property>
-	 <property name="ypad">0</property>
-	 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-	 <property name="width_chars">-1</property>
-	 <property name="single_line_mode">False</property>
-	 <property name="angle">0</property>
-	 </widget>
-	 <packing>
-	 <property name="type">tab</property>
-	 </packing>
-	 </child>
-
-	 <child>
-	 <widget class="GtkFrame" id="frame1">
-	 <property name="border_width">4</property>
-	 <property name="visible">True</property>
-	 <property name="label_xalign">0</property>
-	 <property name="label_yalign">0.5</property>
-	 <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-
-	 <child>
-		<widget class="GtkVBox" id="vbox1">
-		 <property name="border_width">2</property>
-		 <property name="visible">True</property>
-		 <property name="homogeneous">False</property>
-		 <property name="spacing">2</property>
-
-		 <child>
-		 <widget class="GtkCheckButton" id="cfg_ftitle_override">
-		 <property name="visible">True</property>
-		 <property name="tooltip" translatable="yes">By enabling this option you can specify a custom Tuplez formatting string for SID-files. The SID-plugin specific Tuplez tags are described shortly below.</property>
-		 <property name="can_focus">True</property>
-		 <property name="label" translatable="yes">Override generic Tuplez format string</property>
-		 <property name="use_underline">True</property>
-		 <property name="relief">GTK_RELIEF_NORMAL</property>
-		 <property name="focus_on_click">True</property>
-		 <property name="active">False</property>
-		 <property name="inconsistent">False</property>
-		 <property name="draw_indicator">True</property>
-		 <signal name="toggled" handler="xs_cfg_ftitle_override_toggled" last_modification_time="Wed, 05 Sep 2007 21:51:50 GMT"/>
-		 </widget>
-		 <packing>
-		 <property name="padding">0</property>
-		 <property name="expand">False</property>
-		 <property name="fill">False</property>
-		 </packing>
-		 </child>
-
-		 <child>
-		 <widget class="GtkVBox" id="cfg_ftitle_box">
-		 <property name="visible">True</property>
-		 <property name="homogeneous">False</property>
-		 <property name="spacing">0</property>
-
-		 <child>
-			<widget class="GtkEntry" id="cfg_ftitle_format">
-			 <property name="visible">True</property>
-			 <property name="tooltip" translatable="yes">Tuplez format string for SID-files</property>
-			 <property name="can_focus">True</property>
-			 <property name="editable">True</property>
-			 <property name="visibility">True</property>
-			 <property name="max_length">0</property>
-			 <property name="text" translatable="yes"></property>
-			 <property name="has_frame">True</property>
-			 <property name="invisible_char">●</property>
-			 <property name="activates_default">False</property>
-			</widget>
-			<packing>
-			 <property name="padding">0</property>
-			 <property name="expand">False</property>
-			 <property name="fill">False</property>
-			</packing>
-		 </child>
-
-		 <child>
-			<widget class="GtkLabel" id="cfg_ftitle_descs">
-			 <property name="visible">True</property>
-			 <property name="label" translatable="yes">&lt;u&gt;SID-specific Tuplez fields:&lt;/u&gt;
-
-&lt;b&gt;sid-format&lt;/b&gt;		- Specific fileformat
-&lt;b&gt;sid-model&lt;/b&gt;		- 6581 or 8580
-&lt;b&gt;sid-speed&lt;/b&gt;		- Timing or speed: PAL/NTSC/etc.
-
-&lt;u&gt;Other &quot;special&quot; fields set:&lt;/u&gt;
-
-&lt;b&gt;subsong-num, subsong-id&lt;/b&gt;</property>
-			 <property name="use_underline">False</property>
-			 <property name="use_markup">True</property>
-			 <property name="justify">GTK_JUSTIFY_LEFT</property>
-			 <property name="wrap">False</property>
-			 <property name="selectable">False</property>
-			 <property name="xalign">0</property>
-			 <property name="yalign">0</property>
-			 <property name="xpad">8</property>
-			 <property name="ypad">8</property>
-			 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			 <property name="width_chars">-1</property>
-			 <property name="single_line_mode">False</property>
-			 <property name="angle">0</property>
-			</widget>
-			<packing>
-			 <property name="padding">0</property>
-			 <property name="expand">True</property>
-			 <property name="fill">True</property>
-			</packing>
-		 </child>
-		 </widget>
-		 <packing>
-		 <property name="padding">0</property>
-		 <property name="expand">True</property>
-		 <property name="fill">True</property>
-		 </packing>
-		 </child>
-		</widget>
-	 </child>
-
-	 <child>
-		<widget class="GtkLabel" id="label29">
-		 <property name="visible">True</property>
-		 <property name="label" translatable="yes">Song title format:</property>
-		 <property name="use_underline">False</property>
-		 <property name="use_markup">False</property>
-		 <property name="justify">GTK_JUSTIFY_LEFT</property>
-		 <property name="wrap">False</property>
-		 <property name="selectable">False</property>
-		 <property name="xalign">0.5</property>
-		 <property name="yalign">0.5</property>
-		 <property name="xpad">0</property>
-		 <property name="ypad">0</property>
-		 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		 <property name="width_chars">-1</property>
-		 <property name="single_line_mode">False</property>
-		 <property name="angle">0</property>
-		</widget>
-		<packing>
-		 <property name="type">label_item</property>
-		</packing>
-	 </child>
-	 </widget>
-	 <packing>
-	 <property name="tab_expand">False</property>
-	 <property name="tab_fill">True</property>
-	 </packing>
-	 </child>
-
-	 <child>
-	 <widget class="GtkLabel" id="w_label27">
-	 <property name="visible">True</property>
-	 <property name="label" translatable="yes">Title</property>
-	 <property name="use_underline">False</property>
-	 <property name="use_markup">False</property>
-	 <property name="justify">GTK_JUSTIFY_LEFT</property>
-	 <property name="wrap">False</property>
-	 <property name="selectable">False</property>
-	 <property name="xalign">0.5</property>
-	 <property name="yalign">0.5</property>
-	 <property name="xpad">0</property>
-	 <property name="ypad">0</property>
-	 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-	 <property name="width_chars">-1</property>
-	 <property name="single_line_mode">False</property>
-	 <property name="angle">0</property>
-	 </widget>
-	 <packing>
-	 <property name="type">tab</property>
-	 </packing>
-	 </child>
-
-	 <child>
-	 <widget class="GtkVBox" id="w_vbox19">
-	 <property name="visible">True</property>
-	 <property name="homogeneous">False</property>
-	 <property name="spacing">0</property>
-
-	 <child>
-		<widget class="GtkFrame" id="w_frame31">
-		 <property name="border_width">4</property>
-		 <property name="visible">True</property>
-		 <property name="label_xalign">0</property>
-		 <property name="label_yalign">0.5</property>
-		 <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-
-		 <child>
-		 <widget class="GtkVBox" id="w_vbox35">
-		 <property name="border_width">2</property>
-		 <property name="visible">True</property>
-		 <property name="homogeneous">False</property>
-		 <property name="spacing">2</property>
-
-		 <child>
-			<widget class="GtkCheckButton" id="cfg_subauto_enable">
-			 <property name="visible">True</property>
-			 <property name="tooltip" translatable="yes">If enabled, sub-tunes of each file will be added to playlist. If disabled, only the default sub-tune will be added.</property>
-			 <property name="can_focus">True</property>
-			 <property name="label" translatable="yes">Add sub-tunes to playlist</property>
-			 <property name="use_underline">True</property>
-			 <property name="relief">GTK_RELIEF_NORMAL</property>
-			 <property name="focus_on_click">True</property>
-			 <property name="active">False</property>
-			 <property name="inconsistent">False</property>
-			 <property name="draw_indicator">True</property>
-			 <signal name="toggled" handler="xs_cfg_subauto_enable_toggled"/>
-			</widget>
-			<packing>
-			 <property name="padding">0</property>
-			 <property name="expand">False</property>
-			 <property name="fill">False</property>
-			</packing>
-		 </child>
-
-		 <child>
-			<widget class="GtkCheckButton" id="cfg_subauto_min_only">
-			 <property name="visible">True</property>
-			 <property name="tooltip" translatable="yes">Only add sub-tunes that have a duration of at least specified time.</property>
-			 <property name="can_focus">True</property>
-			 <property name="label" translatable="yes">Only tunes with specified minimum duration</property>
-			 <property name="use_underline">True</property>
-			 <property name="relief">GTK_RELIEF_NORMAL</property>
-			 <property name="focus_on_click">True</property>
-			 <property name="active">False</property>
-			 <property name="inconsistent">False</property>
-			 <property name="draw_indicator">True</property>
-			 <signal name="toggled" handler="xs_cfg_subauto_min_only_toggled"/>
-			</widget>
-			<packing>
-			 <property name="padding">0</property>
-			 <property name="expand">False</property>
-			 <property name="fill">False</property>
-			</packing>
-		 </child>
-
-		 <child>
-			<widget class="GtkHBox" id="cfg_subauto_box">
-			 <property name="visible">True</property>
-			 <property name="homogeneous">False</property>
-			 <property name="spacing">2</property>
-
-			 <child>
-			 <widget class="GtkLabel" id="w_label52">
-			 <property name="visible">True</property>
-			 <property name="label" translatable="yes">Playtime:</property>
-			 <property name="use_underline">False</property>
-			 <property name="use_markup">False</property>
-			 <property name="justify">GTK_JUSTIFY_CENTER</property>
-			 <property name="wrap">False</property>
-			 <property name="selectable">False</property>
-			 <property name="xalign">0</property>
-			 <property name="yalign">0.5</property>
-			 <property name="xpad">0</property>
-			 <property name="ypad">0</property>
-			 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			 <property name="width_chars">-1</property>
-			 <property name="single_line_mode">False</property>
-			 <property name="angle">0</property>
-			 </widget>
-			 <packing>
-			 <property name="padding">0</property>
-			 <property name="expand">False</property>
-			 <property name="fill">False</property>
-			 </packing>
-			 </child>
-
-			 <child>
-			 <widget class="GtkSpinButton" id="cfg_subauto_mintime">
-			 <property name="visible">True</property>
-			 <property name="can_focus">True</property>
-			 <property name="climb_rate">1</property>
-			 <property name="digits">0</property>
-			 <property name="numeric">False</property>
-			 <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-			 <property name="snap_to_ticks">False</property>
-			 <property name="wrap">False</property>
-			 <property name="adjustment">15 1 32767 1 60 60</property>
-			 </widget>
-			 <packing>
-			 <property name="padding">0</property>
-			 <property name="expand">False</property>
-			 <property name="fill">True</property>
-			 </packing>
-			 </child>
-
-			 <child>
-			 <widget class="GtkLabel" id="w_label53">
-			 <property name="visible">True</property>
-			 <property name="label" translatable="yes">seconds</property>
-			 <property name="use_underline">False</property>
-			 <property name="use_markup">False</property>
-			 <property name="justify">GTK_JUSTIFY_CENTER</property>
-			 <property name="wrap">False</property>
-			 <property name="selectable">False</property>
-			 <property name="xalign">0</property>
-			 <property name="yalign">0.5</property>
-			 <property name="xpad">0</property>
-			 <property name="ypad">0</property>
-			 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			 <property name="width_chars">-1</property>
-			 <property name="single_line_mode">False</property>
-			 <property name="angle">0</property>
-			 </widget>
-			 <packing>
-			 <property name="padding">0</property>
-			 <property name="expand">False</property>
-			 <property name="fill">False</property>
-			 </packing>
-			 </child>
-			</widget>
-			<packing>
-			 <property name="padding">0</property>
-			 <property name="expand">True</property>
-			 <property name="fill">True</property>
-			</packing>
-		 </child>
-		 </widget>
-		 </child>
-
-		 <child>
-		 <widget class="GtkLabel" id="label21">
-		 <property name="visible">True</property>
-		 <property name="label" translatable="yes">Sub-tune handling:</property>
-		 <property name="use_underline">False</property>
-		 <property name="use_markup">False</property>
-		 <property name="justify">GTK_JUSTIFY_LEFT</property>
-		 <property name="wrap">False</property>
-		 <property name="selectable">False</property>
-		 <property name="xalign">0.5</property>
-		 <property name="yalign">0.5</property>
-		 <property name="xpad">0</property>
-		 <property name="ypad">0</property>
-		 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		 <property name="width_chars">-1</property>
-		 <property name="single_line_mode">False</property>
-		 <property name="angle">0</property>
-		 </widget>
-		 <packing>
-		 <property name="type">label_item</property>
-		 </packing>
-		 </child>
-		</widget>
-		<packing>
-		 <property name="padding">0</property>
-		 <property name="expand">False</property>
-		 <property name="fill">True</property>
-		</packing>
-	 </child>
-
-	 <child>
-		<widget class="GtkFrame" id="w_frame7">
-		 <property name="border_width">4</property>
-		 <property name="visible">True</property>
-		 <property name="label_xalign">0</property>
-		 <property name="label_yalign">0.5</property>
-		 <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-
-		 <child>
-		 <widget class="GtkVBox" id="w_vbox8">
-		 <property name="border_width">2</property>
-		 <property name="visible">True</property>
-		 <property name="homogeneous">False</property>
-		 <property name="spacing">2</property>
-
-		 <child>
-			<widget class="GtkCheckButton" id="cfg_stil_enable">
-			 <property name="visible">True</property>
-			 <property name="tooltip" translatable="yes">If this option is enabled (and the database &amp; HVSC settings below are correctly set), Audacious-SID will use and display additional information from STIL database when HVSC SIDs are played.</property>
-			 <property name="can_focus">True</property>
-			 <property name="label" translatable="yes">Use STIL database</property>
-			 <property name="use_underline">True</property>
-			 <property name="relief">GTK_RELIEF_NORMAL</property>
-			 <property name="focus_on_click">True</property>
-			 <property name="active">False</property>
-			 <property name="inconsistent">False</property>
-			 <property name="draw_indicator">True</property>
-			 <signal name="toggled" handler="xs_cfg_stil_enable_toggled"/>
-			</widget>
-			<packing>
-			 <property name="padding">0</property>
-			 <property name="expand">True</property>
-			 <property name="fill">False</property>
-			</packing>
-		 </child>
-
-		 <child>
-			<widget class="GtkHBox" id="cfg_stil_box1">
-			 <property name="visible">True</property>
-			 <property name="homogeneous">False</property>
-			 <property name="spacing">0</property>
-
-			 <child>
-			 <widget class="GtkLabel" id="cfg_stil_label1">
-			 <property name="visible">True</property>
-			 <property name="label" translatable="yes">STIL file:</property>
-			 <property name="use_underline">False</property>
-			 <property name="use_markup">False</property>
-			 <property name="justify">GTK_JUSTIFY_CENTER</property>
-			 <property name="wrap">False</property>
-			 <property name="selectable">False</property>
-			 <property name="xalign">0.5</property>
-			 <property name="yalign">0.5</property>
-			 <property name="xpad">4</property>
-			 <property name="ypad">0</property>
-			 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			 <property name="width_chars">-1</property>
-			 <property name="single_line_mode">False</property>
-			 <property name="angle">0</property>
-			 </widget>
-			 <packing>
-			 <property name="padding">0</property>
-			 <property name="expand">False</property>
-			 <property name="fill">False</property>
-			 </packing>
-			 </child>
-
-			 <child>
-			 <widget class="GtkAlignment" id="w_alignment2">
-			 <property name="visible">True</property>
-			 <property name="xalign">0.5</property>
-			 <property name="yalign">0.5</property>
-			 <property name="xscale">1</property>
-			 <property name="yscale">1</property>
-			 <property name="top_padding">0</property>
-			 <property name="bottom_padding">0</property>
-			 <property name="left_padding">0</property>
-			 <property name="right_padding">0</property>
-
-			 <child>
-				<widget class="GtkEntry" id="cfg_stil_dbpath">
-				 <property name="visible">True</property>
-				 <property name="tooltip" translatable="yes">Path and filename of STIL database file (STIL.txt), usually found from HVSC's DOCUMENTS-subdirectory.</property>
-				 <property name="can_focus">True</property>
-				 <property name="editable">True</property>
-				 <property name="visibility">True</property>
-				 <property name="max_length">0</property>
-				 <property name="text" translatable="yes"></property>
-				 <property name="has_frame">True</property>
-				 <property name="invisible_char">●</property>
-				 <property name="activates_default">False</property>
-				</widget>
-			 </child>
-			 </widget>
-			 <packing>
-			 <property name="padding">4</property>
-			 <property name="expand">True</property>
-			 <property name="fill">True</property>
-			 </packing>
-			 </child>
-
-			 <child>
-			 <widget class="GtkAlignment" id="w_alignment1">
-			 <property name="border_width">4</property>
-			 <property name="visible">True</property>
-			 <property name="xalign">0.5</property>
-			 <property name="yalign">0.5</property>
-			 <property name="xscale">1</property>
-			 <property name="yscale">0.300000995398</property>
-			 <property name="top_padding">0</property>
-			 <property name="bottom_padding">0</property>
-			 <property name="left_padding">0</property>
-			 <property name="right_padding">0</property>
-
-			 <child>
-				<widget class="GtkButton" id="cfg_stil_browse">
-				 <property name="visible">True</property>
-				 <property name="tooltip" translatable="yes">Browse for STIL-database file</property>
-				 <property name="can_focus">True</property>
-				 <property name="relief">GTK_RELIEF_NORMAL</property>
-				 <property name="focus_on_click">True</property>
-				 <signal name="clicked" handler="xs_cfg_stil_browse"/>
-
-				 <child>
-				 <widget class="GtkAlignment" id="alignment2">
-				 <property name="visible">True</property>
-				 <property name="xalign">0.5</property>
-				 <property name="yalign">0.5</property>
-				 <property name="xscale">0</property>
-				 <property name="yscale">0</property>
-				 <property name="top_padding">0</property>
-				 <property name="bottom_padding">0</property>
-				 <property name="left_padding">0</property>
-				 <property name="right_padding">0</property>
-
-				 <child>
-					<widget class="GtkHBox" id="hbox2">
-					 <property name="visible">True</property>
-					 <property name="homogeneous">False</property>
-					 <property name="spacing">2</property>
-
-					 <child>
-					 <widget class="GtkImage" id="image2">
-					 <property name="visible">True</property>
-					 <property name="stock">gtk-open</property>
-					 <property name="icon_size">4</property>
-					 <property name="xalign">0.5</property>
-					 <property name="yalign">0.5</property>
-					 <property name="xpad">0</property>
-					 <property name="ypad">0</property>
-					 </widget>
-					 <packing>
-					 <property name="padding">0</property>
-					 <property name="expand">False</property>
-					 <property name="fill">False</property>
-					 </packing>
-					 </child>
-
-					 <child>
-					 <widget class="GtkLabel" id="label31">
-					 <property name="visible">True</property>
-					 <property name="label" translatable="yes">Browse</property>
-					 <property name="use_underline">True</property>
-					 <property name="use_markup">False</property>
-					 <property name="justify">GTK_JUSTIFY_LEFT</property>
-					 <property name="wrap">False</property>
-					 <property name="selectable">False</property>
-					 <property name="xalign">0.5</property>
-					 <property name="yalign">0.5</property>
-					 <property name="xpad">0</property>
-					 <property name="ypad">0</property>
-					 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-					 <property name="width_chars">-1</property>
-					 <property name="single_line_mode">False</property>
-					 <property name="angle">0</property>
-					 </widget>
-					 <packing>
-					 <property name="padding">0</property>
-					 <property name="expand">False</property>
-					 <property name="fill">False</property>
-					 </packing>
-					 </child>
-					</widget>
-				 </child>
-				 </widget>
-				 </child>
-				</widget>
-			 </child>
-			 </widget>
-			 <packing>
-			 <property name="padding">0</property>
-			 <property name="expand">False</property>
-			 <property name="fill">False</property>
-			 <property name="pack_type">GTK_PACK_END</property>
-			 </packing>
-			 </child>
-			</widget>
-			<packing>
-			 <property name="padding">0</property>
-			 <property name="expand">True</property>
-			 <property name="fill">True</property>
-			</packing>
-		 </child>
-
-		 <child>
-			<widget class="GtkHBox" id="cfg_stil_box2">
-			 <property name="visible">True</property>
-			 <property name="homogeneous">False</property>
-			 <property name="spacing">0</property>
-
-			 <child>
-			 <widget class="GtkLabel" id="cfg_hvsc_label1">
-			 <property name="visible">True</property>
-			 <property name="label" translatable="yes">HVSC path:</property>
-			 <property name="use_underline">False</property>
-			 <property name="use_markup">False</property>
-			 <property name="justify">GTK_JUSTIFY_CENTER</property>
-			 <property name="wrap">False</property>
-			 <property name="selectable">False</property>
-			 <property name="xalign">0.5</property>
-			 <property name="yalign">0.5</property>
-			 <property name="xpad">4</property>
-			 <property name="ypad">0</property>
-			 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			 <property name="width_chars">-1</property>
-			 <property name="single_line_mode">False</property>
-			 <property name="angle">0</property>
-			 </widget>
-			 <packing>
-			 <property name="padding">0</property>
-			 <property name="expand">False</property>
-			 <property name="fill">False</property>
-			 </packing>
-			 </child>
-
-			 <child>
-			 <widget class="GtkAlignment" id="w_alignment6">
-			 <property name="visible">True</property>
-			 <property name="xalign">0.5</property>
-			 <property name="yalign">0.5</property>
-			 <property name="xscale">1</property>
-			 <property name="yscale">1</property>
-			 <property name="top_padding">0</property>
-			 <property name="bottom_padding">0</property>
-			 <property name="left_padding">0</property>
-			 <property name="right_padding">0</property>
-
-			 <child>
-				<widget class="GtkEntry" id="cfg_hvsc_path">
-				 <property name="visible">True</property>
-				 <property name="tooltip" translatable="yes">Path to base-directory of your High Voltage SID Collection (HVSC), for example /media/C64Music/</property>
-				 <property name="can_focus">True</property>
-				 <property name="editable">True</property>
-				 <property name="visibility">True</property>
-				 <property name="max_length">0</property>
-				 <property name="text" translatable="yes"></property>
-				 <property name="has_frame">True</property>
-				 <property name="invisible_char">●</property>
-				 <property name="activates_default">False</property>
-				</widget>
-			 </child>
-			 </widget>
-			 <packing>
-			 <property name="padding">4</property>
-			 <property name="expand">True</property>
-			 <property name="fill">True</property>
-			 </packing>
-			 </child>
-
-			 <child>
-			 <widget class="GtkAlignment" id="w_alignment7">
-			 <property name="border_width">4</property>
-			 <property name="visible">True</property>
-			 <property name="xalign">0.5</property>
-			 <property name="yalign">0.5</property>
-			 <property name="xscale">1</property>
-			 <property name="yscale">0.300000995398</property>
-			 <property name="top_padding">0</property>
-			 <property name="bottom_padding">0</property>
-			 <property name="left_padding">0</property>
-			 <property name="right_padding">0</property>
-
-			 <child>
-				<widget class="GtkButton" id="cfg_hvsc_browse">
-				 <property name="visible">True</property>
-				 <property name="tooltip" translatable="yes">Browse for HVSC path</property>
-				 <property name="can_focus">True</property>
-				 <property name="relief">GTK_RELIEF_NORMAL</property>
-				 <property name="focus_on_click">True</property>
-				 <signal name="clicked" handler="xs_cfg_hvsc_browse"/>
-
-				 <child>
-				 <widget class="GtkAlignment" id="alignment3">
-				 <property name="visible">True</property>
-				 <property name="xalign">0.5</property>
-				 <property name="yalign">0.5</property>
-				 <property name="xscale">0</property>
-				 <property name="yscale">0</property>
-				 <property name="top_padding">0</property>
-				 <property name="bottom_padding">0</property>
-				 <property name="left_padding">0</property>
-				 <property name="right_padding">0</property>
-
-				 <child>
-					<widget class="GtkHBox" id="hbox3">
-					 <property name="visible">True</property>
-					 <property name="homogeneous">False</property>
-					 <property name="spacing">2</property>
-
-					 <child>
-					 <widget class="GtkImage" id="image3">
-					 <property name="visible">True</property>
-					 <property name="stock">gtk-open</property>
-					 <property name="icon_size">4</property>
-					 <property name="xalign">0.5</property>
-					 <property name="yalign">0.5</property>
-					 <property name="xpad">0</property>
-					 <property name="ypad">0</property>
-					 </widget>
-					 <packing>
-					 <property name="padding">0</property>
-					 <property name="expand">False</property>
-					 <property name="fill">False</property>
-					 </packing>
-					 </child>
-
-					 <child>
-					 <widget class="GtkLabel" id="label32">
-					 <property name="visible">True</property>
-					 <property name="label" translatable="yes">Browse</property>
-					 <property name="use_underline">True</property>
-					 <property name="use_markup">False</property>
-					 <property name="justify">GTK_JUSTIFY_LEFT</property>
-					 <property name="wrap">False</property>
-					 <property name="selectable">False</property>
-					 <property name="xalign">0.5</property>
-					 <property name="yalign">0.5</property>
-					 <property name="xpad">0</property>
-					 <property name="ypad">0</property>
-					 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-					 <property name="width_chars">-1</property>
-					 <property name="single_line_mode">False</property>
-					 <property name="angle">0</property>
-					 </widget>
-					 <packing>
-					 <property name="padding">0</property>
-					 <property name="expand">False</property>
-					 <property name="fill">False</property>
-					 </packing>
-					 </child>
-					</widget>
-				 </child>
-				 </widget>
-				 </child>
-				</widget>
-			 </child>
-			 </widget>
-			 <packing>
-			 <property name="padding">0</property>
-			 <property name="expand">False</property>
-			 <property name="fill">False</property>
-			 <property name="pack_type">GTK_PACK_END</property>
-			 </packing>
-			 </child>
-			</widget>
-			<packing>
-			 <property name="padding">0</property>
-			 <property name="expand">True</property>
-			 <property name="fill">True</property>
-			</packing>
-		 </child>
-		 </widget>
-		 </child>
-
-		 <child>
-		 <widget class="GtkLabel" id="label18">
-		 <property name="visible">True</property>
-		 <property name="label" translatable="yes">SID Tune Information List (STIL) database:</property>
-		 <property name="use_underline">False</property>
-		 <property name="use_markup">False</property>
-		 <property name="justify">GTK_JUSTIFY_LEFT</property>
-		 <property name="wrap">False</property>
-		 <property name="selectable">False</property>
-		 <property name="xalign">0.5</property>
-		 <property name="yalign">0.5</property>
-		 <property name="xpad">0</property>
-		 <property name="ypad">0</property>
-		 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		 <property name="width_chars">-1</property>
-		 <property name="single_line_mode">False</property>
-		 <property name="angle">0</property>
-		 </widget>
-		 <packing>
-		 <property name="type">label_item</property>
-		 </packing>
-		 </child>
-		</widget>
-		<packing>
-		 <property name="padding">0</property>
-		 <property name="expand">False</property>
-		 <property name="fill">False</property>
-		</packing>
-	 </child>
-	 </widget>
-	 <packing>
-	 <property name="tab_expand">False</property>
-	 <property name="tab_fill">True</property>
-	 </packing>
-	 </child>
-
-	 <child>
-	 <widget class="GtkLabel" id="w_label3">
-	 <property name="visible">True</property>
-	 <property name="label" translatable="yes">Misc</property>
-	 <property name="use_underline">False</property>
-	 <property name="use_markup">False</property>
-	 <property name="justify">GTK_JUSTIFY_CENTER</property>
-	 <property name="wrap">False</property>
-	 <property name="selectable">False</property>
-	 <property name="xalign">0.5</property>
-	 <property name="yalign">0.5</property>
-	 <property name="xpad">0</property>
-	 <property name="ypad">0</property>
-	 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-	 <property name="width_chars">-1</property>
-	 <property name="single_line_mode">False</property>
-	 <property name="angle">0</property>
-	 </widget>
-	 <packing>
-	 <property name="type">tab</property>
-	 </packing>
-	 </child>
-	</widget>
-	<packing>
-	 <property name="padding">0</property>
-	 <property name="expand">True</property>
-	 <property name="fill">True</property>
-	</packing>
- </child>
-
- <child>
-	<widget class="GtkHButtonBox" id="hbuttonbox1">
-	 <property name="border_width">4</property>
-	 <property name="visible">True</property>
-	 <property name="layout_style">GTK_BUTTONBOX_END</property>
-	 <property name="spacing">8</property>
-
-	 <child>
-	 <widget class="GtkButton" id="cfg_cancel">
-	 <property name="visible">True</property>
-	 <property name="tooltip" translatable="yes">Cancel any changes</property>
-	 <property name="can_default">True</property>
-	 <property name="can_focus">True</property>
-	 <property name="label">gtk-cancel</property>
-	 <property name="use_stock">True</property>
-	 <property name="relief">GTK_RELIEF_NORMAL</property>
-	 <property name="focus_on_click">True</property>
-	 <signal name="clicked" handler="xs_cfg_cancel"/>
-	 </widget>
-	 </child>
-
-	 <child>
-	 <widget class="GtkButton" id="cfg_ok">
-	 <property name="visible">True</property>
-	 <property name="tooltip" translatable="yes">Accept and update changes</property>
-	 <property name="can_default">True</property>
-	 <property name="can_focus">True</property>
-	 <property name="label">gtk-ok</property>
-	 <property name="use_stock">True</property>
-	 <property name="relief">GTK_RELIEF_NORMAL</property>
-	 <property name="focus_on_click">True</property>
-	 <signal name="clicked" handler="xs_cfg_ok"/>
-	 </widget>
-	 </child>
-	</widget>
-	<packing>
-	 <property name="padding">0</property>
-	 <property name="expand">False</property>
-	 <property name="fill">False</property>
-	 <property name="pack_type">GTK_PACK_END</property>
-	</packing>
- </child>
- </widget>
- </child>
-</widget>
-
-<widget class="GtkWindow" id="xs_fileinfowin">
- <property name="width_request">400</property>
- <property name="visible">True</property>
- <property name="title" translatable="yes">Audacious-SID Fileinfo</property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_NONE</property>
- <property name="modal">False</property>
- <property name="resizable">True</property>
- <property name="destroy_with_parent">False</property>
- <property name="decorated">True</property>
- <property name="skip_taskbar_hint">False</property>
- <property name="skip_pager_hint">False</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
- <property name="focus_on_map">True</property>
- <property name="urgency_hint">False</property>
- <signal name="delete_event" handler="xs_fileinfo_delete"/>
-
- <child>
- <widget class="GtkVBox" id="w_vbox14">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
-	<widget class="GtkFrame" id="w_frame14">
-	 <property name="border_width">4</property>
-	 <property name="visible">True</property>
-	 <property name="label_xalign">0</property>
-	 <property name="label_yalign">0.5</property>
-	 <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-
-	 <child>
-	 <widget class="GtkTable" id="table1">
-	 <property name="border_width">4</property>
-	 <property name="visible">True</property>
-	 <property name="n_rows">4</property>
-	 <property name="n_columns">2</property>
-	 <property name="homogeneous">False</property>
-	 <property name="row_spacing">2</property>
-	 <property name="column_spacing">4</property>
-
-	 <child>
-		<widget class="GtkLabel" id="w_label16">
-		 <property name="visible">True</property>
-		 <property name="label" translatable="yes">Filename:</property>
-		 <property name="use_underline">False</property>
-		 <property name="use_markup">False</property>
-		 <property name="justify">GTK_JUSTIFY_CENTER</property>
-		 <property name="wrap">False</property>
-		 <property name="selectable">False</property>
-		 <property name="xalign">0.5</property>
-		 <property name="yalign">0.5</property>
-		 <property name="xpad">0</property>
-		 <property name="ypad">0</property>
-		 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		 <property name="width_chars">-1</property>
-		 <property name="single_line_mode">False</property>
-		 <property name="angle">0</property>
-		</widget>
-		<packing>
-		 <property name="left_attach">0</property>
-		 <property name="right_attach">1</property>
-		 <property name="top_attach">0</property>
-		 <property name="bottom_attach">1</property>
-		 <property name="x_options"></property>
-		 <property name="y_options"></property>
-		</packing>
-	 </child>
-
-	 <child>
-		<widget class="GtkLabel" id="w_label17">
-		 <property name="visible">True</property>
-		 <property name="label" translatable="yes">Songname:</property>
-		 <property name="use_underline">False</property>
-		 <property name="use_markup">False</property>
-		 <property name="justify">GTK_JUSTIFY_CENTER</property>
-		 <property name="wrap">False</property>
-		 <property name="selectable">False</property>
-		 <property name="xalign">0.5</property>
-		 <property name="yalign">0.5</property>
-		 <property name="xpad">0</property>
-		 <property name="ypad">0</property>
-		 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		 <property name="width_chars">-1</property>
-		 <property name="single_line_mode">False</property>
-		 <property name="angle">0</property>
-		</widget>
-		<packing>
-		 <property name="left_attach">0</property>
-		 <property name="right_attach">1</property>
-		 <property name="top_attach">1</property>
-		 <property name="bottom_attach">2</property>
-		 <property name="x_options"></property>
-		 <property name="y_options"></property>
-		</packing>
-	 </child>
-
-	 <child>
-		<widget class="GtkLabel" id="w_label18">
-		 <property name="visible">True</property>
-		 <property name="label" translatable="yes">Composer:</property>
-		 <property name="use_underline">False</property>
-		 <property name="use_markup">False</property>
-		 <property name="justify">GTK_JUSTIFY_CENTER</property>
-		 <property name="wrap">False</property>
-		 <property name="selectable">False</property>
-		 <property name="xalign">0.5</property>
-		 <property name="yalign">0.5</property>
-		 <property name="xpad">0</property>
-		 <property name="ypad">0</property>
-		 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		 <property name="width_chars">-1</property>
-		 <property name="single_line_mode">False</property>
-		 <property name="angle">0</property>
-		</widget>
-		<packing>
-		 <property name="left_attach">0</property>
-		 <property name="right_attach">1</property>
-		 <property name="top_attach">2</property>
-		 <property name="bottom_attach">3</property>
-		 <property name="x_options"></property>
-		 <property name="y_options"></property>
-		</packing>
-	 </child>
-
-	 <child>
-		<widget class="GtkLabel" id="w_label19">
-		 <property name="visible">True</property>
-		 <property name="label" translatable="yes">Copyright:</property>
-		 <property name="use_underline">False</property>
-		 <property name="use_markup">False</property>
-		 <property name="justify">GTK_JUSTIFY_CENTER</property>
-		 <property name="wrap">False</property>
-		 <property name="selectable">False</property>
-		 <property name="xalign">0.5</property>
-		 <property name="yalign">0.5</property>
-		 <property name="xpad">0</property>
-		 <property name="ypad">0</property>
-		 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		 <property name="width_chars">-1</property>
-		 <property name="single_line_mode">False</property>
-		 <property name="angle">0</property>
-		</widget>
-		<packing>
-		 <property name="left_attach">0</property>
-		 <property name="right_attach">1</property>
-		 <property name="top_attach">3</property>
-		 <property name="bottom_attach">4</property>
-		 <property name="x_options"></property>
-		 <property name="y_options"></property>
-		</packing>
-	 </child>
-
-	 <child>
-		<widget class="GtkEntry" id="fileinfo_filename">
-		 <property name="visible">True</property>
-		 <property name="can_focus">True</property>
-		 <property name="editable">False</property>
-		 <property name="visibility">True</property>
-		 <property name="max_length">0</property>
-		 <property name="text" translatable="yes"></property>
-		 <property name="has_frame">True</property>
-		 <property name="invisible_char">●</property>
-		 <property name="activates_default">False</property>
-		</widget>
-		<packing>
-		 <property name="left_attach">1</property>
-		 <property name="right_attach">2</property>
-		 <property name="top_attach">0</property>
-		 <property name="bottom_attach">1</property>
-		 <property name="y_options"></property>
-		</packing>
-	 </child>
-
-	 <child>
-		<widget class="GtkEntry" id="fileinfo_songname">
-		 <property name="visible">True</property>
-		 <property name="can_focus">True</property>
-		 <property name="editable">False</property>
-		 <property name="visibility">True</property>
-		 <property name="max_length">0</property>
-		 <property name="text" translatable="yes"></property>
-		 <property name="has_frame">True</property>
-		 <property name="invisible_char">●</property>
-		 <property name="activates_default">False</property>
-		</widget>
-		<packing>
-		 <property name="left_attach">1</property>
-		 <property name="right_attach">2</property>
-		 <property name="top_attach">1</property>
-		 <property name="bottom_attach">2</property>
-		 <property name="y_options"></property>
-		</packing>
-	 </child>
-
-	 <child>
-		<widget class="GtkEntry" id="fileinfo_composer">
-		 <property name="visible">True</property>
-		 <property name="can_focus">True</property>
-		 <property name="editable">False</property>
-		 <property name="visibility">True</property>
-		 <property name="max_length">0</property>
-		 <property name="text" translatable="yes"></property>
-		 <property name="has_frame">True</property>
-		 <property name="invisible_char">●</property>
-		 <property name="activates_default">False</property>
-		</widget>
-		<packing>
-		 <property name="left_attach">1</property>
-		 <property name="right_attach">2</property>
-		 <property name="top_attach">2</property>
-		 <property name="bottom_attach">3</property>
-		 <property name="y_options"></property>
-		</packing>
-	 </child>
-
-	 <child>
-		<widget class="GtkEntry" id="fileinfo_copyright">
-		 <property name="visible">True</property>
-		 <property name="can_focus">True</property>
-		 <property name="editable">False</property>
-		 <property name="visibility">True</property>
-		 <property name="max_length">0</property>
-		 <property name="text" translatable="yes"></property>
-		 <property name="has_frame">True</property>
-		 <property name="invisible_char">●</property>
-		 <property name="activates_default">False</property>
-		</widget>
-		<packing>
-		 <property name="left_attach">1</property>
-		 <property name="right_attach">2</property>
-		 <property name="top_attach">3</property>
-		 <property name="bottom_attach">4</property>
-		 <property name="y_options"></property>
-		</packing>
-	 </child>
-	 </widget>
-	 </child>
-
-	 <child>
-	 <widget class="GtkLabel" id="label23">
-	 <property name="visible">True</property>
-	 <property name="label" translatable="yes">Song Information:</property>
-	 <property name="use_underline">False</property>
-	 <property name="use_markup">False</property>
-	 <property name="justify">GTK_JUSTIFY_LEFT</property>
-	 <property name="wrap">False</property>
-	 <property name="selectable">False</property>
-	 <property name="xalign">0.5</property>
-	 <property name="yalign">0.5</property>
-	 <property name="xpad">0</property>
-	 <property name="ypad">0</property>
-	 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-	 <property name="width_chars">-1</property>
-	 <property name="single_line_mode">False</property>
-	 <property name="angle">0</property>
-	 </widget>
-	 <packing>
-	 <property name="type">label_item</property>
-	 </packing>
-	 </child>
-	</widget>
-	<packing>
-	 <property name="padding">0</property>
-	 <property name="expand">False</property>
-	 <property name="fill">True</property>
-	</packing>
- </child>
-
- <child>
-	<widget class="GtkFrame" id="w_frame15">
-	 <property name="border_width">4</property>
-	 <property name="visible">True</property>
-	 <property name="label_xalign">0</property>
-	 <property name="label_yalign">0.5</property>
-	 <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-
-	 <child>
-	 <widget class="GtkVBox" id="w_vbox15">
-	 <property name="visible">True</property>
-	 <property name="homogeneous">False</property>
-	 <property name="spacing">2</property>
-
-	 <child>
-		<widget class="GtkOptionMenu" id="fileinfo_sub_tune">
-		 <property name="border_width">2</property>
-		 <property name="visible">True</property>
-		 <property name="can_focus">True</property>
-		 <property name="history">-1</property>
-
-		 <child internal-child="menu">
-		 <widget class="GtkMenu" id="convertwidget7">
-		 <property name="visible">True</property>
-		 </widget>
-		 </child>
-		</widget>
-		<packing>
-		 <property name="padding">0</property>
-		 <property name="expand">False</property>
-		 <property name="fill">False</property>
-		</packing>
-	 </child>
-
-	 <child>
-		<widget class="GtkTable" id="table2">
-		 <property name="border_width">4</property>
-		 <property name="visible">True</property>
-		 <property name="n_rows">3</property>
-		 <property name="n_columns">2</property>
-		 <property name="homogeneous">False</property>
-		 <property name="row_spacing">2</property>
-		 <property name="column_spacing">4</property>
-
-		 <child>
-		 <widget class="GtkLabel" id="w_label41">
-		 <property name="visible">True</property>
-		 <property name="label" translatable="yes">Author:</property>
-		 <property name="use_underline">False</property>
-		 <property name="use_markup">False</property>
-		 <property name="justify">GTK_JUSTIFY_CENTER</property>
-		 <property name="wrap">False</property>
-		 <property name="selectable">False</property>
-		 <property name="xalign">0.5</property>
-		 <property name="yalign">0.5</property>
-		 <property name="xpad">0</property>
-		 <property name="ypad">0</property>
-		 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		 <property name="width_chars">-1</property>
-		 <property name="single_line_mode">False</property>
-		 <property name="angle">0</property>
-		 </widget>
-		 <packing>
-		 <property name="left_attach">0</property>
-		 <property name="right_attach">1</property>
-		 <property name="top_attach">1</property>
-		 <property name="bottom_attach">2</property>
-		 <property name="x_options">fill</property>
-		 <property name="y_options"></property>
-		 </packing>
-		 </child>
-
-		 <child>
-		 <widget class="GtkEntry" id="fileinfo_sub_author">
-		 <property name="visible">True</property>
-		 <property name="can_focus">True</property>
-		 <property name="editable">False</property>
-		 <property name="visibility">True</property>
-		 <property name="max_length">0</property>
-		 <property name="text" translatable="yes"></property>
-		 <property name="has_frame">True</property>
-		 <property name="invisible_char">●</property>
-		 <property name="activates_default">False</property>
-		 </widget>
-		 <packing>
-		 <property name="left_attach">1</property>
-		 <property name="right_attach">2</property>
-		 <property name="top_attach">1</property>
-		 <property name="bottom_attach">2</property>
-		 <property name="y_options"></property>
-		 </packing>
-		 </child>
-
-		 <child>
-		 <widget class="GtkLabel" id="w_label50">
-		 <property name="visible">True</property>
-		 <property name="label" translatable="yes">Name:</property>
-		 <property name="use_underline">False</property>
-		 <property name="use_markup">False</property>
-		 <property name="justify">GTK_JUSTIFY_CENTER</property>
-		 <property name="wrap">False</property>
-		 <property name="selectable">False</property>
-		 <property name="xalign">0.5</property>
-		 <property name="yalign">0.5</property>
-		 <property name="xpad">0</property>
-		 <property name="ypad">0</property>
-		 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		 <property name="width_chars">-1</property>
-		 <property name="single_line_mode">False</property>
-		 <property name="angle">0</property>
-		 </widget>
-		 <packing>
-		 <property name="left_attach">0</property>
-		 <property name="right_attach">1</property>
-		 <property name="top_attach">0</property>
-		 <property name="bottom_attach">1</property>
-		 <property name="x_options">fill</property>
-		 <property name="y_options"></property>
-		 </packing>
-		 </child>
-
-		 <child>
-		 <widget class="GtkEntry" id="fileinfo_sub_name">
-		 <property name="visible">True</property>
-		 <property name="can_focus">True</property>
-		 <property name="editable">False</property>
-		 <property name="visibility">True</property>
-		 <property name="max_length">0</property>
-		 <property name="text" translatable="yes"></property>
-		 <property name="has_frame">True</property>
-		 <property name="invisible_char">●</property>
-		 <property name="activates_default">False</property>
-		 </widget>
-		 <packing>
-		 <property name="left_attach">1</property>
-		 <property name="right_attach">2</property>
-		 <property name="top_attach">0</property>
-		 <property name="bottom_attach">1</property>
-		 <property name="y_options"></property>
-		 </packing>
-		 </child>
-
-		 <child>
-		 <widget class="GtkLabel" id="w_label51">
-		 <property name="visible">True</property>
-		 <property name="label" translatable="yes">Duration:</property>
-		 <property name="use_underline">False</property>
-		 <property name="use_markup">False</property>
-		 <property name="justify">GTK_JUSTIFY_CENTER</property>
-		 <property name="wrap">False</property>
-		 <property name="selectable">False</property>
-		 <property name="xalign">0</property>
-		 <property name="yalign">0.5</property>
-		 <property name="xpad">0</property>
-		 <property name="ypad">0</property>
-		 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		 <property name="width_chars">-1</property>
-		 <property name="single_line_mode">False</property>
-		 <property name="angle">0</property>
-		 </widget>
-		 <packing>
-		 <property name="left_attach">0</property>
-		 <property name="right_attach">1</property>
-		 <property name="top_attach">2</property>
-		 <property name="bottom_attach">3</property>
-		 <property name="x_options">fill</property>
-		 <property name="y_options"></property>
-		 </packing>
-		 </child>
-
-		 <child>
-		 <widget class="GtkEntry" id="entry1">
-		 <property name="visible">True</property>
-		 <property name="can_focus">True</property>
-		 <property name="editable">False</property>
-		 <property name="visibility">True</property>
-		 <property name="max_length">0</property>
-		 <property name="text" translatable="yes"></property>
-		 <property name="has_frame">True</property>
-		 <property name="invisible_char">●</property>
-		 <property name="activates_default">False</property>
-		 </widget>
-		 <packing>
-		 <property name="left_attach">1</property>
-		 <property name="right_attach">2</property>
-		 <property name="top_attach">2</property>
-		 <property name="bottom_attach">3</property>
-		 <property name="y_options"></property>
-		 </packing>
-		 </child>
-		</widget>
-		<packing>
-		 <property name="padding">0</property>
-		 <property name="expand">False</property>
-		 <property name="fill">False</property>
-		</packing>
-	 </child>
-
-	 <child>
-		<widget class="GtkScrolledWindow" id="scrolledwindow2">
-		 <property name="border_width">4</property>
-		 <property name="visible">True</property>
-		 <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-		 <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
-		 <property name="shadow_type">GTK_SHADOW_IN</property>
-		 <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-		 <child>
-		 <widget class="GtkTextView" id="fileinfo_sub_info">
-		 <property name="visible">True</property>
-		 <property name="can_focus">True</property>
-		 <property name="editable">False</property>
-		 <property name="overwrite">False</property>
-		 <property name="accepts_tab">True</property>
-		 <property name="justification">GTK_JUSTIFY_LEFT</property>
-		 <property name="wrap_mode">GTK_WRAP_WORD</property>
-		 <property name="cursor_visible">True</property>
-		 <property name="pixels_above_lines">0</property>
-		 <property name="pixels_below_lines">0</property>
-		 <property name="pixels_inside_wrap">0</property>
-		 <property name="left_margin">0</property>
-		 <property name="right_margin">0</property>
-		 <property name="indent">0</property>
-		 <property name="text" translatable="yes"></property>
-		 </widget>
-		 </child>
-		</widget>
-		<packing>
-		 <property name="padding">0</property>
-		 <property name="expand">True</property>
-		 <property name="fill">True</property>
-		</packing>
-	 </child>
-	 </widget>
-	 </child>
-
-	 <child>
-	 <widget class="GtkLabel" id="label24">
-	 <property name="visible">True</property>
-	 <property name="label" translatable="yes">Sub-tune Information:</property>
-	 <property name="use_underline">False</property>
-	 <property name="use_markup">False</property>
-	 <property name="justify">GTK_JUSTIFY_LEFT</property>
-	 <property name="wrap">False</property>
-	 <property name="selectable">False</property>
-	 <property name="xalign">0.5</property>
-	 <property name="yalign">0.5</property>
-	 <property name="xpad">0</property>
-	 <property name="ypad">0</property>
-	 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-	 <property name="width_chars">-1</property>
-	 <property name="single_line_mode">False</property>
-	 <property name="angle">0</property>
-	 </widget>
-	 <packing>
-	 <property name="type">label_item</property>
-	 </packing>
-	 </child>
-	</widget>
-	<packing>
-	 <property name="padding">0</property>
-	 <property name="expand">True</property>
-	 <property name="fill">True</property>
-	</packing>
- </child>
-
- <child>
-	<widget class="GtkButton" id="button2">
-	 <property name="border_width">4</property>
-	 <property name="visible">True</property>
-	 <property name="can_default">True</property>
-	 <property name="has_default">True</property>
-	 <property name="can_focus">True</property>
-	 <property name="has_focus">True</property>
-	 <property name="label" translatable="yes">Close</property>
-	 <property name="use_underline">True</property>
-	 <property name="relief">GTK_RELIEF_NORMAL</property>
-	 <property name="focus_on_click">True</property>
-	 <signal name="clicked" handler="xs_fileinfo_ok"/>
-	</widget>
-	<packing>
-	 <property name="padding">0</property>
-	 <property name="expand">False</property>
-	 <property name="fill">False</property>
-	</packing>
- </child>
- </widget>
- </child>
-</widget>
-
-<widget class="GtkFileSelection" id="xs_sldb_fs">
- <property name="border_width">10</property>
- <property name="visible">True</property>
- <property name="title" translatable="yes">Select HVSC song length database</property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_NONE</property>
- <property name="modal">True</property>
- <property name="resizable">True</property>
- <property name="destroy_with_parent">False</property>
- <property name="decorated">True</property>
- <property name="skip_taskbar_hint">False</property>
- <property name="skip_pager_hint">False</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
- <property name="focus_on_map">True</property>
- <property name="urgency_hint">False</property>
- <property name="show_fileops">True</property>
- <signal name="delete_event" handler="xs_sldb_fs_delete"/>
-
- <child internal-child="cancel_button">
- <widget class="GtkButton" id="cancel_button2">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <signal name="clicked" handler="xs_sldb_fs_cancel"/>
- </widget>
- </child>
-
- <child internal-child="ok_button">
- <widget class="GtkButton" id="ok_button2">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <signal name="clicked" handler="xs_sldb_fs_ok"/>
- </widget>
- </child>
-</widget>
-
-<widget class="GtkFileSelection" id="xs_stil_fs">
- <property name="border_width">10</property>
- <property name="visible">True</property>
- <property name="title" translatable="yes">Select STIL-database</property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_NONE</property>
- <property name="modal">True</property>
- <property name="resizable">True</property>
- <property name="destroy_with_parent">False</property>
- <property name="decorated">True</property>
- <property name="skip_taskbar_hint">False</property>
- <property name="skip_pager_hint">False</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
- <property name="focus_on_map">True</property>
- <property name="urgency_hint">False</property>
- <property name="show_fileops">True</property>
- <signal name="delete_event" handler="xs_stil_fs_delete"/>
-
- <child internal-child="cancel_button">
- <widget class="GtkButton" id="cancel_button3">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <signal name="clicked" handler="xs_stil_fs_cancel"/>
- </widget>
- </child>
-
- <child internal-child="ok_button">
- <widget class="GtkButton" id="ok_button3">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <signal name="clicked" handler="xs_stil_fs_ok"/>
- </widget>
- </child>
-</widget>
-
-<widget class="GtkFileSelection" id="xs_hvsc_fs">
- <property name="border_width">10</property>
- <property name="visible">True</property>
- <property name="title" translatable="yes">Select HVSC location prefix</property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_NONE</property>
- <property name="modal">True</property>
- <property name="resizable">True</property>
- <property name="destroy_with_parent">False</property>
- <property name="decorated">True</property>
- <property name="skip_taskbar_hint">False</property>
- <property name="skip_pager_hint">False</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
- <property name="focus_on_map">True</property>
- <property name="urgency_hint">False</property>
- <property name="show_fileops">True</property>
- <signal name="delete_event" handler="xs_hvsc_fs_delete"/>
-
- <child internal-child="cancel_button">
- <widget class="GtkButton" id="cancel_button4">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <signal name="clicked" handler="xs_hvsc_fs_cancel"/>
- </widget>
- </child>
-
- <child internal-child="ok_button">
- <widget class="GtkButton" id="ok_button4">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <signal name="clicked" handler="xs_hvsc_fs_ok"/>
- </widget>
- </child>
-</widget>
-
-<widget class="GtkFileSelection" id="xs_filter_import_fs">
- <property name="border_width">10</property>
- <property name="visible">True</property>
- <property name="title" translatable="yes">Select SIDPlay2 filters file for importing</property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_NONE</property>
- <property name="modal">True</property>
- <property name="resizable">True</property>
- <property name="destroy_with_parent">False</property>
- <property name="decorated">True</property>
- <property name="skip_taskbar_hint">False</property>
- <property name="skip_pager_hint">False</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
- <property name="focus_on_map">True</property>
- <property name="urgency_hint">False</property>
- <property name="show_fileops">True</property>
- <signal name="delete_event" handler="xs_filter_import_fs_delete"/>
-
- <child internal-child="cancel_button">
- <widget class="GtkButton" id="cancel_button64">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <signal name="clicked" handler="xs_filter_import_fs_cancel"/>
- </widget>
- </child>
-
- <child internal-child="ok_button">
- <widget class="GtkButton" id="ok_button64">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <signal name="clicked" handler="xs_filter_import_fs_ok"/>
- </widget>
- </child>
-</widget>
-
-<widget class="GtkFileSelection" id="xs_filter_export_fs">
- <property name="border_width">10</property>
- <property name="visible">True</property>
- <property name="title" translatable="yes">Select SIDPlay2 filters file for exporting</property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_NONE</property>
- <property name="modal">True</property>
- <property name="resizable">True</property>
- <property name="destroy_with_parent">False</property>
- <property name="decorated">True</property>
- <property name="skip_taskbar_hint">False</property>
- <property name="skip_pager_hint">False</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
- <property name="focus_on_map">True</property>
- <property name="urgency_hint">False</property>
- <property name="show_fileops">True</property>
- <signal name="delete_event" handler="xs_filter_export_fs_delete"/>
-
- <child internal-child="cancel_button">
- <widget class="GtkButton" id="cancel_button64">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <signal name="clicked" handler="xs_filter_export_fs_cancel"/>
- </widget>
- </child>
-
- <child internal-child="ok_button">
- <widget class="GtkButton" id="ok_button64">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <signal name="clicked" handler="xs_filter_export_fs_ok"/>
- </widget>
- </child>
-</widget>
-
-<widget class="GtkDialog" id="xs_confirmwin">
- <property name="visible">True</property>
- <property name="title" translatable="yes">Confirm selected action</property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_NONE</property>
- <property name="modal">False</property>
- <property name="resizable">True</property>
- <property name="destroy_with_parent">False</property>
- <property name="decorated">True</property>
- <property name="skip_taskbar_hint">False</property>
- <property name="skip_pager_hint">False</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
- <property name="focus_on_map">True</property>
- <property name="urgency_hint">False</property>
- <property name="has_separator">True</property>
- <signal name="delete_event" handler="xs_confirmwin_delete"/>
-
- <child internal-child="vbox">
- <widget class="GtkVBox" id="dialog-vbox1">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child internal-child="action_area">
-	<widget class="GtkHButtonBox" id="dialog-action_area1">
-	 <property name="visible">True</property>
-	 <property name="layout_style">GTK_BUTTONBOX_END</property>
-
-	 <child>
-	 <widget class="GtkHButtonBox" id="hbuttonbox2">
-	 <property name="visible">True</property>
-	 <property name="layout_style">GTK_BUTTONBOX_END</property>
-	 <property name="spacing">8</property>
-
-	 <child>
-		<widget class="GtkButton" id="xs_confirm_yes">
-		 <property name="visible">True</property>
-		 <property name="can_default">True</property>
-		 <property name="can_focus">True</property>
-		 <property name="label" translatable="yes">Yes</property>
-		 <property name="use_underline">True</property>
-		 <property name="relief">GTK_RELIEF_NORMAL</property>
-		 <property name="focus_on_click">True</property>
-		</widget>
-	 </child>
-
-	 <child>
-		<widget class="GtkButton" id="xs_confirm_no">
-		 <property name="visible">True</property>
-		 <property name="can_default">True</property>
-		 <property name="can_focus">True</property>
-		 <property name="label" translatable="yes">No</property>
-		 <property name="use_underline">True</property>
-		 <property name="relief">GTK_RELIEF_NORMAL</property>
-		 <property name="focus_on_click">True</property>
-		</widget>
-	 </child>
-	 </widget>
-	 </child>
-	</widget>
-	<packing>
-	 <property name="padding">0</property>
-	 <property name="expand">False</property>
-	 <property name="fill">True</property>
-	 <property name="pack_type">GTK_PACK_END</property>
-	</packing>
- </child>
-
- <child>
-	<widget class="GtkFrame" id="xs_confirm_frame">
-	 <property name="border_width">6</property>
-	 <property name="visible">True</property>
-	 <property name="label_xalign">0</property>
-	 <property name="label_yalign">0.5</property>
-	 <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-
-	 <child>
-	 <placeholder/>
-	 </child>
-
-	 <child>
-	 <widget class="GtkLabel" id="label25">
-	 <property name="visible">True</property>
-	 <property name="label" translatable="yes">Confirm selected action</property>
-	 <property name="use_underline">False</property>
-	 <property name="use_markup">False</property>
-	 <property name="justify">GTK_JUSTIFY_LEFT</property>
-	 <property name="wrap">False</property>
-	 <property name="selectable">False</property>
-	 <property name="xalign">0.5</property>
-	 <property name="yalign">0.5</property>
-	 <property name="xpad">0</property>
-	 <property name="ypad">0</property>
-	 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-	 <property name="width_chars">-1</property>
-	 <property name="single_line_mode">False</property>
-	 <property name="angle">0</property>
-	 </widget>
-	 <packing>
-	 <property name="type">label_item</property>
-	 </packing>
-	 </child>
-	</widget>
-	<packing>
-	 <property name="padding">0</property>
-	 <property name="expand">True</property>
-	 <property name="fill">True</property>
-	</packing>
- </child>
- </widget>
- </child>
-</widget>
-
-</glade-interface>

audacious-plugins-3.0.3.tar.bz2/src/sid/xmms-sid.gladep Deleted

audacious-plugins-3.0.3.tar.bz2/src/sid/xs_about.c Deleted

@@ -1,226 +0,0 @@
-/* 
- xmms-sid - SIDPlay input plugin for X MultiMedia System (XMMS)
-
- Aboutbox dialog
- 
- Programmed and designed by Matti 'ccr' Hamalainen <ccr@tnsp.org>
- (C) Copyright 1999-2007 Tecnic Software productions (TNSP)
-
- 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.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
-#include "xmms-sid.h"
-#include <gtk/gtk.h>
-#include "xmms-sid-logo.xpm"
-
-
-static GtkWidget *xs_aboutwin = NULL;
-
-
-#ifdef HAVE_THEMETUNE
-#include <xmms/xmmsctrl.h>
-
-/* (Included only if themetune support is enabled)
- * Stop playing, add XMMS-SID themetune to playlist
- * and start playing it.
- */
-gint xs_about_theme(void)
-{
- const gint iSession = 0; /* Assume session 0 */
- gint iPos;
-
- /* Stop current song, add theme to playlist, play. */
- xmms_remote_stop(iSession);
- iPos = xmms_remote_get_playlist_length(iSession);
- xmms_remote_playlist_add_url_string(iSession, THEMETUNE_FILE);
- xmms_remote_set_playlist_pos(iSession, iPos);
- xmms_remote_play(iSession);
- return 0;
-}
-#endif
-
-
-XS_DEF_WINDOW_CLOSE(about_ok, aboutwin)
-XS_DEF_WINDOW_DELETE(about, aboutwin)
-
-
-/*
- * Execute the about dialog
- */
-void xs_about(void)
-{
- GtkWidget *about_vbox1;
- GtkWidget *about_frame;
- GtkWidget *about_logo;
- GdkPixmap *about_logo_pixmap = NULL, *about_logo_mask = NULL;
- GtkWidget *about_scrwin;
- GtkWidget *about_text;
- GtkWidget *alignment6;
- GtkWidget *about_close;
- gchar tmpStr[64];
-
- /* Check if there already is an open about window */
- if (xs_aboutwin != NULL) {
- gtk_window_present(GTK_WINDOW(xs_aboutwin));
- return;
- }
-
- /* No, create one ... */
- xs_aboutwin = gtk_window_new(GTK_WINDOW_TOPLEVEL);
- gtk_window_set_type_hint(GTK_WINDOW(xs_aboutwin), GDK_WINDOW_TYPE_HINT_DIALOG);
- gtk_widget_set_name(xs_aboutwin, "xs_aboutwin");
- gtk_object_set_data(GTK_OBJECT(xs_aboutwin), "xs_aboutwin", xs_aboutwin);
- g_snprintf(tmpStr, sizeof(tmpStr), _("About %s"), XS_PACKAGE_STRING);
- gtk_window_set_title(GTK_WINDOW(xs_aboutwin), tmpStr);
- gtk_window_set_default_size(GTK_WINDOW(xs_aboutwin), 350, -1);
-
- XS_SIGNAL_CONNECT(xs_aboutwin, "delete_event", xs_about_delete, NULL);
-
- about_vbox1 = gtk_vbox_new(FALSE, 0);
- gtk_widget_set_name(about_vbox1, "about_vbox1");
- gtk_widget_ref(about_vbox1);
- gtk_object_set_data_full(GTK_OBJECT(xs_aboutwin), "about_vbox1", about_vbox1,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show(about_vbox1);
- gtk_container_add(GTK_CONTAINER(xs_aboutwin), about_vbox1);
-
-#ifdef HAVE_THEMETUNE
- about_frame = gtk_button_new();
-#else
- about_frame = gtk_frame_new(NULL);
-#endif
- gtk_widget_set_name(about_frame, "about_frame");
- gtk_widget_ref(about_frame);
- gtk_object_set_data_full(GTK_OBJECT(xs_aboutwin), "about_frame", about_frame,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show(about_frame);
- gtk_box_pack_start(GTK_BOX(about_vbox1), about_frame, FALSE, FALSE, 0);
- gtk_container_set_border_width(GTK_CONTAINER(about_frame), 4);
-
-#ifdef HAVE_THEMETUNE
- gtk_signal_connect(GTK_OBJECT(about_frame), "clicked", GTK_SIGNAL_FUNC(xs_about_theme), NULL);
-#else
- gtk_frame_set_shadow_type(GTK_FRAME(about_frame), GTK_SHADOW_OUT);
-#endif
-
- /* Create the Gdk data for logo pixmap */
- gtk_widget_realize(xs_aboutwin);
- about_logo_pixmap = gdk_pixmap_create_from_xpm_d(
- xs_aboutwin->window, &about_logo_mask,
- NULL, (gchar **) xmms_sid_logo_xpm);
-
- about_logo = gtk_pixmap_new(about_logo_pixmap, about_logo_mask);
-
- /* Create logo widget */
- gtk_widget_set_name(about_logo, "about_logo");
- gtk_widget_ref(about_logo);
- gtk_object_set_data_full(GTK_OBJECT(xs_aboutwin), "about_logo", about_logo,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show(about_logo);
- gtk_container_add(GTK_CONTAINER(about_frame), about_logo);
- gtk_misc_set_padding(GTK_MISC(about_logo), 0, 6);
-
- about_scrwin = gtk_scrolled_window_new(NULL, NULL);
- gtk_widget_set_name(about_scrwin, "about_scrwin");
- gtk_widget_ref(about_scrwin);
- gtk_object_set_data_full(GTK_OBJECT(xs_aboutwin), "about_scrwin", about_scrwin,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show(about_scrwin);
- gtk_box_pack_start(GTK_BOX(about_vbox1), about_scrwin, TRUE, TRUE, 0);
- gtk_container_set_border_width(GTK_CONTAINER(about_scrwin), 8);
- gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(about_scrwin),
- GTK_POLICY_NEVER, GTK_POLICY_ALWAYS);
-
- about_text = gtk_text_view_new();
- gtk_widget_set_name(about_text, "about_text");
- gtk_widget_ref(about_text);
- gtk_object_set_data_full(GTK_OBJECT(xs_aboutwin), "about_text", about_text,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show(about_text);
- gtk_container_add(GTK_CONTAINER(about_scrwin), about_text);
- gtk_widget_set_usize(about_text, -2, 100);
- gtk_text_buffer_set_text(
- GTK_TEXT_BUFFER(gtk_text_view_get_buffer(GTK_TEXT_VIEW(about_text))),
- "\n"
- "This release of XMMS-SID is dedicated to\n"
- " Richard Joseph\n"
- " and\n"
- " Lauri Sipilä (aka Xaztur/PWP)\n"
- " - Now gone, but forever in our hearts -\n"
- "\n"
- "\n"
- "(C) Copyright 1999-2007\n"
- "\tTecnic Software productions (TNSP)\n"
- "\tLicensed under GNU GPL v2\n"
- "\n"
- "Programming and design\n"
- "\tMatti 'ccr' Hämäläinen\n"
- "\n"
-#ifdef HAVE_SIDPLAY1
- "libSIDPlay1 created by\n"
- "\tMichael Schwendt\n" "\n"
-#endif
-#ifdef HAVE_SIDPLAY2
- "libSIDPlay2 and reSID created by\n"
- "\tSimon White, Dag Lem,\n"
- "\tMichael Schwendt and rest.\n"
- "\n"
-#endif
-#ifdef HAVE_THEMETUNE
- "\"Kummatti City\", theme of XMMS-SID 0.8\n"
- "\tby Ari 'Agemixer' Yliaho\n"
- "\t(C) Copyright 1998 Scallop\n"
- "\t(Refer to README for license)\n" "\n"
-#endif
- "Original XMMS-SID (v0.4) by\n" "\tWillem Monsuwe\n" "\n"
-
- "Greetings fly out to ...\n"
- "\tEveryone at #Linux.Fi, #Fireball,\n"
- "\t#TNSP and #c-64 of IRCNet, #xmms\n"
- "\tof Freenode.net.\n"
- "\n"
- "\tDekadence, PWP, Byterapers,\n"
- "\tmfx, Unique, Fairlight, iSO,\n"
- "\tWrath Designs, Padua, Extend,\n"
- "\tPHn, Creators, Cosine, tAAt,\n"
- "\tViruz, Crest and Skalaria.\n" "\n"
-
- "Special thanks\n"
- "\tGerfried 'Alfie' Fuchs\n"
- "\tAndreas 'mrsid' Varga\n"
- "\tAll the betatesters.\n"
- "\tAll the users!\n", -1);
-
- alignment6 = gtk_alignment_new(0.5, 0.5, 0.18, 1);
- gtk_widget_set_name(alignment6, "alignment6");
- gtk_widget_ref(alignment6);
- gtk_object_set_data_full(GTK_OBJECT(xs_aboutwin), "alignment6", alignment6,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show(alignment6);
- gtk_box_pack_start(GTK_BOX(about_vbox1), alignment6, FALSE, TRUE, 0);
- gtk_container_set_border_width(GTK_CONTAINER(alignment6), 8);
-
- about_close = gtk_button_new_with_label(_("Close"));
- gtk_widget_set_name(about_close, "about_close");
- gtk_widget_ref(about_close);
- gtk_object_set_data_full(GTK_OBJECT(xs_aboutwin), "about_close", about_close,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show(about_close);
- gtk_container_add(GTK_CONTAINER(alignment6), about_close);
- GTK_WIDGET_SET_FLAGS(about_close, GTK_CAN_DEFAULT);
-
- XS_SIGNAL_CONNECT(about_close, "clicked", xs_about_ok, NULL);
-
- gtk_widget_show(xs_aboutwin);
-}

audacious-plugins-3.0.3.tar.bz2/src/sid/xs_curve.c Deleted

@@ -1,710 +0,0 @@
-/*
- XMMS-SID - SIDPlay input plugin for X MultiMedia System (XMMS)
-
- XSCurve, a custom Gtk+ spline widget for representing SIDPlay2/reSID
- filter curves in the configuration GUI. Implementation based heavily
- on GtkCurve from Gtk+ 1.2.10 (C) 1997 David Mosberger.
- Spline formula from reSID 0.16 (C) 2004 Dag Lem.
-
- Programmed by Matti 'ccr' Hamalainen <ccr@tnsp.org>
- (C) Copyright 2006-2007 Tecnic Software productions (TNSP)
-
- 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.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
-#include <stdio.h>
-#include "xs_curve.h"
-#include <gtk/gtkdrawingarea.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkprivate.h>
-
-
-#define RADIUS 3 /* radius of the control points */
-#define RADIUS2 (RADIUS * 2)
-#define MIN_DISTANCE 7 /* min distance between control points */
-
-
-#define GRAPH_MASK (GDK_EXPOSURE_MASK | \
- GDK_POINTER_MOTION_MASK | \
- GDK_POINTER_MOTION_HINT_MASK | \
- GDK_ENTER_NOTIFY_MASK | \
- GDK_BUTTON_PRESS_MASK | \
- GDK_BUTTON_RELEASE_MASK | \
- GDK_BUTTON1_MOTION_MASK)
-
-#define GET_X(i) curve->ctlpoints[i].x
-#define GET_Y(i) curve->ctlpoints[i].y
-
-
-enum {
- PROP_0,
- PROP_MIN_X,
- PROP_MAX_X,
- PROP_MIN_Y,
- PROP_MAX_Y
-};
-
-static GtkDrawingAreaClass *parent_class = NULL;
-
-static void xs_curve_class_init(XSCurveClass * class);
-static void xs_curve_init(XSCurve * curve);
-static void xs_curve_get_property(GObject * object, guint param_id,
- GValue * value, GParamSpec * pspec);
-static void xs_curve_set_property(GObject * object, guint param_id,
- const GValue * value, GParamSpec * pspec);
-static void xs_curve_finalize(GObject * object);
-static gint xs_curve_graph_events(GtkWidget * widget, GdkEvent * event, XSCurve * c);
-static void xs_curve_size_graph(XSCurve * curve);
-
-
-GtkType xs_curve_get_type(void)
-{
- static GType curve_type = 0;
-
- if (!curve_type) {
- static const GTypeInfo curve_info = {
- sizeof(XSCurveClass),
- NULL, /* base_init */
- NULL, /* base_finalize */
- (GClassInitFunc) xs_curve_class_init,
- NULL, /* class_finalize */
- NULL, /* class_data */
- sizeof(XSCurve),
- 0, /* n_preallocs */
- (GInstanceInitFunc) xs_curve_init,
- };
-
- curve_type = g_type_register_static(
- GTK_TYPE_DRAWING_AREA, "XSCurve",
- &curve_info, 0);
- }
- return curve_type;
-}
-
-
-static void xs_curve_class_init(XSCurveClass *class)
-{
- GObjectClass *gobject_class = G_OBJECT_CLASS(class);
-
- parent_class = g_type_class_peek_parent(class);
-
- gobject_class->finalize = xs_curve_finalize;
-
- gobject_class->set_property = xs_curve_set_property;
- gobject_class->get_property = xs_curve_get_property;
-
- g_object_class_install_property(gobject_class, PROP_MIN_X,
- g_param_spec_float("min-x",
- "Minimum X",
- "Minimum possible value for X",
- -G_MAXFLOAT, G_MAXFLOAT, 0.0,
- GTK_PARAM_READWRITE)
- );
-
- g_object_class_install_property(gobject_class, PROP_MAX_X,
- g_param_spec_float("max-x",
- "Maximum X",
- "Maximum possible X value",
- -G_MAXFLOAT, G_MAXFLOAT, 1.0,
- GTK_PARAM_READWRITE)
- );
-
- g_object_class_install_property(gobject_class, PROP_MIN_Y,
- g_param_spec_float("min-y",
- "Minimum Y",
- "Minimum possible value for Y",
- -G_MAXFLOAT, G_MAXFLOAT, 0.0,
- GTK_PARAM_READWRITE)
- );
-
- g_object_class_install_property(gobject_class, PROP_MAX_Y,
- g_param_spec_float("max-y",
- "Maximum Y",
- "Maximum possible value for Y",
- -G_MAXFLOAT, G_MAXFLOAT, 1.0,
- GTK_PARAM_READWRITE)
- );
-}
-
-
-static void xs_curve_init(XSCurve *curve)
-{
- gint old_mask;
-
- curve->pixmap = NULL;
- curve->grab_point = -1;
-
- curve->nctlpoints = 0;
- curve->ctlpoints = NULL;
-
- curve->min_x = 0.0;
- curve->max_x = 2047.0;
- curve->min_y = 0.0;
- curve->max_y = 24000.0;
-
- old_mask = gtk_widget_get_events(GTK_WIDGET(curve));
- gtk_widget_set_events(GTK_WIDGET(curve), old_mask | GRAPH_MASK);
- g_signal_connect(curve, "event", G_CALLBACK(xs_curve_graph_events), curve);
- xs_curve_size_graph(curve);
-}
-
-
-static void xs_curve_set_property(GObject * object, guint prop_id, const GValue * value, GParamSpec * pspec)
-{
- XSCurve *curve = XS_CURVE(object);
-
- switch (prop_id) {
- case PROP_MIN_X:
- xs_curve_set_range(curve,
- g_value_get_float(value), curve->max_x,
- curve->min_y, curve->max_y);
- break;
- case PROP_MAX_X:
- xs_curve_set_range(curve,
- curve->min_x, g_value_get_float(value),
- curve->min_y, curve->max_y);
- break;
- case PROP_MIN_Y:
- xs_curve_set_range(curve,
- curve->min_x, curve->max_x,
- g_value_get_float(value), curve->max_y);
- break;
- case PROP_MAX_Y:
- xs_curve_set_range(curve,
- curve->min_x, curve->max_x,
- curve->min_y, g_value_get_float(value));
- break;
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
- break;
- }
-}
-
-
-static void xs_curve_get_property(GObject * object, guint prop_id, GValue * value, GParamSpec * pspec)
-{
- XSCurve *curve = XS_CURVE(object);
-
- switch (prop_id) {
- case PROP_MIN_X:
- g_value_set_float(value, curve->min_x);
- break;
- case PROP_MAX_X:
- g_value_set_float(value, curve->max_x);
- break;
- case PROP_MIN_Y:
- g_value_set_float(value, curve->min_y);
- break;
- case PROP_MAX_Y:
- g_value_set_float(value, curve->max_y);
- break;
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
- break;
- }
-}
-
-
-static int xs_project(gfloat value, gfloat min, gfloat max, int norm)
-{
- return (norm - 1) * ((value - min) / (max - min)) + 0.5;
-}
-
-
-static gfloat xs_unproject(gint value, gfloat min, gfloat max, int norm)
-{
- return value / (gfloat) (norm - 1) * (max - min) + min;
-}
-
-
-static inline void xs_cubic_coeff(gfloat x1, gfloat y1,
- gfloat x2, gfloat y2,
- gfloat k1, gfloat k2,
- gfloat *a, gfloat *b,
- gfloat *c, gfloat *d)
-{
- gfloat dx = x2 - x1, dy = y2 - y1;
-
- *a = ((k1 + k2) - 2 * dy / dx) / (dx * dx);
- *b = ((k2 - k1) / dx - 3 * (x1 + x2) * (*a)) / 2;
- *c = k1 - (3 * x1 * (*a) + 2 * (*b)) * x1;
- *d = y1 - ((x1 * (*a) + (*b)) * x1 + (*c)) * x1;
-}
-
-
-static void xs_curve_draw(XSCurve *curve, gint width, gint height)
-{
- gfloat res = 5.0f;
- GtkStateType state;
- GtkStyle *style;
- gint i, ox = -1, oy = -1;
- xs_point_t *p0, *p1, *p2, *p3;
-
- if (!curve->pixmap)
- return;
-
- state = GTK_STATE_NORMAL;
- if (!GTK_WIDGET_IS_SENSITIVE(GTK_WIDGET(curve)))
- state = GTK_STATE_INSENSITIVE;
-
- style = GTK_WIDGET(curve)->style;
-
- /* Clear the pixmap */
- gtk_paint_flat_box(style, curve->pixmap,
- GTK_STATE_NORMAL, GTK_SHADOW_NONE,
- NULL, GTK_WIDGET(curve), "curve_bg",
- 0, 0,
- width + RADIUS2,
- height + RADIUS2);
-
-
- /* Draw the grid */
- for (i = 0; i < 5; i++) {
- gdk_draw_line(curve->pixmap, style->dark_gc[state],
- RADIUS, i * (height / 4.0) + RADIUS,
- width + RADIUS, i * (height / 4.0) + RADIUS);
-
- gdk_draw_line(curve->pixmap, style->dark_gc[state],
- i * (width / 4.0) + RADIUS, RADIUS,
- i * (width / 4.0) + RADIUS, height + RADIUS);
- }
-
-#if 1
- /* Draw the spline/curve itself */
- p0 = curve->ctlpoints;
- p1 = p0;
- p2 = p1; p2++;
- p3 = p2; p3++;
-
- /* Draw each curve segment */
- if (curve->nctlpoints > 5)
- for (i = 0; i < curve->nctlpoints; i++, ++p0, ++p1, ++p2, ++p3) {
- gint n;
- gfloat k1, k2, a, b, c, d, x;
-
- if (p1->x == p2->x)
- continue;
-
- if (p0->x == p1->x && p2->x == p3->x) {
- k1 = k2 = (p2->y - p1->y) / (p2->x - p1->x);
- } else if (p0->x == p1->x) {
- k2 = (p3->y - p1->y) / (p3->x - p1->x);
- k1 = (3 * (p2->y - p1->y) / (p2->x - p1->x) - k2) / 2;
- } else if (p2->x == p3->x) {
- k1 = (p2->y - p0->y) / (p2->x - p0->x);
- k2 = (3 * (p2->y - p1->y) / (p2->x - p1->x) - k1) / 2;
- } else {
- k1 = (p2->y - p0->y) / (p2->x - p0->x);
- k2 = (p3->y - p1->y) / (p3->x - p1->x);
- }
-
- xs_cubic_coeff(p1->x, p1->y, p2->x, p2->y, k1, k2, &a, &b, &c, &d);
-
- for (x = p1->x; x <= p2->x; x += res, n++) {
- gfloat y = ((a * x + b) * x + c) * x + d;
- gint qx, qy;
- qx = RADIUS + xs_project(x, curve->min_x, curve->max_x, width);
- qy = RADIUS + xs_project(y, curve->min_y, curve->max_y, height);
-
- if (ox != -1) {
- gdk_draw_line(curve->pixmap, style->fg_gc[state],
- ox, oy, qx, qy);
- }
- ox = qx; oy = qy;
- }
- }
-
-#endif
-
- /* Draw control points */
- for (i = 0; i < curve->nctlpoints; ++i) {
- gint x, y;
- GtkStateType cstate;
-
- if (GET_X(i) < curve->min_x || GET_Y(i) < curve->min_y ||
- GET_X(i) >= curve->max_x || GET_Y(i) >= curve->max_y)
- continue;
-
- x = xs_project(GET_X(i), curve->min_x, curve->max_x, width);
- y = xs_project(GET_Y(i), curve->min_y, curve->max_y, height);
-
- if (i == curve->grab_point) {
- cstate = GTK_STATE_SELECTED;
- gdk_draw_line(curve->pixmap, style->fg_gc[cstate],
- x + RADIUS, RADIUS, x + RADIUS, height + RADIUS);
- gdk_draw_line(curve->pixmap, style->fg_gc[cstate],
- RADIUS, y + RADIUS, width + RADIUS, y + RADIUS);
- } else
- cstate = state;
-
- gdk_draw_arc(curve->pixmap, style->fg_gc[cstate], TRUE,
- x, y, RADIUS2, RADIUS2, 0, 360 * 64);
- }
-
- /* Draw pixmap in the widget */
- gdk_draw_pixmap(GTK_WIDGET(curve)->window,
- style->fg_gc[state], curve->pixmap,
- 0, 0, 0, 0,
- width + RADIUS2,
- height + RADIUS2);
-}
-
-
-static gint xs_curve_graph_events(GtkWidget *widget, GdkEvent *event, XSCurve *curve)
-{
- GdkCursorType new_type = curve->cursor_type;
- GtkWidget *w;
- gint i, width, height, x, y, tx, ty, cx, closest_point = 0, min_x;
- guint distance;
-
- w = GTK_WIDGET(curve);
- width = w->allocation.width - RADIUS2;
- height = w->allocation.height - RADIUS2;
-
- if ((width < 0) || (height < 0))
- return FALSE;
-
- /* get the pointer position */
- gdk_window_get_pointer(w->window, &tx, &ty, NULL);
- x = CLAMP((tx - RADIUS), 0, width - 1);
- y = CLAMP((ty - RADIUS), 0, height - 1);
- min_x = curve->min_x;
-
- distance = ~0U;
- for (i = 0; i < curve->nctlpoints; ++i) {
- cx = xs_project(GET_X(i), min_x, curve->max_x, width);
- if ((guint) abs(x - cx) < distance) {
- distance = abs(x - cx);
- closest_point = i;
- }
- }
-
- /* Act based on event type */
- switch (event->type) {
- case GDK_CONFIGURE:
- if (curve->pixmap)
- gdk_pixmap_unref(curve->pixmap);
- curve->pixmap = 0;
-
- /* fall through */
-
- case GDK_EXPOSE:
- if (!curve->pixmap) {
- curve->pixmap = gdk_pixmap_new(w->window,
- w->allocation.width, w->allocation.height, -1);
- }
- xs_curve_draw(curve, width, height);
- break;
-
- case GDK_BUTTON_PRESS:
- gtk_grab_add(widget);
-
- new_type = GDK_TCROSS;
-
- if (distance > MIN_DISTANCE) {
- /* insert a new control point */
- if (curve->nctlpoints > 0) {
- cx = xs_project(GET_X(closest_point), min_x, curve->max_x, width);
- if (x > cx) closest_point++;
- }
-
- curve->nctlpoints++;
-
- curve->ctlpoints = g_realloc(curve->ctlpoints,
- curve->nctlpoints * sizeof(*curve->ctlpoints));
-
- for (i = curve->nctlpoints - 1; i > closest_point; --i) {
- memcpy(curve->ctlpoints + i,
- curve->ctlpoints + i - 1,
- sizeof(*curve->ctlpoints));
- }
- }
-
- curve->grab_point = closest_point;
- GET_X(curve->grab_point) = xs_unproject(x, min_x, curve->max_x, width);
- GET_Y(curve->grab_point) = xs_unproject(y, curve->min_y, curve->max_y, height);
-
- xs_curve_draw(curve, width, height);
- break;
-
- case GDK_BUTTON_RELEASE:
- {
- gint src, dst;
-
- gtk_grab_remove(widget);
-
- /* delete inactive points: */
- for (src = dst = 0; src < curve->nctlpoints; ++src) {
- if (GET_X(src) >= min_x) {
- memcpy(curve->ctlpoints + dst,
- curve->ctlpoints + src,
- sizeof(*curve->ctlpoints));
- dst++;
- }
- }
-
- if (dst < src) {
- curve->nctlpoints -= (src - dst);
- if (curve->nctlpoints <= 0) {
- curve->nctlpoints = 1;
- GET_X(0) = min_x;
- GET_Y(0) = curve->min_y;
- xs_curve_draw(curve, width, height);
- }
- curve->ctlpoints = g_realloc(curve->ctlpoints,
- curve->nctlpoints * sizeof(*curve->ctlpoints));
- }
-
- new_type = GDK_FLEUR;
- curve->grab_point = -1;
- }
- xs_curve_draw(curve, width, height);
- break;
-
- case GDK_MOTION_NOTIFY:
- if (curve->grab_point == -1) {
- /* if no point is grabbed... */
- if (distance <= MIN_DISTANCE)
- new_type = GDK_FLEUR;
- else
- new_type = GDK_TCROSS;
- } else {
- gint leftbound, rightbound;
-
- /* drag the grabbed point */
- new_type = GDK_TCROSS;
-
- leftbound = -MIN_DISTANCE;
- if (curve->grab_point > 0) {
- leftbound = xs_project(
- GET_X(curve->grab_point-1),
- min_x, curve->max_x, width);
- }
-
- rightbound = width + RADIUS2 + MIN_DISTANCE;
- if (curve->grab_point + 1 < curve->nctlpoints) {
- rightbound = xs_project(
- GET_X(curve->grab_point+1),
- min_x, curve->max_x, width);
- }
-
- if ((tx <= leftbound) || (tx >= rightbound) ||
- (ty > height + RADIUS2 + MIN_DISTANCE) || (ty < -MIN_DISTANCE)) {
- GET_X(curve->grab_point) = min_x - 1.0;
- } else {
- GET_X(curve->grab_point) =
- xs_unproject(x, min_x, curve->max_x, width);
- GET_Y(curve->grab_point) =
- xs_unproject(y, curve->min_y, curve->max_y, height);
- }
-
- xs_curve_draw(curve, width, height);
- }
-
- /* See if cursor type was changed and update accordingly */
- if (new_type != (GdkCursorType) curve->cursor_type) {
- GdkCursor *cursor;
- curve->cursor_type = new_type;
- cursor = gdk_cursor_new(curve->cursor_type);
- gdk_window_set_cursor(w->window, cursor);
- gdk_cursor_destroy(cursor);
- }
- break;
-
- default:
- break;
- }
-
- return FALSE;
-}
-
-
-static void xs_curve_size_graph(XSCurve *curve)
-{
- gint width, height;
- gfloat aspect;
- GdkScreen *screen = gtk_widget_get_screen(GTK_WIDGET(curve));
-
- width = (curve->max_x - curve->min_x) + 1;
- height = (curve->max_y - curve->min_y) + 1;
- aspect = width / (gfloat) height;
-
- if (width > gdk_screen_get_width(screen) / 4)
- width = gdk_screen_get_width(screen) / 4;
-
- if (height > gdk_screen_get_height(screen) / 4)
- height = gdk_screen_get_height(screen) / 4;
-
- if (aspect < 1.0)
- width = height * aspect;
- else
- height = width / aspect;
-
- gtk_widget_set_size_request(GTK_WIDGET(curve), width + RADIUS2, height + RADIUS2);
-}
-
-
-static void xs_curve_update(XSCurve *curve)
-{
- if (curve->pixmap) {
- gint width, height;
-
- width = GTK_WIDGET(curve)->allocation.width - RADIUS2;
- height = GTK_WIDGET(curve)->allocation.height - RADIUS2;
- xs_curve_draw(curve, width, height);
- }
-}
-
-
-void xs_curve_reset(XSCurve *curve)
-{
- if (curve->ctlpoints)
- g_free(curve->ctlpoints);
-
- curve->nctlpoints = 4;
- curve->ctlpoints = g_malloc(curve->nctlpoints * sizeof(curve->ctlpoints[0]));
-
- GET_X(0) = curve->min_x;
- GET_Y(0) = curve->min_y;
- GET_X(1) = curve->min_x;
- GET_Y(1) = curve->min_y;
-
- GET_X(2) = curve->max_x;
- GET_Y(2) = curve->max_y;
- GET_X(3) = curve->max_x;
- GET_Y(3) = curve->max_y;
-
- xs_curve_update(curve);
-}
-
-
-void xs_curve_set_range(XSCurve *curve, gfloat min_x, gfloat min_y, gfloat max_x, gfloat max_y)
-{
- g_object_freeze_notify(G_OBJECT(curve));
- if (curve->min_x != min_x) {
- curve->min_x = min_x;
- g_object_notify(G_OBJECT(curve), "min-x");
- }
- if (curve->max_x != max_x) {
- curve->max_x = max_x;
- g_object_notify(G_OBJECT(curve), "max-x");
- }
- if (curve->min_y != min_y) {
- curve->min_y = min_y;
- g_object_notify(G_OBJECT(curve), "min-y");
- }
- if (curve->max_y != max_y) {
- curve->max_y = max_y;
- g_object_notify(G_OBJECT(curve), "max-y");
- }
- g_object_thaw_notify(G_OBJECT(curve));
-
- xs_curve_size_graph(curve);
- xs_curve_reset(curve);
-}
-
-
-gboolean xs_curve_realloc_data(XSCurve *curve, gint npoints)
-{
- if (npoints != curve->nctlpoints) {
- curve->nctlpoints = npoints;
- curve->ctlpoints = (xs_point_t *) g_realloc(curve->ctlpoints,
- curve->nctlpoints * sizeof(*curve->ctlpoints));
-
- if (curve->ctlpoints == NULL)
- return FALSE;
- }
-
- return TRUE;
-}
-
-
-void xs_curve_get_data(XSCurve *curve, xs_point_t ***points, gint **npoints)
-{
- *points = &(curve->ctlpoints);
- *npoints = &(curve->nctlpoints);
-}
-
-
-gboolean xs_curve_set_points(XSCurve *curve, xs_int_point_t *points, gint npoints)
-{
- gint i;
-
- if (!xs_curve_realloc_data(curve, npoints + 4))
- return FALSE;
-
- GET_X(0) = curve->min_x;
- GET_Y(0) = curve->min_y;
- GET_X(1) = curve->min_x;
- GET_Y(1) = curve->min_y;
-
- for (i = 0; i < npoints; i++) {
- GET_X(i+2) = points[i].x;
- GET_Y(i+2) = points[i].y;
- }
-
- GET_X(npoints+2) = curve->max_x;
- GET_Y(npoints+2) = curve->max_y;
- GET_X(npoints+3) = curve->max_x;
- GET_Y(npoints+3) = curve->max_y;
-
- xs_curve_update(curve);
- return TRUE;
-}
-
-
-gboolean xs_curve_get_points(XSCurve *curve, xs_int_point_t **points, gint *npoints)
-{
- gint i, n;
-
- n = curve->nctlpoints - 4;
-
- *points = g_malloc(n * sizeof(xs_int_point_t));
- if (*points == NULL)
- return FALSE;
-
- *npoints = n;
- for (i = 2; i < curve->nctlpoints - 2; i++) {
- (*points)[i].x = GET_X(i);
- (*points)[i].y = GET_Y(i);
- }
-
- return TRUE;
-}
-
-
-GtkWidget *xs_curve_new(void)
-{
- return g_object_new(XS_TYPE_CURVE, NULL);
-}
-
-
-static void xs_curve_finalize(GObject *object)
-{
- XSCurve *curve;
-
- g_return_if_fail(object != NULL);
- g_return_if_fail(XS_IS_CURVE(object));
-
- curve = XS_CURVE(object);
- if (curve->pixmap)
- g_object_unref(curve->pixmap);
- if (curve->ctlpoints)
- g_free(curve->ctlpoints);
-
- G_OBJECT_CLASS(parent_class)->finalize(object);
-}

audacious-plugins-3.0.3.tar.bz2/src/sid/xs_fileinfo.c Deleted

@@ -1,206 +0,0 @@
-/*
- XMMS-SID - SIDPlay input plugin for X MultiMedia System (XMMS)
-
- File information window
-
- Programmed and designed by Matti 'ccr' Hamalainen <ccr@tnsp.org>
- (C) Copyright 1999-2007 Tecnic Software productions (TNSP)
-
- 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.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
-#include <gdk/gdkkeysyms.h>
-#include <gtk/gtk.h>
-
-#include <libaudcore/audstrings.h>
-
-#include "xs_fileinfo.h"
-#include "xs_player.h"
-#include "xs_support.h"
-#include "xs_config.h"
-#include "xs_interface.h"
-#include "xs_glade.h"
-#include "xs_slsup.h"
-
-
-static GtkWidget *xs_fileinfowin = NULL;
-static stil_node_t *xs_fileinfostil = NULL;
-XS_MUTEX(xs_fileinfowin);
-
-#define LUW(x) lookup_widget(xs_fileinfowin, x)
-
-
-void xs_fileinfo_ok(void)
-{
- XS_MUTEX_LOCK(xs_fileinfowin);
- if (xs_fileinfowin) {
- gtk_widget_destroy(xs_fileinfowin);
- xs_fileinfowin = NULL;
- }
- XS_MUTEX_UNLOCK(xs_fileinfowin);
-}
-
-
-gboolean xs_fileinfo_delete(GtkWidget * widget, GdkEvent * event, gpointer user_data)
-{
- (void) widget;
- (void) event;
- (void) user_data;
-
- XSDEBUG("delete_event\n");
- xs_fileinfo_ok();
- return FALSE;
-}
-
-
-static void xs_fileinfo_subtune(GtkWidget * widget, void *data)
-{
- stil_subnode_t *tmpNode;
- GtkWidget *tmpText;
- gchar *subName, *subAuthor, *subInfo;
-
- (void) widget;
- (void) data;
-
- /* Freeze text-widget and delete the old text */
- tmpText = LUW("fileinfo_sub_info");
-
- /* Get subtune information */
- tmpNode = (stil_subnode_t *) data;
- if (!tmpNode && xs_fileinfostil)
- tmpNode = xs_fileinfostil->subTunes[0];
-
- if (tmpNode) {
- subName = tmpNode->name;
- subAuthor = tmpNode->author;
- subInfo = tmpNode->info;
- } else {
- subName = NULL;
- subAuthor = NULL;
- subInfo = NULL;
- }
-
- /* Get and set subtune information */
- gtk_entry_set_text(GTK_ENTRY(LUW("fileinfo_sub_name")), subName ? subName : "");
- gtk_entry_set_text(GTK_ENTRY(LUW("fileinfo_sub_author")), subAuthor ? subAuthor : "");
-
- gtk_text_buffer_set_text(GTK_TEXT_BUFFER(gtk_text_view_get_buffer(GTK_TEXT_VIEW(tmpText))),
- subInfo ? subInfo : "", -1);
-}
-
-
-void xs_fileinfo(const gchar * filename)
-{
- GtkWidget *tmpMenuItem, *tmpMenu, *tmpOptionMenu;
- xs_tuneinfo_t *tmpInfo;
- stil_subnode_t *tmpNode;
- gchar tmpStr[256], *tmpFilename;
- gint n;
-
- /* Current implementation leaves old fileinfo window untouched if
- * no information can be found for the new file. Hmm...
- */
- tmpFilename = filename_split_subtune(filename, &n);
-
- /* Get new tune information */
- XS_MUTEX_LOCK(xs_fileinfowin);
- XS_MUTEX_LOCK(xs_status);
- if ((tmpInfo = xs_status.sidPlayer->plrGetSIDInfo(tmpFilename)) == NULL) {
- XS_MUTEX_UNLOCK(xs_fileinfowin);
- XS_MUTEX_UNLOCK(xs_status);
- return;
- }
- XS_MUTEX_UNLOCK(xs_status);
-
- xs_fileinfostil = xs_stil_get(tmpFilename);
- g_free(tmpFilename);
-
- /* Check if there already is an open fileinfo window */
- if (xs_fileinfowin)
- XS_WINDOW_PRESENT(xs_fileinfowin);
- else
- xs_fileinfowin = create_xs_fileinfowin();
-
- /* Delete current items */
- tmpOptionMenu = LUW("fileinfo_sub_tune");
- tmpMenu = gtk_option_menu_get_menu(GTK_OPTION_MENU(tmpOptionMenu));
- gtk_widget_destroy(tmpMenu);
- gtk_option_menu_remove_menu(GTK_OPTION_MENU(tmpOptionMenu));
- tmpMenu = gtk_menu_new();
-
-
- /* Set the generic song information */
- gtk_entry_set_text(GTK_ENTRY(LUW("fileinfo_filename")), filename);
- gtk_entry_set_text(GTK_ENTRY(LUW("fileinfo_songname")), tmpInfo->sidName);
- gtk_entry_set_text(GTK_ENTRY(LUW("fileinfo_composer")), tmpInfo->sidComposer);
- gtk_entry_set_text(GTK_ENTRY(LUW("fileinfo_copyright")), tmpInfo->sidCopyright);
-
-
- /* Main tune - the pseudo tune */
- tmpMenuItem = gtk_menu_item_new_with_label(_("General info"));
- gtk_widget_show(tmpMenuItem);
- gtk_menu_append(GTK_MENU(tmpMenu), tmpMenuItem);
-
- tmpNode = (xs_fileinfostil != NULL) ? xs_fileinfostil->subTunes[0] : NULL;
- XS_SIGNAL_CONNECT(tmpMenuItem, "activate", xs_fileinfo_subtune, tmpNode);
-
- /* Other menu items */
- for (n = 1; n <= tmpInfo->nsubTunes; n++) {
- if (xs_fileinfostil && n <= xs_fileinfostil->nsubTunes && xs_fileinfostil->subTunes[n]) {
- gboolean isSet = FALSE;
- tmpNode = xs_fileinfostil->subTunes[n];
-
- g_snprintf(tmpStr, sizeof(tmpStr), _("Tune #%i: "), n);
-
- if (tmpNode->name) {
- xs_pnstrcat(tmpStr, sizeof(tmpStr), tmpNode->name);
- isSet = TRUE;
- }
-
- if (tmpNode->title) {
- xs_pnstrcat(tmpStr, sizeof(tmpStr),
- isSet ? " [*]" : tmpNode->title);
- isSet = TRUE;
- }
-
- if (tmpNode->info) {
- xs_pnstrcat(tmpStr, sizeof(tmpStr), " [!]");
- isSet = TRUE;
- }
-
- if (!isSet)
- xs_pnstrcat(tmpStr, sizeof(tmpStr), "---");
-
- tmpMenuItem = gtk_menu_item_new_with_label(tmpStr);
- gtk_widget_show(tmpMenuItem);
- gtk_menu_append(GTK_MENU(tmpMenu), tmpMenuItem);
- XS_SIGNAL_CONNECT(tmpMenuItem, "activate", xs_fileinfo_subtune, tmpNode);
- }
-
- }
-
- gtk_option_menu_set_menu(GTK_OPTION_MENU(tmpOptionMenu), tmpMenu);
- gtk_widget_show(tmpOptionMenu);
-
- /* Set the subtune information */
- xs_fileinfo_subtune(tmpOptionMenu, NULL);
-
- /* Free temporary tuneinfo */
- xs_tuneinfo_free(tmpInfo);
-
- /* Show the window */
- gtk_widget_show(xs_fileinfowin);
-
- XS_MUTEX_UNLOCK(xs_fileinfowin);
-}

audacious-plugins-3.0.3.tar.bz2/src/sid/xs_fileinfo.h Deleted

audacious-plugins-3.0.3.tar.bz2/src/sid/xs_genui.c Deleted

audacious-plugins-3.0.3.tar.bz2/src/sid/xs_genui.h Deleted

@@ -1,194 +0,0 @@
-#include <gtk/gtk.h>
-
-
-gboolean
-xs_configwin_delete (GtkWidget *widget,
- GdkEvent *event,
- gpointer user_data);
-
-void
-xs_cfg_oversample_toggled (GtkToggleButton *togglebutton,
- gpointer user_data);
-
-void
-xs_cfg_emu_sidplay1_toggled (GtkToggleButton *togglebutton,
- gpointer user_data);
-
-void
-xs_cfg_emu_sidplay2_toggled (GtkToggleButton *togglebutton,
- gpointer user_data);
-
-void
-xs_cfg_emu_filters_toggled (GtkToggleButton *togglebutton,
- gpointer user_data);
-
-void
-xs_cfg_sp1_filter_reset (GtkButton *button,
- gpointer user_data);
-
-void
-xs_cfg_sp2_filter_export (GtkButton *button,
- gpointer user_data);
-
-void
-xs_cfg_sp2_filter_load (GtkButton *button,
- gpointer user_data);
-
-void
-xs_cfg_sp2_filter_save (GtkButton *button,
- gpointer user_data);
-
-void
-xs_cfg_sp2_filter_import (GtkButton *button,
- gpointer user_data);
-
-void
-xs_cfg_sp2_filter_delete (GtkButton *button,
- gpointer user_data);
-
-void
-xs_cfg_mintime_enable_toggled (GtkToggleButton *togglebutton,
- gpointer user_data);
-
-void
-xs_cfg_mintime_changed (GtkEditable *editable,
- gpointer user_data);
-
-void
-xs_cfg_maxtime_enable_toggled (GtkToggleButton *togglebutton,
- gpointer user_data);
-
-void
-xs_cfg_maxtime_changed (GtkEditable *editable,
- gpointer user_data);
-
-void
-xs_cfg_sldb_enable_toggled (GtkToggleButton *togglebutton,
- gpointer user_data);
-
-void
-xs_cfg_sldb_browse (GtkButton *button,
- gpointer user_data);
-
-void
-xs_cfg_stil_enable_toggled (GtkToggleButton *togglebutton,
- gpointer user_data);
-
-void
-xs_cfg_stil_browse (GtkButton *button,
- gpointer user_data);
-
-void
-xs_cfg_hvsc_browse (GtkButton *button,
- gpointer user_data);
-
-void
-xs_cfg_ftitle_override_toggled (GtkToggleButton *togglebutton,
- gpointer user_data);
-
-void
-xs_cfg_subauto_enable_toggled (GtkToggleButton *togglebutton,
- gpointer user_data);
-
-void
-xs_cfg_subauto_min_only_toggled (GtkToggleButton *togglebutton,
- gpointer user_data);
-
-void
-xs_cfg_ok (GtkButton *button,
- gpointer user_data);
-
-void
-xs_cfg_cancel (GtkButton *button,
- gpointer user_data);
-
-gboolean
-xs_fileinfo_delete (GtkWidget *widget,
- GdkEvent *event,
- gpointer user_data);
-
-void
-xs_subctrl_prevsong (GtkButton *button,
- gpointer user_data);
-
-void
-xs_subctrl_nextsong (GtkButton *button,
- gpointer user_data);
-
-void
-xs_fileinfo_ok (GtkButton *button,
- gpointer user_data);
-
-gboolean
-xs_sldb_fs_delete (GtkWidget *widget,
- GdkEvent *event,
- gpointer user_data);
-
-void
-xs_sldb_fs_ok (GtkButton *button,
- gpointer user_data);
-
-void
-xs_sldb_fs_cancel (GtkButton *button,
- gpointer user_data);
-
-gboolean
-xs_stil_fs_delete (GtkWidget *widget,
- GdkEvent *event,
- gpointer user_data);
-
-void
-xs_stil_fs_ok (GtkButton *button,
- gpointer user_data);
-
-void
-xs_stil_fs_cancel (GtkButton *button,
- gpointer user_data);
-
-gboolean
-xs_hvsc_fs_delete (GtkWidget *widget,
- GdkEvent *event,
- gpointer user_data);
-
-void
-xs_hvsc_fs_ok (GtkButton *button,
- gpointer user_data);
-
-void
-xs_hvsc_fs_cancel (GtkButton *button,
- gpointer user_data);
-
-gboolean
-xs_filter_import_fs_delete (GtkWidget *widget,
- GdkEvent *event,
- gpointer user_data);
-
-void
-xs_filter_import_fs_ok (GtkButton *button,
- gpointer user_data);
-
-void
-xs_filter_import_fs_cancel (GtkButton *button,
- gpointer user_data);
-
-gboolean
-xs_filter_export_fs_delete (GtkWidget *widget,
- GdkEvent *event,
- gpointer user_data);
-
-void
-xs_filter_export_fs_ok (GtkButton *button,
- gpointer user_data);
-
-void
-xs_filter_export_fs_cancel (GtkButton *button,
- gpointer user_data);
-
-gboolean
-xs_confirmwin_delete (GtkWidget *widget,
- GdkEvent *event,
- gpointer user_data);
-
-void
-xs_cfg_ftitle_override_toggled (GtkToggleButton *togglebutton,
- gpointer user_data);

audacious-plugins-3.0.3.tar.bz2/src/sid/xs_glade.c Deleted

@@ -1,144 +0,0 @@
-/*
- * DO NOT EDIT THIS FILE - it is generated by Glade.
- */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdio.h>
-
-#include <gtk/gtk.h>
-
-#include "xs_glade.h"
-
-GtkWidget*
-lookup_widget (GtkWidget *widget,
- const gchar *widget_name)
-{
- GtkWidget *parent, *found_widget;
-
- for (;;)
- {
- if (GTK_IS_MENU (widget))
- parent = gtk_menu_get_attach_widget (GTK_MENU (widget));
- else
- parent = widget->parent;
- if (!parent)
- parent = (GtkWidget*) g_object_get_data (G_OBJECT (widget), "GladeParentKey");
- if (parent == NULL)
- break;
- widget = parent;
- }
-
- found_widget = (GtkWidget*) g_object_get_data (G_OBJECT (widget),
- widget_name);
- if (!found_widget)
- g_warning ("Widget not found: %s", widget_name);
- return found_widget;
-}
-
-static GList *pixmaps_directories = NULL;
-
-/* Use this function to set the directory containing installed pixmaps. */
-void
-add_pixmap_directory (const gchar *directory)
-{
- pixmaps_directories = g_list_prepend (pixmaps_directories,
- g_strdup (directory));
-}
-
-/* This is an internally used function to find pixmap files. */
-static gchar*
-find_pixmap_file (const gchar *filename)
-{
- GList *elem;
-
- /* We step through each of the pixmaps directory to find it. */
- elem = pixmaps_directories;
- while (elem)
- {
- gchar *pathname = g_strdup_printf ("%s%s%s", (gchar*)elem->data,
- G_DIR_SEPARATOR_S, filename);
- if (g_file_test (pathname, G_FILE_TEST_EXISTS))
- return pathname;
- g_free (pathname);
- elem = elem->next;
- }
- return NULL;
-}
-
-/* This is an internally used function to create pixmaps. */
-GtkWidget*
-create_pixmap (GtkWidget *widget,
- const gchar *filename)
-{
- gchar *pathname = NULL;
- GtkWidget *pixmap;
-
- if (!filename || !filename[0])
- return gtk_image_new ();
-
- pathname = find_pixmap_file (filename);
-
- if (!pathname)
- {
- g_warning (_("Couldn't find pixmap file: %s"), filename);
- return gtk_image_new ();
- }
-
- pixmap = gtk_image_new_from_file (pathname);
- g_free (pathname);
- return pixmap;
-}
-
-/* This is an internally used function to create pixmaps. */
-GdkPixbuf*
-create_pixbuf (const gchar *filename)
-{
- gchar *pathname = NULL;
- GdkPixbuf *pixbuf;
- GError *error = NULL;
-
- if (!filename || !filename[0])
- return NULL;
-
- pathname = find_pixmap_file (filename);
-
- if (!pathname)
- {
- g_warning (_("Couldn't find pixmap file: %s"), filename);
- return NULL;
- }
-
- pixbuf = gdk_pixbuf_new_from_file (pathname, &error);
- if (!pixbuf)
- {
- fprintf (stderr, "Failed to load pixbuf file: %s: %s\n",
- pathname, error->message);
- g_error_free (error);
- }
- g_free (pathname);
- return pixbuf;
-}
-
-/* This is used to set ATK action descriptions. */
-void
-glade_set_atk_action_description (AtkAction *action,
- const gchar *action_name,
- const gchar *description)
-{
- gint n_actions, i;
-
- n_actions = atk_action_get_n_actions (action);
- for (i = 0; i < n_actions; i++)
- {
- if (!strcmp (atk_action_get_name (action, i), action_name))
- atk_action_set_description (action, i, description);
- }
-}
-

audacious-plugins-3.0.3.tar.bz2/src/sid/xs_glade.h Deleted

@@ -1,69 +0,0 @@
-/*
- * DO NOT EDIT THIS FILE - it is generated by Glade.
- */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <gtk/gtk.h>
-
-/*
- * Standard gettext macros.
- */
-#ifdef ENABLE_NLS
-# include <libintl.h>
-# undef _
-# define _(String) dgettext (PACKAGE, String)
-# define Q_(String) g_strip_context ((String), gettext (String))
-# ifdef gettext_noop
-# define N_(String) gettext_noop (String)
-# else
-# define N_(String) (String)
-# endif
-#else
-# define textdomain(String) (String)
-# define gettext(String) (String)
-# define dgettext(Domain,Message) (Message)
-# define dcgettext(Domain,Message,Type) (Message)
-# define bindtextdomain(Domain,Directory) (Domain)
-# define _(String) (String)
-# define Q_(String) g_strip_context ((String), (String))
-# define N_(String) (String)
-#endif
-
-
-/*
- * Public Functions.
- */
-
-/*
- * This function returns a widget in a component created by Glade.
- * Call it with the toplevel widget in the component (i.e. a window/dialog),
- * or alternatively any widget in the component, and the name of the widget
- * you want returned.
- */
-GtkWidget* lookup_widget (GtkWidget *widget,
- const gchar *widget_name);
-
-
-/* Use this function to set the directory containing installed pixmaps. */
-void add_pixmap_directory (const gchar *directory);
-
-
-/*
- * Private Functions.
- */
-
-/* This is used to create the pixmaps used in the interface. */
-GtkWidget* create_pixmap (GtkWidget *widget,
- const gchar *filename);
-
-/* This is used to create the pixbufs used in the interface. */
-GdkPixbuf* create_pixbuf (const gchar *filename);
-
-/* This is used to set ATK action descriptions. */
-void glade_set_atk_action_description (AtkAction *action,
- const gchar *action_name,
- const gchar *description);
-

audacious-plugins-3.0.3.tar.bz2/src/sid/xs_interface.c Deleted

@@ -1,2151 +0,0 @@
-/*
- * DO NOT EDIT THIS FILE - it is generated by Glade.
- */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdio.h>
-
-#include <gdk/gdkkeysyms.h>
-#include <gtk/gtk.h>
-
-#include "xs_genui.h"
-#include "xs_interface.h"
-#include "xs_glade.h"
-
-#define GLADE_HOOKUP_OBJECT(component,widget,name) \
- g_object_set_data_full (G_OBJECT (component), name, \
- gtk_widget_ref (widget), (GDestroyNotify) gtk_widget_unref)
-
-#define GLADE_HOOKUP_OBJECT_NO_REF(component,widget,name) \
- g_object_set_data (G_OBJECT (component), name, widget)
-
-GtkWidget*
-create_xs_configwin (void)
-{
- GtkWidget *xs_configwin;
- GtkWidget *w_vbox1;
- GtkWidget *cfg_notebook;
- GtkWidget *w_vbox6;
- GtkWidget *w_hbox2;
- GtkWidget *cfg_sndres_frame;
- GtkWidget *w_vbox9;
- GtkWidget *cfg_res_8bit;
- GSList *cfg_res_8bit_group = NULL;
- GtkWidget *cfg_res_16bit;
- GtkWidget *label1;
- GtkWidget *cfg_channels_frame;
- GtkWidget *w_vbox10;
- GtkWidget *cfg_chn_mono;
- GSList *cfg_chn_mono_group = NULL;
- GtkWidget *cfg_chn_stereo;
- GtkWidget *cfg_chn_autopan;
- GtkWidget *label2;
- GtkWidget *cfg_samplerate_frame;
- GtkWidget *w_hbox4;
- GtkWidget *cfg_samplerate_combo;
- GList *cfg_samplerate_combo_items = NULL;
- GtkWidget *cfg_samplerate;
- GtkWidget *w_label8;
- GtkWidget *w_label54;
- GtkWidget *label3;
- GtkWidget *cfg_oversample_frame;
- GtkWidget *w_vbox27;
- GtkWidget *cfg_oversample;
- GtkWidget *cfg_oversample_box;
- GtkWidget *cfg_oversample_label1;
- GtkObject *cfg_oversample_factor_adj;
- GtkWidget *cfg_oversample_factor;
- GtkWidget *cfg_oversample_label2;
- GtkWidget *label4;
- GtkWidget *w_label1;
- GtkWidget *w_vbox2;
- GtkWidget *w_hbox1;
- GtkWidget *cfg_clock_frame;
- GtkWidget *w_vbox4;
- GtkWidget *cfg_emu_clock_force;
- GtkWidget *cfg_emu_clock_pal;
- GSList *cfg_emu_clock_pal_group = NULL;
- GtkWidget *cfg_emu_clock_ntsc;
- GtkWidget *label5;
- GtkWidget *cfg_sid_model_frame;
- GtkWidget *w_vbox3;
- GtkWidget *cfg_emu_sid_force;
- GtkWidget *cfg_emu_mos6581;
- GSList *cfg_emu_mos6581_group = NULL;
- GtkWidget *cfg_emu_mos8580;
- GtkWidget *label6;
- GtkWidget *cfg_emulib_frame;
- GtkWidget *w_vbox26;
- GtkWidget *cfg_emu_sidplay1;
- GSList *cfg_emu_sidplay1_group = NULL;
- GtkWidget *cfg_emu_sidplay2;
- GtkWidget *label7;
- GtkWidget *cfg_memmode_frame;
- GtkWidget *w_vbox5;
- GtkWidget *cfg_emu_mem_real;
- GSList *cfg_emu_mem_real_group = NULL;
- GtkWidget *cfg_emu_mem_banksw;
- GtkWidget *cfg_emu_mem_transrom;
- GtkWidget *cfg_emu_mem_playsid;
- GtkWidget *label8;
- GtkWidget *w_label2;
- GtkWidget *w_vbox29;
- GtkWidget *cfg_sidplay2_frame;
- GtkWidget *w_vbox30;
- GtkWidget *cfg_emu_sp2_opt;
- GtkWidget *cfg_emu_sp2_resid;
- GSList *cfg_emu_sp2_resid_group = NULL;
- GtkWidget *cfg_emu_sp2_hardsid;
- GtkWidget *label9;
- GtkWidget *cfg_resid_frame;
- GtkWidget *w_vbox37;
- GtkWidget *cfg_emu_resid_fast;
- GSList *cfg_emu_resid_fast_group = NULL;
- GtkWidget *cfg_emu_resid_int;
- GtkWidget *cfg_emu_resid_res_fast;
- GtkWidget *cfg_emu_resid_res_int;
- GtkWidget *label10;
- GtkWidget *w_label48;
- GtkWidget *w_vbox25;
- GtkWidget *cfg_emu_filters;
- GtkWidget *cfg_filters_notebook;
- GtkWidget *cfg_box_filter_sidplay1;
- GtkWidget *cfg_sp1_frm_fs;
- GtkWidget *cfg_sp1_filter_fs;
- GtkWidget *label11;
- GtkWidget *cfg_sp1_frm_fm;
- GtkWidget *cfg_sp1_filter_fm;
- GtkWidget *label12;
- GtkWidget *cfg_sp1_frm_ft;
- GtkWidget *cfg_sp1_filter_ft;
- GtkWidget *label13;
- GtkWidget *w_vbox17;
- GtkWidget *cfg_sp1_filter_reset;
- GtkWidget *w_label55;
- GtkWidget *cfg_box_filter_sidplay2;
- GtkWidget *cfg_sp_filter_controlbox;
- GtkWidget *cfg_sp2_filter_combo;
- GList *cfg_sp2_filter_combo_items = NULL;
- GtkWidget *cfg_sp2_filter_combo_entry;
- GtkWidget *table3;
- GtkWidget *cfg_sp2_filter_export;
- GtkWidget *cfg_sp2_filter_load;
- GtkWidget *cfg_sp2_filter_save;
- GtkWidget *cfg_sp2_filter_import;
- GtkWidget *cfg_sp2_filter_delete;
- GtkWidget *cfg_sp2_filter_frame;
- GtkWidget *label14;
- GtkWidget *w_label56;
- GtkWidget *w_label24;
- GtkWidget *w_vbox20;
- GtkWidget *w_frame29;
- GtkWidget *w_vbox32;
- GtkWidget *cfg_mintime_enable;
- GtkWidget *cfg_mintime_box;
- GtkWidget *cfg_mintime_label1;
- GtkObject *cfg_mintime_adj;
- GtkWidget *cfg_mintime;
- GtkWidget *cfg_mintime_label2;
- GtkWidget *label15;
- GtkWidget *w_frame21;
- GtkWidget *w_vbox21;
- GtkWidget *cfg_maxtime_enable;
- GtkWidget *cfg_maxtime_unknown;
- GtkWidget *cfg_maxtime_box;
- GtkWidget *cfg_maxtime_label1;
- GtkObject *cfg_maxtime_adj;
- GtkWidget *cfg_maxtime;
- GtkWidget *cfg_maxtime_label2;
- GtkWidget *label16;
- GtkWidget *w_frame18;
- GtkWidget *w_vbox18;
- GtkWidget *cfg_sld_enable;
- GtkWidget *cfg_sld_box;
- GtkWidget *cfg_sld_label1;
- GtkWidget *cfg_sld_dbpath;
- GtkWidget *cfg_sld_dbbrowse;
- GtkWidget *alignment1;
- GtkWidget *hbox1;
- GtkWidget *image1;
- GtkWidget *label30;
- GtkWidget *label17;
- GtkWidget *w_label26;
- GtkWidget *frame1;
- GtkWidget *vbox1;
- GtkWidget *cfg_ftitle_override;
- GtkWidget *cfg_ftitle_box;
- GtkWidget *cfg_ftitle_format;
- GtkWidget *cfg_ftitle_descs;
- GtkWidget *label29;
- GtkWidget *w_label27;
- GtkWidget *w_vbox19;
- GtkWidget *w_frame31;
- GtkWidget *w_vbox35;
- GtkWidget *cfg_subauto_enable;
- GtkWidget *cfg_subauto_min_only;
- GtkWidget *cfg_subauto_box;
- GtkWidget *w_label52;
- GtkObject *cfg_subauto_mintime_adj;
- GtkWidget *cfg_subauto_mintime;
- GtkWidget *w_label53;
- GtkWidget *label21;
- GtkWidget *w_frame7;
- GtkWidget *w_vbox8;
- GtkWidget *cfg_stil_enable;
- GtkWidget *cfg_stil_box1;
- GtkWidget *cfg_stil_label1;
- GtkWidget *w_alignment2;
- GtkWidget *cfg_stil_dbpath;
- GtkWidget *w_alignment1;
- GtkWidget *cfg_stil_browse;
- GtkWidget *alignment2;
- GtkWidget *hbox2;
- GtkWidget *image2;
- GtkWidget *label31;
- GtkWidget *cfg_stil_box2;
- GtkWidget *cfg_hvsc_label1;
- GtkWidget *w_alignment6;
- GtkWidget *cfg_hvsc_path;
- GtkWidget *w_alignment7;
- GtkWidget *cfg_hvsc_browse;
- GtkWidget *alignment3;
- GtkWidget *hbox3;
- GtkWidget *image3;
- GtkWidget *label32;
- GtkWidget *label18;
- GtkWidget *w_label3;
- GtkWidget *hbuttonbox1;
- GtkWidget *cfg_cancel;
- GtkWidget *cfg_ok;
- GtkTooltips *tooltips;
-
- tooltips = gtk_tooltips_new ();
-
- xs_configwin = gtk_window_new (GTK_WINDOW_TOPLEVEL);
- gtk_window_set_type_hint(GTK_WINDOW(xs_configwin), GDK_WINDOW_TYPE_HINT_DIALOG);
- gtk_widget_set_name (xs_configwin, "xs_configwin");
- gtk_window_set_title (GTK_WINDOW (xs_configwin), _("Audacious-SID configuration"));
-
- w_vbox1 = gtk_vbox_new (FALSE, 0);
- gtk_widget_set_name (w_vbox1, "w_vbox1");
- gtk_widget_show (w_vbox1);
- gtk_container_add (GTK_CONTAINER (xs_configwin), w_vbox1);
- gtk_container_set_border_width (GTK_CONTAINER (w_vbox1), 8);
-
- cfg_notebook = gtk_notebook_new ();
- gtk_widget_set_name (cfg_notebook, "cfg_notebook");
- gtk_widget_show (cfg_notebook);
- gtk_box_pack_start (GTK_BOX (w_vbox1), cfg_notebook, TRUE, TRUE, 0);
- gtk_notebook_set_show_border (GTK_NOTEBOOK (cfg_notebook), FALSE);
-
- w_vbox6 = gtk_vbox_new (FALSE, 0);
- gtk_widget_set_name (w_vbox6, "w_vbox6");
- gtk_widget_show (w_vbox6);
- gtk_container_add (GTK_CONTAINER (cfg_notebook), w_vbox6);
-
- w_hbox2 = gtk_hbox_new (FALSE, 0);
- gtk_widget_set_name (w_hbox2, "w_hbox2");
- gtk_widget_show (w_hbox2);
- gtk_box_pack_start (GTK_BOX (w_vbox6), w_hbox2, FALSE, TRUE, 0);
-
- cfg_sndres_frame = gtk_frame_new (NULL);
- gtk_widget_set_name (cfg_sndres_frame, "cfg_sndres_frame");
- gtk_widget_show (cfg_sndres_frame);
- gtk_box_pack_start (GTK_BOX (w_hbox2), cfg_sndres_frame, TRUE, TRUE, 0);
- gtk_container_set_border_width (GTK_CONTAINER (cfg_sndres_frame), 4);
-
- w_vbox9 = gtk_vbox_new (FALSE, 2);
- gtk_widget_set_name (w_vbox9, "w_vbox9");
- gtk_widget_show (w_vbox9);
- gtk_container_add (GTK_CONTAINER (cfg_sndres_frame), w_vbox9);
- gtk_container_set_border_width (GTK_CONTAINER (w_vbox9), 2);
-
- cfg_res_8bit = gtk_radio_button_new_with_mnemonic (NULL, _("8-bit"));
- gtk_widget_set_name (cfg_res_8bit, "cfg_res_8bit");
- gtk_widget_show (cfg_res_8bit);
- gtk_box_pack_start (GTK_BOX (w_vbox9), cfg_res_8bit, FALSE, FALSE, 0);
- gtk_radio_button_set_group (GTK_RADIO_BUTTON (cfg_res_8bit), cfg_res_8bit_group);
- cfg_res_8bit_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (cfg_res_8bit));
-
- cfg_res_16bit = gtk_radio_button_new_with_mnemonic (NULL, _("16-bit"));
- gtk_widget_set_name (cfg_res_16bit, "cfg_res_16bit");
- gtk_widget_show (cfg_res_16bit);
- gtk_box_pack_start (GTK_BOX (w_vbox9), cfg_res_16bit, FALSE, FALSE, 0);
- gtk_radio_button_set_group (GTK_RADIO_BUTTON (cfg_res_16bit), cfg_res_8bit_group);
- cfg_res_8bit_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (cfg_res_16bit));
-
- label1 = gtk_label_new (_("Resolution:"));
- gtk_widget_set_name (label1, "label1");
- gtk_widget_show (label1);
- gtk_frame_set_label_widget (GTK_FRAME (cfg_sndres_frame), label1);
-
- cfg_channels_frame = gtk_frame_new (NULL);
- gtk_widget_set_name (cfg_channels_frame, "cfg_channels_frame");
- gtk_widget_show (cfg_channels_frame);
- gtk_box_pack_start (GTK_BOX (w_hbox2), cfg_channels_frame, TRUE, TRUE, 0);
- gtk_container_set_border_width (GTK_CONTAINER (cfg_channels_frame), 4);
-
- w_vbox10 = gtk_vbox_new (FALSE, 2);
- gtk_widget_set_name (w_vbox10, "w_vbox10");
- gtk_widget_show (w_vbox10);
- gtk_container_add (GTK_CONTAINER (cfg_channels_frame), w_vbox10);
- gtk_container_set_border_width (GTK_CONTAINER (w_vbox10), 2);
-
- cfg_chn_mono = gtk_radio_button_new_with_mnemonic (NULL, _("Mono"));
- gtk_widget_set_name (cfg_chn_mono, "cfg_chn_mono");
- gtk_widget_show (cfg_chn_mono);
- gtk_box_pack_start (GTK_BOX (w_vbox10), cfg_chn_mono, FALSE, FALSE, 0);
- gtk_radio_button_set_group (GTK_RADIO_BUTTON (cfg_chn_mono), cfg_chn_mono_group);
- cfg_chn_mono_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (cfg_chn_mono));
-
- cfg_chn_stereo = gtk_radio_button_new_with_mnemonic (NULL, _("Stereo"));
- gtk_widget_set_name (cfg_chn_stereo, "cfg_chn_stereo");
- gtk_widget_show (cfg_chn_stereo);
- gtk_box_pack_start (GTK_BOX (w_vbox10), cfg_chn_stereo, FALSE, FALSE, 0);
- gtk_radio_button_set_group (GTK_RADIO_BUTTON (cfg_chn_stereo), cfg_chn_mono_group);
- cfg_chn_mono_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (cfg_chn_stereo));
-
- cfg_chn_autopan = gtk_radio_button_new_with_mnemonic (NULL, _("Autopanning"));
- gtk_widget_set_name (cfg_chn_autopan, "cfg_chn_autopan");
- gtk_widget_show (cfg_chn_autopan);
- gtk_box_pack_start (GTK_BOX (w_vbox10), cfg_chn_autopan, FALSE, FALSE, 0);
- gtk_radio_button_set_group (GTK_RADIO_BUTTON (cfg_chn_autopan), cfg_chn_mono_group);
- cfg_chn_mono_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (cfg_chn_autopan));
-
- label2 = gtk_label_new (_("Channels:"));
- gtk_widget_set_name (label2, "label2");
- gtk_widget_show (label2);
- gtk_frame_set_label_widget (GTK_FRAME (cfg_channels_frame), label2);
-
- cfg_samplerate_frame = gtk_frame_new (NULL);
- gtk_widget_set_name (cfg_samplerate_frame, "cfg_samplerate_frame");
- gtk_widget_show (cfg_samplerate_frame);
- gtk_box_pack_start (GTK_BOX (w_vbox6), cfg_samplerate_frame, FALSE, TRUE, 0);
- gtk_container_set_border_width (GTK_CONTAINER (cfg_samplerate_frame), 4);
-
- w_hbox4 = gtk_hbox_new (FALSE, 0);
- gtk_widget_set_name (w_hbox4, "w_hbox4");
- gtk_widget_show (w_hbox4);
- gtk_container_add (GTK_CONTAINER (cfg_samplerate_frame), w_hbox4);
- gtk_container_set_border_width (GTK_CONTAINER (w_hbox4), 4);
-
- cfg_samplerate_combo = gtk_combo_new ();
- g_object_set_data (G_OBJECT (GTK_COMBO (cfg_samplerate_combo)->popwin),
- "GladeParentKey", cfg_samplerate_combo);
- gtk_widget_set_name (cfg_samplerate_combo, "cfg_samplerate_combo");
- gtk_widget_show (cfg_samplerate_combo);
- gtk_box_pack_start (GTK_BOX (w_hbox4), cfg_samplerate_combo, FALSE, FALSE, 0);
- cfg_samplerate_combo_items = g_list_append (cfg_samplerate_combo_items, (gpointer) "");
- gtk_combo_set_popdown_strings (GTK_COMBO (cfg_samplerate_combo), cfg_samplerate_combo_items);
- g_list_free (cfg_samplerate_combo_items);
-
- cfg_samplerate = GTK_COMBO (cfg_samplerate_combo)->entry;
- gtk_widget_set_name (cfg_samplerate, "cfg_samplerate");
- gtk_widget_show (cfg_samplerate);
- gtk_entry_set_invisible_char (GTK_ENTRY (cfg_samplerate), 9679);
-
- w_label8 = gtk_label_new (_("Hz"));
- gtk_widget_set_name (w_label8, "w_label8");
- gtk_widget_show (w_label8);
- gtk_box_pack_start (GTK_BOX (w_hbox4), w_label8, FALSE, TRUE, 4);
- gtk_label_set_justify (GTK_LABEL (w_label8), GTK_JUSTIFY_CENTER);
-
- w_label54 = gtk_label_new ("");
- gtk_widget_set_name (w_label54, "w_label54");
- gtk_widget_show (w_label54);
- gtk_box_pack_start (GTK_BOX (w_hbox4), w_label54, FALSE, TRUE, 0);
- gtk_label_set_justify (GTK_LABEL (w_label54), GTK_JUSTIFY_CENTER);
-
- label3 = gtk_label_new (_("Samplerate:"));
- gtk_widget_set_name (label3, "label3");
- gtk_widget_show (label3);
- gtk_frame_set_label_widget (GTK_FRAME (cfg_samplerate_frame), label3);
-
- cfg_oversample_frame = gtk_frame_new (NULL);
- gtk_widget_set_name (cfg_oversample_frame, "cfg_oversample_frame");
- gtk_widget_show (cfg_oversample_frame);
- gtk_box_pack_start (GTK_BOX (w_vbox6), cfg_oversample_frame, FALSE, TRUE, 0);
- gtk_container_set_border_width (GTK_CONTAINER (cfg_oversample_frame), 4);
-
- w_vbox27 = gtk_vbox_new (FALSE, 2);
- gtk_widget_set_name (w_vbox27, "w_vbox27");
- gtk_widget_show (w_vbox27);
- gtk_container_add (GTK_CONTAINER (cfg_oversample_frame), w_vbox27);
- gtk_container_set_border_width (GTK_CONTAINER (w_vbox27), 2);
-
- cfg_oversample = gtk_check_button_new_with_mnemonic (_("Use oversampling"));
- gtk_widget_set_name (cfg_oversample, "cfg_oversample");
- gtk_widget_show (cfg_oversample);
- gtk_box_pack_start (GTK_BOX (w_vbox27), cfg_oversample, FALSE, FALSE, 0);
-
- cfg_oversample_box = gtk_hbox_new (FALSE, 4);
- gtk_widget_set_name (cfg_oversample_box, "cfg_oversample_box");
- gtk_widget_show (cfg_oversample_box);
- gtk_box_pack_start (GTK_BOX (w_vbox27), cfg_oversample_box, FALSE, TRUE, 0);
- gtk_container_set_border_width (GTK_CONTAINER (cfg_oversample_box), 2);
-
- cfg_oversample_label1 = gtk_label_new (_("Factor:"));
- gtk_widget_set_name (cfg_oversample_label1, "cfg_oversample_label1");
- gtk_widget_show (cfg_oversample_label1);
- gtk_box_pack_start (GTK_BOX (cfg_oversample_box), cfg_oversample_label1, FALSE, FALSE, 0);
- gtk_label_set_justify (GTK_LABEL (cfg_oversample_label1), GTK_JUSTIFY_CENTER);
-
- cfg_oversample_factor_adj = gtk_adjustment_new (2, 2, 8, 1, 1, 0);
- cfg_oversample_factor = gtk_spin_button_new (GTK_ADJUSTMENT (cfg_oversample_factor_adj), 1, 0);
- gtk_widget_set_name (cfg_oversample_factor, "cfg_oversample_factor");
- gtk_widget_show (cfg_oversample_factor);
- gtk_box_pack_start (GTK_BOX (cfg_oversample_box), cfg_oversample_factor, FALSE, TRUE, 0);
-
- cfg_oversample_label2 = gtk_label_new (_("Large factors require more CPU-power"));
- gtk_widget_set_name (cfg_oversample_label2, "cfg_oversample_label2");
- gtk_widget_show (cfg_oversample_label2);
- gtk_box_pack_start (GTK_BOX (cfg_oversample_box), cfg_oversample_label2, FALSE, FALSE, 0);
- gtk_label_set_justify (GTK_LABEL (cfg_oversample_label2), GTK_JUSTIFY_CENTER);
-
- label4 = gtk_label_new (_("Oversampling:"));
- gtk_widget_set_name (label4, "label4");
- gtk_widget_show (label4);
- gtk_frame_set_label_widget (GTK_FRAME (cfg_oversample_frame), label4);
-
- w_label1 = gtk_label_new (_("Audio"));
- gtk_widget_set_name (w_label1, "w_label1");
- gtk_widget_show (w_label1);
- gtk_notebook_set_tab_label (GTK_NOTEBOOK (cfg_notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (cfg_notebook), 0), w_label1);
- gtk_label_set_justify (GTK_LABEL (w_label1), GTK_JUSTIFY_CENTER);
-
- w_vbox2 = gtk_vbox_new (FALSE, 0);
- gtk_widget_set_name (w_vbox2, "w_vbox2");
- gtk_widget_show (w_vbox2);
- gtk_container_add (GTK_CONTAINER (cfg_notebook), w_vbox2);
-
- w_hbox1 = gtk_hbox_new (FALSE, 0);
- gtk_widget_set_name (w_hbox1, "w_hbox1");
- gtk_widget_show (w_hbox1);
- gtk_box_pack_start (GTK_BOX (w_vbox2), w_hbox1, FALSE, TRUE, 0);
-
- cfg_clock_frame = gtk_frame_new (NULL);
- gtk_widget_set_name (cfg_clock_frame, "cfg_clock_frame");
- gtk_widget_show (cfg_clock_frame);
- gtk_box_pack_start (GTK_BOX (w_hbox1), cfg_clock_frame, TRUE, TRUE, 0);
- gtk_container_set_border_width (GTK_CONTAINER (cfg_clock_frame), 4);
-
- w_vbox4 = gtk_vbox_new (FALSE, 2);
- gtk_widget_set_name (w_vbox4, "w_vbox4");
- gtk_widget_show (w_vbox4);
- gtk_container_add (GTK_CONTAINER (cfg_clock_frame), w_vbox4);
- gtk_container_set_border_width (GTK_CONTAINER (w_vbox4), 2);
-
- cfg_emu_clock_force = gtk_check_button_new_with_mnemonic (_("Force speed"));
- gtk_widget_set_name (cfg_emu_clock_force, "cfg_emu_clock_force");
- gtk_widget_show (cfg_emu_clock_force);
- gtk_box_pack_start (GTK_BOX (w_vbox4), cfg_emu_clock_force, FALSE, FALSE, 0);
- gtk_tooltips_set_tip (tooltips, cfg_emu_clock_force, _("If enabled, this option \"forces\" the emulation engine to use the selected clock speed/frequency. Otherwise the speed is determined from played file itself."), NULL);
-
- cfg_emu_clock_pal = gtk_radio_button_new_with_mnemonic (NULL, _("PAL (50 Hz)"));
- gtk_widget_set_name (cfg_emu_clock_pal, "cfg_emu_clock_pal");
- gtk_widget_show (cfg_emu_clock_pal);
- gtk_box_pack_start (GTK_BOX (w_vbox4), cfg_emu_clock_pal, FALSE, FALSE, 0);
- gtk_tooltips_set_tip (tooltips, cfg_emu_clock_pal, _("PAL is the european TV standard, which uses 50Hz vertical refresh frequency. Most of SID-tunes have been made for PAL computers."), NULL);
- gtk_radio_button_set_group (GTK_RADIO_BUTTON (cfg_emu_clock_pal), cfg_emu_clock_pal_group);
- cfg_emu_clock_pal_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (cfg_emu_clock_pal));
-
- cfg_emu_clock_ntsc = gtk_radio_button_new_with_mnemonic (NULL, _("NTSC (60 Hz)"));
- gtk_widget_set_name (cfg_emu_clock_ntsc, "cfg_emu_clock_ntsc");
- gtk_widget_show (cfg_emu_clock_ntsc);
- gtk_box_pack_start (GTK_BOX (w_vbox4), cfg_emu_clock_ntsc, FALSE, FALSE, 0);
- gtk_tooltips_set_tip (tooltips, cfg_emu_clock_ntsc, _("NTSC is the TV standard with 60Hz vertical refresh rate (and other features that differ from PAL). It is mainly used in United States, Japan and certain other countries."), NULL);
- gtk_radio_button_set_group (GTK_RADIO_BUTTON (cfg_emu_clock_ntsc), cfg_emu_clock_pal_group);
- cfg_emu_clock_pal_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (cfg_emu_clock_ntsc));
-
- label5 = gtk_label_new (_("Clock speed:"));
- gtk_widget_set_name (label5, "label5");
- gtk_widget_show (label5);
- gtk_frame_set_label_widget (GTK_FRAME (cfg_clock_frame), label5);
-
- cfg_sid_model_frame = gtk_frame_new (NULL);
- gtk_widget_set_name (cfg_sid_model_frame, "cfg_sid_model_frame");
- gtk_widget_show (cfg_sid_model_frame);
- gtk_box_pack_start (GTK_BOX (w_hbox1), cfg_sid_model_frame, TRUE, TRUE, 0);
- gtk_container_set_border_width (GTK_CONTAINER (cfg_sid_model_frame), 4);
-
- w_vbox3 = gtk_vbox_new (FALSE, 2);
- gtk_widget_set_name (w_vbox3, "w_vbox3");
- gtk_widget_show (w_vbox3);
- gtk_container_add (GTK_CONTAINER (cfg_sid_model_frame), w_vbox3);
- gtk_container_set_border_width (GTK_CONTAINER (w_vbox3), 2);
-
- cfg_emu_sid_force = gtk_check_button_new_with_mnemonic (_("Force model"));
- gtk_widget_set_name (cfg_emu_sid_force, "cfg_emu_sid_force");
- gtk_widget_show (cfg_emu_sid_force);
- gtk_box_pack_start (GTK_BOX (w_vbox3), cfg_emu_sid_force, FALSE, FALSE, 0);
- gtk_tooltips_set_tip (tooltips, cfg_emu_sid_force, _("If enabled, this option \"forces\" the emulation engine to use the selected SID-chip model. Otherwise the preferred SID model is determined from the file (if PSIDv2NG type) or if not available, this setting is used."), NULL);
-
- cfg_emu_mos6581 = gtk_radio_button_new_with_mnemonic (NULL, _("MOS 6581"));
- gtk_widget_set_name (cfg_emu_mos6581, "cfg_emu_mos6581");
- gtk_widget_show (cfg_emu_mos6581);
- gtk_box_pack_start (GTK_BOX (w_vbox3), cfg_emu_mos6581, FALSE, FALSE, 0);
- gtk_tooltips_set_tip (tooltips, cfg_emu_mos6581, _("MOS/CSG 6581 is the earlier major version of SID chip. It differs from 8580 in few ways, having much fuller filter (which, due to design error, is never same between two different SID-chips) and has the \"volume adjustment bug\", which enables playing of digital samples."), NULL);
- gtk_radio_button_set_group (GTK_RADIO_BUTTON (cfg_emu_mos6581), cfg_emu_mos6581_group);
- cfg_emu_mos6581_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (cfg_emu_mos6581));
-
- cfg_emu_mos8580 = gtk_radio_button_new_with_mnemonic (NULL, _("MOS 8580"));
- gtk_widget_set_name (cfg_emu_mos8580, "cfg_emu_mos8580");
- gtk_widget_show (cfg_emu_mos8580);
- gtk_box_pack_start (GTK_BOX (w_vbox3), cfg_emu_mos8580, FALSE, FALSE, 0);
- gtk_radio_button_set_group (GTK_RADIO_BUTTON (cfg_emu_mos8580), cfg_emu_mos6581_group);
- cfg_emu_mos6581_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (cfg_emu_mos8580));
-
- label6 = gtk_label_new (_("SID model:"));
- gtk_widget_set_name (label6, "label6");
- gtk_widget_show (label6);
- gtk_frame_set_label_widget (GTK_FRAME (cfg_sid_model_frame), label6);
-
- cfg_emulib_frame = gtk_frame_new (NULL);
- gtk_widget_set_name (cfg_emulib_frame, "cfg_emulib_frame");
- gtk_widget_show (cfg_emulib_frame);
- gtk_box_pack_start (GTK_BOX (w_vbox2), cfg_emulib_frame, FALSE, FALSE, 0);
- gtk_container_set_border_width (GTK_CONTAINER (cfg_emulib_frame), 4);
-
- w_vbox26 = gtk_vbox_new (FALSE, 2);
- gtk_widget_set_name (w_vbox26, "w_vbox26");
- gtk_widget_show (w_vbox26);
- gtk_container_add (GTK_CONTAINER (cfg_emulib_frame), w_vbox26);
- gtk_container_set_border_width (GTK_CONTAINER (w_vbox26), 2);
-
- cfg_emu_sidplay1 = gtk_radio_button_new_with_mnemonic (NULL, _("SIDPlay 1 (frame-based)"));
- gtk_widget_set_name (cfg_emu_sidplay1, "cfg_emu_sidplay1");
- gtk_widget_show (cfg_emu_sidplay1);
- gtk_box_pack_start (GTK_BOX (w_vbox26), cfg_emu_sidplay1, FALSE, FALSE, 0);
- gtk_tooltips_set_tip (tooltips, cfg_emu_sidplay1, _("Use libSIDPlay 1.x emulation, faster but not so accurate. Good in most cases, though."), NULL);
- gtk_radio_button_set_group (GTK_RADIO_BUTTON (cfg_emu_sidplay1), cfg_emu_sidplay1_group);
- cfg_emu_sidplay1_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (cfg_emu_sidplay1));
-
- cfg_emu_sidplay2 = gtk_radio_button_new_with_mnemonic (NULL, _("SIDPlay 2 (cycle-based)"));
- gtk_widget_set_name (cfg_emu_sidplay2, "cfg_emu_sidplay2");
- gtk_widget_show (cfg_emu_sidplay2);
- gtk_box_pack_start (GTK_BOX (w_vbox26), cfg_emu_sidplay2, FALSE, FALSE, 0);
- gtk_tooltips_set_tip (tooltips, cfg_emu_sidplay2, _("Use libSIDPlay 2.x emulation, which requires powerful CPU due to more exact emulation."), NULL);
- gtk_radio_button_set_group (GTK_RADIO_BUTTON (cfg_emu_sidplay2), cfg_emu_sidplay1_group);
- cfg_emu_sidplay1_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (cfg_emu_sidplay2));
-
- label7 = gtk_label_new (_("Emulation library selection:"));
- gtk_widget_set_name (label7, "label7");
- gtk_widget_show (label7);
- gtk_frame_set_label_widget (GTK_FRAME (cfg_emulib_frame), label7);
-
- cfg_memmode_frame = gtk_frame_new (NULL);
- gtk_widget_set_name (cfg_memmode_frame, "cfg_memmode_frame");
- gtk_widget_show (cfg_memmode_frame);
- gtk_box_pack_start (GTK_BOX (w_vbox2), cfg_memmode_frame, FALSE, FALSE, 0);
- gtk_container_set_border_width (GTK_CONTAINER (cfg_memmode_frame), 4);
-
- w_vbox5 = gtk_vbox_new (FALSE, 2);
- gtk_widget_set_name (w_vbox5, "w_vbox5");
- gtk_widget_show (w_vbox5);
- gtk_container_add (GTK_CONTAINER (cfg_memmode_frame), w_vbox5);
- gtk_container_set_border_width (GTK_CONTAINER (w_vbox5), 2);
-
- cfg_emu_mem_real = gtk_radio_button_new_with_mnemonic (NULL, _("Real C64 (SIDPlay 2 only)"));
- gtk_widget_set_name (cfg_emu_mem_real, "cfg_emu_mem_real");
- gtk_widget_show (cfg_emu_mem_real);
- gtk_box_pack_start (GTK_BOX (w_vbox5), cfg_emu_mem_real, FALSE, FALSE, 0);
- gtk_radio_button_set_group (GTK_RADIO_BUTTON (cfg_emu_mem_real), cfg_emu_mem_real_group);
- cfg_emu_mem_real_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (cfg_emu_mem_real));
-
- cfg_emu_mem_banksw = gtk_radio_button_new_with_mnemonic (NULL, _("Bank switching"));
- gtk_widget_set_name (cfg_emu_mem_banksw, "cfg_emu_mem_banksw");
- gtk_widget_show (cfg_emu_mem_banksw);
- gtk_box_pack_start (GTK_BOX (w_vbox5), cfg_emu_mem_banksw, FALSE, FALSE, 0);
- gtk_radio_button_set_group (GTK_RADIO_BUTTON (cfg_emu_mem_banksw), cfg_emu_mem_real_group);
- cfg_emu_mem_real_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (cfg_emu_mem_banksw));
-
- cfg_emu_mem_transrom = gtk_radio_button_new_with_mnemonic (NULL, _("Transparent ROM"));
- gtk_widget_set_name (cfg_emu_mem_transrom, "cfg_emu_mem_transrom");
- gtk_widget_show (cfg_emu_mem_transrom);
- gtk_box_pack_start (GTK_BOX (w_vbox5), cfg_emu_mem_transrom, FALSE, FALSE, 0);
- gtk_radio_button_set_group (GTK_RADIO_BUTTON (cfg_emu_mem_transrom), cfg_emu_mem_real_group);
- cfg_emu_mem_real_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (cfg_emu_mem_transrom));
-
- cfg_emu_mem_playsid = gtk_radio_button_new_with_mnemonic (NULL, _("PlaySID environment"));
- gtk_widget_set_name (cfg_emu_mem_playsid, "cfg_emu_mem_playsid");
- gtk_widget_show (cfg_emu_mem_playsid);
- gtk_box_pack_start (GTK_BOX (w_vbox5), cfg_emu_mem_playsid, FALSE, FALSE, 0);
- gtk_radio_button_set_group (GTK_RADIO_BUTTON (cfg_emu_mem_playsid), cfg_emu_mem_real_group);
- cfg_emu_mem_real_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (cfg_emu_mem_playsid));
-
- label8 = gtk_label_new (_("Memory mode:"));
- gtk_widget_set_name (label8, "label8");
- gtk_widget_show (label8);
- gtk_frame_set_label_widget (GTK_FRAME (cfg_memmode_frame), label8);
-
- w_label2 = gtk_label_new (_("Emu#1"));
- gtk_widget_set_name (w_label2, "w_label2");
- gtk_widget_show (w_label2);
- gtk_notebook_set_tab_label (GTK_NOTEBOOK (cfg_notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (cfg_notebook), 1), w_label2);
- gtk_label_set_justify (GTK_LABEL (w_label2), GTK_JUSTIFY_CENTER);
-
- w_vbox29 = gtk_vbox_new (FALSE, 0);
- gtk_widget_set_name (w_vbox29, "w_vbox29");
- gtk_widget_show (w_vbox29);
- gtk_container_add (GTK_CONTAINER (cfg_notebook), w_vbox29);
-
- cfg_sidplay2_frame = gtk_frame_new (NULL);
- gtk_widget_set_name (cfg_sidplay2_frame, "cfg_sidplay2_frame");
- gtk_widget_show (cfg_sidplay2_frame);
- gtk_box_pack_start (GTK_BOX (w_vbox29), cfg_sidplay2_frame, FALSE, TRUE, 0);
- gtk_container_set_border_width (GTK_CONTAINER (cfg_sidplay2_frame), 4);
-
- w_vbox30 = gtk_vbox_new (FALSE, 2);
- gtk_widget_set_name (w_vbox30, "w_vbox30");
- gtk_widget_show (w_vbox30);
- gtk_container_add (GTK_CONTAINER (cfg_sidplay2_frame), w_vbox30);
- gtk_container_set_border_width (GTK_CONTAINER (w_vbox30), 2);
-
- cfg_emu_sp2_opt = gtk_check_button_new_with_mnemonic (_("Optimization mode (faster, inaccurate)"));
- gtk_widget_set_name (cfg_emu_sp2_opt, "cfg_emu_sp2_opt");
- gtk_widget_show (cfg_emu_sp2_opt);
- gtk_box_pack_start (GTK_BOX (w_vbox30), cfg_emu_sp2_opt, FALSE, FALSE, 0);
- gtk_tooltips_set_tip (tooltips, cfg_emu_sp2_opt, _("This setting can be used to enable libSIDPlay2's \"optimization mode\", which in downgrades the emulation from cycle-exact to something similar to frame-exact. The result is lower CPU usage, but worse accuracy."), NULL);
-
- cfg_emu_sp2_resid = gtk_radio_button_new_with_mnemonic (NULL, _("reSID-emulation"));
- gtk_widget_set_name (cfg_emu_sp2_resid, "cfg_emu_sp2_resid");
- gtk_widget_show (cfg_emu_sp2_resid);
- gtk_box_pack_start (GTK_BOX (w_vbox30), cfg_emu_sp2_resid, FALSE, FALSE, 0);
- gtk_tooltips_set_tip (tooltips, cfg_emu_sp2_resid, _("reSID is the software SID-chip simulator based on SID reverse-engineering, created by Dag Lem. It is probably the closest thing to real SID available as software-only emulation."), NULL);
- gtk_radio_button_set_group (GTK_RADIO_BUTTON (cfg_emu_sp2_resid), cfg_emu_sp2_resid_group);
- cfg_emu_sp2_resid_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (cfg_emu_sp2_resid));
-
- cfg_emu_sp2_hardsid = gtk_radio_button_new_with_mnemonic (NULL, _("HardSID"));
- gtk_widget_set_name (cfg_emu_sp2_hardsid, "cfg_emu_sp2_hardsid");
- gtk_widget_show (cfg_emu_sp2_hardsid);
- gtk_box_pack_start (GTK_BOX (w_vbox30), cfg_emu_sp2_hardsid, FALSE, FALSE, 0);
- gtk_tooltips_set_tip (tooltips, cfg_emu_sp2_hardsid, _("HardSID is a EISA/PCI card for PC-compatibles, which can be fitted with a real SID-chip. Software can be used to control the HardSID and combined with software emulation of rest of C64 via libSIDPlay2 HardSID can be used to achieve \"near 100%\" similarity to real C64. For more information, see http://www.hardsid.com/"), NULL);
- gtk_radio_button_set_group (GTK_RADIO_BUTTON (cfg_emu_sp2_hardsid), cfg_emu_sp2_resid_group);
- cfg_emu_sp2_resid_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (cfg_emu_sp2_hardsid));
-
- label9 = gtk_label_new (_("SIDPlay 2 options:"));
- gtk_widget_set_name (label9, "label9");
- gtk_widget_show (label9);
- gtk_frame_set_label_widget (GTK_FRAME (cfg_sidplay2_frame), label9);
-
- cfg_resid_frame = gtk_frame_new (NULL);
- gtk_widget_set_name (cfg_resid_frame, "cfg_resid_frame");
- gtk_widget_show (cfg_resid_frame);
- gtk_box_pack_start (GTK_BOX (w_vbox29), cfg_resid_frame, FALSE, TRUE, 0);
- gtk_container_set_border_width (GTK_CONTAINER (cfg_resid_frame), 4);
-
- w_vbox37 = gtk_vbox_new (FALSE, 2);
- gtk_widget_set_name (w_vbox37, "w_vbox37");
- gtk_widget_show (w_vbox37);
- gtk_container_add (GTK_CONTAINER (cfg_resid_frame), w_vbox37);
- gtk_container_set_border_width (GTK_CONTAINER (w_vbox37), 2);
-
- cfg_emu_resid_fast = gtk_radio_button_new_with_mnemonic (NULL, _("Fast (nearest neighbour)"));
- gtk_widget_set_name (cfg_emu_resid_fast, "cfg_emu_resid_fast");
- gtk_widget_show (cfg_emu_resid_fast);
- gtk_box_pack_start (GTK_BOX (w_vbox37), cfg_emu_resid_fast, FALSE, FALSE, 0);
- gtk_tooltips_set_tip (tooltips, cfg_emu_resid_fast, _("Fastest and also worst sounding sampling method, simply picks nearest neighbouring sample."), NULL);
- gtk_radio_button_set_group (GTK_RADIO_BUTTON (cfg_emu_resid_fast), cfg_emu_resid_fast_group);
- cfg_emu_resid_fast_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (cfg_emu_resid_fast));
-
- cfg_emu_resid_int = gtk_radio_button_new_with_mnemonic (NULL, _("Linear interpolation"));
- gtk_widget_set_name (cfg_emu_resid_int, "cfg_emu_resid_int");
- gtk_widget_show (cfg_emu_resid_int);
- gtk_box_pack_start (GTK_BOX (w_vbox37), cfg_emu_resid_int, FALSE, FALSE, 0);
- gtk_tooltips_set_tip (tooltips, cfg_emu_resid_int, _("Uses linear interpolation between samples, yielding higher audio quality with less sampling noise."), NULL);
- gtk_radio_button_set_group (GTK_RADIO_BUTTON (cfg_emu_resid_int), cfg_emu_resid_fast_group);
- cfg_emu_resid_fast_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (cfg_emu_resid_int));
-
- cfg_emu_resid_res_fast = gtk_radio_button_new_with_mnemonic (NULL, _("Resampling"));
- gtk_widget_set_name (cfg_emu_resid_res_fast, "cfg_emu_resid_res_fast");
- gtk_widget_show (cfg_emu_resid_res_fast);
- gtk_box_pack_start (GTK_BOX (w_vbox37), cfg_emu_resid_res_fast, FALSE, FALSE, 0);
- gtk_radio_button_set_group (GTK_RADIO_BUTTON (cfg_emu_resid_res_fast), cfg_emu_resid_fast_group);
- cfg_emu_resid_fast_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (cfg_emu_resid_res_fast));
-
- cfg_emu_resid_res_int = gtk_radio_button_new_with_mnemonic (NULL, _("Resampling (FIR)"));
- gtk_widget_set_name (cfg_emu_resid_res_int, "cfg_emu_resid_res_int");
- gtk_widget_show (cfg_emu_resid_res_int);
- gtk_box_pack_start (GTK_BOX (w_vbox37), cfg_emu_resid_res_int, FALSE, FALSE, 0);
- gtk_radio_button_set_group (GTK_RADIO_BUTTON (cfg_emu_resid_res_int), cfg_emu_resid_fast_group);
- cfg_emu_resid_fast_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (cfg_emu_resid_res_int));
-
- label10 = gtk_label_new (_("reSID sampling options:"));
- gtk_widget_set_name (label10, "label10");
- gtk_widget_show (label10);
- gtk_frame_set_label_widget (GTK_FRAME (cfg_resid_frame), label10);
-
- w_label48 = gtk_label_new (_("Emu#2"));
- gtk_widget_set_name (w_label48, "w_label48");
- gtk_widget_show (w_label48);
- gtk_notebook_set_tab_label (GTK_NOTEBOOK (cfg_notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (cfg_notebook), 2), w_label48);
- gtk_label_set_justify (GTK_LABEL (w_label48), GTK_JUSTIFY_CENTER);
-
- w_vbox25 = gtk_vbox_new (FALSE, 2);
- gtk_widget_set_name (w_vbox25, "w_vbox25");
- gtk_widget_show (w_vbox25);
- gtk_container_add (GTK_CONTAINER (cfg_notebook), w_vbox25);
- gtk_container_set_border_width (GTK_CONTAINER (w_vbox25), 4);
-
- cfg_emu_filters = gtk_check_button_new_with_mnemonic (_("Emulate filters"));
- gtk_widget_set_name (cfg_emu_filters, "cfg_emu_filters");
- gtk_widget_show (cfg_emu_filters);
- gtk_box_pack_start (GTK_BOX (w_vbox25), cfg_emu_filters, FALSE, FALSE, 0);
- gtk_tooltips_set_tip (tooltips, cfg_emu_filters, _("This option enables emulation of SID filter. The filter is an essential part of SID's sound capacity, but accurate emulation of it may require quite much CPU power. However, if filter emulation is disabled, tunes won't sound authentic at all if they utilize the filter."), NULL);
-
- cfg_filters_notebook = gtk_notebook_new ();
- gtk_widget_set_name (cfg_filters_notebook, "cfg_filters_notebook");
- gtk_widget_show (cfg_filters_notebook);
- gtk_box_pack_start (GTK_BOX (w_vbox25), cfg_filters_notebook, TRUE, TRUE, 0);
-
- cfg_box_filter_sidplay1 = gtk_hbox_new (FALSE, 0);
- gtk_widget_set_name (cfg_box_filter_sidplay1, "cfg_box_filter_sidplay1");
- gtk_widget_show (cfg_box_filter_sidplay1);
- gtk_container_add (GTK_CONTAINER (cfg_filters_notebook), cfg_box_filter_sidplay1);
- gtk_container_set_border_width (GTK_CONTAINER (cfg_box_filter_sidplay1), 4);
-
- cfg_sp1_frm_fs = gtk_frame_new (NULL);
- gtk_widget_set_name (cfg_sp1_frm_fs, "cfg_sp1_frm_fs");
- gtk_widget_show (cfg_sp1_frm_fs);
- gtk_box_pack_start (GTK_BOX (cfg_box_filter_sidplay1), cfg_sp1_frm_fs, TRUE, TRUE, 0);
- gtk_container_set_border_width (GTK_CONTAINER (cfg_sp1_frm_fs), 2);
-
- cfg_sp1_filter_fs = gtk_vscale_new (GTK_ADJUSTMENT (gtk_adjustment_new (0, 0, 1000, 1, 100, 0)));
- gtk_widget_set_name (cfg_sp1_filter_fs, "cfg_sp1_filter_fs");
- gtk_widget_show (cfg_sp1_filter_fs);
- gtk_container_add (GTK_CONTAINER (cfg_sp1_frm_fs), cfg_sp1_filter_fs);
- gtk_scale_set_digits (GTK_SCALE (cfg_sp1_filter_fs), 2);
-
- label11 = gtk_label_new (_("FS"));
- gtk_widget_set_name (label11, "label11");
- gtk_widget_show (label11);
- gtk_frame_set_label_widget (GTK_FRAME (cfg_sp1_frm_fs), label11);
-
- cfg_sp1_frm_fm = gtk_frame_new (NULL);
- gtk_widget_set_name (cfg_sp1_frm_fm, "cfg_sp1_frm_fm");
- gtk_widget_show (cfg_sp1_frm_fm);
- gtk_box_pack_start (GTK_BOX (cfg_box_filter_sidplay1), cfg_sp1_frm_fm, TRUE, TRUE, 0);
- gtk_container_set_border_width (GTK_CONTAINER (cfg_sp1_frm_fm), 2);
-
- cfg_sp1_filter_fm = gtk_vscale_new (GTK_ADJUSTMENT (gtk_adjustment_new (0, 0, 100, 1, 10, 0)));
- gtk_widget_set_name (cfg_sp1_filter_fm, "cfg_sp1_filter_fm");
- gtk_widget_show (cfg_sp1_filter_fm);
- gtk_container_add (GTK_CONTAINER (cfg_sp1_frm_fm), cfg_sp1_filter_fm);
- gtk_scale_set_digits (GTK_SCALE (cfg_sp1_filter_fm), 2);
-
- label12 = gtk_label_new (_("FM"));
- gtk_widget_set_name (label12, "label12");
- gtk_widget_show (label12);
- gtk_frame_set_label_widget (GTK_FRAME (cfg_sp1_frm_fm), label12);
-
- cfg_sp1_frm_ft = gtk_frame_new (NULL);
- gtk_widget_set_name (cfg_sp1_frm_ft, "cfg_sp1_frm_ft");
- gtk_widget_show (cfg_sp1_frm_ft);
- gtk_box_pack_start (GTK_BOX (cfg_box_filter_sidplay1), cfg_sp1_frm_ft, TRUE, TRUE, 0);
- gtk_container_set_border_width (GTK_CONTAINER (cfg_sp1_frm_ft), 2);
-
- cfg_sp1_filter_ft = gtk_vscale_new (GTK_ADJUSTMENT (gtk_adjustment_new (0, 0, 1, 0.01, 0.1, 0)));
- gtk_widget_set_name (cfg_sp1_filter_ft, "cfg_sp1_filter_ft");
- gtk_widget_show (cfg_sp1_filter_ft);
- gtk_container_add (GTK_CONTAINER (cfg_sp1_frm_ft), cfg_sp1_filter_ft);
- gtk_scale_set_digits (GTK_SCALE (cfg_sp1_filter_ft), 2);
-
- label13 = gtk_label_new (_("FT"));
- gtk_widget_set_name (label13, "label13");
- gtk_widget_show (label13);
- gtk_frame_set_label_widget (GTK_FRAME (cfg_sp1_frm_ft), label13);
-
- w_vbox17 = gtk_vbox_new (FALSE, 8);
- gtk_widget_set_name (w_vbox17, "w_vbox17");
- gtk_widget_show (w_vbox17);
- gtk_box_pack_start (GTK_BOX (cfg_box_filter_sidplay1), w_vbox17, TRUE, TRUE, 0);
- gtk_container_set_border_width (GTK_CONTAINER (w_vbox17), 4);
-
- cfg_sp1_filter_reset = gtk_button_new_with_mnemonic (_("Reset values"));
- gtk_widget_set_name (cfg_sp1_filter_reset, "cfg_sp1_filter_reset");
- gtk_widget_show (cfg_sp1_filter_reset);
- gtk_box_pack_start (GTK_BOX (w_vbox17), cfg_sp1_filter_reset, FALSE, FALSE, 0);
-
- w_label55 = gtk_label_new (_("SIDPlay1"));
- gtk_widget_set_name (w_label55, "w_label55");
- gtk_widget_show (w_label55);
- gtk_notebook_set_tab_label (GTK_NOTEBOOK (cfg_filters_notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (cfg_filters_notebook), 0), w_label55);
- gtk_label_set_justify (GTK_LABEL (w_label55), GTK_JUSTIFY_CENTER);
-
- cfg_box_filter_sidplay2 = gtk_vbox_new (FALSE, 0);
- gtk_widget_set_name (cfg_box_filter_sidplay2, "cfg_box_filter_sidplay2");
- gtk_widget_show (cfg_box_filter_sidplay2);
- gtk_container_add (GTK_CONTAINER (cfg_filters_notebook), cfg_box_filter_sidplay2);
-
- cfg_sp_filter_controlbox = gtk_hbox_new (FALSE, 0);
- gtk_widget_set_name (cfg_sp_filter_controlbox, "cfg_sp_filter_controlbox");
- gtk_widget_show (cfg_sp_filter_controlbox);
- gtk_box_pack_start (GTK_BOX (cfg_box_filter_sidplay2), cfg_sp_filter_controlbox, FALSE, FALSE, 0);
- gtk_container_set_border_width (GTK_CONTAINER (cfg_sp_filter_controlbox), 2);
-
- cfg_sp2_filter_combo = gtk_combo_new ();
- g_object_set_data (G_OBJECT (GTK_COMBO (cfg_sp2_filter_combo)->popwin),
- "GladeParentKey", cfg_sp2_filter_combo);
- gtk_widget_set_name (cfg_sp2_filter_combo, "cfg_sp2_filter_combo");
- gtk_widget_show (cfg_sp2_filter_combo);
- gtk_box_pack_start (GTK_BOX (cfg_sp_filter_controlbox), cfg_sp2_filter_combo, TRUE, TRUE, 0);
- gtk_container_set_border_width (GTK_CONTAINER (cfg_sp2_filter_combo), 2);
- cfg_sp2_filter_combo_items = g_list_append (cfg_sp2_filter_combo_items, (gpointer) "");
- gtk_combo_set_popdown_strings (GTK_COMBO (cfg_sp2_filter_combo), cfg_sp2_filter_combo_items);
- g_list_free (cfg_sp2_filter_combo_items);
-
- cfg_sp2_filter_combo_entry = GTK_COMBO (cfg_sp2_filter_combo)->entry;
- gtk_widget_set_name (cfg_sp2_filter_combo_entry, "cfg_sp2_filter_combo_entry");
- gtk_widget_show (cfg_sp2_filter_combo_entry);
- gtk_entry_set_invisible_char (GTK_ENTRY (cfg_sp2_filter_combo_entry), 9679);
-
- table3 = gtk_table_new (2, 3, TRUE);
- gtk_widget_set_name (table3, "table3");
- gtk_widget_show (table3);
- gtk_box_pack_start (GTK_BOX (cfg_sp_filter_controlbox), table3, FALSE, TRUE, 0);
- gtk_container_set_border_width (GTK_CONTAINER (table3), 2);
- gtk_table_set_row_spacings (GTK_TABLE (table3), 4);
- gtk_table_set_col_spacings (GTK_TABLE (table3), 4);
-
- cfg_sp2_filter_export = gtk_button_new_with_mnemonic (_("Export"));
- gtk_widget_set_name (cfg_sp2_filter_export, "cfg_sp2_filter_export");
- gtk_widget_show (cfg_sp2_filter_export);
- gtk_table_attach (GTK_TABLE (table3), cfg_sp2_filter_export, 2, 3, 1, 2,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
- GTK_WIDGET_SET_FLAGS (cfg_sp2_filter_export, GTK_CAN_DEFAULT);
-
- cfg_sp2_filter_load = gtk_button_new_with_mnemonic (_("Use"));
- gtk_widget_set_name (cfg_sp2_filter_load, "cfg_sp2_filter_load");
- gtk_widget_show (cfg_sp2_filter_load);
- gtk_table_attach (GTK_TABLE (table3), cfg_sp2_filter_load, 0, 1, 0, 1,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
- GTK_WIDGET_SET_FLAGS (cfg_sp2_filter_load, GTK_CAN_DEFAULT);
-
- cfg_sp2_filter_save = gtk_button_new_with_mnemonic (_("Save"));
- gtk_widget_set_name (cfg_sp2_filter_save, "cfg_sp2_filter_save");
- gtk_widget_show (cfg_sp2_filter_save);
- gtk_table_attach (GTK_TABLE (table3), cfg_sp2_filter_save, 1, 2, 0, 1,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
- GTK_WIDGET_SET_FLAGS (cfg_sp2_filter_save, GTK_CAN_DEFAULT);
-
- cfg_sp2_filter_import = gtk_button_new_with_mnemonic (_("Import"));
- gtk_widget_set_name (cfg_sp2_filter_import, "cfg_sp2_filter_import");
- gtk_widget_show (cfg_sp2_filter_import);
- gtk_table_attach (GTK_TABLE (table3), cfg_sp2_filter_import, 1, 2, 1, 2,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
- GTK_WIDGET_SET_FLAGS (cfg_sp2_filter_import, GTK_CAN_DEFAULT);
-
- cfg_sp2_filter_delete = gtk_button_new_with_mnemonic (_("Delete"));
- gtk_widget_set_name (cfg_sp2_filter_delete, "cfg_sp2_filter_delete");
- gtk_widget_show (cfg_sp2_filter_delete);
- gtk_table_attach (GTK_TABLE (table3), cfg_sp2_filter_delete, 2, 3, 0, 1,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
- GTK_WIDGET_SET_FLAGS (cfg_sp2_filter_delete, GTK_CAN_DEFAULT);
-
- cfg_sp2_filter_frame = gtk_frame_new (NULL);
- gtk_widget_set_name (cfg_sp2_filter_frame, "cfg_sp2_filter_frame");
- gtk_widget_show (cfg_sp2_filter_frame);
- gtk_box_pack_start (GTK_BOX (cfg_box_filter_sidplay2), cfg_sp2_filter_frame, TRUE, TRUE, 0);
- gtk_container_set_border_width (GTK_CONTAINER (cfg_sp2_filter_frame), 2);
-
- label14 = gtk_label_new (_("Filter curve:"));
- gtk_widget_set_name (label14, "label14");
- gtk_widget_show (label14);
- gtk_frame_set_label_widget (GTK_FRAME (cfg_sp2_filter_frame), label14);
-
- w_label56 = gtk_label_new (_("SIDPlay2"));
- gtk_widget_set_name (w_label56, "w_label56");
- gtk_widget_show (w_label56);
- gtk_notebook_set_tab_label (GTK_NOTEBOOK (cfg_filters_notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (cfg_filters_notebook), 1), w_label56);
- gtk_label_set_justify (GTK_LABEL (w_label56), GTK_JUSTIFY_CENTER);
-
- w_label24 = gtk_label_new (_("Filters"));
- gtk_widget_set_name (w_label24, "w_label24");
- gtk_widget_show (w_label24);
- gtk_notebook_set_tab_label (GTK_NOTEBOOK (cfg_notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (cfg_notebook), 3), w_label24);
- gtk_label_set_justify (GTK_LABEL (w_label24), GTK_JUSTIFY_CENTER);
-
- w_vbox20 = gtk_vbox_new (FALSE, 0);
- gtk_widget_set_name (w_vbox20, "w_vbox20");
- gtk_widget_show (w_vbox20);
- gtk_container_add (GTK_CONTAINER (cfg_notebook), w_vbox20);
-
- w_frame29 = gtk_frame_new (NULL);
- gtk_widget_set_name (w_frame29, "w_frame29");
- gtk_widget_show (w_frame29);
- gtk_box_pack_start (GTK_BOX (w_vbox20), w_frame29, FALSE, FALSE, 0);
- gtk_container_set_border_width (GTK_CONTAINER (w_frame29), 4);
-
- w_vbox32 = gtk_vbox_new (FALSE, 2);
- gtk_widget_set_name (w_vbox32, "w_vbox32");
- gtk_widget_show (w_vbox32);
- gtk_container_add (GTK_CONTAINER (w_frame29), w_vbox32);
- gtk_container_set_border_width (GTK_CONTAINER (w_vbox32), 2);
-
- cfg_mintime_enable = gtk_check_button_new_with_mnemonic (_("Play at least for specified time"));
- gtk_widget_set_name (cfg_mintime_enable, "cfg_mintime_enable");
- gtk_widget_show (cfg_mintime_enable);
- gtk_box_pack_start (GTK_BOX (w_vbox32), cfg_mintime_enable, FALSE, FALSE, 0);
- gtk_tooltips_set_tip (tooltips, cfg_mintime_enable, _("If enabled, the tune is played at least for the specified time, adding silence to the end if necessary."), NULL);
-
- cfg_mintime_box = gtk_hbox_new (FALSE, 2);
- gtk_widget_set_name (cfg_mintime_box, "cfg_mintime_box");
- gtk_widget_show (cfg_mintime_box);
- gtk_box_pack_start (GTK_BOX (w_vbox32), cfg_mintime_box, FALSE, TRUE, 2);
-
- cfg_mintime_label1 = gtk_label_new (_("Playtime:"));
- gtk_widget_set_name (cfg_mintime_label1, "cfg_mintime_label1");
- gtk_widget_show (cfg_mintime_label1);
- gtk_box_pack_start (GTK_BOX (cfg_mintime_box), cfg_mintime_label1, FALSE, FALSE, 0);
- gtk_label_set_justify (GTK_LABEL (cfg_mintime_label1), GTK_JUSTIFY_CENTER);
- gtk_misc_set_alignment (GTK_MISC (cfg_mintime_label1), 0, 0.5);
-
- cfg_mintime_adj = gtk_adjustment_new (15, 1, 32767, 1, 60, 0);
- cfg_mintime = gtk_spin_button_new (GTK_ADJUSTMENT (cfg_mintime_adj), 1, 0);
- gtk_widget_set_name (cfg_mintime, "cfg_mintime");
- gtk_widget_show (cfg_mintime);
- gtk_box_pack_start (GTK_BOX (cfg_mintime_box), cfg_mintime, FALSE, TRUE, 0);
-
- cfg_mintime_label2 = gtk_label_new (_("seconds"));
- gtk_widget_set_name (cfg_mintime_label2, "cfg_mintime_label2");
- gtk_widget_show (cfg_mintime_label2);
- gtk_box_pack_start (GTK_BOX (cfg_mintime_box), cfg_mintime_label2, FALSE, FALSE, 0);
- gtk_label_set_justify (GTK_LABEL (cfg_mintime_label2), GTK_JUSTIFY_CENTER);
- gtk_misc_set_alignment (GTK_MISC (cfg_mintime_label2), 0, 0.5);
-
- label15 = gtk_label_new (_("Minimum playtime:"));
- gtk_widget_set_name (label15, "label15");
- gtk_widget_show (label15);
- gtk_frame_set_label_widget (GTK_FRAME (w_frame29), label15);
-
- w_frame21 = gtk_frame_new (NULL);
- gtk_widget_set_name (w_frame21, "w_frame21");
- gtk_widget_show (w_frame21);
- gtk_box_pack_start (GTK_BOX (w_vbox20), w_frame21, FALSE, TRUE, 0);
- gtk_container_set_border_width (GTK_CONTAINER (w_frame21), 4);
-
- w_vbox21 = gtk_vbox_new (FALSE, 2);
- gtk_widget_set_name (w_vbox21, "w_vbox21");
- gtk_widget_show (w_vbox21);
- gtk_container_add (GTK_CONTAINER (w_frame21), w_vbox21);
- gtk_container_set_border_width (GTK_CONTAINER (w_vbox21), 2);
-
- cfg_maxtime_enable = gtk_check_button_new_with_mnemonic (_("Play for specified time maximum"));
- gtk_widget_set_name (cfg_maxtime_enable, "cfg_maxtime_enable");
- gtk_widget_show (cfg_maxtime_enable);
- gtk_box_pack_start (GTK_BOX (w_vbox21), cfg_maxtime_enable, FALSE, FALSE, 0);
- gtk_tooltips_set_tip (tooltips, cfg_maxtime_enable, _("If enabled, tune is played until specified duration is reached (aka maximum playtime)."), NULL);
-
- cfg_maxtime_unknown = gtk_check_button_new_with_mnemonic (_("Only when song length is unknown"));
- gtk_widget_set_name (cfg_maxtime_unknown, "cfg_maxtime_unknown");
- gtk_widget_show (cfg_maxtime_unknown);
- gtk_box_pack_start (GTK_BOX (w_vbox21), cfg_maxtime_unknown, FALSE, FALSE, 0);
- gtk_tooltips_set_tip (tooltips, cfg_maxtime_unknown, _("If enabled, the maximum playtime is applied only if song/tune length is not known."), NULL);
-
- cfg_maxtime_box = gtk_hbox_new (FALSE, 2);
- gtk_widget_set_name (cfg_maxtime_box, "cfg_maxtime_box");
- gtk_widget_show (cfg_maxtime_box);
- gtk_box_pack_start (GTK_BOX (w_vbox21), cfg_maxtime_box, FALSE, TRUE, 2);
-
- cfg_maxtime_label1 = gtk_label_new (_("Playtime:"));
- gtk_widget_set_name (cfg_maxtime_label1, "cfg_maxtime_label1");
- gtk_widget_show (cfg_maxtime_label1);
- gtk_box_pack_start (GTK_BOX (cfg_maxtime_box), cfg_maxtime_label1, FALSE, FALSE, 0);
- gtk_label_set_justify (GTK_LABEL (cfg_maxtime_label1), GTK_JUSTIFY_CENTER);
- gtk_misc_set_alignment (GTK_MISC (cfg_maxtime_label1), 0, 0.5);
-
- cfg_maxtime_adj = gtk_adjustment_new (150, 1, 32767, 1, 60, 0);
- cfg_maxtime = gtk_spin_button_new (GTK_ADJUSTMENT (cfg_maxtime_adj), 1, 0);
- gtk_widget_set_name (cfg_maxtime, "cfg_maxtime");
- gtk_widget_show (cfg_maxtime);
- gtk_box_pack_start (GTK_BOX (cfg_maxtime_box), cfg_maxtime, FALSE, TRUE, 0);
-
- cfg_maxtime_label2 = gtk_label_new (_("seconds"));
- gtk_widget_set_name (cfg_maxtime_label2, "cfg_maxtime_label2");
- gtk_widget_show (cfg_maxtime_label2);
- gtk_box_pack_start (GTK_BOX (cfg_maxtime_box), cfg_maxtime_label2, FALSE, FALSE, 0);
- gtk_label_set_justify (GTK_LABEL (cfg_maxtime_label2), GTK_JUSTIFY_CENTER);
- gtk_misc_set_alignment (GTK_MISC (cfg_maxtime_label2), 0, 0.5);
-
- label16 = gtk_label_new (_("Maximum playtime:"));
- gtk_widget_set_name (label16, "label16");
- gtk_widget_show (label16);
- gtk_frame_set_label_widget (GTK_FRAME (w_frame21), label16);
-
- w_frame18 = gtk_frame_new (NULL);
- gtk_widget_set_name (w_frame18, "w_frame18");
- gtk_widget_show (w_frame18);
- gtk_box_pack_start (GTK_BOX (w_vbox20), w_frame18, FALSE, TRUE, 0);
- gtk_container_set_border_width (GTK_CONTAINER (w_frame18), 4);
-
- w_vbox18 = gtk_vbox_new (FALSE, 2);
- gtk_widget_set_name (w_vbox18, "w_vbox18");
- gtk_widget_show (w_vbox18);
- gtk_container_add (GTK_CONTAINER (w_frame18), w_vbox18);
- gtk_container_set_border_width (GTK_CONTAINER (w_vbox18), 2);
-
- cfg_sld_enable = gtk_check_button_new_with_mnemonic (_("Use XSIDPLAY-compatible database"));
- gtk_widget_set_name (cfg_sld_enable, "cfg_sld_enable");
- gtk_widget_show (cfg_sld_enable);
- gtk_box_pack_start (GTK_BOX (w_vbox18), cfg_sld_enable, FALSE, FALSE, 0);
- gtk_tooltips_set_tip (tooltips, cfg_sld_enable, _("This option enables using of XSIDPLAY compatible song length database. (Refer to Audacious-SID documentation for more information)"), NULL);
-
- cfg_sld_box = gtk_hbox_new (FALSE, 4);
- gtk_widget_set_name (cfg_sld_box, "cfg_sld_box");
- gtk_widget_show (cfg_sld_box);
- gtk_box_pack_start (GTK_BOX (w_vbox18), cfg_sld_box, FALSE, TRUE, 0);
-
- cfg_sld_label1 = gtk_label_new (_("DB-file:"));
- gtk_widget_set_name (cfg_sld_label1, "cfg_sld_label1");
- gtk_widget_show (cfg_sld_label1);
- gtk_box_pack_start (GTK_BOX (cfg_sld_box), cfg_sld_label1, FALSE, TRUE, 0);
- gtk_label_set_justify (GTK_LABEL (cfg_sld_label1), GTK_JUSTIFY_CENTER);
-
- cfg_sld_dbpath = gtk_entry_new ();
- gtk_widget_set_name (cfg_sld_dbpath, "cfg_sld_dbpath");
- gtk_widget_show (cfg_sld_dbpath);
- gtk_box_pack_start (GTK_BOX (cfg_sld_box), cfg_sld_dbpath, TRUE, TRUE, 0);
- gtk_tooltips_set_tip (tooltips, cfg_sld_dbpath, _("Database path and filename"), NULL);
- gtk_entry_set_invisible_char (GTK_ENTRY (cfg_sld_dbpath), 9679);
-
- cfg_sld_dbbrowse = gtk_button_new ();
- gtk_widget_set_name (cfg_sld_dbbrowse, "cfg_sld_dbbrowse");
- gtk_widget_show (cfg_sld_dbbrowse);
- gtk_box_pack_start (GTK_BOX (cfg_sld_box), cfg_sld_dbbrowse, FALSE, FALSE, 0);
- gtk_tooltips_set_tip (tooltips, cfg_sld_dbbrowse, _("Browse for song length-database file"), NULL);
-
- alignment1 = gtk_alignment_new (0.5, 0.5, 0, 0);
- gtk_widget_set_name (alignment1, "alignment1");
- gtk_widget_show (alignment1);
- gtk_container_add (GTK_CONTAINER (cfg_sld_dbbrowse), alignment1);
-
- hbox1 = gtk_hbox_new (FALSE, 2);
- gtk_widget_set_name (hbox1, "hbox1");
- gtk_widget_show (hbox1);
- gtk_container_add (GTK_CONTAINER (alignment1), hbox1);
-
- image1 = gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_BUTTON);
- gtk_widget_set_name (image1, "image1");
- gtk_widget_show (image1);
- gtk_box_pack_start (GTK_BOX (hbox1), image1, FALSE, FALSE, 0);
-
- label30 = gtk_label_new_with_mnemonic (_("Browse"));
- gtk_widget_set_name (label30, "label30");
- gtk_widget_show (label30);
- gtk_box_pack_start (GTK_BOX (hbox1), label30, FALSE, FALSE, 0);
-
- label17 = gtk_label_new (_("Song length database:"));
- gtk_widget_set_name (label17, "label17");
- gtk_widget_show (label17);
- gtk_frame_set_label_widget (GTK_FRAME (w_frame18), label17);
-
- w_label26 = gtk_label_new (_("Songlength"));
- gtk_widget_set_name (w_label26, "w_label26");
- gtk_widget_show (w_label26);
- gtk_notebook_set_tab_label (GTK_NOTEBOOK (cfg_notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (cfg_notebook), 4), w_label26);
- gtk_label_set_justify (GTK_LABEL (w_label26), GTK_JUSTIFY_CENTER);
-
- frame1 = gtk_frame_new (NULL);
- gtk_widget_set_name (frame1, "frame1");
- gtk_widget_show (frame1);
- gtk_container_add (GTK_CONTAINER (cfg_notebook), frame1);
- gtk_container_set_border_width (GTK_CONTAINER (frame1), 4);
-
- vbox1 = gtk_vbox_new (FALSE, 2);
- gtk_widget_set_name (vbox1, "vbox1");
- gtk_widget_show (vbox1);
- gtk_container_add (GTK_CONTAINER (frame1), vbox1);
- gtk_container_set_border_width (GTK_CONTAINER (vbox1), 2);
-
- cfg_ftitle_override = gtk_check_button_new_with_mnemonic (_("Override generic Tuplez format string"));
- gtk_widget_set_name (cfg_ftitle_override, "cfg_ftitle_override");
- gtk_widget_show (cfg_ftitle_override);
- gtk_box_pack_start (GTK_BOX (vbox1), cfg_ftitle_override, FALSE, FALSE, 0);
- gtk_tooltips_set_tip (tooltips, cfg_ftitle_override, _("By enabling this option you can specify a custom Tuplez formatting string for SID-files. The SID-plugin specific Tuplez tags are described shortly below."), NULL);
-
- cfg_ftitle_box = gtk_vbox_new (FALSE, 0);
- gtk_widget_set_name (cfg_ftitle_box, "cfg_ftitle_box");
- gtk_widget_show (cfg_ftitle_box);
- gtk_box_pack_start (GTK_BOX (vbox1), cfg_ftitle_box, TRUE, TRUE, 0);
-
- cfg_ftitle_format = gtk_entry_new ();
- gtk_widget_set_name (cfg_ftitle_format, "cfg_ftitle_format");
- gtk_widget_show (cfg_ftitle_format);
- gtk_box_pack_start (GTK_BOX (cfg_ftitle_box), cfg_ftitle_format, FALSE, FALSE, 0);
- gtk_tooltips_set_tip (tooltips, cfg_ftitle_format, _("Tuplez format string for SID-files"), NULL);
- gtk_entry_set_invisible_char (GTK_ENTRY (cfg_ftitle_format), 9679);
-
- cfg_ftitle_descs = gtk_label_new (_("SID-specific Tuplez fields:\n\nsid-format\t\t- Specific fileformat\nsid-model\t\t- 6581 or 8580\nsid-speed\t\t- Timing or speed: PAL/NTSC/etc.\n\nOther \"special\" fields set:\n\nsubsong-num, subsong-id"));
- gtk_widget_set_name (cfg_ftitle_descs, "cfg_ftitle_descs");
- gtk_widget_show (cfg_ftitle_descs);
- gtk_box_pack_start (GTK_BOX (cfg_ftitle_box), cfg_ftitle_descs, TRUE, TRUE, 0);
- gtk_label_set_use_markup (GTK_LABEL (cfg_ftitle_descs), TRUE);
- gtk_misc_set_alignment (GTK_MISC (cfg_ftitle_descs), 0, 0);
- gtk_misc_set_padding (GTK_MISC (cfg_ftitle_descs), 8, 8);
-
- label29 = gtk_label_new (_("Song title format:"));
- gtk_widget_set_name (label29, "label29");
- gtk_widget_show (label29);
- gtk_frame_set_label_widget (GTK_FRAME (frame1), label29);
-
- w_label27 = gtk_label_new (_("Title"));
- gtk_widget_set_name (w_label27, "w_label27");
- gtk_widget_show (w_label27);
- gtk_notebook_set_tab_label (GTK_NOTEBOOK (cfg_notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (cfg_notebook), 5), w_label27);
-
- w_vbox19 = gtk_vbox_new (FALSE, 0);
- gtk_widget_set_name (w_vbox19, "w_vbox19");
- gtk_widget_show (w_vbox19);
- gtk_container_add (GTK_CONTAINER (cfg_notebook), w_vbox19);
-
- w_frame31 = gtk_frame_new (NULL);
- gtk_widget_set_name (w_frame31, "w_frame31");
- gtk_widget_show (w_frame31);
- gtk_box_pack_start (GTK_BOX (w_vbox19), w_frame31, FALSE, TRUE, 0);
- gtk_container_set_border_width (GTK_CONTAINER (w_frame31), 4);
-
- w_vbox35 = gtk_vbox_new (FALSE, 2);
- gtk_widget_set_name (w_vbox35, "w_vbox35");
- gtk_widget_show (w_vbox35);
- gtk_container_add (GTK_CONTAINER (w_frame31), w_vbox35);
- gtk_container_set_border_width (GTK_CONTAINER (w_vbox35), 2);
-
- cfg_subauto_enable = gtk_check_button_new_with_mnemonic (_("Add sub-tunes to playlist"));
- gtk_widget_set_name (cfg_subauto_enable, "cfg_subauto_enable");
- gtk_widget_show (cfg_subauto_enable);
- gtk_box_pack_start (GTK_BOX (w_vbox35), cfg_subauto_enable, FALSE, FALSE, 0);
- gtk_tooltips_set_tip (tooltips, cfg_subauto_enable, _("If enabled, sub-tunes of each file will be added to playlist. If disabled, only the default sub-tune will be added."), NULL);
-
- cfg_subauto_min_only = gtk_check_button_new_with_mnemonic (_("Only tunes with specified minimum duration"));
- gtk_widget_set_name (cfg_subauto_min_only, "cfg_subauto_min_only");
- gtk_widget_show (cfg_subauto_min_only);
- gtk_box_pack_start (GTK_BOX (w_vbox35), cfg_subauto_min_only, FALSE, FALSE, 0);
- gtk_tooltips_set_tip (tooltips, cfg_subauto_min_only, _("Only add sub-tunes that have a duration of at least specified time."), NULL);
-
- cfg_subauto_box = gtk_hbox_new (FALSE, 2);
- gtk_widget_set_name (cfg_subauto_box, "cfg_subauto_box");
- gtk_widget_show (cfg_subauto_box);
- gtk_box_pack_start (GTK_BOX (w_vbox35), cfg_subauto_box, TRUE, TRUE, 0);
-
- w_label52 = gtk_label_new (_("Playtime:"));
- gtk_widget_set_name (w_label52, "w_label52");
- gtk_widget_show (w_label52);
- gtk_box_pack_start (GTK_BOX (cfg_subauto_box), w_label52, FALSE, FALSE, 0);
- gtk_label_set_justify (GTK_LABEL (w_label52), GTK_JUSTIFY_CENTER);
- gtk_misc_set_alignment (GTK_MISC (w_label52), 0, 0.5);
-
- cfg_subauto_mintime_adj = gtk_adjustment_new (15, 1, 32767, 1, 60, 0);
- cfg_subauto_mintime = gtk_spin_button_new (GTK_ADJUSTMENT (cfg_subauto_mintime_adj), 1, 0);
- gtk_widget_set_name (cfg_subauto_mintime, "cfg_subauto_mintime");
- gtk_widget_show (cfg_subauto_mintime);
- gtk_box_pack_start (GTK_BOX (cfg_subauto_box), cfg_subauto_mintime, FALSE, TRUE, 0);
-
- w_label53 = gtk_label_new (_("seconds"));
- gtk_widget_set_name (w_label53, "w_label53");
- gtk_widget_show (w_label53);
- gtk_box_pack_start (GTK_BOX (cfg_subauto_box), w_label53, FALSE, FALSE, 0);
- gtk_label_set_justify (GTK_LABEL (w_label53), GTK_JUSTIFY_CENTER);
- gtk_misc_set_alignment (GTK_MISC (w_label53), 0, 0.5);
-
- label21 = gtk_label_new (_("Sub-tune handling:"));
- gtk_widget_set_name (label21, "label21");
- gtk_widget_show (label21);
- gtk_frame_set_label_widget (GTK_FRAME (w_frame31), label21);
-
- w_frame7 = gtk_frame_new (NULL);
- gtk_widget_set_name (w_frame7, "w_frame7");
- gtk_widget_show (w_frame7);
- gtk_box_pack_start (GTK_BOX (w_vbox19), w_frame7, FALSE, FALSE, 0);
- gtk_container_set_border_width (GTK_CONTAINER (w_frame7), 4);
-
- w_vbox8 = gtk_vbox_new (FALSE, 2);
- gtk_widget_set_name (w_vbox8, "w_vbox8");
- gtk_widget_show (w_vbox8);
- gtk_container_add (GTK_CONTAINER (w_frame7), w_vbox8);
- gtk_container_set_border_width (GTK_CONTAINER (w_vbox8), 2);
-
- cfg_stil_enable = gtk_check_button_new_with_mnemonic (_("Use STIL database"));
- gtk_widget_set_name (cfg_stil_enable, "cfg_stil_enable");
- gtk_widget_show (cfg_stil_enable);
- gtk_box_pack_start (GTK_BOX (w_vbox8), cfg_stil_enable, TRUE, FALSE, 0);
- gtk_tooltips_set_tip (tooltips, cfg_stil_enable, _("If this option is enabled (and the database & HVSC settings below are correctly set), Audacious-SID will use and display additional information from STIL database when HVSC SIDs are played."), NULL);
-
- cfg_stil_box1 = gtk_hbox_new (FALSE, 0);
- gtk_widget_set_name (cfg_stil_box1, "cfg_stil_box1");
- gtk_widget_show (cfg_stil_box1);
- gtk_box_pack_start (GTK_BOX (w_vbox8), cfg_stil_box1, TRUE, TRUE, 0);
-
- cfg_stil_label1 = gtk_label_new (_("STIL file:"));
- gtk_widget_set_name (cfg_stil_label1, "cfg_stil_label1");
- gtk_widget_show (cfg_stil_label1);
- gtk_box_pack_start (GTK_BOX (cfg_stil_box1), cfg_stil_label1, FALSE, FALSE, 0);
- gtk_label_set_justify (GTK_LABEL (cfg_stil_label1), GTK_JUSTIFY_CENTER);
- gtk_misc_set_padding (GTK_MISC (cfg_stil_label1), 4, 0);
-
- w_alignment2 = gtk_alignment_new (0.5, 0.5, 1, 1);
- gtk_widget_set_name (w_alignment2, "w_alignment2");
- gtk_widget_show (w_alignment2);
- gtk_box_pack_start (GTK_BOX (cfg_stil_box1), w_alignment2, TRUE, TRUE, 4);
-
- cfg_stil_dbpath = gtk_entry_new ();
- gtk_widget_set_name (cfg_stil_dbpath, "cfg_stil_dbpath");
- gtk_widget_show (cfg_stil_dbpath);
- gtk_container_add (GTK_CONTAINER (w_alignment2), cfg_stil_dbpath);
- gtk_tooltips_set_tip (tooltips, cfg_stil_dbpath, _("Path and filename of STIL database file (STIL.txt), usually found from HVSC's DOCUMENTS-subdirectory."), NULL);
- gtk_entry_set_invisible_char (GTK_ENTRY (cfg_stil_dbpath), 9679);
-
- w_alignment1 = gtk_alignment_new (0.5, 0.5, 1, 0.300001);
- gtk_widget_set_name (w_alignment1, "w_alignment1");
- gtk_widget_show (w_alignment1);
- gtk_box_pack_end (GTK_BOX (cfg_stil_box1), w_alignment1, FALSE, FALSE, 0);
- gtk_container_set_border_width (GTK_CONTAINER (w_alignment1), 4);
-
- cfg_stil_browse = gtk_button_new ();
- gtk_widget_set_name (cfg_stil_browse, "cfg_stil_browse");
- gtk_widget_show (cfg_stil_browse);
- gtk_container_add (GTK_CONTAINER (w_alignment1), cfg_stil_browse);
- gtk_tooltips_set_tip (tooltips, cfg_stil_browse, _("Browse for STIL-database file"), NULL);
-
- alignment2 = gtk_alignment_new (0.5, 0.5, 0, 0);
- gtk_widget_set_name (alignment2, "alignment2");
- gtk_widget_show (alignment2);
- gtk_container_add (GTK_CONTAINER (cfg_stil_browse), alignment2);
-
- hbox2 = gtk_hbox_new (FALSE, 2);
- gtk_widget_set_name (hbox2, "hbox2");
- gtk_widget_show (hbox2);
- gtk_container_add (GTK_CONTAINER (alignment2), hbox2);
-
- image2 = gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_BUTTON);
- gtk_widget_set_name (image2, "image2");
- gtk_widget_show (image2);
- gtk_box_pack_start (GTK_BOX (hbox2), image2, FALSE, FALSE, 0);
-
- label31 = gtk_label_new_with_mnemonic (_("Browse"));
- gtk_widget_set_name (label31, "label31");
- gtk_widget_show (label31);
- gtk_box_pack_start (GTK_BOX (hbox2), label31, FALSE, FALSE, 0);
-
- cfg_stil_box2 = gtk_hbox_new (FALSE, 0);
- gtk_widget_set_name (cfg_stil_box2, "cfg_stil_box2");
- gtk_widget_show (cfg_stil_box2);
- gtk_box_pack_start (GTK_BOX (w_vbox8), cfg_stil_box2, TRUE, TRUE, 0);
-
- cfg_hvsc_label1 = gtk_label_new (_("HVSC path:"));
- gtk_widget_set_name (cfg_hvsc_label1, "cfg_hvsc_label1");
- gtk_widget_show (cfg_hvsc_label1);
- gtk_box_pack_start (GTK_BOX (cfg_stil_box2), cfg_hvsc_label1, FALSE, FALSE, 0);
- gtk_label_set_justify (GTK_LABEL (cfg_hvsc_label1), GTK_JUSTIFY_CENTER);
- gtk_misc_set_padding (GTK_MISC (cfg_hvsc_label1), 4, 0);
-
- w_alignment6 = gtk_alignment_new (0.5, 0.5, 1, 1);
- gtk_widget_set_name (w_alignment6, "w_alignment6");
- gtk_widget_show (w_alignment6);
- gtk_box_pack_start (GTK_BOX (cfg_stil_box2), w_alignment6, TRUE, TRUE, 4);
-
- cfg_hvsc_path = gtk_entry_new ();
- gtk_widget_set_name (cfg_hvsc_path, "cfg_hvsc_path");
- gtk_widget_show (cfg_hvsc_path);
- gtk_container_add (GTK_CONTAINER (w_alignment6), cfg_hvsc_path);
- gtk_tooltips_set_tip (tooltips, cfg_hvsc_path, _("Path to base-directory of your High Voltage SID Collection (HVSC), for example /media/C64Music/"), NULL);
- gtk_entry_set_invisible_char (GTK_ENTRY (cfg_hvsc_path), 9679);
-
- w_alignment7 = gtk_alignment_new (0.5, 0.5, 1, 0.300001);
- gtk_widget_set_name (w_alignment7, "w_alignment7");
- gtk_widget_show (w_alignment7);
- gtk_box_pack_end (GTK_BOX (cfg_stil_box2), w_alignment7, FALSE, FALSE, 0);
- gtk_container_set_border_width (GTK_CONTAINER (w_alignment7), 4);
-
- cfg_hvsc_browse = gtk_button_new ();
- gtk_widget_set_name (cfg_hvsc_browse, "cfg_hvsc_browse");
- gtk_widget_show (cfg_hvsc_browse);
- gtk_container_add (GTK_CONTAINER (w_alignment7), cfg_hvsc_browse);
- gtk_tooltips_set_tip (tooltips, cfg_hvsc_browse, _("Browse for HVSC path"), NULL);
-
- alignment3 = gtk_alignment_new (0.5, 0.5, 0, 0);
- gtk_widget_set_name (alignment3, "alignment3");
- gtk_widget_show (alignment3);
- gtk_container_add (GTK_CONTAINER (cfg_hvsc_browse), alignment3);
-
- hbox3 = gtk_hbox_new (FALSE, 2);
- gtk_widget_set_name (hbox3, "hbox3");
- gtk_widget_show (hbox3);
- gtk_container_add (GTK_CONTAINER (alignment3), hbox3);
-
- image3 = gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_BUTTON);
- gtk_widget_set_name (image3, "image3");
- gtk_widget_show (image3);
- gtk_box_pack_start (GTK_BOX (hbox3), image3, FALSE, FALSE, 0);
-
- label32 = gtk_label_new_with_mnemonic (_("Browse"));
- gtk_widget_set_name (label32, "label32");
- gtk_widget_show (label32);
- gtk_box_pack_start (GTK_BOX (hbox3), label32, FALSE, FALSE, 0);
-
- label18 = gtk_label_new (_("SID Tune Information List (STIL) database:"));
- gtk_widget_set_name (label18, "label18");
- gtk_widget_show (label18);
- gtk_frame_set_label_widget (GTK_FRAME (w_frame7), label18);
-
- w_label3 = gtk_label_new (_("Misc"));
- gtk_widget_set_name (w_label3, "w_label3");
- gtk_widget_show (w_label3);
- gtk_notebook_set_tab_label (GTK_NOTEBOOK (cfg_notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (cfg_notebook), 6), w_label3);
- gtk_label_set_justify (GTK_LABEL (w_label3), GTK_JUSTIFY_CENTER);
-
- hbuttonbox1 = gtk_hbutton_box_new ();
- gtk_widget_set_name (hbuttonbox1, "hbuttonbox1");
- gtk_widget_show (hbuttonbox1);
- gtk_box_pack_end (GTK_BOX (w_vbox1), hbuttonbox1, FALSE, FALSE, 0);
- gtk_container_set_border_width (GTK_CONTAINER (hbuttonbox1), 4);
- gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox1), GTK_BUTTONBOX_END);
- gtk_box_set_spacing (GTK_BOX (hbuttonbox1), 8);
-
- cfg_cancel = gtk_button_new_from_stock ("gtk-cancel");
- gtk_widget_set_name (cfg_cancel, "cfg_cancel");
- gtk_widget_show (cfg_cancel);
- gtk_container_add (GTK_CONTAINER (hbuttonbox1), cfg_cancel);
- GTK_WIDGET_SET_FLAGS (cfg_cancel, GTK_CAN_DEFAULT);
- gtk_tooltips_set_tip (tooltips, cfg_cancel, _("Cancel any changes"), NULL);
-
- cfg_ok = gtk_button_new_from_stock ("gtk-ok");
- gtk_widget_set_name (cfg_ok, "cfg_ok");
- gtk_widget_show (cfg_ok);
- gtk_container_add (GTK_CONTAINER (hbuttonbox1), cfg_ok);
- GTK_WIDGET_SET_FLAGS (cfg_ok, GTK_CAN_DEFAULT);
- gtk_tooltips_set_tip (tooltips, cfg_ok, _("Accept and update changes"), NULL);
-
- g_signal_connect ((gpointer) xs_configwin, "delete_event",
- G_CALLBACK (xs_configwin_delete),
- NULL);
- g_signal_connect ((gpointer) cfg_oversample, "toggled",
- G_CALLBACK (xs_cfg_oversample_toggled),
- NULL);
- g_signal_connect ((gpointer) cfg_emu_sidplay1, "toggled",
- G_CALLBACK (xs_cfg_emu_sidplay1_toggled),
- NULL);
- g_signal_connect ((gpointer) cfg_emu_sidplay2, "toggled",
- G_CALLBACK (xs_cfg_emu_sidplay2_toggled),
- NULL);
- g_signal_connect ((gpointer) cfg_emu_filters, "toggled",
- G_CALLBACK (xs_cfg_emu_filters_toggled),
- NULL);
- g_signal_connect ((gpointer) cfg_sp1_filter_reset, "clicked",
- G_CALLBACK (xs_cfg_sp1_filter_reset),
- NULL);
- g_signal_connect ((gpointer) cfg_sp2_filter_export, "clicked",
- G_CALLBACK (xs_cfg_sp2_filter_export),
- NULL);
- g_signal_connect ((gpointer) cfg_sp2_filter_load, "clicked",
- G_CALLBACK (xs_cfg_sp2_filter_load),
- NULL);
- g_signal_connect ((gpointer) cfg_sp2_filter_save, "clicked",
- G_CALLBACK (xs_cfg_sp2_filter_save),
- NULL);
- g_signal_connect ((gpointer) cfg_sp2_filter_import, "clicked",
- G_CALLBACK (xs_cfg_sp2_filter_import),
- NULL);
- g_signal_connect ((gpointer) cfg_sp2_filter_delete, "clicked",
- G_CALLBACK (xs_cfg_sp2_filter_delete),
- NULL);
- g_signal_connect ((gpointer) cfg_mintime_enable, "toggled",
- G_CALLBACK (xs_cfg_mintime_enable_toggled),
- NULL);
- g_signal_connect ((gpointer) cfg_mintime, "changed",
- G_CALLBACK (xs_cfg_mintime_changed),
- NULL);
- g_signal_connect ((gpointer) cfg_maxtime_enable, "toggled",
- G_CALLBACK (xs_cfg_maxtime_enable_toggled),
- NULL);
- g_signal_connect ((gpointer) cfg_maxtime, "changed",
- G_CALLBACK (xs_cfg_maxtime_changed),
- NULL);
- g_signal_connect ((gpointer) cfg_sld_enable, "toggled",
- G_CALLBACK (xs_cfg_sldb_enable_toggled),
- NULL);
- g_signal_connect ((gpointer) cfg_sld_dbbrowse, "clicked",
- G_CALLBACK (xs_cfg_sldb_browse),
- NULL);
- g_signal_connect ((gpointer) cfg_ftitle_override, "toggled",
- G_CALLBACK (xs_cfg_ftitle_override_toggled),
- NULL);
- g_signal_connect ((gpointer) cfg_subauto_enable, "toggled",
- G_CALLBACK (xs_cfg_subauto_enable_toggled),
- NULL);
- g_signal_connect ((gpointer) cfg_subauto_min_only, "toggled",
- G_CALLBACK (xs_cfg_subauto_min_only_toggled),
- NULL);
- g_signal_connect ((gpointer) cfg_stil_enable, "toggled",
- G_CALLBACK (xs_cfg_stil_enable_toggled),
- NULL);
- g_signal_connect ((gpointer) cfg_stil_browse, "clicked",
- G_CALLBACK (xs_cfg_stil_browse),
- NULL);
- g_signal_connect ((gpointer) cfg_hvsc_browse, "clicked",
- G_CALLBACK (xs_cfg_hvsc_browse),
- NULL);
- g_signal_connect ((gpointer) cfg_cancel, "clicked",
- G_CALLBACK (xs_cfg_cancel),
- NULL);
- g_signal_connect ((gpointer) cfg_ok, "clicked",
- G_CALLBACK (xs_cfg_ok),
- NULL);
-
- /* Store pointers to all widgets, for use by lookup_widget(). */
- GLADE_HOOKUP_OBJECT_NO_REF (xs_configwin, xs_configwin, "xs_configwin");
- GLADE_HOOKUP_OBJECT (xs_configwin, w_vbox1, "w_vbox1");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_notebook, "cfg_notebook");
- GLADE_HOOKUP_OBJECT (xs_configwin, w_vbox6, "w_vbox6");
- GLADE_HOOKUP_OBJECT (xs_configwin, w_hbox2, "w_hbox2");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_sndres_frame, "cfg_sndres_frame");
- GLADE_HOOKUP_OBJECT (xs_configwin, w_vbox9, "w_vbox9");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_res_8bit, "cfg_res_8bit");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_res_16bit, "cfg_res_16bit");
- GLADE_HOOKUP_OBJECT (xs_configwin, label1, "label1");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_channels_frame, "cfg_channels_frame");
- GLADE_HOOKUP_OBJECT (xs_configwin, w_vbox10, "w_vbox10");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_chn_mono, "cfg_chn_mono");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_chn_stereo, "cfg_chn_stereo");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_chn_autopan, "cfg_chn_autopan");
- GLADE_HOOKUP_OBJECT (xs_configwin, label2, "label2");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_samplerate_frame, "cfg_samplerate_frame");
- GLADE_HOOKUP_OBJECT (xs_configwin, w_hbox4, "w_hbox4");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_samplerate_combo, "cfg_samplerate_combo");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_samplerate, "cfg_samplerate");
- GLADE_HOOKUP_OBJECT (xs_configwin, w_label8, "w_label8");
- GLADE_HOOKUP_OBJECT (xs_configwin, w_label54, "w_label54");
- GLADE_HOOKUP_OBJECT (xs_configwin, label3, "label3");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_oversample_frame, "cfg_oversample_frame");
- GLADE_HOOKUP_OBJECT (xs_configwin, w_vbox27, "w_vbox27");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_oversample, "cfg_oversample");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_oversample_box, "cfg_oversample_box");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_oversample_label1, "cfg_oversample_label1");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_oversample_factor, "cfg_oversample_factor");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_oversample_label2, "cfg_oversample_label2");
- GLADE_HOOKUP_OBJECT (xs_configwin, label4, "label4");
- GLADE_HOOKUP_OBJECT (xs_configwin, w_label1, "w_label1");
- GLADE_HOOKUP_OBJECT (xs_configwin, w_vbox2, "w_vbox2");
- GLADE_HOOKUP_OBJECT (xs_configwin, w_hbox1, "w_hbox1");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_clock_frame, "cfg_clock_frame");
- GLADE_HOOKUP_OBJECT (xs_configwin, w_vbox4, "w_vbox4");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_emu_clock_force, "cfg_emu_clock_force");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_emu_clock_pal, "cfg_emu_clock_pal");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_emu_clock_ntsc, "cfg_emu_clock_ntsc");
- GLADE_HOOKUP_OBJECT (xs_configwin, label5, "label5");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_sid_model_frame, "cfg_sid_model_frame");
- GLADE_HOOKUP_OBJECT (xs_configwin, w_vbox3, "w_vbox3");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_emu_sid_force, "cfg_emu_sid_force");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_emu_mos6581, "cfg_emu_mos6581");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_emu_mos8580, "cfg_emu_mos8580");
- GLADE_HOOKUP_OBJECT (xs_configwin, label6, "label6");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_emulib_frame, "cfg_emulib_frame");
- GLADE_HOOKUP_OBJECT (xs_configwin, w_vbox26, "w_vbox26");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_emu_sidplay1, "cfg_emu_sidplay1");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_emu_sidplay2, "cfg_emu_sidplay2");
- GLADE_HOOKUP_OBJECT (xs_configwin, label7, "label7");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_memmode_frame, "cfg_memmode_frame");
- GLADE_HOOKUP_OBJECT (xs_configwin, w_vbox5, "w_vbox5");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_emu_mem_real, "cfg_emu_mem_real");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_emu_mem_banksw, "cfg_emu_mem_banksw");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_emu_mem_transrom, "cfg_emu_mem_transrom");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_emu_mem_playsid, "cfg_emu_mem_playsid");
- GLADE_HOOKUP_OBJECT (xs_configwin, label8, "label8");
- GLADE_HOOKUP_OBJECT (xs_configwin, w_label2, "w_label2");
- GLADE_HOOKUP_OBJECT (xs_configwin, w_vbox29, "w_vbox29");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_sidplay2_frame, "cfg_sidplay2_frame");
- GLADE_HOOKUP_OBJECT (xs_configwin, w_vbox30, "w_vbox30");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_emu_sp2_opt, "cfg_emu_sp2_opt");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_emu_sp2_resid, "cfg_emu_sp2_resid");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_emu_sp2_hardsid, "cfg_emu_sp2_hardsid");
- GLADE_HOOKUP_OBJECT (xs_configwin, label9, "label9");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_resid_frame, "cfg_resid_frame");
- GLADE_HOOKUP_OBJECT (xs_configwin, w_vbox37, "w_vbox37");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_emu_resid_fast, "cfg_emu_resid_fast");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_emu_resid_int, "cfg_emu_resid_int");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_emu_resid_res_fast, "cfg_emu_resid_res_fast");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_emu_resid_res_int, "cfg_emu_resid_res_int");
- GLADE_HOOKUP_OBJECT (xs_configwin, label10, "label10");
- GLADE_HOOKUP_OBJECT (xs_configwin, w_label48, "w_label48");
- GLADE_HOOKUP_OBJECT (xs_configwin, w_vbox25, "w_vbox25");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_emu_filters, "cfg_emu_filters");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_filters_notebook, "cfg_filters_notebook");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_box_filter_sidplay1, "cfg_box_filter_sidplay1");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_sp1_frm_fs, "cfg_sp1_frm_fs");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_sp1_filter_fs, "cfg_sp1_filter_fs");
- GLADE_HOOKUP_OBJECT (xs_configwin, label11, "label11");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_sp1_frm_fm, "cfg_sp1_frm_fm");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_sp1_filter_fm, "cfg_sp1_filter_fm");
- GLADE_HOOKUP_OBJECT (xs_configwin, label12, "label12");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_sp1_frm_ft, "cfg_sp1_frm_ft");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_sp1_filter_ft, "cfg_sp1_filter_ft");
- GLADE_HOOKUP_OBJECT (xs_configwin, label13, "label13");
- GLADE_HOOKUP_OBJECT (xs_configwin, w_vbox17, "w_vbox17");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_sp1_filter_reset, "cfg_sp1_filter_reset");
- GLADE_HOOKUP_OBJECT (xs_configwin, w_label55, "w_label55");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_box_filter_sidplay2, "cfg_box_filter_sidplay2");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_sp_filter_controlbox, "cfg_sp_filter_controlbox");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_sp2_filter_combo, "cfg_sp2_filter_combo");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_sp2_filter_combo_entry, "cfg_sp2_filter_combo_entry");
- GLADE_HOOKUP_OBJECT (xs_configwin, table3, "table3");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_sp2_filter_export, "cfg_sp2_filter_export");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_sp2_filter_load, "cfg_sp2_filter_load");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_sp2_filter_save, "cfg_sp2_filter_save");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_sp2_filter_import, "cfg_sp2_filter_import");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_sp2_filter_delete, "cfg_sp2_filter_delete");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_sp2_filter_frame, "cfg_sp2_filter_frame");
- GLADE_HOOKUP_OBJECT (xs_configwin, label14, "label14");
- GLADE_HOOKUP_OBJECT (xs_configwin, w_label56, "w_label56");
- GLADE_HOOKUP_OBJECT (xs_configwin, w_label24, "w_label24");
- GLADE_HOOKUP_OBJECT (xs_configwin, w_vbox20, "w_vbox20");
- GLADE_HOOKUP_OBJECT (xs_configwin, w_frame29, "w_frame29");
- GLADE_HOOKUP_OBJECT (xs_configwin, w_vbox32, "w_vbox32");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_mintime_enable, "cfg_mintime_enable");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_mintime_box, "cfg_mintime_box");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_mintime_label1, "cfg_mintime_label1");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_mintime, "cfg_mintime");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_mintime_label2, "cfg_mintime_label2");
- GLADE_HOOKUP_OBJECT (xs_configwin, label15, "label15");
- GLADE_HOOKUP_OBJECT (xs_configwin, w_frame21, "w_frame21");
- GLADE_HOOKUP_OBJECT (xs_configwin, w_vbox21, "w_vbox21");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_maxtime_enable, "cfg_maxtime_enable");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_maxtime_unknown, "cfg_maxtime_unknown");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_maxtime_box, "cfg_maxtime_box");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_maxtime_label1, "cfg_maxtime_label1");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_maxtime, "cfg_maxtime");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_maxtime_label2, "cfg_maxtime_label2");
- GLADE_HOOKUP_OBJECT (xs_configwin, label16, "label16");
- GLADE_HOOKUP_OBJECT (xs_configwin, w_frame18, "w_frame18");
- GLADE_HOOKUP_OBJECT (xs_configwin, w_vbox18, "w_vbox18");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_sld_enable, "cfg_sld_enable");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_sld_box, "cfg_sld_box");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_sld_label1, "cfg_sld_label1");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_sld_dbpath, "cfg_sld_dbpath");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_sld_dbbrowse, "cfg_sld_dbbrowse");
- GLADE_HOOKUP_OBJECT (xs_configwin, alignment1, "alignment1");
- GLADE_HOOKUP_OBJECT (xs_configwin, hbox1, "hbox1");
- GLADE_HOOKUP_OBJECT (xs_configwin, image1, "image1");
- GLADE_HOOKUP_OBJECT (xs_configwin, label30, "label30");
- GLADE_HOOKUP_OBJECT (xs_configwin, label17, "label17");
- GLADE_HOOKUP_OBJECT (xs_configwin, w_label26, "w_label26");
- GLADE_HOOKUP_OBJECT (xs_configwin, frame1, "frame1");
- GLADE_HOOKUP_OBJECT (xs_configwin, vbox1, "vbox1");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_ftitle_override, "cfg_ftitle_override");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_ftitle_box, "cfg_ftitle_box");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_ftitle_format, "cfg_ftitle_format");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_ftitle_descs, "cfg_ftitle_descs");
- GLADE_HOOKUP_OBJECT (xs_configwin, label29, "label29");
- GLADE_HOOKUP_OBJECT (xs_configwin, w_label27, "w_label27");
- GLADE_HOOKUP_OBJECT (xs_configwin, w_vbox19, "w_vbox19");
- GLADE_HOOKUP_OBJECT (xs_configwin, w_frame31, "w_frame31");
- GLADE_HOOKUP_OBJECT (xs_configwin, w_vbox35, "w_vbox35");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_subauto_enable, "cfg_subauto_enable");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_subauto_min_only, "cfg_subauto_min_only");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_subauto_box, "cfg_subauto_box");
- GLADE_HOOKUP_OBJECT (xs_configwin, w_label52, "w_label52");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_subauto_mintime, "cfg_subauto_mintime");
- GLADE_HOOKUP_OBJECT (xs_configwin, w_label53, "w_label53");
- GLADE_HOOKUP_OBJECT (xs_configwin, label21, "label21");
- GLADE_HOOKUP_OBJECT (xs_configwin, w_frame7, "w_frame7");
- GLADE_HOOKUP_OBJECT (xs_configwin, w_vbox8, "w_vbox8");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_stil_enable, "cfg_stil_enable");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_stil_box1, "cfg_stil_box1");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_stil_label1, "cfg_stil_label1");
- GLADE_HOOKUP_OBJECT (xs_configwin, w_alignment2, "w_alignment2");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_stil_dbpath, "cfg_stil_dbpath");
- GLADE_HOOKUP_OBJECT (xs_configwin, w_alignment1, "w_alignment1");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_stil_browse, "cfg_stil_browse");
- GLADE_HOOKUP_OBJECT (xs_configwin, alignment2, "alignment2");
- GLADE_HOOKUP_OBJECT (xs_configwin, hbox2, "hbox2");
- GLADE_HOOKUP_OBJECT (xs_configwin, image2, "image2");
- GLADE_HOOKUP_OBJECT (xs_configwin, label31, "label31");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_stil_box2, "cfg_stil_box2");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_hvsc_label1, "cfg_hvsc_label1");
- GLADE_HOOKUP_OBJECT (xs_configwin, w_alignment6, "w_alignment6");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_hvsc_path, "cfg_hvsc_path");
- GLADE_HOOKUP_OBJECT (xs_configwin, w_alignment7, "w_alignment7");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_hvsc_browse, "cfg_hvsc_browse");
- GLADE_HOOKUP_OBJECT (xs_configwin, alignment3, "alignment3");
- GLADE_HOOKUP_OBJECT (xs_configwin, hbox3, "hbox3");
- GLADE_HOOKUP_OBJECT (xs_configwin, image3, "image3");
- GLADE_HOOKUP_OBJECT (xs_configwin, label32, "label32");
- GLADE_HOOKUP_OBJECT (xs_configwin, label18, "label18");
- GLADE_HOOKUP_OBJECT (xs_configwin, w_label3, "w_label3");
- GLADE_HOOKUP_OBJECT (xs_configwin, hbuttonbox1, "hbuttonbox1");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_cancel, "cfg_cancel");
- GLADE_HOOKUP_OBJECT (xs_configwin, cfg_ok, "cfg_ok");
- GLADE_HOOKUP_OBJECT_NO_REF (xs_configwin, tooltips, "tooltips");
-
- return xs_configwin;
-}
-
-GtkWidget*
-create_xs_fileinfowin (void)
-{
- GtkWidget *xs_fileinfowin;
- GtkWidget *w_vbox14;
- GtkWidget *w_frame14;
- GtkWidget *table1;
- GtkWidget *w_label16;
- GtkWidget *w_label17;
- GtkWidget *w_label18;
- GtkWidget *w_label19;
- GtkWidget *fileinfo_filename;
- GtkWidget *fileinfo_songname;
- GtkWidget *fileinfo_composer;
- GtkWidget *fileinfo_copyright;
- GtkWidget *label23;
- GtkWidget *w_frame15;
- GtkWidget *w_vbox15;
- GtkWidget *fileinfo_sub_tune;
- GtkWidget *convertwidget7;
- GtkWidget *table2;
- GtkWidget *w_label41;
- GtkWidget *fileinfo_sub_author;
- GtkWidget *w_label50;
- GtkWidget *fileinfo_sub_name;
- GtkWidget *w_label51;
- GtkWidget *entry1;
- GtkWidget *scrolledwindow2;
- GtkWidget *fileinfo_sub_info;
- GtkWidget *label24;
- GtkWidget *button2;
-
- xs_fileinfowin = gtk_window_new (GTK_WINDOW_TOPLEVEL);
- gtk_widget_set_name (xs_fileinfowin, "xs_fileinfowin");
- gtk_widget_set_size_request (xs_fileinfowin, 400, -1);
- gtk_window_set_title (GTK_WINDOW (xs_fileinfowin), _("Audacious-SID Fileinfo"));
-
- w_vbox14 = gtk_vbox_new (FALSE, 0);
- gtk_widget_set_name (w_vbox14, "w_vbox14");
- gtk_widget_show (w_vbox14);
- gtk_container_add (GTK_CONTAINER (xs_fileinfowin), w_vbox14);
-
- w_frame14 = gtk_frame_new (NULL);
- gtk_widget_set_name (w_frame14, "w_frame14");
- gtk_widget_show (w_frame14);
- gtk_box_pack_start (GTK_BOX (w_vbox14), w_frame14, FALSE, TRUE, 0);
- gtk_container_set_border_width (GTK_CONTAINER (w_frame14), 4);
-
- table1 = gtk_table_new (4, 2, FALSE);
- gtk_widget_set_name (table1, "table1");
- gtk_widget_show (table1);
- gtk_container_add (GTK_CONTAINER (w_frame14), table1);
- gtk_container_set_border_width (GTK_CONTAINER (table1), 4);
- gtk_table_set_row_spacings (GTK_TABLE (table1), 2);
- gtk_table_set_col_spacings (GTK_TABLE (table1), 4);
-
- w_label16 = gtk_label_new (_("Filename:"));
- gtk_widget_set_name (w_label16, "w_label16");
- gtk_widget_show (w_label16);
- gtk_table_attach (GTK_TABLE (table1), w_label16, 0, 1, 0, 1,
- (GtkAttachOptions) (0),
- (GtkAttachOptions) (0), 0, 0);
- gtk_label_set_justify (GTK_LABEL (w_label16), GTK_JUSTIFY_CENTER);
-
- w_label17 = gtk_label_new (_("Songname:"));
- gtk_widget_set_name (w_label17, "w_label17");
- gtk_widget_show (w_label17);
- gtk_table_attach (GTK_TABLE (table1), w_label17, 0, 1, 1, 2,
- (GtkAttachOptions) (0),
- (GtkAttachOptions) (0), 0, 0);
- gtk_label_set_justify (GTK_LABEL (w_label17), GTK_JUSTIFY_CENTER);
-
- w_label18 = gtk_label_new (_("Composer:"));
- gtk_widget_set_name (w_label18, "w_label18");
- gtk_widget_show (w_label18);
- gtk_table_attach (GTK_TABLE (table1), w_label18, 0, 1, 2, 3,
- (GtkAttachOptions) (0),
- (GtkAttachOptions) (0), 0, 0);
- gtk_label_set_justify (GTK_LABEL (w_label18), GTK_JUSTIFY_CENTER);
-
- w_label19 = gtk_label_new (_("Copyright:"));
- gtk_widget_set_name (w_label19, "w_label19");
- gtk_widget_show (w_label19);
- gtk_table_attach (GTK_TABLE (table1), w_label19, 0, 1, 3, 4,
- (GtkAttachOptions) (0),
- (GtkAttachOptions) (0), 0, 0);
- gtk_label_set_justify (GTK_LABEL (w_label19), GTK_JUSTIFY_CENTER);
-
- fileinfo_filename = gtk_entry_new ();
- gtk_widget_set_name (fileinfo_filename, "fileinfo_filename");
- gtk_widget_show (fileinfo_filename);
- gtk_table_attach (GTK_TABLE (table1), fileinfo_filename, 1, 2, 0, 1,
- (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
- gtk_editable_set_editable (GTK_EDITABLE (fileinfo_filename), FALSE);
- gtk_entry_set_invisible_char (GTK_ENTRY (fileinfo_filename), 9679);
-
- fileinfo_songname = gtk_entry_new ();
- gtk_widget_set_name (fileinfo_songname, "fileinfo_songname");
- gtk_widget_show (fileinfo_songname);
- gtk_table_attach (GTK_TABLE (table1), fileinfo_songname, 1, 2, 1, 2,
- (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
- gtk_editable_set_editable (GTK_EDITABLE (fileinfo_songname), FALSE);
- gtk_entry_set_invisible_char (GTK_ENTRY (fileinfo_songname), 9679);
-
- fileinfo_composer = gtk_entry_new ();
- gtk_widget_set_name (fileinfo_composer, "fileinfo_composer");
- gtk_widget_show (fileinfo_composer);
- gtk_table_attach (GTK_TABLE (table1), fileinfo_composer, 1, 2, 2, 3,
- (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
- gtk_editable_set_editable (GTK_EDITABLE (fileinfo_composer), FALSE);
- gtk_entry_set_invisible_char (GTK_ENTRY (fileinfo_composer), 9679);
-
- fileinfo_copyright = gtk_entry_new ();
- gtk_widget_set_name (fileinfo_copyright, "fileinfo_copyright");
- gtk_widget_show (fileinfo_copyright);
- gtk_table_attach (GTK_TABLE (table1), fileinfo_copyright, 1, 2, 3, 4,
- (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
- gtk_editable_set_editable (GTK_EDITABLE (fileinfo_copyright), FALSE);
- gtk_entry_set_invisible_char (GTK_ENTRY (fileinfo_copyright), 9679);
-
- label23 = gtk_label_new (_("Song Information:"));
- gtk_widget_set_name (label23, "label23");
- gtk_widget_show (label23);
- gtk_frame_set_label_widget (GTK_FRAME (w_frame14), label23);
-
- w_frame15 = gtk_frame_new (NULL);
- gtk_widget_set_name (w_frame15, "w_frame15");
- gtk_widget_show (w_frame15);
- gtk_box_pack_start (GTK_BOX (w_vbox14), w_frame15, TRUE, TRUE, 0);
- gtk_container_set_border_width (GTK_CONTAINER (w_frame15), 4);
-
- w_vbox15 = gtk_vbox_new (FALSE, 2);
- gtk_widget_set_name (w_vbox15, "w_vbox15");
- gtk_widget_show (w_vbox15);
- gtk_container_add (GTK_CONTAINER (w_frame15), w_vbox15);
-
- fileinfo_sub_tune = gtk_option_menu_new ();
- gtk_widget_set_name (fileinfo_sub_tune, "fileinfo_sub_tune");
- gtk_widget_show (fileinfo_sub_tune);
- gtk_box_pack_start (GTK_BOX (w_vbox15), fileinfo_sub_tune, FALSE, FALSE, 0);
- gtk_container_set_border_width (GTK_CONTAINER (fileinfo_sub_tune), 2);
-
- convertwidget7 = gtk_menu_new ();
- gtk_widget_set_name (convertwidget7, "convertwidget7");
-
- gtk_option_menu_set_menu (GTK_OPTION_MENU (fileinfo_sub_tune), convertwidget7);
-
- table2 = gtk_table_new (3, 2, FALSE);
- gtk_widget_set_name (table2, "table2");
- gtk_widget_show (table2);
- gtk_box_pack_start (GTK_BOX (w_vbox15), table2, FALSE, FALSE, 0);
- gtk_container_set_border_width (GTK_CONTAINER (table2), 4);
- gtk_table_set_row_spacings (GTK_TABLE (table2), 2);
- gtk_table_set_col_spacings (GTK_TABLE (table2), 4);
-
- w_label41 = gtk_label_new (_("Author:"));
- gtk_widget_set_name (w_label41, "w_label41");
- gtk_widget_show (w_label41);
- gtk_table_attach (GTK_TABLE (table2), w_label41, 0, 1, 1, 2,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
- gtk_label_set_justify (GTK_LABEL (w_label41), GTK_JUSTIFY_CENTER);
-
- fileinfo_sub_author = gtk_entry_new ();
- gtk_widget_set_name (fileinfo_sub_author, "fileinfo_sub_author");
- gtk_widget_show (fileinfo_sub_author);
- gtk_table_attach (GTK_TABLE (table2), fileinfo_sub_author, 1, 2, 1, 2,
- (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
- gtk_editable_set_editable (GTK_EDITABLE (fileinfo_sub_author), FALSE);
- gtk_entry_set_invisible_char (GTK_ENTRY (fileinfo_sub_author), 9679);
-
- w_label50 = gtk_label_new (_("Name:"));
- gtk_widget_set_name (w_label50, "w_label50");
- gtk_widget_show (w_label50);
- gtk_table_attach (GTK_TABLE (table2), w_label50, 0, 1, 0, 1,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
- gtk_label_set_justify (GTK_LABEL (w_label50), GTK_JUSTIFY_CENTER);
-
- fileinfo_sub_name = gtk_entry_new ();
- gtk_widget_set_name (fileinfo_sub_name, "fileinfo_sub_name");
- gtk_widget_show (fileinfo_sub_name);
- gtk_table_attach (GTK_TABLE (table2), fileinfo_sub_name, 1, 2, 0, 1,
- (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
- gtk_editable_set_editable (GTK_EDITABLE (fileinfo_sub_name), FALSE);
- gtk_entry_set_invisible_char (GTK_ENTRY (fileinfo_sub_name), 9679);
-
- w_label51 = gtk_label_new (_("Duration:"));
- gtk_widget_set_name (w_label51, "w_label51");
- gtk_widget_show (w_label51);
- gtk_table_attach (GTK_TABLE (table2), w_label51, 0, 1, 2, 3,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
- gtk_label_set_justify (GTK_LABEL (w_label51), GTK_JUSTIFY_CENTER);
- gtk_misc_set_alignment (GTK_MISC (w_label51), 0, 0.5);
-
- entry1 = gtk_entry_new ();
- gtk_widget_set_name (entry1, "entry1");
- gtk_widget_show (entry1);
- gtk_table_attach (GTK_TABLE (table2), entry1, 1, 2, 2, 3,
- (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
- gtk_editable_set_editable (GTK_EDITABLE (entry1), FALSE);
- gtk_entry_set_invisible_char (GTK_ENTRY (entry1), 9679);
-
- scrolledwindow2 = gtk_scrolled_window_new (NULL, NULL);
- gtk_widget_set_name (scrolledwindow2, "scrolledwindow2");
- gtk_widget_show (scrolledwindow2);
- gtk_box_pack_start (GTK_BOX (w_vbox15), scrolledwindow2, TRUE, TRUE, 0);
- gtk_container_set_border_width (GTK_CONTAINER (scrolledwindow2), 4);
- GTK_WIDGET_UNSET_FLAGS (scrolledwindow2, GTK_CAN_FOCUS);
- gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow2), GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
- gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolledwindow2), GTK_SHADOW_IN);
-
- fileinfo_sub_info = gtk_text_view_new ();
- gtk_widget_set_name (fileinfo_sub_info, "fileinfo_sub_info");
- gtk_widget_show (fileinfo_sub_info);
- gtk_container_add (GTK_CONTAINER (scrolledwindow2), fileinfo_sub_info);
- gtk_text_view_set_editable (GTK_TEXT_VIEW (fileinfo_sub_info), FALSE);
- gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (fileinfo_sub_info), GTK_WRAP_WORD);
-
- label24 = gtk_label_new (_("Sub-tune Information:"));
- gtk_widget_set_name (label24, "label24");
- gtk_widget_show (label24);
- gtk_frame_set_label_widget (GTK_FRAME (w_frame15), label24);
-
- button2 = gtk_button_new_with_mnemonic (_("Close"));
- gtk_widget_set_name (button2, "button2");
- gtk_widget_show (button2);
- gtk_box_pack_start (GTK_BOX (w_vbox14), button2, FALSE, FALSE, 0);
- gtk_container_set_border_width (GTK_CONTAINER (button2), 4);
- GTK_WIDGET_SET_FLAGS (button2, GTK_CAN_DEFAULT);
-
- g_signal_connect ((gpointer) xs_fileinfowin, "delete_event",
- G_CALLBACK (xs_fileinfo_delete),
- NULL);
- g_signal_connect ((gpointer) button2, "clicked",
- G_CALLBACK (xs_fileinfo_ok),
- NULL);
-
- /* Store pointers to all widgets, for use by lookup_widget(). */
- GLADE_HOOKUP_OBJECT_NO_REF (xs_fileinfowin, xs_fileinfowin, "xs_fileinfowin");
- GLADE_HOOKUP_OBJECT (xs_fileinfowin, w_vbox14, "w_vbox14");
- GLADE_HOOKUP_OBJECT (xs_fileinfowin, w_frame14, "w_frame14");
- GLADE_HOOKUP_OBJECT (xs_fileinfowin, table1, "table1");
- GLADE_HOOKUP_OBJECT (xs_fileinfowin, w_label16, "w_label16");
- GLADE_HOOKUP_OBJECT (xs_fileinfowin, w_label17, "w_label17");
- GLADE_HOOKUP_OBJECT (xs_fileinfowin, w_label18, "w_label18");
- GLADE_HOOKUP_OBJECT (xs_fileinfowin, w_label19, "w_label19");
- GLADE_HOOKUP_OBJECT (xs_fileinfowin, fileinfo_filename, "fileinfo_filename");
- GLADE_HOOKUP_OBJECT (xs_fileinfowin, fileinfo_songname, "fileinfo_songname");
- GLADE_HOOKUP_OBJECT (xs_fileinfowin, fileinfo_composer, "fileinfo_composer");
- GLADE_HOOKUP_OBJECT (xs_fileinfowin, fileinfo_copyright, "fileinfo_copyright");
- GLADE_HOOKUP_OBJECT (xs_fileinfowin, label23, "label23");
- GLADE_HOOKUP_OBJECT (xs_fileinfowin, w_frame15, "w_frame15");
- GLADE_HOOKUP_OBJECT (xs_fileinfowin, w_vbox15, "w_vbox15");
- GLADE_HOOKUP_OBJECT (xs_fileinfowin, fileinfo_sub_tune, "fileinfo_sub_tune");
- GLADE_HOOKUP_OBJECT (xs_fileinfowin, convertwidget7, "convertwidget7");
- GLADE_HOOKUP_OBJECT (xs_fileinfowin, table2, "table2");
- GLADE_HOOKUP_OBJECT (xs_fileinfowin, w_label41, "w_label41");
- GLADE_HOOKUP_OBJECT (xs_fileinfowin, fileinfo_sub_author, "fileinfo_sub_author");
- GLADE_HOOKUP_OBJECT (xs_fileinfowin, w_label50, "w_label50");
- GLADE_HOOKUP_OBJECT (xs_fileinfowin, fileinfo_sub_name, "fileinfo_sub_name");
- GLADE_HOOKUP_OBJECT (xs_fileinfowin, w_label51, "w_label51");
- GLADE_HOOKUP_OBJECT (xs_fileinfowin, entry1, "entry1");
- GLADE_HOOKUP_OBJECT (xs_fileinfowin, scrolledwindow2, "scrolledwindow2");
- GLADE_HOOKUP_OBJECT (xs_fileinfowin, fileinfo_sub_info, "fileinfo_sub_info");
- GLADE_HOOKUP_OBJECT (xs_fileinfowin, label24, "label24");
- GLADE_HOOKUP_OBJECT (xs_fileinfowin, button2, "button2");
-
- gtk_widget_grab_focus (button2);
- gtk_widget_grab_default (button2);
- return xs_fileinfowin;
-}
-
-GtkWidget*
-create_xs_sldb_fs (void)
-{
- GtkWidget *xs_sldb_fs;
- GtkWidget *ok_button2;
- GtkWidget *cancel_button2;
-
- xs_sldb_fs = gtk_file_selection_new (_("Select HVSC song length database"));
- gtk_widget_set_name (xs_sldb_fs, "xs_sldb_fs");
- gtk_container_set_border_width (GTK_CONTAINER (xs_sldb_fs), 10);
- gtk_window_set_modal (GTK_WINDOW (xs_sldb_fs), TRUE);
- gtk_window_set_type_hint (GTK_WINDOW (xs_sldb_fs), GDK_WINDOW_TYPE_HINT_DIALOG);
-
- ok_button2 = GTK_FILE_SELECTION (xs_sldb_fs)->ok_button;
- gtk_widget_set_name (ok_button2, "ok_button2");
- gtk_widget_show (ok_button2);
- GTK_WIDGET_SET_FLAGS (ok_button2, GTK_CAN_DEFAULT);
-
- cancel_button2 = GTK_FILE_SELECTION (xs_sldb_fs)->cancel_button;
- gtk_widget_set_name (cancel_button2, "cancel_button2");
- gtk_widget_show (cancel_button2);
- GTK_WIDGET_SET_FLAGS (cancel_button2, GTK_CAN_DEFAULT);
-
- g_signal_connect ((gpointer) xs_sldb_fs, "delete_event",
- G_CALLBACK (xs_sldb_fs_delete),
- NULL);
- g_signal_connect ((gpointer) ok_button2, "clicked",
- G_CALLBACK (xs_sldb_fs_ok),
- NULL);
- g_signal_connect ((gpointer) cancel_button2, "clicked",
- G_CALLBACK (xs_sldb_fs_cancel),
- NULL);
-
- /* Store pointers to all widgets, for use by lookup_widget(). */
- GLADE_HOOKUP_OBJECT_NO_REF (xs_sldb_fs, xs_sldb_fs, "xs_sldb_fs");
- GLADE_HOOKUP_OBJECT_NO_REF (xs_sldb_fs, ok_button2, "ok_button2");
- GLADE_HOOKUP_OBJECT_NO_REF (xs_sldb_fs, cancel_button2, "cancel_button2");
-
- return xs_sldb_fs;
-}
-
-GtkWidget*
-create_xs_stil_fs (void)
-{
- GtkWidget *xs_stil_fs;
- GtkWidget *ok_button3;
- GtkWidget *cancel_button3;
-
- xs_stil_fs = gtk_file_selection_new (_("Select STIL-database"));
- gtk_widget_set_name (xs_stil_fs, "xs_stil_fs");
- gtk_container_set_border_width (GTK_CONTAINER (xs_stil_fs), 10);
- gtk_window_set_modal (GTK_WINDOW (xs_stil_fs), TRUE);
- gtk_window_set_type_hint (GTK_WINDOW (xs_stil_fs), GDK_WINDOW_TYPE_HINT_DIALOG);
-
- ok_button3 = GTK_FILE_SELECTION (xs_stil_fs)->ok_button;
- gtk_widget_set_name (ok_button3, "ok_button3");
- gtk_widget_show (ok_button3);
- GTK_WIDGET_SET_FLAGS (ok_button3, GTK_CAN_DEFAULT);
-
- cancel_button3 = GTK_FILE_SELECTION (xs_stil_fs)->cancel_button;
- gtk_widget_set_name (cancel_button3, "cancel_button3");
- gtk_widget_show (cancel_button3);
- GTK_WIDGET_SET_FLAGS (cancel_button3, GTK_CAN_DEFAULT);
-
- g_signal_connect ((gpointer) xs_stil_fs, "delete_event",
- G_CALLBACK (xs_stil_fs_delete),
- NULL);
- g_signal_connect ((gpointer) ok_button3, "clicked",
- G_CALLBACK (xs_stil_fs_ok),
- NULL);
- g_signal_connect ((gpointer) cancel_button3, "clicked",
- G_CALLBACK (xs_stil_fs_cancel),
- NULL);
-
- /* Store pointers to all widgets, for use by lookup_widget(). */
- GLADE_HOOKUP_OBJECT_NO_REF (xs_stil_fs, xs_stil_fs, "xs_stil_fs");
- GLADE_HOOKUP_OBJECT_NO_REF (xs_stil_fs, ok_button3, "ok_button3");
- GLADE_HOOKUP_OBJECT_NO_REF (xs_stil_fs, cancel_button3, "cancel_button3");
-
- return xs_stil_fs;
-}
-
-GtkWidget*
-create_xs_hvsc_fs (void)
-{
- GtkWidget *xs_hvsc_fs;
- GtkWidget *ok_button4;
- GtkWidget *cancel_button4;
-
- xs_hvsc_fs = gtk_file_selection_new (_("Select HVSC location prefix"));
- gtk_widget_set_name (xs_hvsc_fs, "xs_hvsc_fs");
- gtk_container_set_border_width (GTK_CONTAINER (xs_hvsc_fs), 10);
- gtk_window_set_modal (GTK_WINDOW (xs_hvsc_fs), TRUE);
- gtk_window_set_type_hint (GTK_WINDOW (xs_hvsc_fs), GDK_WINDOW_TYPE_HINT_DIALOG);
-
- ok_button4 = GTK_FILE_SELECTION (xs_hvsc_fs)->ok_button;
- gtk_widget_set_name (ok_button4, "ok_button4");
- gtk_widget_show (ok_button4);
- GTK_WIDGET_SET_FLAGS (ok_button4, GTK_CAN_DEFAULT);
-
- cancel_button4 = GTK_FILE_SELECTION (xs_hvsc_fs)->cancel_button;
- gtk_widget_set_name (cancel_button4, "cancel_button4");
- gtk_widget_show (cancel_button4);
- GTK_WIDGET_SET_FLAGS (cancel_button4, GTK_CAN_DEFAULT);
-
- g_signal_connect ((gpointer) xs_hvsc_fs, "delete_event",
- G_CALLBACK (xs_hvsc_fs_delete),
- NULL);
- g_signal_connect ((gpointer) ok_button4, "clicked",
- G_CALLBACK (xs_hvsc_fs_ok),
- NULL);
- g_signal_connect ((gpointer) cancel_button4, "clicked",
- G_CALLBACK (xs_hvsc_fs_cancel),
- NULL);
-
- /* Store pointers to all widgets, for use by lookup_widget(). */
- GLADE_HOOKUP_OBJECT_NO_REF (xs_hvsc_fs, xs_hvsc_fs, "xs_hvsc_fs");
- GLADE_HOOKUP_OBJECT_NO_REF (xs_hvsc_fs, ok_button4, "ok_button4");
- GLADE_HOOKUP_OBJECT_NO_REF (xs_hvsc_fs, cancel_button4, "cancel_button4");
-
- return xs_hvsc_fs;
-}
-
-GtkWidget*
-create_xs_filter_import_fs (void)
-{
- GtkWidget *xs_filter_import_fs;
- GtkWidget *ok_button64;
- GtkWidget *cancel_button64;
-
- xs_filter_import_fs = gtk_file_selection_new (_("Select SIDPlay2 filters file for importing"));
- gtk_widget_set_name (xs_filter_import_fs, "xs_filter_import_fs");
- gtk_container_set_border_width (GTK_CONTAINER (xs_filter_import_fs), 10);
- gtk_window_set_modal (GTK_WINDOW (xs_filter_import_fs), TRUE);
- gtk_window_set_type_hint (GTK_WINDOW (xs_filter_import_fs), GDK_WINDOW_TYPE_HINT_DIALOG);
-
- ok_button64 = GTK_FILE_SELECTION (xs_filter_import_fs)->ok_button;
- gtk_widget_set_name (ok_button64, "ok_button64");
- gtk_widget_show (ok_button64);
- GTK_WIDGET_SET_FLAGS (ok_button64, GTK_CAN_DEFAULT);
-
- cancel_button64 = GTK_FILE_SELECTION (xs_filter_import_fs)->cancel_button;
- gtk_widget_set_name (cancel_button64, "cancel_button64");
- gtk_widget_show (cancel_button64);
- GTK_WIDGET_SET_FLAGS (cancel_button64, GTK_CAN_DEFAULT);
-
- g_signal_connect ((gpointer) xs_filter_import_fs, "delete_event",
- G_CALLBACK (xs_filter_import_fs_delete),
- NULL);
- g_signal_connect ((gpointer) ok_button64, "clicked",
- G_CALLBACK (xs_filter_import_fs_ok),
- NULL);
- g_signal_connect ((gpointer) cancel_button64, "clicked",
- G_CALLBACK (xs_filter_import_fs_cancel),
- NULL);
-
- /* Store pointers to all widgets, for use by lookup_widget(). */
- GLADE_HOOKUP_OBJECT_NO_REF (xs_filter_import_fs, xs_filter_import_fs, "xs_filter_import_fs");
- GLADE_HOOKUP_OBJECT_NO_REF (xs_filter_import_fs, ok_button64, "ok_button64");
- GLADE_HOOKUP_OBJECT_NO_REF (xs_filter_import_fs, cancel_button64, "cancel_button64");
-
- return xs_filter_import_fs;
-}
-
-GtkWidget*
-create_xs_filter_export_fs (void)
-{
- GtkWidget *xs_filter_export_fs;
- GtkWidget *ok_button64;
- GtkWidget *cancel_button64;
-
- xs_filter_export_fs = gtk_file_selection_new (_("Select SIDPlay2 filters file for exporting"));
- gtk_widget_set_name (xs_filter_export_fs, "xs_filter_export_fs");
- gtk_container_set_border_width (GTK_CONTAINER (xs_filter_export_fs), 10);
- gtk_window_set_modal (GTK_WINDOW (xs_filter_export_fs), TRUE);
- gtk_window_set_type_hint (GTK_WINDOW (xs_filter_export_fs), GDK_WINDOW_TYPE_HINT_DIALOG);
-
- ok_button64 = GTK_FILE_SELECTION (xs_filter_export_fs)->ok_button;
- gtk_widget_set_name (ok_button64, "ok_button64");
- gtk_widget_show (ok_button64);
- GTK_WIDGET_SET_FLAGS (ok_button64, GTK_CAN_DEFAULT);
-
- cancel_button64 = GTK_FILE_SELECTION (xs_filter_export_fs)->cancel_button;
- gtk_widget_set_name (cancel_button64, "cancel_button64");
- gtk_widget_show (cancel_button64);
- GTK_WIDGET_SET_FLAGS (cancel_button64, GTK_CAN_DEFAULT);
-
- g_signal_connect ((gpointer) xs_filter_export_fs, "delete_event",
- G_CALLBACK (xs_filter_export_fs_delete),
- NULL);
- g_signal_connect ((gpointer) ok_button64, "clicked",
- G_CALLBACK (xs_filter_export_fs_ok),
- NULL);
- g_signal_connect ((gpointer) cancel_button64, "clicked",
- G_CALLBACK (xs_filter_export_fs_cancel),
- NULL);
-
- /* Store pointers to all widgets, for use by lookup_widget(). */
- GLADE_HOOKUP_OBJECT_NO_REF (xs_filter_export_fs, xs_filter_export_fs, "xs_filter_export_fs");
- GLADE_HOOKUP_OBJECT_NO_REF (xs_filter_export_fs, ok_button64, "ok_button64");
- GLADE_HOOKUP_OBJECT_NO_REF (xs_filter_export_fs, cancel_button64, "cancel_button64");
-
- return xs_filter_export_fs;
-}
-
-GtkWidget*
-create_xs_confirmwin (void)
-{
- GtkWidget *xs_confirmwin;
- GtkWidget *dialog_vbox1;
- GtkWidget *xs_confirm_frame;
- GtkWidget *label25;
- GtkWidget *dialog_action_area1;
- GtkWidget *hbuttonbox2;
- GtkWidget *xs_confirm_yes;
- GtkWidget *xs_confirm_no;
-
- xs_confirmwin = gtk_dialog_new ();
- gtk_widget_set_name (xs_confirmwin, "xs_confirmwin");
- gtk_window_set_title (GTK_WINDOW (xs_confirmwin), _("Confirm selected action"));
- gtk_window_set_type_hint (GTK_WINDOW (xs_confirmwin), GDK_WINDOW_TYPE_HINT_DIALOG);
-
- dialog_vbox1 = GTK_DIALOG (xs_confirmwin)->vbox;
- gtk_widget_set_name (dialog_vbox1, "dialog_vbox1");
- gtk_widget_show (dialog_vbox1);
-
- xs_confirm_frame = gtk_frame_new (NULL);
- gtk_widget_set_name (xs_confirm_frame, "xs_confirm_frame");
- gtk_widget_show (xs_confirm_frame);
- gtk_box_pack_start (GTK_BOX (dialog_vbox1), xs_confirm_frame, TRUE, TRUE, 0);
- gtk_container_set_border_width (GTK_CONTAINER (xs_confirm_frame), 6);
-
- label25 = gtk_label_new (_("Confirm selected action"));
- gtk_widget_set_name (label25, "label25");
- gtk_widget_show (label25);
- gtk_frame_set_label_widget (GTK_FRAME (xs_confirm_frame), label25);
-
- dialog_action_area1 = GTK_DIALOG (xs_confirmwin)->action_area;
- gtk_widget_set_name (dialog_action_area1, "dialog_action_area1");
- gtk_widget_show (dialog_action_area1);
- gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area1), GTK_BUTTONBOX_END);
-
- hbuttonbox2 = gtk_hbutton_box_new ();
- gtk_widget_set_name (hbuttonbox2, "hbuttonbox2");
- gtk_widget_show (hbuttonbox2);
- gtk_container_add (GTK_CONTAINER (dialog_action_area1), hbuttonbox2);
- gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox2), GTK_BUTTONBOX_END);
- gtk_box_set_spacing (GTK_BOX (hbuttonbox2), 8);
-
- xs_confirm_yes = gtk_button_new_with_mnemonic (_("Yes"));
- gtk_widget_set_name (xs_confirm_yes, "xs_confirm_yes");
- gtk_widget_show (xs_confirm_yes);
- gtk_container_add (GTK_CONTAINER (hbuttonbox2), xs_confirm_yes);
- GTK_WIDGET_SET_FLAGS (xs_confirm_yes, GTK_CAN_DEFAULT);
-
- xs_confirm_no = gtk_button_new_with_mnemonic (_("No"));
- gtk_widget_set_name (xs_confirm_no, "xs_confirm_no");
- gtk_widget_show (xs_confirm_no);
- gtk_container_add (GTK_CONTAINER (hbuttonbox2), xs_confirm_no);
- GTK_WIDGET_SET_FLAGS (xs_confirm_no, GTK_CAN_DEFAULT);
-
- g_signal_connect ((gpointer) xs_confirmwin, "delete_event",
- G_CALLBACK (xs_confirmwin_delete),
- NULL);
-
- /* Store pointers to all widgets, for use by lookup_widget(). */
- GLADE_HOOKUP_OBJECT_NO_REF (xs_confirmwin, xs_confirmwin, "xs_confirmwin");
- GLADE_HOOKUP_OBJECT_NO_REF (xs_confirmwin, dialog_vbox1, "dialog_vbox1");
- GLADE_HOOKUP_OBJECT (xs_confirmwin, xs_confirm_frame, "xs_confirm_frame");
- GLADE_HOOKUP_OBJECT (xs_confirmwin, label25, "label25");
- GLADE_HOOKUP_OBJECT_NO_REF (xs_confirmwin, dialog_action_area1, "dialog_action_area1");
- GLADE_HOOKUP_OBJECT (xs_confirmwin, hbuttonbox2, "hbuttonbox2");
- GLADE_HOOKUP_OBJECT (xs_confirmwin, xs_confirm_yes, "xs_confirm_yes");
- GLADE_HOOKUP_OBJECT (xs_confirmwin, xs_confirm_no, "xs_confirm_no");
-
- return xs_confirmwin;
-}
-

audacious-plugins-3.0.3.tar.bz2/src/sid/xs_interface.h Deleted

audacious-plugins-3.0.3.tar.bz2/src/vorbis/base64.c Deleted

@@ -1,112 +0,0 @@
-/*
- * base64.c
- * Copyright 2011 John Lindgren
- *
- * This file is part of Audacious.
- *
- * Audacious 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, version 2 or version 3 of the License.
- *
- * Audacious 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
- * Audacious. If not, see <http://www.gnu.org/licenses/>.
- *
- * The Audacious team does not consider modular code linking to Audacious or
- * using our public API to be a derived work.
- */
-
-#include <stdio.h>
-#include <string.h>
-#include <glib.h>
-
-static gint unalpha (gchar c)
-{
- if (c >= 'A' && c <= 'Z')
- return c - 'A';
- if (c >= 'a' && c <= 'z')
- return 26 + c - 'a';
- if (c >= '0' && c <= '9')
- return 52 + c - '0';
- if (c == '+')
- return 62;
- if (c == '/')
- return 63;
-
- return -1;
-}
-
-gboolean base64_decode (const gchar * text, void * * data, gint * length)
-{
- gint length_estimate = (strlen (text) * 3 + 3) / 4;
- guchar * buf = g_malloc (length_estimate);
- memset (buf, 0, length_estimate);
-
- const gchar * get = text;
- guchar * set = buf;
- gint x, a;
-
- while (1)
- {
- x = 0;
-
- if ((a = unalpha (* get)) < 0)
- break;
- x |= a << 18;
- get ++;
-
- if ((a = unalpha (* get)) < 0)
- break;
- x |= a << 12;
- get ++;
-
- if ((a = unalpha (* get)) < 0)
- break;
- x |= a << 6;
- get ++;
-
- if ((a = unalpha (* get)) < 0)
- break;
- x |= a;
- get ++;
-
- * set ++ = x >> 16;
- * set ++ = x >> 8;
- * set ++ = x;
- }
-
- if (! strcmp (get, "")) /* no bytes remaining */
- {
- if (x)
- goto ERR;
- }
- else if (! strcmp (get, "==")) /* one byte remaining */
- {
- if (x & ~0xff0000)
- goto ERR;
-
- * set ++ = x >> 16;
- }
- else if (! strcmp (get, "=")) /* two bytes remaining */
- {
- if (x & ~0xffff00)
- goto ERR;
-
- * set ++ = x >> 16;
- * set ++ = x >> 8;
- }
- else
- goto ERR;
-
- * data = buf;
- * length = set - buf;
- return TRUE;
-
-ERR:
- fprintf (stderr, "base64 decoding error at byte %d.\n", (int) (get - text));
- g_free (buf);
- return FALSE;
-}

audacious-plugins-3.0.3.tar.bz2/src/vorbis/configure.c Deleted

@@ -1,76 +0,0 @@
-#include "config.h"
-
-#include "vorbis.h"
-
-#include <glib.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <audacious/configdb.h>
-#include <audacious/plugin.h>
-#include <audacious/preferences.h>
-#include <audacious/i18n.h>
-
-vorbis_config_t vorbis_cfg;
-
-static void
-vorbis_save_config()
-{
- mcs_handle_t *db;
-
- db = aud_cfg_db_open();
- aud_cfg_db_set_bool(db, "vorbis", "tag_override",
- vorbis_cfg.tag_override);
- aud_cfg_db_set_string(db, "vorbis", "tag_format", vorbis_cfg.tag_format);
- aud_cfg_db_close(db);
-}
-
-vorbis_config_t config; /* temporary config */
-
-static PreferencesWidget settings_elements[] = {
- {WIDGET_CHK_BTN, N_("Override generic titles"), &config.tag_override, NULL, NULL, FALSE},
- {WIDGET_ENTRY, N_("Title format:"), &config.tag_format, NULL, NULL, TRUE, {.entry = {FALSE}}, VALUE_STRING},
-};
-
-static PreferencesWidget prefs[] = {
- {WIDGET_BOX, N_("Ogg Vorbis Tags"), NULL, NULL, NULL, FALSE,
- {.box = {settings_elements,
- G_N_ELEMENTS(settings_elements),
- FALSE /* vertical */, TRUE /* frame */}}},
-};
-
-static void
-configure_apply()
-{
- vorbis_cfg.tag_override = config.tag_override;
-
- g_free(vorbis_cfg.tag_format);
- vorbis_cfg.tag_format = g_strdup(config.tag_format);
-
- vorbis_save_config();
-}
-
-static void
-configure_init(void)
-{
- memcpy(&config, &vorbis_cfg, sizeof(config));
- config.tag_format = g_strdup(vorbis_cfg.tag_format);
-}
-
-static void
-configure_cleanup(void)
-{
- g_free(config.tag_format);
- config.tag_format = NULL;
-}
-
-PluginPreferences preferences = {
- .domain = PACKAGE,
- .title = N_("Ogg Vorbis Audio Plugin Configuration"),
- .prefs = prefs,
- .n_prefs = G_N_ELEMENTS(prefs),
- .type = PREFERENCES_WINDOW,
- .init = configure_init,
- .apply = configure_apply,
- .cleanup = configure_cleanup,
-};

audacious-plugins-3.0.3.tar.bz2/acinclude.m4 -> audacious-plugins-3.1.tar.bz2/acinclude.m4 Changed

@@ -167,21 +167,34 @@
 
 dnl Check for C and C++ compilers
 dnl =============================
-AUD_CHECK_GNU_MAKE
-AC_PROG_CC
-AC_PROG_CXX
-AM_PROG_AS
-AC_ISC_POSIX
-AC_C_BIGENDIAN
+AC_REQUIRE([AC_PROG_CC])
+AC_REQUIRE([AC_PROG_CXX])
+AC_REQUIRE([AM_PROG_AS])
+AC_REQUIRE([AC_C_BIGENDIAN])
+AC_REQUIRE([AC_SYS_LARGEFILE])
 
 if test "x$GCC" = "xyes"; then
 CFLAGS="$CFLAGS -Wall -pipe"
- CXXFLAGS="$CXXFLAGS -pipe -Wall"
+ CXXFLAGS="$CXXFLAGS -Wall -pipe"
 AUD_CHECK_CFLAGS(-Wtype-limits)
 fi
 
+dnl Enable "-z defs" only on Linux
+dnl ==============================
+AC_MSG_CHECKING([for Linux])
+case "$target" in
+ *linux*)
+ AC_MSG_RESULT([yes])
+ LDFLAGS="$LDFLAGS -z defs"
+ ;;
+ *)
+ AC_MSG_RESULT([no])
+ ;;
+esac
+
 dnl Checks for various programs
 dnl ===========================
+AUD_CHECK_GNU_MAKE
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
 AC_PATH_PROG([RM], [rm])
@@ -190,78 +203,20 @@
 AC_PATH_PROG([AR], [ar])
 AC_PATH_PROG([TR], [tr])
 AC_PATH_PROG([RANLIB], [ranlib])
+AC_PATH_PROG([WINDRES], [windres])
 
 dnl Check for Gtk+/GLib and pals
 dnl ============================
 AUD_CHECK_MODULE([GLIB], [glib-2.0], [>= 2.16], [Glib2])
+AUD_CHECK_MODULE([GTHREAD], [gthread-2.0], [>= 2.16], [GThread])
 AUD_CHECK_MODULE([PANGO], [pango], [>= 1.20], [Pango])
 AUD_CHECK_MODULE([CAIRO], [cairo], [>= 1.6], [Cairo])
 
-
 dnl Check for libmowgli
 dnl ===================
 AUD_CHECK_MODULE([MOWGLI], [libmowgli], [>= 0.9], [libmowgli],
 [http://www.atheme.org/projects/mowgli.shtml])
 
-
-dnl Check for libmcs
-dnl ================
-AUD_CHECK_MODULE([LIBMCS], [libmcs], [>= 0.7], [libmcs],
- [http://www.atheme.org/projects/mcs.shtml])
-
-
-dnl SSE2 support
-dnl ============
-AUD_ARG_ENABLE([sse2], [yes], [SSE2 support],
-[
- AC_MSG_CHECKING([SSE2 support])
- aud_my_save_CFLAGS="$CFLAGS"
- CFLAGS="-msse2"
- AC_TRY_RUN([
-#include <emmintrin.h>
-int main()
-{
- _mm_setzero_pd();
- asm volatile("xorpd %xmm0,%xmm0\n\t");
- return 0;
-}
- ],[
- AC_MSG_RESULT([yes])
- AC_DEFINE([HAVE_SSE2], 1, [Define to 1 if your system has SSE2 support])
- SIMD_CFLAGS="-msse2"
- ],[
- AC_MSG_RESULT([no])
- enable_sse2="no"
- ])
- AC_SUBST([SIMD_CFLAGS])
- CFLAGS="$aud_my_save_CFLAGS"
-])
-
-dnl AltiVec support
-dnl ===============
-AUD_ARG_ENABLE([altivec], [yes], [AltiVec support],
-[
- AC_CHECK_HEADERS([altivec.h],
- [
- AC_DEFINE([HAVE_ALTIVEC], 1, [Define to 1 if your system has AltiVec.])
- AC_DEFINE([HAVE_ALTIVEC_H], 1, [Define to 1 if your system has an altivec.h file.])
- AC_DEFINE([ARCH_POWERPC], 1, [Define to 1 if your system is a PowerPC.])
- case $target in
- *-apple-*)
- SIMD_CFLAGS="-mpim-altivec"
- ;;
- *)
- SIMD_CFLAGS="-maltivec"
- ;;
- esac
- AC_SUBST([SIMD_CFLAGS])
- ],[
- enable_altivec="no"
- ])
-])
-
-AC_CHECK_FUNC([getrlimit])
-
 ])

audacious-plugins-3.0.3.tar.bz2/buildsys.mk.in -> audacious-plugins-3.1.tar.bz2/buildsys.mk.in Changed

audacious-plugins-3.0.3.tar.bz2/config.h.in -> audacious-plugins-3.1.tar.bz2/config.h.in Changed

@@ -3,18 +3,6 @@
 /* Define if building universal (internal helper macro) */
 #undef AC_APPLE_UNIVERSAL_BUILD
 
-/* Define to 1 if your system is a PowerPC. */
-#undef ARCH_POWERPC
-
-/* Path to OSS DSP, really just a data pipe, default is /dev/dsp. */
-#undef DEV_DSP
-
-/* Path to OSS mixer, default is /dev/mixer. */
-#undef DEV_MIXER
-
-/* Define to disable per user plugin directory */
-#undef DISABLE_USER_PLUGIN_DIR
-
 /* Define to 1 if translation of program messages to the user's native
 language is requested. */
 #undef ENABLE_NLS
@@ -28,12 +16,6 @@
 /* Define if Vorbis output part should be built */
 #undef FILEWRITER_VORBIS
 
-/* Define to 1 if your system has AltiVec. */
-#undef HAVE_ALTIVEC
-
-/* Define to 1 if your system has an altivec.h file. */
-#undef HAVE_ALTIVEC_H
-
 /* Define to 1 if you have the <Carbon/Carbon.h> header file. */
 #undef HAVE_CARBON_CARBON_H
 
@@ -58,9 +40,6 @@
 /* Define to 1 if you have the `fsync' function. */
 #undef HAVE_FSYNC
 
-/* Define to 1 if you have the <fts.h> header file. */
-#undef HAVE_FTS_H
-
 /* Define if the GNU gettext() function is already present or preinstalled. */
 #undef HAVE_GETTEXT
 
@@ -76,9 +55,6 @@
 /* Define to 1 if you have the <libsmbclient.h> header file. */
 #undef HAVE_LIBSMBCLIENT_H
 
-/* Define to 1 if you have the <machine/soundcard.h> header file. */
-#undef HAVE_MACHINE_SOUNDCARD_H
-
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 
@@ -88,9 +64,6 @@
 /* Whether we have ne_set_connect_timeout */
 #undef HAVE_NE_SET_CONNECT_TIMEOUT
 
-/* Define if the OSS output plugin should be built */
-#undef HAVE_OSS
-
 /* Define if you have reSID for libSIDPlay 2 */
 #undef HAVE_RESID_BUILDER
 
@@ -110,9 +83,6 @@
 /* Define to 1 if you have the <soundcard.h> header file. */
 #undef HAVE_SOUNDCARD_H
 
-/* Define to 1 if your system has SSE2 support */
-#undef HAVE_SSE2
-
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
 
@@ -125,12 +95,6 @@
 /* Define to 1 if you have the <string.h> header file. */
 #undef HAVE_STRING_H
 
-/* Define to 1 if you have the `strnlen' function. */
-#undef HAVE_STRNLEN
-
-/* Define to 1 if you have the `strtoul' function. */
-#undef HAVE_STRTOUL
-
 /* Define to 1 if you have the <sys/soundcard.h> header file. */
 #undef HAVE_SYS_SOUNDCARD_H
 
@@ -176,12 +140,6 @@
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
 
-/* Define to symbol prefix, if any */
-#undef SYMBOL_PREFIX
-
-/* Define if character set detection enabled */
-#undef USE_CHARDET
-
 /* Define if building with IPv6 support */
 #undef USE_IPV6

audacious-plugins-3.0.3.tar.bz2/configure -> audacious-plugins-3.1.tar.bz2/configure Changed

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for audacious-plugins 3.0.3.
+# Generated by GNU Autoconf 2.68 for audacious-plugins 3.1.
 #
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -559,8 +559,8 @@
 # Identity of this package.
 PACKAGE_NAME='audacious-plugins'
 PACKAGE_TARNAME='audacious-plugins'
-PACKAGE_VERSION='3.0.3'
-PACKAGE_STRING='audacious-plugins 3.0.3'
+PACKAGE_VERSION='3.1'
+PACKAGE_STRING='audacious-plugins 3.1'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -620,13 +620,6 @@
 OUTPUT_PLUGIN_DIR
 INPUT_PLUGIN_DIR
 plugindir
-HAVE_SOLARIS_FALSE
-HAVE_SOLARIS_TRUE
-USE_X86ASM_FALSE
-USE_X86ASM_TRUE
-ARCH_X86_FALSE
-ARCH_X86_TRUE
-ARCH_DEFINES
 GLIB214_LIBS
 GLIB214_CFLAGS
 BS2B_LIBS
@@ -635,8 +628,6 @@
 FILEWRITER_CFLAGS
 FLAC_LIBS
 FLAC_CFLAGS
-GTK218_LIBS
-GTK218_CFLAGS
 CUE_LIBS
 CUE_CFLAGS
 XML_LIBS
@@ -649,10 +640,6 @@
 NEON_CFLAGS
 CURL_LIBS
 CURL_CFLAGS
-HAVE_LINUX_JOYSTICK_FALSE
-HAVE_LINUX_JOYSTICK_TRUE
-HAVE_CDROM_FALSE
-HAVE_CDROM_TRUE
 CDDB_LIBS
 CDDB_CFLAGS
 CDIO_LIBS
@@ -668,8 +655,6 @@
 SDL_CONFIG
 ALSA_LIBS
 ALSA_CFLAGS
-OSS4_CPPFLAGS
-OSS_LIBS
 OSS_CFLAGS
 CXXCPP
 BUILDERS_LIBS
@@ -719,29 +704,6 @@
 LIBROAR_CFLAGS
 PULSE_LIBS
 PULSE_CFLAGS
-CLEAN_LIB
-UNINSTALL_LIB
-INSTALL_LIB
-PLUGIN_SUFFIX
-PLUGIN_LDFLAGS
-PLUGIN_CFLAGS
-LDFLAGS_RPATH
-LIB_SUFFIX
-LIB_PREFIX
-LIB_LDFLAGS
-LIB_CFLAGS
-TERM_SETAF6
-TERM_SETAF4
-TERM_SETAF3
-TERM_SETAF2
-TERM_SETAF1
-TERM_BOLD
-TERM_SGR0
-TERM_EL
-TPUT
-USE_CHARDET
-USE_CHARDET_FALSE
-USE_CHARDET_TRUE
 USE_IPV6
 USE_IPV6_FALSE
 USE_IPV6_TRUE
@@ -749,26 +711,10 @@
 PTHREAD_LIBS
 GIO_LIBS
 GIO_CFLAGS
-SIMD_CFLAGS
-LIBMCS_LIBS
-LIBMCS_CFLAGS
-MOWGLI_LIBS
-MOWGLI_CFLAGS
-CAIRO_LIBS
-CAIRO_CFLAGS
-PANGO_LIBS
-PANGO_CFLAGS
-GLIB_LIBS
-GLIB_CFLAGS
-MAKE
 GTK_LIBS
 GTK_CFLAGS
-PC_REQUIRES
 AUDACIOUS_LIBS
 AUDACIOUS_CFLAGS
-PKG_CONFIG_LIBDIR
-PKG_CONFIG_PATH
-PKG_CONFIG
 POSUB
 LTLIBINTL
 LIBINTL
@@ -791,6 +737,41 @@
 INSTALL_DATA
 INSTALL_SCRIPT
 INSTALL_PROGRAM
+CLEAN_LIB
+UNINSTALL_LIB
+INSTALL_LIB
+PLUGIN_SUFFIX
+PLUGIN_LDFLAGS
+PLUGIN_CFLAGS
+LDFLAGS_RPATH
+LIB_SUFFIX
+LIB_PREFIX
+LIB_LDFLAGS
+LIB_CFLAGS
+TERM_SETAF6
+TERM_SETAF4
+TERM_SETAF3
+TERM_SETAF2
+TERM_SETAF1
+TERM_BOLD
+TERM_SGR0
+TERM_EL
+TPUT
+MOWGLI_LIBS
+MOWGLI_CFLAGS
+CAIRO_LIBS
+CAIRO_CFLAGS
+PANGO_LIBS
+PANGO_CFLAGS
+GTHREAD_LIBS
+GTHREAD_CFLAGS
+PC_REQUIRES
+GLIB_LIBS
+GLIB_CFLAGS
+PKG_CONFIG_LIBDIR
+PKG_CONFIG_PATH
+PKG_CONFIG
+WINDRES
 RANLIB
 TR
 AR
@@ -799,6 +780,10 @@
 RM
 SET_MAKE
 LN_S
+MAKE
+EGREP
+GREP
+CPP
 am__fastdepCCAS_FALSE
 am__fastdepCCAS_TRUE
 CCASDEPMODE
@@ -811,9 +796,6 @@
 am__leading_dot
 CCASFLAGS
 CCAS
-EGREP
-GREP
-CPP
 ac_ct_CXX
 CXXFLAGS
 CXX
@@ -824,8 +806,6 @@
 LDFLAGS
 CFLAGS
 CC
-VERSION
-PACKAGE
 target_os
 target_vendor
 target_cpu
@@ -838,6 +818,8 @@
 build_vendor
 build_cpu
 build
+VERSION
+PACKAGE
 target_alias
 host_alias
 build_alias
@@ -879,21 +861,16 @@
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
-enable_largefile
 enable_dependency_tracking
+enable_largefile
 enable_nls
 with_gnu_ld
 enable_rpath
 with_libiconv_prefix
 with_libintl_prefix
-with_dev_dsp
-with_dev_mixer
 enable_gtk3
-enable_sse2
-enable_altivec
 enable_gio
 enable_ipv6
-enable_chardet
 enable_console
 enable_xsf
 enable_pulse
@@ -905,7 +882,6 @@
 enable_psf
 enable_usf
 enable_mp3
-enable_rocklight
 enable_hotkey
 enable_gnomeshortcuts
 enable_songchange
@@ -949,7 +925,6 @@
 enable_smb
 enable_mtp_up
 enable_cue
-enable_moodbar
 enable_filewriter
 enable_filewriter_mp3
 enable_filewriter_vorbis
@@ -971,26 +946,26 @@
 CXX
 CXXFLAGS
 CCC
-CPP
 CCAS
 CCASFLAGS
+CPP
 PKG_CONFIG
 PKG_CONFIG_PATH
 PKG_CONFIG_LIBDIR
-AUDACIOUS_CFLAGS
-AUDACIOUS_LIBS
-GTK_CFLAGS
-GTK_LIBS
 GLIB_CFLAGS
 GLIB_LIBS
+GTHREAD_CFLAGS
+GTHREAD_LIBS
 PANGO_CFLAGS
 PANGO_LIBS
 CAIRO_CFLAGS
 CAIRO_LIBS
 MOWGLI_CFLAGS
 MOWGLI_LIBS
-LIBMCS_CFLAGS
-LIBMCS_LIBS
+AUDACIOUS_CFLAGS
+AUDACIOUS_LIBS
+GTK_CFLAGS
+GTK_LIBS
 GIO_CFLAGS
 GIO_LIBS
 PULSE_CFLAGS
@@ -1054,8 +1029,6 @@
 XML_LIBS
 CUE_CFLAGS
 CUE_LIBS
-GTK218_CFLAGS
-GTK218_LIBS
 FLAC_CFLAGS
 FLAC_LIBS
 BS2B_CFLAGS
@@ -1604,7 +1577,7 @@
 # Omit some internal or obsolete options to make the list less imposing.
 # This message is too long to be a string in the A/UX 3.1 sh.
 cat <<_ACEOF
-\`configure' configures audacious-plugins 3.0.3 to adapt to many kinds of systems.
+\`configure' configures audacious-plugins 3.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1671,7 +1644,7 @@
 
 if test -n "$ac_init_help"; then
 case $ac_init_help in
- short | recursive ) echo "Configuration of audacious-plugins 3.0.3:";;
+ short | recursive ) echo "Configuration of audacious-plugins 3.1:";;
 esac
 cat <<\_ACEOF
 
@@ -1679,17 +1652,14 @@
 --disable-option-checking ignore unrecognized --enable/--with options
 --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
 --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
- --disable-largefile omit support for large files
 --disable-dependency-tracking speeds up one-time build
 --enable-dependency-tracking do not reject slow dependency extractors
+ --disable-largefile omit support for large files
 --disable-nls do not use Native Language Support
 --disable-rpath do not hardcode runtime library paths
 --disable-gtk3 Use GTK2 even if GTK3 is present
- --disable-sse2 Disable SSE2 support (def: enabled)
- --disable-altivec Disable AltiVec support (def: enabled)
 --enable-gio enable GIO support (default=disabled)
 --enable-ipv6		 enable IPv6 support (default=no)
- --enable-chardet	 enable character set detection support (default=no)
 --disable-console disable game music decoder (console)
 --disable-xsf disable Nintendo DS audio decoder (xsf)
 --disable-pulse disable PulseAudio output plugin (default=enabled)
@@ -1701,7 +1671,6 @@
 --disable-psf disable PlayStation (psf/psf2) audio decoder
 --enable-usf enable the USF input plugin (default=disabled)
 --disable-mp3 disable MP3 plugin (default=enabled)
- --disable-rocklight disable Rocklight vis plugin (default=enabled)
 --disable-hotkey disable global hotkey plugin (default=enabled)
 --disable-gnomeshortcuts disable gnome shortcuts (default=enabled)
 --disable-songchange disable song change plugin
@@ -1719,8 +1688,8 @@
 --disable-ffaudio disable ffaudio plugin (default=enabled)
 --disable-jack disable JACK output plugin (default=enabled)
 --disable-sid disable SID input plugin (default=enabled)
- --disable-oss disable the OSS output plugin (default=enabled)
- --disable-oss4 disable the OSS4 output plugin
+ --enable-oss enable OSS3 output plugin
+ --disable-oss4 disable OSS4 output plugin
 --disable-alsa disable ALSA output plugin
 --disable-sdlout disable SDL output plugin
 --disable-sdltest Do not try to compile and run a test SDL program
@@ -1731,10 +1700,9 @@
 --disable-scrobbler disable Scrobbler plugin (default=enabled)
 --disable-neon disable neon HTTP support (default=enabled)
 --disable-mms disable mms support. (default=enabled)
- --disable-smb disable SMB transport (default=enabled)
+ --enable-smb enable SMB transport (default=disabled)
 --disable-mtp_up disable mtp upload support. (default=enabled)
 --disable-cue disable cue support. (default=enabled)
- --disable-moodbar disable Moodbar data renderer (default=enabled)
 --disable-filewriter disable FileWriter output plugin (default=enabled)
 --disable-filewriter_mp3 disable FileWriter MP3 output part (default=enabled)
 --disable-filewriter_vorbis disable FileWriter Vorbis output part (default=enabled)
@@ -1753,8 +1721,6 @@
 --without-libiconv-prefix don't search for libiconv in includedir and libdir
 --with-libintl-prefix[=DIR] search for libintl in DIR/include and DIR/lib
 --without-libintl-prefix don't search for libintl in includedir and libdir
- --with-dev-dsp=path Path to OSS DSP data pipe, default is /dev/dsp.
- --with-dev-mixer=path Path to OSS sound mixer, default is /dev/mixer.
 --with-sidplay1=PREFIX Enable libSIDPlay1 with install-PREFIX
 --with-sidplay1-inc=DIR Where the libSIDPlay1 headers are located
 --with-sidplay1-lib=DIR Where the libSIDPlay1 library is installed
@@ -1777,22 +1743,20 @@
 you have headers in a nonstandard directory <include dir>
 CXX C++ compiler command
 CXXFLAGS C++ compiler flags
- CPP C preprocessor
 CCAS assembler compiler command (defaults to CC)
 CCASFLAGS assembler compiler flags (defaults to CFLAGS)
+ CPP C preprocessor
 PKG_CONFIG path to pkg-config utility
 PKG_CONFIG_PATH
 directories to add to pkg-config's search path
 PKG_CONFIG_LIBDIR
 path overriding pkg-config's built-in search path
- AUDACIOUS_CFLAGS
- C compiler flags for AUDACIOUS, overriding pkg-config
- AUDACIOUS_LIBS
- linker flags for AUDACIOUS, overriding pkg-config
- GTK_CFLAGS C compiler flags for GTK, overriding pkg-config
- GTK_LIBS linker flags for GTK, overriding pkg-config
 GLIB_CFLAGS C compiler flags for GLIB, overriding pkg-config
 GLIB_LIBS linker flags for GLIB, overriding pkg-config
+ GTHREAD_CFLAGS
+ C compiler flags for GTHREAD, overriding pkg-config
+ GTHREAD_LIBS
+ linker flags for GTHREAD, overriding pkg-config
 PANGO_CFLAGS
 C compiler flags for PANGO, overriding pkg-config
 PANGO_LIBS linker flags for PANGO, overriding pkg-config
@@ -1802,9 +1766,12 @@
 MOWGLI_CFLAGS
 C compiler flags for MOWGLI, overriding pkg-config
 MOWGLI_LIBS linker flags for MOWGLI, overriding pkg-config
- LIBMCS_CFLAGS
- C compiler flags for LIBMCS, overriding pkg-config
- LIBMCS_LIBS linker flags for LIBMCS, overriding pkg-config
+ AUDACIOUS_CFLAGS
+ C compiler flags for AUDACIOUS, overriding pkg-config
+ AUDACIOUS_LIBS
+ linker flags for AUDACIOUS, overriding pkg-config
+ GTK_CFLAGS C compiler flags for GTK, overriding pkg-config
+ GTK_LIBS linker flags for GTK, overriding pkg-config
 GIO_CFLAGS C compiler flags for GIO, overriding pkg-config
 GIO_LIBS linker flags for GIO, overriding pkg-config
 PULSE_CFLAGS
@@ -1898,9 +1865,6 @@
 XML_LIBS linker flags for XML, overriding pkg-config
 CUE_CFLAGS C compiler flags for CUE, overriding pkg-config
 CUE_LIBS linker flags for CUE, overriding pkg-config
- GTK218_CFLAGS
- C compiler flags for GTK218, overriding pkg-config
- GTK218_LIBS linker flags for GTK218, overriding pkg-config
 FLAC_CFLAGS C compiler flags for FLAC, overriding pkg-config
 FLAC_LIBS linker flags for FLAC, overriding pkg-config
 BS2B_CFLAGS C compiler flags for BS2B, overriding pkg-config
@@ -1976,7 +1940,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
 cat <<\_ACEOF
-audacious-plugins configure 3.0.3
+audacious-plugins configure 3.1
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2068,52 +2032,6 @@
 
 } # ac_fn_cxx_try_compile
 
-# ac_fn_c_try_link LINENO
-# -----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_link ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { { ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_link") 2>conftest.err
- ac_status=$?
- if test -s conftest.err; then
- grep -v '^ *+' conftest.err >conftest.er1
- cat conftest.er1 >&5
- mv -f conftest.er1 conftest.err
- fi
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
- }; then :
- ac_retval=0
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
- # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
- # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
- # interfere with the next link command; also delete a directory that is
- # left behind by Apple's compiler. We do this before executing the actions.
- rm -rf conftest.dSYM conftest_ipa8_conftest.oo
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
- as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_link
-
 # ac_fn_c_try_run LINENO
 # ----------------------
 # Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
@@ -2224,6 +2142,52 @@
 
 } # ac_fn_c_check_header_compile
 
+# ac_fn_c_try_link LINENO
+# -----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_link ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { { ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_link") 2>conftest.err
+ ac_status=$?
+ if test -s conftest.err; then
+ grep -v '^ *+' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ mv -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+ }; then :
+ ac_retval=0
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+ # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+ # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+ # interfere with the next link command; also delete a directory that is
+ # left behind by Apple's compiler. We do this before executing the actions.
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_link
+
 # ac_fn_c_check_func LINENO FUNC VAR
 # ----------------------------------
 # Tests whether FUNC exists, setting the cache variable VAR accordingly
@@ -2510,7 +2474,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by audacious-plugins $as_me 3.0.3, which was
+It was created by audacious-plugins $as_me 3.1, which was
 generated by GNU Autoconf 2.68. Invocation command line was
 
 $ $0 $@
@@ -2861,6 +2825,20 @@
 
 
 
+PACKAGE=audacious-plugins
+
+VERSION=3.1
+
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE "$PACKAGE"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define VERSION "$VERSION"
+_ACEOF
+
 
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -3004,31 +2982,6 @@
 ac_config_headers="$ac_config_headers config.h"
 
 
-if test -d "/usr/X11R6/include"; then
-	CPPFLAGS="$CPPFLAGS -I/usr/X11R6/include"
-fi
-
-if test "x$prefix" != "xNONE" ; then
- CPPFLAGS="$CPPFLAGS -I${includedir}"
-fi
-
-PACKAGE=audacious-plugins
-
-VERSION=3.0.3
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE "$PACKAGE"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define VERSION "$VERSION"
-_ACEOF
-
-
-
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -4076,63 +4029,210 @@
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
+rm -rf .tst 2>/dev/null
+mkdir .tst 2>/dev/null
+if test -d .tst; then
+ am__leading_dot=.
+else
+ am__leading_dot=_
+fi
+rmdir .tst 2>/dev/null
+
+DEPDIR="${am__leading_dot}deps"
+
+ac_config_commands="$ac_config_commands depfiles"
+
+
+am_make=${MAKE-make}
+cat > confinc << 'END'
+am__doit:
+	@echo this is the am__doit target
+.PHONY: am__doit
+END
+# If we don't find an include directive, just comment out the code.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
+$as_echo_n "checking for style of include used by $am_make... " >&6; }
+am__include="#"
+am__quote=
+_am_result=none
+# First try GNU make style include.
+echo "include confinc" > confmf
+# Ignore all kinds of additional output from `make'.
+case `$am_make -s -f confmf 2> /dev/null` in #(
+*the\ am__doit\ target*)
+ am__include=include
+ am__quote=
+ _am_result=GNU
+ ;;
+esac
+# Now try BSD make style include.
+if test "$am__include" = "#"; then
+ echo '.include "confinc"' > confmf
+ case `$am_make -s -f confmf 2> /dev/null` in #(
+ *the\ am__doit\ target*)
+ am__include=.include
+ am__quote="\""
+ _am_result=BSD
+ ;;
+ esac
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
+$as_echo "$_am_result" >&6; }
+rm -f confinc confmf
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5
-$as_echo_n "checking for library containing strerror... " >&6; }
-if ${ac_cv_search_strerror+:} false; then :
+# Check whether --enable-dependency-tracking was given.
+if test "${enable_dependency_tracking+set}" = set; then :
+ enableval=$enable_dependency_tracking;
+fi
+
+if test "x$enable_dependency_tracking" != xno; then
+ am_depcomp="$ac_aux_dir/depcomp"
+ AMDEPBACKSLASH='\'
+fi
+ if test "x$enable_dependency_tracking" != xno; then
+ AMDEP_TRUE=
+ AMDEP_FALSE='#'
+else
+ AMDEP_TRUE='#'
+ AMDEP_FALSE=
+fi
+
+
+# By default we simply use the C compiler to build assembly code.
+
+test "${CCAS+set}" = set || CCAS=$CC
+test "${CCASFLAGS+set}" = set || CCASFLAGS=$CFLAGS
+
+
+
+depcc="$CCAS" am_compiler_list=
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+$as_echo_n "checking dependency style of $depcc... " >&6; }
+if ${am_cv_CCAS_dependencies_compiler_type+:} false; then :
 $as_echo_n "(cached) " >&6
 else
- ac_func_search_save_LIBS=$LIBS
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+ if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+ # We make a subdir and do the tests there. Otherwise we can end up
+ # making bogus files that we don't know about and never remove. For
+ # instance it was reported that on HP-UX the gcc test will end up
+ # making a dummy file named `D' -- because `-MD' means `put the output
+ # in D'.
+ mkdir conftest.dir
+ # Copy depcomp to subdir because otherwise we won't find it if we're
+ # using a relative directory.
+ cp "$am_depcomp" conftest.dir
+ cd conftest.dir
+ # We will build objects and dependencies in a subdirectory because
+ # it helps to detect inapplicable dependency modes. For instance
+ # both Tru64's cc and ICC support -MD to output dependencies as a
+ # side effect of compilation, but ICC will put the dependencies in
+ # the current directory while Tru64 will put them in the object
+ # directory.
+ mkdir sub
 
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char strerror ();
-int
-main ()
-{
-return strerror ();
- ;
- return 0;
-}
-_ACEOF
-for ac_lib in '' cposix; do
- if test -z "$ac_lib"; then
- ac_res="none required"
- else
- ac_res=-l$ac_lib
- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+ am_cv_CCAS_dependencies_compiler_type=none
+ if test "$am_compiler_list" = ""; then
+ am_compiler_list=`sed -n 's/^#*$[a-zA-Z0-9]*$)$/\1/p' < ./depcomp`
 fi
- if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_search_strerror=$ac_res
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext
- if ${ac_cv_search_strerror+:} false; then :
- break
-fi
-done
-if ${ac_cv_search_strerror+:} false; then :
+ am__universal=false
+
+
+ for depmode in $am_compiler_list; do
+ # Setup a source with many dependencies, because some compilers
+ # like to wrap large dependency lists on column 80 (with \), and
+ # we should not choose a depcomp mode which is confused by this.
+ #
+ # We need to recreate these files for each test, as the compiler may
+ # overwrite some of them when testing with obscure command lines.
+ # This happens at least with the AIX C compiler.
+ : > sub/conftest.c
+ for i in 1 2 3 4 5 6; do
+ echo '#include "conftst'$i'.h"' >> sub/conftest.c
+ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+ # Solaris 8's {/usr,}/bin/sh.
+ touch sub/conftst$i.h
+ done
+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+ # We check with `-c' and `-o' for the sake of the "dashmstdout"
+ # mode. It turns out that the SunPro C++ compiler does not properly
+ # handle `-M -o', and we need to detect this. Also, some Intel
+ # versions had trouble with output in subdirs
+ am__obj=sub/conftest.${OBJEXT-o}
+ am__minus_obj="-o $am__obj"
+ case $depmode in
+ gcc)
+ # This depmode causes a compiler race in universal mode.
+ test "$am__universal" = false || continue
+ ;;
+ nosideeffect)
+ # after this tag, mechanisms are not by side-effect, so they'll
+ # only be used when explicitly requested
+ if test "x$enable_dependency_tracking" = xyes; then
+	continue
+ else
+	break
+ fi
+ ;;
+ msvisualcpp | msvcmsys)
+ # This compiler won't grok `-c -o', but also, the minuso test has
+ # not run yet. These depmodes are late enough in the game, and
+ # so weak that their functioning should not be impacted.
+ am__obj=conftest.${OBJEXT-o}
+ am__minus_obj=
+ ;;
+ none) break ;;
+ esac
+ if depmode=$depmode \
+ source=sub/conftest.c object=$am__obj \
+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+ >/dev/null 2>conftest.err &&
+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+ grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+ # icc doesn't choke on unknown options, it will just issue warnings
+ # or remarks (even with -Werror). So we grep stderr for any message
+ # that says an option was ignored or not supported.
+ # When given -MP, icc 7.0 and 7.1 complain thusly:
+ # icc: Command line warning: ignoring option '-M'; no argument required
+ # The diagnosis changed in icc 8.0:
+ # icc: Command line remark: option '-MP' not supported
+ if (grep 'ignoring option' conftest.err ||
+ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+ am_cv_CCAS_dependencies_compiler_type=$depmode
+ break
+ fi
+ fi
+ done
 
+ cd ..
+ rm -rf conftest.dir
 else
- ac_cv_search_strerror=no
+ am_cv_CCAS_dependencies_compiler_type=none
 fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
+
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_strerror" >&5
-$as_echo "$ac_cv_search_strerror" >&6; }
-ac_res=$ac_cv_search_strerror
-if test "$ac_res" != no; then :
- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CCAS_dependencies_compiler_type" >&5
+$as_echo "$am_cv_CCAS_dependencies_compiler_type" >&6; }
+CCASDEPMODE=depmode=$am_cv_CCAS_dependencies_compiler_type
 
+ if
+ test "x$enable_dependency_tracking" != xno \
+ && test "$am_cv_CCAS_dependencies_compiler_type" = gcc3; then
+ am__fastdepCCAS_TRUE=
+ am__fastdepCCAS_FALSE='#'
+else
+ am__fastdepCCAS_TRUE='#'
+ am__fastdepCCAS_FALSE=
 fi
 
+
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -4754,13 +4854,6 @@
 presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
 esac
 
-
-if test "x$GCC" = "xyes"; then
-	CFLAGS="$CFLAGS -pipe -Wall"
-	CXXFLAGS="$CXXFLAGS -pipe -Wall"
-fi
-
-
 # Check whether --enable-largefile was given.
 if test "${enable_largefile+set}" = set; then :
 enableval=$enable_largefile;
@@ -4962,27 +5055,32 @@
 
 
 
-GCC42_CFLAGS="-fgnu89-inline"
-for ac_prog in ${ac_tool_prefix}gcc ${ac_tool_prefix}cc
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
+
+
+
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
+if ${ac_cv_path_PKG_CONFIG+:} false; then :
 $as_echo_n "(cached) " >&6
 else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ case $PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CC="$ac_prog"
+ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
 fi
@@ -4990,248 +5088,173 @@
 done
 IFS=$as_save_IFS
 
+ ;;
+esac
 fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
 else
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
- test -n "$CC" && break
-done
-
-if test -z "$CC"; then
- ac_verc_fail=yes
-else
- # Found it, now check the version.
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking version of $CC" >&5
-$as_echo_n "checking version of $CC... " >&6; }
- ac_prog_version=`$CC -v 2>&1 | sed -n 's/^.*version $[egcygnustpi-]*[0-9.]*$.*$/\1/p'`
- case $ac_prog_version in
- '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
- 4.[2-9]* )
- ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
- *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
-
- esac
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_prog_version" >&5
-$as_echo "$ac_prog_version" >&6; }
-fi
-if test $ac_verc_fail = yes; then
- GCC42_CFLAGS=""
 fi
-
-
-
-rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
- am__leading_dot=.
+if test -z "$ac_cv_path_PKG_CONFIG"; then
+ ac_pt_PKG_CONFIG=$PKG_CONFIG
+ # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
+ $as_echo_n "(cached) " >&6
 else
- am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-
-DEPDIR="${am__leading_dot}deps"
-
-ac_config_commands="$ac_config_commands depfiles"
-
+ case $ac_pt_PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
 
-am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
-	@echo this is the am__doit target
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
-$as_echo_n "checking for style of include used by $am_make... " >&6; }
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# Ignore all kinds of additional output from `make'.
-case `$am_make -s -f confmf 2> /dev/null` in #(
-*the\ am__doit\ target*)
- am__include=include
- am__quote=
- _am_result=GNU
 ;;
 esac
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
- echo '.include "confinc"' > confmf
- case `$am_make -s -f confmf 2> /dev/null` in #(
- *the\ am__doit\ target*)
- am__include=.include
- am__quote="\""
- _am_result=BSD
- ;;
- esac
+fi
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+if test -n "$ac_pt_PKG_CONFIG"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
-$as_echo "$_am_result" >&6; }
-rm -f confinc confmf
-
-# Check whether --enable-dependency-tracking was given.
-if test "${enable_dependency_tracking+set}" = set; then :
- enableval=$enable_dependency_tracking;
+ if test "x$ac_pt_PKG_CONFIG" = x; then
+ PKG_CONFIG=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ PKG_CONFIG=$ac_pt_PKG_CONFIG
+ fi
+else
+ PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
 fi
 
-if test "x$enable_dependency_tracking" != xno; then
- am_depcomp="$ac_aux_dir/depcomp"
- AMDEPBACKSLASH='\'
 fi
- if test "x$enable_dependency_tracking" != xno; then
- AMDEP_TRUE=
- AMDEP_FALSE='#'
-else
- AMDEP_TRUE='#'
- AMDEP_FALSE=
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=0.9.0
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	else
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+		PKG_CONFIG=""
+	fi
 fi
 
 
-# By default we simply use the C compiler to build assembly code.
 
-test "${CCAS+set}" = set || CCAS=$CC
-test "${CCASFLAGS+set}" = set || CCASFLAGS=$CFLAGS
 
 
 
-depcc="$CCAS" am_compiler_list=
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
-$as_echo_n "checking dependency style of $depcc... " >&6; }
-if ${am_cv_CCAS_dependencies_compiler_type+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
- # We make a subdir and do the tests there. Otherwise we can end up
- # making bogus files that we don't know about and never remove. For
- # instance it was reported that on HP-UX the gcc test will end up
- # making a dummy file named `D' -- because `-MD' means `put the output
- # in D'.
- mkdir conftest.dir
- # Copy depcomp to subdir because otherwise we won't find it if we're
- # using a relative directory.
- cp "$am_depcomp" conftest.dir
- cd conftest.dir
- # We will build objects and dependencies in a subdirectory because
- # it helps to detect inapplicable dependency modes. For instance
- # both Tru64's cc and ICC support -MD to output dependencies as a
- # side effect of compilation, but ICC will put the dependencies in
- # the current directory while Tru64 will put them in the object
- # directory.
- mkdir sub
 
- am_cv_CCAS_dependencies_compiler_type=none
- if test "$am_compiler_list" = ""; then
- am_compiler_list=`sed -n 's/^#*$[a-zA-Z0-9]*$)$/\1/p' < ./depcomp`
- fi
- am__universal=false
+if test "x$GCC" = "xyes"; then
+ CFLAGS="$CFLAGS -Wall -pipe"
+ CXXFLAGS="$CXXFLAGS -Wall -pipe"
 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C/C++ compiler supports -Wtype-limits" >&5
+$as_echo_n "checking whether the C/C++ compiler supports -Wtype-limits... " >&6; }
+ OLDCFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -Wtype-limits -Werror"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
 
- for depmode in $am_compiler_list; do
- # Setup a source with many dependencies, because some compilers
- # like to wrap large dependency lists on column 80 (with \), and
- # we should not choose a depcomp mode which is confused by this.
- #
- # We need to recreate these files for each test, as the compiler may
- # overwrite some of them when testing with obscure command lines.
- # This happens at least with the AIX C compiler.
- : > sub/conftest.c
- for i in 1 2 3 4 5 6; do
- echo '#include "conftst'$i'.h"' >> sub/conftest.c
- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
- # Solaris 8's {/usr,}/bin/sh.
- touch sub/conftst$i.h
- done
- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+int
+main ()
+{
+return 0;
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
 
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
- # mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this. Also, some Intel
- # versions had trouble with output in subdirs
- am__obj=sub/conftest.${OBJEXT-o}
- am__minus_obj="-o $am__obj"
- case $depmode in
- gcc)
- # This depmode causes a compiler race in universal mode.
- test "$am__universal" = false || continue
- ;;
- nosideeffect)
- # after this tag, mechanisms are not by side-effect, so they'll
- # only be used when explicitly requested
- if test "x$enable_dependency_tracking" = xyes; then
-	continue
- else
-	break
- fi
- ;;
- msvisualcpp | msvcmsys)
- # This compiler won't grok `-c -o', but also, the minuso test has
- # not run yet. These depmodes are late enough in the game, and
- # so weak that their functioning should not be impacted.
- am__obj=conftest.${OBJEXT-o}
- am__minus_obj=
- ;;
- none) break ;;
- esac
- if depmode=$depmode \
- source=sub/conftest.c object=$am__obj \
- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
- $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
- >/dev/null 2>conftest.err &&
- grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
- grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
- # icc doesn't choke on unknown options, it will just issue warnings
- # or remarks (even with -Werror). So we grep stderr for any message
- # that says an option was ignored or not supported.
- # When given -MP, icc 7.0 and 7.1 complain thusly:
- # icc: Command line warning: ignoring option '-M'; no argument required
- # The diagnosis changed in icc 8.0:
- # icc: Command line remark: option '-MP' not supported
- if (grep 'ignoring option' conftest.err ||
- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
- am_cv_CCAS_dependencies_compiler_type=$depmode
- break
- fi
- fi
- done
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ CFLAGS="$OLDCFLAGS -Wtype-limits"
+ CXXFLAGS="$CXXFLAGS -Wtype-limits"
 
- cd ..
- rm -rf conftest.dir
 else
- am_cv_CCAS_dependencies_compiler_type=none
-fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ CFLAGS="$OLDCFLAGS"
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CCAS_dependencies_compiler_type" >&5
-$as_echo "$am_cv_CCAS_dependencies_compiler_type" >&6; }
-CCASDEPMODE=depmode=$am_cv_CCAS_dependencies_compiler_type
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
- if
- test "x$enable_dependency_tracking" != xno \
- && test "$am_cv_CCAS_dependencies_compiler_type" = gcc3; then
- am__fastdepCCAS_TRUE=
- am__fastdepCCAS_FALSE='#'
-else
- am__fastdepCCAS_TRUE='#'
- am__fastdepCCAS_FALSE=
 fi
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Linux" >&5
+$as_echo_n "checking for Linux... " >&6; }
+case "$target" in
+ *linux*)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ LDFLAGS="$LDFLAGS -z defs"
+ ;;
+ *)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ ;;
+esac
 
 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU make" >&5
+$as_echo_n "checking for GNU make... " >&6; }
+if ${_cv_gnu_make_command+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+
+ _cv_gnu_make_command=""
+ for a in "$MAKE" make gmake gnumake; do
+ test "x$a" = "x" && continue
+ if ( sh -c "$a --version" 2>/dev/null | grep "GNU Make" >/dev/null ) ; then
+ _cv_gnu_make_command="$a"
+ break
+ fi
+ done
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_cv_gnu_make_command" >&5
+$as_echo "$_cv_gnu_make_command" >&6; }
+ if test "x$_cv_gnu_make_command" != "x" ; then
+ MAKE="$_cv_gnu_make_command"
+ else
+ as_fn_error $? "** GNU make not found. If it is installed, try setting MAKE environment variable. **" "$LINENO" 5
+ fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
 $as_echo_n "checking whether ln -s works... " >&6; }
@@ -5275,7 +5298,6 @@
 SET_MAKE="MAKE=${MAKE-make}"
 fi
 
-
 # Extract the first word of "rm", so it can be a program name with args.
 set dummy rm; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -5516,6 +5538,891 @@
 fi
 
 
+# Extract the first word of "windres", so it can be a program name with args.
+set dummy windres; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_WINDRES+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $WINDRES in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_WINDRES="$WINDRES" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_WINDRES="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+WINDRES=$ac_cv_path_WINDRES
+if test -n "$WINDRES"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WINDRES" >&5
+$as_echo "$WINDRES" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+
+
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB" >&5
+$as_echo_n "checking for GLIB... " >&6; }
+
+if test -n "$GLIB_CFLAGS"; then
+ pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.16\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.16") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.16" 2>/dev/null`
+		 test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$GLIB_LIBS"; then
+ pkg_cv_GLIB_LIBS="$GLIB_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.16\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.16") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.16" 2>/dev/null`
+		 test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+	 GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.16" 2>&1`
+ else
+	 GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.16" 2>&1`
+ fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$GLIB_PKG_ERRORS" >&5
+
+
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "glib-2.0") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+
+ cv_pkg_version=`$PKG_CONFIG --modversion "glib-2.0" 2>/dev/null`
+ as_fn_error $? "
+Glib2 version $cv_pkg_version was found, but glib-2.0 >= 2.16 is required.
+" "$LINENO" 5
+
+else
+
+ as_fn_error $? "
+Cannot find Glib2! If you are using binary packages based system, check that you
+have the corresponding -dev/devel packages installed.
+" "$LINENO" 5
+
+fi
+
+elif test $pkg_failed = untried; then
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "glib-2.0") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+
+ cv_pkg_version=`$PKG_CONFIG --modversion "glib-2.0" 2>/dev/null`
+ as_fn_error $? "
+Glib2 version $cv_pkg_version was found, but glib-2.0 >= 2.16 is required.
+" "$LINENO" 5
+
+else
+
+ as_fn_error $? "
+Cannot find Glib2! If you are using binary packages based system, check that you
+have the corresponding -dev/devel packages installed.
+" "$LINENO" 5
+
+fi
+
+else
+	GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS
+	GLIB_LIBS=$pkg_cv_GLIB_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+
+ if test "x$PC_REQUIRES" = "x"; then
+ PC_REQUIRES="glib-2.0 >= 2.16"
+ else
+ PC_REQUIRES="$PC_REQUIRES, glib-2.0 >= 2.16"
+ fi
+
+
+
+fi
+
+
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTHREAD" >&5
+$as_echo_n "checking for GTHREAD... " >&6; }
+
+if test -n "$GTHREAD_CFLAGS"; then
+ pkg_cv_GTHREAD_CFLAGS="$GTHREAD_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gthread-2.0 >= 2.16\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gthread-2.0 >= 2.16") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_GTHREAD_CFLAGS=`$PKG_CONFIG --cflags "gthread-2.0 >= 2.16" 2>/dev/null`
+		 test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$GTHREAD_LIBS"; then
+ pkg_cv_GTHREAD_LIBS="$GTHREAD_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gthread-2.0 >= 2.16\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gthread-2.0 >= 2.16") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_GTHREAD_LIBS=`$PKG_CONFIG --libs "gthread-2.0 >= 2.16" 2>/dev/null`
+		 test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+	 GTHREAD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gthread-2.0 >= 2.16" 2>&1`
+ else
+	 GTHREAD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gthread-2.0 >= 2.16" 2>&1`
+ fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$GTHREAD_PKG_ERRORS" >&5
+
+
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gthread-2.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gthread-2.0") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+
+ cv_pkg_version=`$PKG_CONFIG --modversion "gthread-2.0" 2>/dev/null`
+ as_fn_error $? "
+GThread version $cv_pkg_version was found, but gthread-2.0 >= 2.16 is required.
+" "$LINENO" 5
+
+else
+
+ as_fn_error $? "
+Cannot find GThread! If you are using binary packages based system, check that you
+have the corresponding -dev/devel packages installed.
+" "$LINENO" 5
+
+fi
+
+elif test $pkg_failed = untried; then
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gthread-2.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gthread-2.0") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+
+ cv_pkg_version=`$PKG_CONFIG --modversion "gthread-2.0" 2>/dev/null`
+ as_fn_error $? "
+GThread version $cv_pkg_version was found, but gthread-2.0 >= 2.16 is required.
+" "$LINENO" 5
+
+else
+
+ as_fn_error $? "
+Cannot find GThread! If you are using binary packages based system, check that you
+have the corresponding -dev/devel packages installed.
+" "$LINENO" 5
+
+fi
+
+else
+	GTHREAD_CFLAGS=$pkg_cv_GTHREAD_CFLAGS
+	GTHREAD_LIBS=$pkg_cv_GTHREAD_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+
+ if test "x$PC_REQUIRES" = "x"; then
+ PC_REQUIRES="gthread-2.0 >= 2.16"
+ else
+ PC_REQUIRES="$PC_REQUIRES, gthread-2.0 >= 2.16"
+ fi
+
+
+
+fi
+
+
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PANGO" >&5
+$as_echo_n "checking for PANGO... " >&6; }
+
+if test -n "$PANGO_CFLAGS"; then
+ pkg_cv_PANGO_CFLAGS="$PANGO_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pango >= 1.20\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "pango >= 1.20") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_PANGO_CFLAGS=`$PKG_CONFIG --cflags "pango >= 1.20" 2>/dev/null`
+		 test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$PANGO_LIBS"; then
+ pkg_cv_PANGO_LIBS="$PANGO_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pango >= 1.20\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "pango >= 1.20") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_PANGO_LIBS=`$PKG_CONFIG --libs "pango >= 1.20" 2>/dev/null`
+		 test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+	 PANGO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "pango >= 1.20" 2>&1`
+ else
+	 PANGO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "pango >= 1.20" 2>&1`
+ fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$PANGO_PKG_ERRORS" >&5
+
+
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pango\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "pango") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+
+ cv_pkg_version=`$PKG_CONFIG --modversion "pango" 2>/dev/null`
+ as_fn_error $? "
+Pango version $cv_pkg_version was found, but pango >= 1.20 is required.
+" "$LINENO" 5
+
+else
+
+ as_fn_error $? "
+Cannot find Pango! If you are using binary packages based system, check that you
+have the corresponding -dev/devel packages installed.
+" "$LINENO" 5
+
+fi
+
+elif test $pkg_failed = untried; then
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pango\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "pango") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+
+ cv_pkg_version=`$PKG_CONFIG --modversion "pango" 2>/dev/null`
+ as_fn_error $? "
+Pango version $cv_pkg_version was found, but pango >= 1.20 is required.
+" "$LINENO" 5
+
+else
+
+ as_fn_error $? "
+Cannot find Pango! If you are using binary packages based system, check that you
+have the corresponding -dev/devel packages installed.
+" "$LINENO" 5
+
+fi
+
+else
+	PANGO_CFLAGS=$pkg_cv_PANGO_CFLAGS
+	PANGO_LIBS=$pkg_cv_PANGO_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+
+ if test "x$PC_REQUIRES" = "x"; then
+ PC_REQUIRES="pango >= 1.20"
+ else
+ PC_REQUIRES="$PC_REQUIRES, pango >= 1.20"
+ fi
+
+
+
+fi
+
+
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CAIRO" >&5
+$as_echo_n "checking for CAIRO... " >&6; }
+
+if test -n "$CAIRO_CFLAGS"; then
+ pkg_cv_CAIRO_CFLAGS="$CAIRO_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo >= 1.6\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "cairo >= 1.6") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo >= 1.6" 2>/dev/null`
+		 test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$CAIRO_LIBS"; then
+ pkg_cv_CAIRO_LIBS="$CAIRO_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo >= 1.6\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "cairo >= 1.6") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_CAIRO_LIBS=`$PKG_CONFIG --libs "cairo >= 1.6" 2>/dev/null`
+		 test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+	 CAIRO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "cairo >= 1.6" 2>&1`
+ else
+	 CAIRO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "cairo >= 1.6" 2>&1`
+ fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$CAIRO_PKG_ERRORS" >&5
+
+
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "cairo") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+
+ cv_pkg_version=`$PKG_CONFIG --modversion "cairo" 2>/dev/null`
+ as_fn_error $? "
+Cairo version $cv_pkg_version was found, but cairo >= 1.6 is required.
+" "$LINENO" 5
+
+else
+
+ as_fn_error $? "
+Cannot find Cairo! If you are using binary packages based system, check that you
+have the corresponding -dev/devel packages installed.
+" "$LINENO" 5
+
+fi
+
+elif test $pkg_failed = untried; then
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "cairo") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+
+ cv_pkg_version=`$PKG_CONFIG --modversion "cairo" 2>/dev/null`
+ as_fn_error $? "
+Cairo version $cv_pkg_version was found, but cairo >= 1.6 is required.
+" "$LINENO" 5
+
+else
+
+ as_fn_error $? "
+Cannot find Cairo! If you are using binary packages based system, check that you
+have the corresponding -dev/devel packages installed.
+" "$LINENO" 5
+
+fi
+
+else
+	CAIRO_CFLAGS=$pkg_cv_CAIRO_CFLAGS
+	CAIRO_LIBS=$pkg_cv_CAIRO_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+
+ if test "x$PC_REQUIRES" = "x"; then
+ PC_REQUIRES="cairo >= 1.6"
+ else
+ PC_REQUIRES="$PC_REQUIRES, cairo >= 1.6"
+ fi
+
+
+
+fi
+
+
+
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MOWGLI" >&5
+$as_echo_n "checking for MOWGLI... " >&6; }
+
+if test -n "$MOWGLI_CFLAGS"; then
+ pkg_cv_MOWGLI_CFLAGS="$MOWGLI_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmowgli >= 0.9\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libmowgli >= 0.9") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_MOWGLI_CFLAGS=`$PKG_CONFIG --cflags "libmowgli >= 0.9" 2>/dev/null`
+		 test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$MOWGLI_LIBS"; then
+ pkg_cv_MOWGLI_LIBS="$MOWGLI_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmowgli >= 0.9\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libmowgli >= 0.9") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_MOWGLI_LIBS=`$PKG_CONFIG --libs "libmowgli >= 0.9" 2>/dev/null`
+		 test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+	 MOWGLI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libmowgli >= 0.9" 2>&1`
+ else
+	 MOWGLI_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libmowgli >= 0.9" 2>&1`
+ fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$MOWGLI_PKG_ERRORS" >&5
+
+
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmowgli\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libmowgli") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+
+ cv_pkg_version=`$PKG_CONFIG --modversion "libmowgli" 2>/dev/null`
+ as_fn_error $? "
+libmowgli version $cv_pkg_version was found, but libmowgli >= 0.9 is required.
+http://www.atheme.org/projects/mowgli.shtml" "$LINENO" 5
+
+else
+
+ as_fn_error $? "
+Cannot find libmowgli! If you are using binary packages based system, check that you
+have the corresponding -dev/devel packages installed.
+http://www.atheme.org/projects/mowgli.shtml" "$LINENO" 5
+
+fi
+
+elif test $pkg_failed = untried; then
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmowgli\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libmowgli") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+
+ cv_pkg_version=`$PKG_CONFIG --modversion "libmowgli" 2>/dev/null`
+ as_fn_error $? "
+libmowgli version $cv_pkg_version was found, but libmowgli >= 0.9 is required.
+http://www.atheme.org/projects/mowgli.shtml" "$LINENO" 5
+
+else
+
+ as_fn_error $? "
+Cannot find libmowgli! If you are using binary packages based system, check that you
+have the corresponding -dev/devel packages installed.
+http://www.atheme.org/projects/mowgli.shtml" "$LINENO" 5
+
+fi
+
+else
+	MOWGLI_CFLAGS=$pkg_cv_MOWGLI_CFLAGS
+	MOWGLI_LIBS=$pkg_cv_MOWGLI_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+
+ if test "x$PC_REQUIRES" = "x"; then
+ PC_REQUIRES="libmowgli >= 0.9"
+ else
+ PC_REQUIRES="$PC_REQUIRES, libmowgli >= 0.9"
+ fi
+
+
+
+fi
+
+
+
+
+
+	# Extract the first word of "tput", so it can be a program name with args.
+set dummy tput; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_TPUT+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $TPUT in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_TPUT="$TPUT" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_TPUT="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+TPUT=$ac_cv_path_TPUT
+if test -n "$TPUT"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TPUT" >&5
+$as_echo "$TPUT" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+
+	if test x"$TPUT" != x""; then :
+
+		if x=$($TPUT el 2>/dev/null); then
+			TERM_EL="$x"
+
+		else
+			TERM_EL="$($TPUT ce 2>/dev/null)"
+
+		fi
+
+		if x=$($TPUT sgr0 2>/dev/null); then
+			TERM_SGR0="$x"
+
+		else
+			TERM_SGR0="$($TPUT me 2>/dev/null)"
+
+		fi
+
+		if x=$($TPUT bold 2>/dev/null); then
+			TERM_BOLD="$x"
+
+		else
+			TERM_BOLD="$($TPUT md 2>/dev/null)"
+
+		fi
+
+		if x=$($TPUT setaf 1 2>/dev/null); then
+			TERM_SETAF1="$x"
+
+			TERM_SETAF2="$($TPUT setaf 2 2>/dev/null)"
+
+			TERM_SETAF3="$($TPUT setaf 3 2>/dev/null)"
+
+			TERM_SETAF4="$($TPUT setaf 4 2>/dev/null)"
+
+			TERM_SETAF6="$($TPUT setaf 6 2>/dev/null)"
+
+		else
+			TERM_SETAF1="$($TPUT AF 1 2>/dev/null)"
+
+			TERM_SETAF2="$($TPUT AF 2 2>/dev/null)"
+
+			TERM_SETAF3="$($TPUT AF 3 2>/dev/null)"
+
+			TERM_SETAF4="$($TPUT AF 4 2>/dev/null)"
+
+			TERM_SETAF6="$($TPUT AF 6 2>/dev/null)"
+
+		fi
+
+else
+
+		TERM_EL='\033\133K'
+
+		TERM_SGR0='\033\133m'
+
+		TERM_BOLD='\033\1331m'
+
+		TERM_SETAF1='\033\13331m'
+
+		TERM_SETAF2='\033\13332m'
+
+		TERM_SETAF3='\033\13333m'
+
+		TERM_SETAF4='\033\13334m'
+
+		TERM_SETAF6='\033\13336m'
+
+
+fi
+
+
+
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for shared library system" >&5
+$as_echo_n "checking for shared library system... " >&6; }
+	case "$host_os" in
+		darwin*)
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Darwin" >&5
+$as_echo "Darwin" >&6; }
+			LIB_CFLAGS='-fPIC -DPIC'
+			LIB_LDFLAGS='-dynamiclib -current_version ${LIB_MAJOR}.${LIB_MINOR} -compatibility_version ${LIB_MAJOR}'
+			LIB_PREFIX='lib'
+			LIB_SUFFIX='.dylib'
+			LDFLAGS_RPATH='-Wl,-rpath,${libdir}'
+			PLUGIN_CFLAGS='-fPIC -DPIC'
+			PLUGIN_LDFLAGS='-bundle -undefined dynamic_lookup'
+			PLUGIN_SUFFIX='.impl'
+			INSTALL_LIB='&& ${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib && ${LN_S} -f $${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.dylib && ${LN_S} -f $${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib ${DESTDIR}${libdir}/$$i'
+			UNINSTALL_LIB='&& rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.dylib ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib'
+			CLEAN_LIB=''
+			;;
+		solaris*)
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Solaris" >&5
+$as_echo "Solaris" >&6; }
+			LIB_CFLAGS='-fPIC -DPIC'
+			LIB_LDFLAGS='-shared -Wl,-soname=${LIB}.${LIB_MAJOR}.${LIB_MINOR}'
+			LIB_PREFIX='lib'
+			LIB_SUFFIX='.so'
+			LDFLAGS_RPATH='-Wl,-rpath,${libdir}'
+			PLUGIN_CFLAGS='-fPIC -DPIC'
+			PLUGIN_LDFLAGS='-shared'
+			PLUGIN_SUFFIX='.so'
+			INSTALL_LIB='&& ${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR} && rm -f ${DESTDIR}${libdir}/$$i && ${LN_S} $$i.${LIB_MAJOR}.${LIB_MINOR} ${DESTDIR}${libdir}/$$i'
+			UNINSTALL_LIB='&& rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}'
+			CLEAN_LIB=''
+			;;
+		openbsd* | mirbsd*)
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: OpenBSD" >&5
+$as_echo "OpenBSD" >&6; }
+			LIB_CFLAGS='-fPIC -DPIC'
+			LIB_LDFLAGS='-shared'
+			LIB_PREFIX='lib'
+			LIB_SUFFIX='.so.${LIB_MAJOR}.${LIB_MINOR}'
+			LDFLAGS_RPATH='-Wl,-rpath,${libdir}'
+			PLUGIN_CFLAGS='-fPIC -DPIC'
+			PLUGIN_LDFLAGS='-shared'
+			PLUGIN_SUFFIX='.so'
+			INSTALL_LIB='&& ${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i'
+			UNINSTALL_LIB='&& rm -f ${DESTDIR}${libdir}/$$i'
+			CLEAN_LIB=''
+			;;
+		cygwin* | mingw*)
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Win32" >&5
+$as_echo "Win32" >&6; }
+			LIB_CFLAGS=''
+			LIB_LDFLAGS='-shared -Wl,--out-implib,${LIB}.a'
+			LIB_PREFIX='lib'
+			LIB_SUFFIX='.dll'
+			LDFLAGS_RPATH='-Wl,-rpath,${libdir}'
+			PLUGIN_CFLAGS=''
+			PLUGIN_LDFLAGS='-shared'
+			PLUGIN_SUFFIX='.dll'
+			INSTALL_LIB='&& ${MKDIR_P} ${DESTDIR}${bindir} && ${INSTALL} -m 755 $$i ${DESTDIR}${bindir}/$$i && ${INSTALL} -m 755 $$i.a ${DESTDIR}${libdir}/$$i.a'
+			UNINSTALL_LIB='&& rm -f ${DESTDIR}${bindir}/$$i ${DESTDIR}${libdir}/$$i.a'
+			CLEAN_LIB='${LIB}.a'
+			;;
+		*)
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: GNU" >&5
+$as_echo "GNU" >&6; }
+			LIB_CFLAGS='-fPIC -DPIC'
+			LIB_LDFLAGS='-shared -Wl,-soname=${LIB}.${LIB_MAJOR}'
+			LIB_PREFIX='lib'
+			LIB_SUFFIX='.so'
+			LDFLAGS_RPATH='-Wl,-rpath,${libdir}'
+			PLUGIN_CFLAGS='-fPIC -DPIC'
+			PLUGIN_LDFLAGS='-shared'
+			PLUGIN_SUFFIX='.so'
+			INSTALL_LIB='&& ${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}.0 && ${LN_S} -f $$i.${LIB_MAJOR}.${LIB_MINOR}.0 ${DESTDIR}${libdir}/$$i.${LIB_MAJOR} && ${LN_S} -f $$i.${LIB_MAJOR}.${LIB_MINOR}.0 ${DESTDIR}${libdir}/$$i'
+			UNINSTALL_LIB='&& rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR} ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}.0'
+			CLEAN_LIB=''
+			;;
+	esac
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+for ac_func in fcntl fsync mkdtemp
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
 
 # Find a good install program. We prefer a C program (faster),
 # so one script is as good as another. But avoid the broken or
@@ -7677,182 +8584,11 @@
 
 
 
-
-
-for ac_func in fcntl fsync mkdtemp strnlen strtoul
-do :
- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-
-
-
-# Check whether --with-dev-dsp was given.
-if test "${with_dev_dsp+set}" = set; then :
- withval=$with_dev_dsp; dev_dsp=$withval
-else
- dev_dsp=/dev/dsp
-
-fi
-
-
-cat >>confdefs.h <<_ACEOF
-#define DEV_DSP "$dev_dsp"
-_ACEOF
-
-
-
-# Check whether --with-dev-mixer was given.
-if test "${with_dev_mixer+set}" = set; then :
- withval=$with_dev_mixer; dev_mixer=$withval
-else
- dev_mixer=/dev/mixer
-
-fi
-
-
-cat >>confdefs.h <<_ACEOF
-#define DEV_MIXER "$dev_mixer"
-_ACEOF
-
-
-
-INPUT_PLUGINS="tonegen metronom vtx"
-OUTPUT_PLUGINS="null"
-EFFECT_PLUGINS="compressor crossfade crystalizer mixdown sndstretch stereo_plugin voice_removal echo_plugin"
-GENERAL_PLUGINS="albumart"
-VISUALIZATION_PLUGINS="blur_scope cairo-spectrum"
-CONTAINER_PLUGINS="m3u pls asx"
-TRANSPORT_PLUGINS="unix-io"
-
-
-
-
-
-
-
-
-
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-	if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
-set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PKG_CONFIG+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $PKG_CONFIG in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_path_PKG_CONFIG"; then
- ac_pt_PKG_CONFIG=$PKG_CONFIG
- # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $ac_pt_PKG_CONFIG in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
-if test -n "$ac_pt_PKG_CONFIG"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
-$as_echo "$ac_pt_PKG_CONFIG" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+if test "$MSGFMT" = ":" ; then
+ as_fn_error $? "msgfmt was not found; have you installed gettext?" "$LINENO" 5
 fi
 
- if test "x$ac_pt_PKG_CONFIG" = x; then
- PKG_CONFIG=""
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
- PKG_CONFIG=$ac_pt_PKG_CONFIG
- fi
-else
- PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
-fi
 
-fi
-if test -n "$PKG_CONFIG"; then
-	_pkg_min_version=0.9.0
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
-$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
-	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	else
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-		PKG_CONFIG=""
-	fi
-fi
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for AUDACIOUS" >&5
@@ -7862,12 +8598,12 @@
 pkg_cv_AUDACIOUS_CFLAGS="$AUDACIOUS_CFLAGS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"audacious >= 3.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "audacious >= 3.0") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"audacious >= 3.1\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "audacious >= 3.1") 2>&5
 ac_status=$?
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_AUDACIOUS_CFLAGS=`$PKG_CONFIG --cflags "audacious >= 3.0" 2>/dev/null`
+ pkg_cv_AUDACIOUS_CFLAGS=`$PKG_CONFIG --cflags "audacious >= 3.1" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -7879,12 +8615,12 @@
 pkg_cv_AUDACIOUS_LIBS="$AUDACIOUS_LIBS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"audacious >= 3.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "audacious >= 3.0") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"audacious >= 3.1\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "audacious >= 3.1") 2>&5
 ac_status=$?
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_AUDACIOUS_LIBS=`$PKG_CONFIG --libs "audacious >= 3.0" 2>/dev/null`
+ pkg_cv_AUDACIOUS_LIBS=`$PKG_CONFIG --libs "audacious >= 3.1" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -7905,19 +8641,19 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 AUDACIOUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "audacious >= 3.0" 2>&1`
+	 AUDACIOUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "audacious >= 3.1" 2>&1`
 else
-	 AUDACIOUS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "audacious >= 3.0" 2>&1`
+	 AUDACIOUS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "audacious >= 3.1" 2>&1`
 fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$AUDACIOUS_PKG_ERRORS" >&5
 
-	as_fn_error $? "Cannot find Audacious 3.0 or later, have you installed audacious yet?" "$LINENO" 5
+	as_fn_error $? "Cannot find Audacious 3.1; have you installed Audacious yet?" "$LINENO" 5
 
 elif test $pkg_failed = untried; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	as_fn_error $? "Cannot find Audacious 3.0 or later, have you installed audacious yet?" "$LINENO" 5
+	as_fn_error $? "Cannot find Audacious 3.1; have you installed Audacious yet?" "$LINENO" 5
 
 else
 	AUDACIOUS_CFLAGS=$pkg_cv_AUDACIOUS_CFLAGS
@@ -7926,19 +8662,27 @@
 $as_echo "yes" >&6; }
 
 if test "x$PC_REQUIRES" = "x"; then
- PC_REQUIRES="audacious >= 3.0"
+ PC_REQUIRES="audacious >= 3.1"
 else
- PC_REQUIRES="$PC_REQUIRES, audacious >= 3.0"
+ PC_REQUIRES="$PC_REQUIRES, audacious >= 3.1"
 fi
 
 
 fi
 
-CFLAGS="$CFLAGS $AUDACIOUS_CFLAGS"
-CPPFLAGS="$CPPFLAGS $AUDACIOUS_CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $AUDACIOUS_CFLAGS"
 LIBS="$LIBS $AUDACIOUS_LIBS"
 
 
+INPUT_PLUGINS="tonegen metronom vtx"
+OUTPUT_PLUGINS="null"
+EFFECT_PLUGINS="compressor crossfade crystalizer ladspa mixer sndstretch stereo_plugin voice_removal echo_plugin"
+GENERAL_PLUGINS="alarm albumart"
+VISUALIZATION_PLUGINS="blur_scope cairo-spectrum"
+CONTAINER_PLUGINS="m3u pls asx"
+TRANSPORT_PLUGINS="unix-io"
+
+
 # Check whether --enable-gtk3 was given.
 if test "${enable_gtk3+set}" = set; then :
 enableval=$enable_gtk3; use_gtk3=$enableval
@@ -8099,2301 +8843,6 @@
 
 
 
-
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU make" >&5
-$as_echo_n "checking for GNU make... " >&6; }
-if ${_cv_gnu_make_command+:} false; then :
- $as_echo_n "(cached) " >&6
-else
-
- _cv_gnu_make_command=""
- for a in "$MAKE" make gmake gnumake; do
- test "x$a" = "x" && continue
- if ( sh -c "$a --version" 2>/dev/null | grep "GNU Make" >/dev/null ) ; then
- _cv_gnu_make_command="$a"
- break
- fi
- done
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_cv_gnu_make_command" >&5
-$as_echo "$_cv_gnu_make_command" >&6; }
- if test "x$_cv_gnu_make_command" != "x" ; then
- MAKE="$_cv_gnu_make_command"
- else
- as_fn_error $? "** GNU make not found. If it is installed, try setting MAKE environment variable. **" "$LINENO" 5
- fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CC="${ac_tool_prefix}gcc"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_CC"; then
- ac_ct_CC=$CC
- # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$ac_ct_CC"; then
- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_CC="gcc"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
- if test "x$ac_ct_CC" = x; then
- CC=""
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
- CC=$ac_ct_CC
- fi
-else
- CC="$ac_cv_prog_CC"
-fi
-
-if test -z "$CC"; then
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CC="${ac_tool_prefix}cc"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- fi
-fi
-if test -z "$CC"; then
- # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
-else
- ac_prog_rejected=no
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
- ac_prog_rejected=yes
- continue
- fi
- ac_cv_prog_CC="cc"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-if test $ac_prog_rejected = yes; then
- # We found a bogon in the path, so make sure we never use it.
- set dummy $ac_cv_prog_CC
- shift
- if test $# != 0; then
- # We chose a different compiler from the bogus one.
- # However, it has the same basename, so the bogon will be chosen
- # first if we set CC to just the basename; use the full file name.
- shift
- ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
- fi
-fi
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$CC"; then
- if test -n "$ac_tool_prefix"; then
- for ac_prog in cl.exe
- do
- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$CC" && break
- done
-fi
-if test -z "$CC"; then
- ac_ct_CC=$CC
- for ac_prog in cl.exe
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$ac_ct_CC"; then
- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_CC="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$ac_ct_CC" && break
-done
-
- if test "x$ac_ct_CC" = x; then
- CC=""
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
- CC=$ac_ct_CC
- fi
-fi
-
-fi
-
-
-test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5; }
-
-# Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
- { { ac_try="$ac_compiler $ac_option >&5"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_compiler $ac_option >&5") 2>conftest.err
- ac_status=$?
- if test -s conftest.err; then
- sed '10a\
-... rest of stderr output deleted ...
- 10q' conftest.err >conftest.er1
- cat conftest.er1 >&5
- fi
- rm -f conftest.er1 conftest.err
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }
-done
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if ${ac_cv_c_compiler_gnu+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-#ifndef __GNUC__
- choke me
-#endif
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_compiler_gnu=yes
-else
- ac_compiler_gnu=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
-$as_echo "$ac_cv_c_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
- GCC=yes
-else
- GCC=
-fi
-ac_test_CFLAGS=${CFLAGS+set}
-ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
-$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if ${ac_cv_prog_cc_g+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_save_c_werror_flag=$ac_c_werror_flag
- ac_c_werror_flag=yes
- ac_cv_prog_cc_g=no
- CFLAGS="-g"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_prog_cc_g=yes
-else
- CFLAGS=""
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-else
- ac_c_werror_flag=$ac_save_c_werror_flag
-	 CFLAGS="-g"
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_prog_cc_g=yes
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_c_werror_flag=$ac_save_c_werror_flag
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
-$as_echo "$ac_cv_prog_cc_g" >&6; }
-if test "$ac_test_CFLAGS" = set; then
- CFLAGS=$ac_save_CFLAGS
-elif test $ac_cv_prog_cc_g = yes; then
- if test "$GCC" = yes; then
- CFLAGS="-g -O2"
- else
- CFLAGS="-g"
- fi
-else
- if test "$GCC" = yes; then
- CFLAGS="-O2"
- else
- CFLAGS=
- fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if ${ac_cv_prog_cc_c89+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_cv_prog_cc_c89=no
-ac_save_CC=$CC
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <stdarg.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
- char **p;
- int i;
-{
- return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
- char *s;
- va_list v;
- va_start (v,p);
- s = g (p, va_arg (v,int));
- va_end (v);
- return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
- function prototypes and stuff, but not '\xHH' hex character constants.
- These don't provoke an error unfortunately, instead are silently treated
- as 'x'. The following induces an error, until -std is added to get
- proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
- array size at least. It's necessary to write '\x00'==0 to get something
- that's true only with -std. */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
- inside strings and character constants. */
-#define FOO(x) 'x'
-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
- ;
- return 0;
-}
-_ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
- CC="$ac_save_CC $ac_arg"
- if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_prog_cc_c89=$ac_arg
-fi
-rm -f core conftest.err conftest.$ac_objext
- test "x$ac_cv_prog_cc_c89" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
-
-fi
-# AC_CACHE_VAL
-case "x$ac_cv_prog_cc_c89" in
- x)
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-$as_echo "none needed" >&6; } ;;
- xno)
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-$as_echo "unsupported" >&6; } ;;
- *)
- CC="$CC $ac_cv_prog_cc_c89"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
-esac
-if test "x$ac_cv_prog_cc_c89" != xno; then :
-
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-if test -z "$CXX"; then
- if test -n "$CCC"; then
- CXX=$CCC
- else
- if test -n "$ac_tool_prefix"; then
- for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
- do
- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CXX+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$CXX"; then
- ac_cv_prog_CXX="$CXX" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-CXX=$ac_cv_prog_CXX
-if test -n "$CXX"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
-$as_echo "$CXX" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$CXX" && break
- done
-fi
-if test -z "$CXX"; then
- ac_ct_CXX=$CXX
- for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CXX+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$ac_ct_CXX"; then
- ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_CXX="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
-if test -n "$ac_ct_CXX"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
-$as_echo "$ac_ct_CXX" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$ac_ct_CXX" && break
-done
-
- if test "x$ac_ct_CXX" = x; then
- CXX="g++"
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
- CXX=$ac_ct_CXX
- fi
-fi
-
- fi
-fi
-# Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
- { { ac_try="$ac_compiler $ac_option >&5"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_compiler $ac_option >&5") 2>conftest.err
- ac_status=$?
- if test -s conftest.err; then
- sed '10a\
-... rest of stderr output deleted ...
- 10q' conftest.err >conftest.er1
- cat conftest.er1 >&5
- fi
- rm -f conftest.er1 conftest.err
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }
-done
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
-$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
-if ${ac_cv_cxx_compiler_gnu+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-#ifndef __GNUC__
- choke me
-#endif
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
- ac_compiler_gnu=yes
-else
- ac_compiler_gnu=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
-$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
- GXX=yes
-else
- GXX=
-fi
-ac_test_CXXFLAGS=${CXXFLAGS+set}
-ac_save_CXXFLAGS=$CXXFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
-$as_echo_n "checking whether $CXX accepts -g... " >&6; }
-if ${ac_cv_prog_cxx_g+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_save_cxx_werror_flag=$ac_cxx_werror_flag
- ac_cxx_werror_flag=yes
- ac_cv_prog_cxx_g=no
- CXXFLAGS="-g"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
- ac_cv_prog_cxx_g=yes
-else
- CXXFLAGS=""
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-
-else
- ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-	 CXXFLAGS="-g"
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
- ac_cv_prog_cxx_g=yes
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
-$as_echo "$ac_cv_prog_cxx_g" >&6; }
-if test "$ac_test_CXXFLAGS" = set; then
- CXXFLAGS=$ac_save_CXXFLAGS
-elif test $ac_cv_prog_cxx_g = yes; then
- if test "$GXX" = yes; then
- CXXFLAGS="-g -O2"
- else
- CXXFLAGS="-g"
- fi
-else
- if test "$GXX" = yes; then
- CXXFLAGS="-O2"
- else
- CXXFLAGS=
- fi
-fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-# By default we simply use the C compiler to build assembly code.
-
-test "${CCAS+set}" = set || CCAS=$CC
-test "${CCASFLAGS+set}" = set || CCASFLAGS=$CFLAGS
-
-
-
-depcc="$CCAS" am_compiler_list=
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
-$as_echo_n "checking dependency style of $depcc... " >&6; }
-if ${am_cv_CCAS_dependencies_compiler_type+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
- # We make a subdir and do the tests there. Otherwise we can end up
- # making bogus files that we don't know about and never remove. For
- # instance it was reported that on HP-UX the gcc test will end up
- # making a dummy file named `D' -- because `-MD' means `put the output
- # in D'.
- mkdir conftest.dir
- # Copy depcomp to subdir because otherwise we won't find it if we're
- # using a relative directory.
- cp "$am_depcomp" conftest.dir
- cd conftest.dir
- # We will build objects and dependencies in a subdirectory because
- # it helps to detect inapplicable dependency modes. For instance
- # both Tru64's cc and ICC support -MD to output dependencies as a
- # side effect of compilation, but ICC will put the dependencies in
- # the current directory while Tru64 will put them in the object
- # directory.
- mkdir sub
-
- am_cv_CCAS_dependencies_compiler_type=none
- if test "$am_compiler_list" = ""; then
- am_compiler_list=`sed -n 's/^#*$[a-zA-Z0-9]*$)$/\1/p' < ./depcomp`
- fi
- am__universal=false
-
-
- for depmode in $am_compiler_list; do
- # Setup a source with many dependencies, because some compilers
- # like to wrap large dependency lists on column 80 (with \), and
- # we should not choose a depcomp mode which is confused by this.
- #
- # We need to recreate these files for each test, as the compiler may
- # overwrite some of them when testing with obscure command lines.
- # This happens at least with the AIX C compiler.
- : > sub/conftest.c
- for i in 1 2 3 4 5 6; do
- echo '#include "conftst'$i'.h"' >> sub/conftest.c
- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
- # Solaris 8's {/usr,}/bin/sh.
- touch sub/conftst$i.h
- done
- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
- # mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this. Also, some Intel
- # versions had trouble with output in subdirs
- am__obj=sub/conftest.${OBJEXT-o}
- am__minus_obj="-o $am__obj"
- case $depmode in
- gcc)
- # This depmode causes a compiler race in universal mode.
- test "$am__universal" = false || continue
- ;;
- nosideeffect)
- # after this tag, mechanisms are not by side-effect, so they'll
- # only be used when explicitly requested
- if test "x$enable_dependency_tracking" = xyes; then
-	continue
- else
-	break
- fi
- ;;
- msvisualcpp | msvcmsys)
- # This compiler won't grok `-c -o', but also, the minuso test has
- # not run yet. These depmodes are late enough in the game, and
- # so weak that their functioning should not be impacted.
- am__obj=conftest.${OBJEXT-o}
- am__minus_obj=
- ;;
- none) break ;;
- esac
- if depmode=$depmode \
- source=sub/conftest.c object=$am__obj \
- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
- $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
- >/dev/null 2>conftest.err &&
- grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
- grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
- # icc doesn't choke on unknown options, it will just issue warnings
- # or remarks (even with -Werror). So we grep stderr for any message
- # that says an option was ignored or not supported.
- # When given -MP, icc 7.0 and 7.1 complain thusly:
- # icc: Command line warning: ignoring option '-M'; no argument required
- # The diagnosis changed in icc 8.0:
- # icc: Command line remark: option '-MP' not supported
- if (grep 'ignoring option' conftest.err ||
- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
- am_cv_CCAS_dependencies_compiler_type=$depmode
- break
- fi
- fi
- done
-
- cd ..
- rm -rf conftest.dir
-else
- am_cv_CCAS_dependencies_compiler_type=none
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CCAS_dependencies_compiler_type" >&5
-$as_echo "$am_cv_CCAS_dependencies_compiler_type" >&6; }
-CCASDEPMODE=depmode=$am_cv_CCAS_dependencies_compiler_type
-
- if
- test "x$enable_dependency_tracking" != xno \
- && test "$am_cv_CCAS_dependencies_compiler_type" = gcc3; then
- am__fastdepCCAS_TRUE=
- am__fastdepCCAS_FALSE='#'
-else
- am__fastdepCCAS_TRUE='#'
- am__fastdepCCAS_FALSE=
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5
-$as_echo_n "checking for library containing strerror... " >&6; }
-if ${ac_cv_search_strerror+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_func_search_save_LIBS=$LIBS
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char strerror ();
-int
-main ()
-{
-return strerror ();
- ;
- return 0;
-}
-_ACEOF
-for ac_lib in '' cposix; do
- if test -z "$ac_lib"; then
- ac_res="none required"
- else
- ac_res=-l$ac_lib
- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
- fi
- if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_search_strerror=$ac_res
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext
- if ${ac_cv_search_strerror+:} false; then :
- break
-fi
-done
-if ${ac_cv_search_strerror+:} false; then :
-
-else
- ac_cv_search_strerror=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_strerror" >&5
-$as_echo "$ac_cv_search_strerror" >&6; }
-ac_res=$ac_cv_search_strerror
-if test "$ac_res" != no; then :
- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
-fi
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
-$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
-if ${ac_cv_c_bigendian+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_cv_c_bigendian=unknown
- # See if we're dealing with a universal compiler.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#ifndef __APPLE_CC__
-	 not a universal capable compiler
-	 #endif
-	 typedef int dummy;
-
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-	# Check for potential -arch flags. It is not universal unless
-	# there are at least two -arch flags with different values.
-	ac_arch=
-	ac_prev=
-	for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do
-	 if test -n "$ac_prev"; then
-	 case $ac_word in
-	 i?86 | x86_64 | ppc | ppc64)
-	 if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then
-		 ac_arch=$ac_word
-	 else
-		 ac_cv_c_bigendian=universal
-		 break
-	 fi
-	 ;;
-	 esac
-	 ac_prev=
-	 elif test "x$ac_word" = "x-arch"; then
-	 ac_prev=arch
-	 fi
- done
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- if test $ac_cv_c_bigendian = unknown; then
- # See if sys/param.h defines the BYTE_ORDER macro.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <sys/types.h>
-	 #include <sys/param.h>
-
-int
-main ()
-{
-#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
-		 && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
-		 && LITTLE_ENDIAN)
-	 bogus endian macros
-	 #endif
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- # It does; now see whether it defined to BIG_ENDIAN or not.
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <sys/types.h>
-		#include <sys/param.h>
-
-int
-main ()
-{
-#if BYTE_ORDER != BIG_ENDIAN
-		 not big endian
-		#endif
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_c_bigendian=yes
-else
- ac_cv_c_bigendian=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- if test $ac_cv_c_bigendian = unknown; then
- # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <limits.h>
-
-int
-main ()
-{
-#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
-	 bogus endian macros
-	 #endif
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- # It does; now see whether it defined to _BIG_ENDIAN or not.
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <limits.h>
-
-int
-main ()
-{
-#ifndef _BIG_ENDIAN
-		 not big endian
-		#endif
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_c_bigendian=yes
-else
- ac_cv_c_bigendian=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- if test $ac_cv_c_bigendian = unknown; then
- # Compile a test program.
- if test "$cross_compiling" = yes; then :
- # Try to guess by grepping values from an object file.
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-short int ascii_mm[] =
-		 { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
-		short int ascii_ii[] =
-		 { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
-		int use_ascii (int i) {
-		 return ascii_mm[i] + ascii_ii[i];
-		}
-		short int ebcdic_ii[] =
-		 { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
-		short int ebcdic_mm[] =
-		 { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
-		int use_ebcdic (int i) {
-		 return ebcdic_mm[i] + ebcdic_ii[i];
-		}
-		extern int foo;
-
-int
-main ()
-{
-return use_ascii (foo) == use_ebcdic (foo);
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
-	 ac_cv_c_bigendian=yes
-	 fi
-	 if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
-	 if test "$ac_cv_c_bigendian" = unknown; then
-		ac_cv_c_bigendian=no
-	 else
-		# finding both strings is unlikely to happen, but who knows?
-		ac_cv_c_bigendian=unknown
-	 fi
-	 fi
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-
-	 /* Are we little or big endian? From Harbison&Steele. */
-	 union
-	 {
-	 long int l;
-	 char c[sizeof (long int)];
-	 } u;
-	 u.l = 1;
-	 return u.c[sizeof (long int) - 1] == 1;
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
- ac_cv_c_bigendian=no
-else
- ac_cv_c_bigendian=yes
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
- fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
-$as_echo "$ac_cv_c_bigendian" >&6; }
- case $ac_cv_c_bigendian in #(
- yes)
- $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h
-;; #(
- no)
- ;; #(
- universal)
-
-$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
-
- ;; #(
- *)
- as_fn_error $? "unknown endianness
- presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
- esac
-
-
-if test "x$GCC" = "xyes"; then
- CFLAGS="$CFLAGS -Wall -pipe"
- CXXFLAGS="$CXXFLAGS -pipe -Wall"
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C/C++ compiler supports -Wtype-limits" >&5
-$as_echo_n "checking whether the C/C++ compiler supports -Wtype-limits... " >&6; }
- OLDCFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -Wtype-limits -Werror"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-return 0;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
- CFLAGS="$OLDCFLAGS -Wtype-limits"
- CXXFLAGS="$CXXFLAGS -Wtype-limits"
-
-else
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- CFLAGS="$OLDCFLAGS"
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
-$as_echo_n "checking whether ln -s works... " >&6; }
-LN_S=$as_ln_s
-if test "$LN_S" = "ln -s"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
-$as_echo "no, using $LN_S" >&6; }
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
-set x ${MAKE-make}
-ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat >conftest.make <<\_ACEOF
-SHELL = /bin/sh
-all:
-	@echo '@@@%%%=$(MAKE)=@@@%%%'
-_ACEOF
-# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
-case `${MAKE-make} -f conftest.make 2>/dev/null` in
- *@@@%%%=?*=@@@%%%*)
- eval ac_cv_prog_make_${ac_make}_set=yes;;
- *)
- eval ac_cv_prog_make_${ac_make}_set=no;;
-esac
-rm -f conftest.make
-fi
-if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
- SET_MAKE=
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-# Extract the first word of "rm", so it can be a program name with args.
-set dummy rm; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_RM+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $RM in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_RM="$RM" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_RM="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-RM=$ac_cv_path_RM
-if test -n "$RM"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RM" >&5
-$as_echo "$RM" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-# Extract the first word of "mv", so it can be a program name with args.
-set dummy mv; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_MV+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $MV in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_MV="$MV" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_MV="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-MV=$ac_cv_path_MV
-if test -n "$MV"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MV" >&5
-$as_echo "$MV" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-# Extract the first word of "cp", so it can be a program name with args.
-set dummy cp; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_CP+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $CP in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_CP="$CP" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_CP="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-CP=$ac_cv_path_CP
-if test -n "$CP"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CP" >&5
-$as_echo "$CP" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-# Extract the first word of "ar", so it can be a program name with args.
-set dummy ar; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_AR+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $AR in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_AR="$AR" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_AR="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-AR=$ac_cv_path_AR
-if test -n "$AR"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
-$as_echo "$AR" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-# Extract the first word of "tr", so it can be a program name with args.
-set dummy tr; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_TR+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $TR in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_TR="$TR" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_TR="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-TR=$ac_cv_path_TR
-if test -n "$TR"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TR" >&5
-$as_echo "$TR" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-# Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_RANLIB+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $RANLIB in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_RANLIB="$RANLIB" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_RANLIB="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-RANLIB=$ac_cv_path_RANLIB
-if test -n "$RANLIB"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
-$as_echo "$RANLIB" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-
-
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB" >&5
-$as_echo_n "checking for GLIB... " >&6; }
-
-if test -n "$GLIB_CFLAGS"; then
- pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.16\""; } >&5
- ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.16") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.16" 2>/dev/null`
-		 test "x$?" != "x0" && pkg_failed=yes
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-if test -n "$GLIB_LIBS"; then
- pkg_cv_GLIB_LIBS="$GLIB_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.16\""; } >&5
- ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.16") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.16" 2>/dev/null`
-		 test "x$?" != "x0" && pkg_failed=yes
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes
-else
- _pkg_short_errors_supported=no
-fi
- if test $_pkg_short_errors_supported = yes; then
-	 GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.16" 2>&1`
- else
-	 GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.16" 2>&1`
- fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$GLIB_PKG_ERRORS" >&5
-
-
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "glib-2.0") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
-
- cv_pkg_version=`$PKG_CONFIG --modversion "glib-2.0" 2>/dev/null`
- as_fn_error $? "
-Glib2 version $cv_pkg_version was found, but glib-2.0 >= 2.16 is required.
-" "$LINENO" 5
-
-else
-
- as_fn_error $? "
-Cannot find Glib2! If you are using binary packages based system, check that you
-have the corresponding -dev/devel packages installed.
-" "$LINENO" 5
-
-fi
-
-elif test $pkg_failed = untried; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "glib-2.0") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
-
- cv_pkg_version=`$PKG_CONFIG --modversion "glib-2.0" 2>/dev/null`
- as_fn_error $? "
-Glib2 version $cv_pkg_version was found, but glib-2.0 >= 2.16 is required.
-" "$LINENO" 5
-
-else
-
- as_fn_error $? "
-Cannot find Glib2! If you are using binary packages based system, check that you
-have the corresponding -dev/devel packages installed.
-" "$LINENO" 5
-
-fi
-
-else
-	GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS
-	GLIB_LIBS=$pkg_cv_GLIB_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-
- if test "x$PC_REQUIRES" = "x"; then
- PC_REQUIRES="glib-2.0 >= 2.16"
- else
- PC_REQUIRES="$PC_REQUIRES, glib-2.0 >= 2.16"
- fi
-
-
-
-fi
-
-
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PANGO" >&5
-$as_echo_n "checking for PANGO... " >&6; }
-
-if test -n "$PANGO_CFLAGS"; then
- pkg_cv_PANGO_CFLAGS="$PANGO_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pango >= 1.20\""; } >&5
- ($PKG_CONFIG --exists --print-errors "pango >= 1.20") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_PANGO_CFLAGS=`$PKG_CONFIG --cflags "pango >= 1.20" 2>/dev/null`
-		 test "x$?" != "x0" && pkg_failed=yes
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-if test -n "$PANGO_LIBS"; then
- pkg_cv_PANGO_LIBS="$PANGO_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pango >= 1.20\""; } >&5
- ($PKG_CONFIG --exists --print-errors "pango >= 1.20") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_PANGO_LIBS=`$PKG_CONFIG --libs "pango >= 1.20" 2>/dev/null`
-		 test "x$?" != "x0" && pkg_failed=yes
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes
-else
- _pkg_short_errors_supported=no
-fi
- if test $_pkg_short_errors_supported = yes; then
-	 PANGO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "pango >= 1.20" 2>&1`
- else
-	 PANGO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "pango >= 1.20" 2>&1`
- fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$PANGO_PKG_ERRORS" >&5
-
-
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pango\""; } >&5
- ($PKG_CONFIG --exists --print-errors "pango") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
-
- cv_pkg_version=`$PKG_CONFIG --modversion "pango" 2>/dev/null`
- as_fn_error $? "
-Pango version $cv_pkg_version was found, but pango >= 1.20 is required.
-" "$LINENO" 5
-
-else
-
- as_fn_error $? "
-Cannot find Pango! If you are using binary packages based system, check that you
-have the corresponding -dev/devel packages installed.
-" "$LINENO" 5
-
-fi
-
-elif test $pkg_failed = untried; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pango\""; } >&5
- ($PKG_CONFIG --exists --print-errors "pango") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
-
- cv_pkg_version=`$PKG_CONFIG --modversion "pango" 2>/dev/null`
- as_fn_error $? "
-Pango version $cv_pkg_version was found, but pango >= 1.20 is required.
-" "$LINENO" 5
-
-else
-
- as_fn_error $? "
-Cannot find Pango! If you are using binary packages based system, check that you
-have the corresponding -dev/devel packages installed.
-" "$LINENO" 5
-
-fi
-
-else
-	PANGO_CFLAGS=$pkg_cv_PANGO_CFLAGS
-	PANGO_LIBS=$pkg_cv_PANGO_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-
- if test "x$PC_REQUIRES" = "x"; then
- PC_REQUIRES="pango >= 1.20"
- else
- PC_REQUIRES="$PC_REQUIRES, pango >= 1.20"
- fi
-
-
-
-fi
-
-
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CAIRO" >&5
-$as_echo_n "checking for CAIRO... " >&6; }
-
-if test -n "$CAIRO_CFLAGS"; then
- pkg_cv_CAIRO_CFLAGS="$CAIRO_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo >= 1.6\""; } >&5
- ($PKG_CONFIG --exists --print-errors "cairo >= 1.6") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo >= 1.6" 2>/dev/null`
-		 test "x$?" != "x0" && pkg_failed=yes
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-if test -n "$CAIRO_LIBS"; then
- pkg_cv_CAIRO_LIBS="$CAIRO_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo >= 1.6\""; } >&5
- ($PKG_CONFIG --exists --print-errors "cairo >= 1.6") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_CAIRO_LIBS=`$PKG_CONFIG --libs "cairo >= 1.6" 2>/dev/null`
-		 test "x$?" != "x0" && pkg_failed=yes
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes
-else
- _pkg_short_errors_supported=no
-fi
- if test $_pkg_short_errors_supported = yes; then
-	 CAIRO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "cairo >= 1.6" 2>&1`
- else
-	 CAIRO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "cairo >= 1.6" 2>&1`
- fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$CAIRO_PKG_ERRORS" >&5
-
-
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo\""; } >&5
- ($PKG_CONFIG --exists --print-errors "cairo") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
-
- cv_pkg_version=`$PKG_CONFIG --modversion "cairo" 2>/dev/null`
- as_fn_error $? "
-Cairo version $cv_pkg_version was found, but cairo >= 1.6 is required.
-" "$LINENO" 5
-
-else
-
- as_fn_error $? "
-Cannot find Cairo! If you are using binary packages based system, check that you
-have the corresponding -dev/devel packages installed.
-" "$LINENO" 5
-
-fi
-
-elif test $pkg_failed = untried; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo\""; } >&5
- ($PKG_CONFIG --exists --print-errors "cairo") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
-
- cv_pkg_version=`$PKG_CONFIG --modversion "cairo" 2>/dev/null`
- as_fn_error $? "
-Cairo version $cv_pkg_version was found, but cairo >= 1.6 is required.
-" "$LINENO" 5
-
-else
-
- as_fn_error $? "
-Cannot find Cairo! If you are using binary packages based system, check that you
-have the corresponding -dev/devel packages installed.
-" "$LINENO" 5
-
-fi
-
-else
-	CAIRO_CFLAGS=$pkg_cv_CAIRO_CFLAGS
-	CAIRO_LIBS=$pkg_cv_CAIRO_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-
- if test "x$PC_REQUIRES" = "x"; then
- PC_REQUIRES="cairo >= 1.6"
- else
- PC_REQUIRES="$PC_REQUIRES, cairo >= 1.6"
- fi
-
-
-
-fi
-
-
-
-
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MOWGLI" >&5
-$as_echo_n "checking for MOWGLI... " >&6; }
-
-if test -n "$MOWGLI_CFLAGS"; then
- pkg_cv_MOWGLI_CFLAGS="$MOWGLI_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmowgli >= 0.9\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libmowgli >= 0.9") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_MOWGLI_CFLAGS=`$PKG_CONFIG --cflags "libmowgli >= 0.9" 2>/dev/null`
-		 test "x$?" != "x0" && pkg_failed=yes
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-if test -n "$MOWGLI_LIBS"; then
- pkg_cv_MOWGLI_LIBS="$MOWGLI_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmowgli >= 0.9\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libmowgli >= 0.9") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_MOWGLI_LIBS=`$PKG_CONFIG --libs "libmowgli >= 0.9" 2>/dev/null`
-		 test "x$?" != "x0" && pkg_failed=yes
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes
-else
- _pkg_short_errors_supported=no
-fi
- if test $_pkg_short_errors_supported = yes; then
-	 MOWGLI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libmowgli >= 0.9" 2>&1`
- else
-	 MOWGLI_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libmowgli >= 0.9" 2>&1`
- fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$MOWGLI_PKG_ERRORS" >&5
-
-
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmowgli\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libmowgli") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
-
- cv_pkg_version=`$PKG_CONFIG --modversion "libmowgli" 2>/dev/null`
- as_fn_error $? "
-libmowgli version $cv_pkg_version was found, but libmowgli >= 0.9 is required.
-http://www.atheme.org/projects/mowgli.shtml" "$LINENO" 5
-
-else
-
- as_fn_error $? "
-Cannot find libmowgli! If you are using binary packages based system, check that you
-have the corresponding -dev/devel packages installed.
-http://www.atheme.org/projects/mowgli.shtml" "$LINENO" 5
-
-fi
-
-elif test $pkg_failed = untried; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmowgli\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libmowgli") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
-
- cv_pkg_version=`$PKG_CONFIG --modversion "libmowgli" 2>/dev/null`
- as_fn_error $? "
-libmowgli version $cv_pkg_version was found, but libmowgli >= 0.9 is required.
-http://www.atheme.org/projects/mowgli.shtml" "$LINENO" 5
-
-else
-
- as_fn_error $? "
-Cannot find libmowgli! If you are using binary packages based system, check that you
-have the corresponding -dev/devel packages installed.
-http://www.atheme.org/projects/mowgli.shtml" "$LINENO" 5
-
-fi
-
-else
-	MOWGLI_CFLAGS=$pkg_cv_MOWGLI_CFLAGS
-	MOWGLI_LIBS=$pkg_cv_MOWGLI_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-
- if test "x$PC_REQUIRES" = "x"; then
- PC_REQUIRES="libmowgli >= 0.9"
- else
- PC_REQUIRES="$PC_REQUIRES, libmowgli >= 0.9"
- fi
-
-
-
-fi
-
-
-
-
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBMCS" >&5
-$as_echo_n "checking for LIBMCS... " >&6; }
-
-if test -n "$LIBMCS_CFLAGS"; then
- pkg_cv_LIBMCS_CFLAGS="$LIBMCS_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmcs >= 0.7\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libmcs >= 0.7") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_LIBMCS_CFLAGS=`$PKG_CONFIG --cflags "libmcs >= 0.7" 2>/dev/null`
-		 test "x$?" != "x0" && pkg_failed=yes
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-if test -n "$LIBMCS_LIBS"; then
- pkg_cv_LIBMCS_LIBS="$LIBMCS_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmcs >= 0.7\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libmcs >= 0.7") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_LIBMCS_LIBS=`$PKG_CONFIG --libs "libmcs >= 0.7" 2>/dev/null`
-		 test "x$?" != "x0" && pkg_failed=yes
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes
-else
- _pkg_short_errors_supported=no
-fi
- if test $_pkg_short_errors_supported = yes; then
-	 LIBMCS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libmcs >= 0.7" 2>&1`
- else
-	 LIBMCS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libmcs >= 0.7" 2>&1`
- fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$LIBMCS_PKG_ERRORS" >&5
-
-
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmcs\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libmcs") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
-
- cv_pkg_version=`$PKG_CONFIG --modversion "libmcs" 2>/dev/null`
- as_fn_error $? "
-libmcs version $cv_pkg_version was found, but libmcs >= 0.7 is required.
-http://www.atheme.org/projects/mcs.shtml" "$LINENO" 5
-
-else
-
- as_fn_error $? "
-Cannot find libmcs! If you are using binary packages based system, check that you
-have the corresponding -dev/devel packages installed.
-http://www.atheme.org/projects/mcs.shtml" "$LINENO" 5
-
-fi
-
-elif test $pkg_failed = untried; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmcs\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libmcs") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
-
- cv_pkg_version=`$PKG_CONFIG --modversion "libmcs" 2>/dev/null`
- as_fn_error $? "
-libmcs version $cv_pkg_version was found, but libmcs >= 0.7 is required.
-http://www.atheme.org/projects/mcs.shtml" "$LINENO" 5
-
-else
-
- as_fn_error $? "
-Cannot find libmcs! If you are using binary packages based system, check that you
-have the corresponding -dev/devel packages installed.
-http://www.atheme.org/projects/mcs.shtml" "$LINENO" 5
-
-fi
-
-else
-	LIBMCS_CFLAGS=$pkg_cv_LIBMCS_CFLAGS
-	LIBMCS_LIBS=$pkg_cv_LIBMCS_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-
- if test "x$PC_REQUIRES" = "x"; then
- PC_REQUIRES="libmcs >= 0.7"
- else
- PC_REQUIRES="$PC_REQUIRES, libmcs >= 0.7"
- fi
-
-
-
-fi
-
-
-
- # Check whether --enable-sse2 was given.
-if test "${enable_sse2+set}" = set; then :
- enableval=$enable_sse2;
-else
- enable_sse2=yes
-fi
-
- if test "x${enable_sse2}" = "xyes"; then
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking SSE2 support" >&5
-$as_echo_n "checking SSE2 support... " >&6; }
- aud_my_save_CFLAGS="$CFLAGS"
- CFLAGS="-msse2"
- if test "$cross_compiling" = yes; then :
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5; }
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-#include <emmintrin.h>
-int main()
-{
- _mm_setzero_pd();
- asm volatile("xorpd %xmm0,%xmm0\n\t");
- return 0;
-}
-
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-$as_echo "#define HAVE_SSE2 1" >>confdefs.h
-
- SIMD_CFLAGS="-msse2"
-
-else
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- enable_sse2="no"
-
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-
- CFLAGS="$aud_my_save_CFLAGS"
-
- fi
-
-
- # Check whether --enable-altivec was given.
-if test "${enable_altivec+set}" = set; then :
- enableval=$enable_altivec;
-else
- enable_altivec=yes
-fi
-
- if test "x${enable_altivec}" = "xyes"; then
-
- for ac_header in altivec.h
-do :
- ac_fn_c_check_header_mongrel "$LINENO" "altivec.h" "ac_cv_header_altivec_h" "$ac_includes_default"
-if test "x$ac_cv_header_altivec_h" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_ALTIVEC_H 1
-_ACEOF
-
-
-$as_echo "#define HAVE_ALTIVEC 1" >>confdefs.h
-
-
-$as_echo "#define HAVE_ALTIVEC_H 1" >>confdefs.h
-
-
-$as_echo "#define ARCH_POWERPC 1" >>confdefs.h
-
- case $target in
- *-apple-*)
- SIMD_CFLAGS="-mpim-altivec"
- ;;
- *)
- SIMD_CFLAGS="-maltivec"
- ;;
- esac
-
-
-else
-
- enable_altivec="no"
-
-fi
-
-done
-
-
- fi
-
-
-ac_fn_c_check_func "$LINENO" "getrlimit" "ac_cv_func_getrlimit"
-if test "x$ac_cv_func_getrlimit" = xyes; then :
-
-fi
-
-
-
-
 # Check whether --enable-gio was given.
 if test "${enable_gio+set}" = set; then :
 enableval=$enable_gio; enable_gio=$enableval
@@ -10641,251 +9090,6 @@
 
 
 
-# Check whether --enable-chardet was given.
-if test "${enable_chardet+set}" = set; then :
- enableval=$enable_chardet; enable_chardet=$enableval
-else
- enable_chardet=no
-fi
-
-if test "x$enable_chardet" = "xyes"; then
-
-$as_echo "#define USE_CHARDET 1" >>confdefs.h
-
-fi
- if test "x$enable_chardet" = "xyes"; then
- USE_CHARDET_TRUE=
- USE_CHARDET_FALSE='#'
-else
- USE_CHARDET_TRUE='#'
- USE_CHARDET_FALSE=
-fi
-
-
-
-
-
-	# Extract the first word of "tput", so it can be a program name with args.
-set dummy tput; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_TPUT+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $TPUT in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_TPUT="$TPUT" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_TPUT="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-TPUT=$ac_cv_path_TPUT
-if test -n "$TPUT"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TPUT" >&5
-$as_echo "$TPUT" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-
-	if test x"$TPUT" != x""; then :
-
-		if x=$($TPUT el 2>/dev/null); then
-			TERM_EL="$x"
-
-		else
-			TERM_EL="$($TPUT ce 2>/dev/null)"
-
-		fi
-
-		if x=$($TPUT sgr0 2>/dev/null); then
-			TERM_SGR0="$x"
-
-		else
-			TERM_SGR0="$($TPUT me 2>/dev/null)"
-
-		fi
-
-		if x=$($TPUT bold 2>/dev/null); then
-			TERM_BOLD="$x"
-
-		else
-			TERM_BOLD="$($TPUT md 2>/dev/null)"
-
-		fi
-
-		if x=$($TPUT setaf 1 2>/dev/null); then
-			TERM_SETAF1="$x"
-
-			TERM_SETAF2="$($TPUT setaf 2 2>/dev/null)"
-
-			TERM_SETAF3="$($TPUT setaf 3 2>/dev/null)"
-
-			TERM_SETAF4="$($TPUT setaf 4 2>/dev/null)"
-
-			TERM_SETAF6="$($TPUT setaf 6 2>/dev/null)"
-
-		else
-			TERM_SETAF1="$($TPUT AF 1 2>/dev/null)"
-
-			TERM_SETAF2="$($TPUT AF 2 2>/dev/null)"
-
-			TERM_SETAF3="$($TPUT AF 3 2>/dev/null)"
-
-			TERM_SETAF4="$($TPUT AF 4 2>/dev/null)"
-
-			TERM_SETAF6="$($TPUT AF 6 2>/dev/null)"
-
-		fi
-
-else
-
-		TERM_EL='\033\133K'
-
-		TERM_SGR0='\033\133m'
-
-		TERM_BOLD='\033\1331m'
-
-		TERM_SETAF1='\033\13331m'
-
-		TERM_SETAF2='\033\13332m'
-
-		TERM_SETAF3='\033\13333m'
-
-		TERM_SETAF4='\033\13334m'
-
-		TERM_SETAF6='\033\13336m'
-
-
-fi
-
-
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for shared library system" >&5
-$as_echo_n "checking for shared library system... " >&6; }
-	case "$host_os" in
-		darwin*)
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Darwin" >&5
-$as_echo "Darwin" >&6; }
-			LIB_CFLAGS='-fPIC -DPIC'
-			LIB_LDFLAGS='-dynamiclib -current_version ${LIB_MAJOR}.${LIB_MINOR} -compatibility_version ${LIB_MAJOR}'
-			LIB_PREFIX='lib'
-			LIB_SUFFIX='.dylib'
-			LDFLAGS_RPATH='-Wl,-rpath,${libdir}'
-			PLUGIN_CFLAGS='-fPIC -DPIC'
-			PLUGIN_LDFLAGS='-bundle -undefined dynamic_lookup'
-			PLUGIN_SUFFIX='.impl'
-			INSTALL_LIB='&& ${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib && ${LN_S} -f $${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.dylib && ${LN_S} -f $${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib ${DESTDIR}${libdir}/$$i'
-			UNINSTALL_LIB='&& rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.dylib ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib'
-			CLEAN_LIB=''
-			;;
-		solaris*)
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Solaris" >&5
-$as_echo "Solaris" >&6; }
-			LIB_CFLAGS='-fPIC -DPIC'
-			LIB_LDFLAGS='-shared -Wl,-soname=${LIB}.${LIB_MAJOR}.${LIB_MINOR}'
-			LIB_PREFIX='lib'
-			LIB_SUFFIX='.so'
-			LDFLAGS_RPATH='-Wl,-rpath,${libdir}'
-			PLUGIN_CFLAGS='-fPIC -DPIC'
-			PLUGIN_LDFLAGS='-shared'
-			PLUGIN_SUFFIX='.so'
-			INSTALL_LIB='&& ${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR} && rm -f ${DESTDIR}${libdir}/$$i && ${LN_S} $$i.${LIB_MAJOR}.${LIB_MINOR} ${DESTDIR}${libdir}/$$i'
-			UNINSTALL_LIB='&& rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}'
-			CLEAN_LIB=''
-			;;
-		openbsd* | mirbsd*)
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: OpenBSD" >&5
-$as_echo "OpenBSD" >&6; }
-			LIB_CFLAGS='-fPIC -DPIC'
-			LIB_LDFLAGS='-shared'
-			LIB_PREFIX='lib'
-			LIB_SUFFIX='.so.${LIB_MAJOR}.${LIB_MINOR}'
-			LDFLAGS_RPATH='-Wl,-rpath,${libdir}'
-			PLUGIN_CFLAGS='-fPIC -DPIC'
-			PLUGIN_LDFLAGS='-shared'
-			PLUGIN_SUFFIX='.so'
-			INSTALL_LIB='&& ${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i'
-			UNINSTALL_LIB='&& rm -f ${DESTDIR}${libdir}/$$i'
-			CLEAN_LIB=''
-			;;
-		cygwin* | mingw*)
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Win32" >&5
-$as_echo "Win32" >&6; }
-			LIB_CFLAGS=''
-			LIB_LDFLAGS='-shared -Wl,--out-implib,${LIB}.a'
-			LIB_PREFIX='lib'
-			LIB_SUFFIX='.dll'
-			LDFLAGS_RPATH='-Wl,-rpath,${libdir}'
-			PLUGIN_CFLAGS=''
-			PLUGIN_LDFLAGS='-shared'
-			PLUGIN_SUFFIX='.dll'
-			INSTALL_LIB='&& ${MKDIR_P} ${DESTDIR}${bindir} && ${INSTALL} -m 755 $$i ${DESTDIR}${bindir}/$$i && ${INSTALL} -m 755 $$i.a ${DESTDIR}${libdir}/$$i.a'
-			UNINSTALL_LIB='&& rm -f ${DESTDIR}${bindir}/$$i ${DESTDIR}${libdir}/$$i.a'
-			CLEAN_LIB='${LIB}.a'
-			;;
-		*)
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: GNU" >&5
-$as_echo "GNU" >&6; }
-			LIB_CFLAGS='-fPIC -DPIC'
-			LIB_LDFLAGS='-shared -Wl,-soname=${LIB}.${LIB_MAJOR}'
-			LIB_PREFIX='lib'
-			LIB_SUFFIX='.so'
-			LDFLAGS_RPATH='-Wl,-rpath,${libdir}'
-			PLUGIN_CFLAGS='-fPIC -DPIC'
-			PLUGIN_LDFLAGS='-shared'
-			PLUGIN_SUFFIX='.so'
-			INSTALL_LIB='&& ${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}.0 && ${LN_S} -f $$i.${LIB_MAJOR}.${LIB_MINOR}.0 ${DESTDIR}${libdir}/$$i.${LIB_MAJOR} && ${LN_S} -f $$i.${LIB_MAJOR}.${LIB_MINOR}.0 ${DESTDIR}${libdir}/$$i'
-			UNINSTALL_LIB='&& rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR} ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}.0'
-			CLEAN_LIB=''
-			;;
-	esac
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if you are running Apple-GCC" >&5
-$as_echo_n "checking if you are running Apple-GCC... " >&6; }
-case "$target" in
-	*-apple-*)
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, sorry you poor bastard" >&5
-$as_echo "yes, sorry you poor bastard" >&6; }
-		LDFLAGS="$LDFLAGS -Wl,-framework -Wl,CoreFoundation -Wl,-framework -Wl,CoreServices"
-		;;
-	*)
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-		;;
-esac
-
 
 # Check whether --enable-console was given.
 if test "${enable_console+set}" = set; then :
@@ -11433,20 +9637,6 @@
 fi
 
 
-# Check whether --enable-rocklight was given.
-if test "${enable_rocklight+set}" = set; then :
- enableval=$enable_rocklight; enable_rocklight="$enableval"
-else
- enable_rocklight="yes"
-
-fi
-
-
-if test "x$enable_rocklight" = "xyes"; then
- VISUALIZATION_PLUGINS="$VISUALIZATION_PLUGINS rocklight"
-fi
-
-
 # Check whether --enable-hotkey was given.
 if test "${enable_hotkey+set}" = set; then :
 enableval=$enable_hotkey; enable_hotkey=$enableval
@@ -14458,7 +12648,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for HardSID builder module" >&5
 $as_echo_n "checking for HardSID builder module... " >&6; }
 
-# xs_try_library ( builders:$BUILDERS_CFLAGS:$BUILDERS_LDFLAGS:hardsid-builder:sidplay/builders/hardsid.h:HardSID *sid; )
+# xs_try_library ( builders:$BUILDERS_CFLAGS:$BUILDERS_LDFLAGS:hardsid-builder:sidplay/builders/hardsid.h:HardSIDBuilder *sid; )
 
 xs_cxxflags_save="$CXXFLAGS"
 CXXFLAGS="$CXXFLAGS $BUILDERS_CFLAGS"
@@ -14473,7 +12663,7 @@
 int
 main ()
 {
-HardSID *sid;
+HardSIDBuilder *sid;
 
 ;
 return 0;
@@ -14630,204 +12820,98 @@
 
 # Check whether --enable-oss was given.
 if test "${enable_oss+set}" = set; then :
- enableval=$enable_oss; enable_oss=$enableval
+ enableval=$enable_oss; enable_oss="$enableval"
 else
- enable_oss=yes
+ enable_oss="no"
 
 fi
 
 
-have_oss=no
-if test "x$enable_oss" = "xyes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OSS include dir" >&5
-$as_echo_n "checking for OSS include dir... " >&6; }
- OSS_CFLAGS=""
- if test -f "/etc/oss.conf" ; then
- for i in `cat /etc/oss.conf`; do
- t=`echo $i | sed -e 's/OSSLIBDIR=//'`
- if test "x$i" != "x$t" ; then
- if test -f "$t/include/sys/soundcard.h" -o -f "$i/include/soundcard.h" ; then
- OSS_CFLAGS="-I$t/include"
- fi
- fi
- done
- fi
- if test -n "$OSS_CFLAGS" ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OSS_CFLAGS" >&5
-$as_echo "$OSS_CFLAGS" >&6; }
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
-$as_echo "not found" >&6; }
- fi
- CFLAGS_save=$CFLAGS
- CFLAGS="$CFLAGS $OSS_CFLAGS"
- for ac_header in soundcard.h
-do :
- ac_fn_c_check_header_mongrel "$LINENO" "soundcard.h" "ac_cv_header_soundcard_h" "$ac_includes_default"
-if test "x$ac_cv_header_soundcard_h" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_SOUNDCARD_H 1
-_ACEOF
+# Check whether --enable-oss4 was given.
+if test "${enable_oss4+set}" = set; then :
+ enableval=$enable_oss4; enable_oss4="$enableval"
+else
+ enable_oss4="yes"
 
 fi
 
-done
 
- for ac_header in sys/soundcard.h
-do :
- ac_fn_c_check_header_mongrel "$LINENO" "sys/soundcard.h" "ac_cv_header_sys_soundcard_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_soundcard_h" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_SYS_SOUNDCARD_H 1
-_ACEOF
+have_oss="no"
+have_oss4="no"
+OSS_CFLAGS=""
 
-fi
+if test "$enable_oss" = "yes" || test "$enable_oss4" = "yes" ; then
+ if test -f "/etc/oss.conf"; then
+ . "/etc/oss.conf"
+ OSS_CFLAGS="-I$OSSLIBDIR/include"
+ fi
 
-done
+ OLD_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $OSS_CFLAGS"
 
- for ac_header in machine/soundcard.h
+ for ac_header in sys/soundcard.h soundcard.h
 do :
- ac_fn_c_check_header_mongrel "$LINENO" "machine/soundcard.h" "ac_cv_header_machine_soundcard_h" "$ac_includes_default"
-if test "x$ac_cv_header_machine_soundcard_h" = xyes; then :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
 cat >>confdefs.h <<_ACEOF
-#define HAVE_MACHINE_SOUNDCARD_H 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
-
+ have_oss="yes"
+else
+ have_oss="$have_oss"
 fi
 
 done
 
- CFLAGS=$CFLAGS_save
 
- if test "x${ac_cv_header_soundcard_h}" = "xyes" || test "x${ac_cv_header_sys_soundcard_h}" = "xyes" || test "x${ac_cv_header_machine_soundcard_h}" = "xyes"; then
- have_oss=yes
- fi
+ if test "$enable_oss4" = "yes" && test "$have_oss" = "yes" ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OSS4" >&5
+$as_echo_n "checking for OSS4... " >&6; }
 
- if test "x${have_oss}" = "xyes"; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we need -lossaudio" >&5
-$as_echo_n "checking whether we need -lossaudio... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
-
-		#include <sys/ioctl.h>
-		#ifdef HAVE_SYS_SOUNDCARD_H
-		#include <sys/soundcard.h>
-		#else
-		#include <soundcard.h>
-		#endif
-
-int
-main ()
-{
-
-		int fd, value;
-		ioctl(fd, SOUND_MIXER_READ_VOLUME, &value);
-
- ;
- return 0;
-}
+#ifdef HAVE_SYS_SOUNDCARD_H
+ #include <sys/soundcard.h>
+ #else
+ #include <soundcard.h>
+ #endif
+ #if OSS_VERSION >= 0x40000 || SOUND_VERSION >= 0x40000
+ yes
+ #endif
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "yes" >/dev/null 2>&1; then :
+ have_oss4="yes"
 else
-
-		OSS_LIBS="-lossaudio"
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
+ have_oss4="no"
 fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- fi
-fi
-
-if test "x$have_oss" = "xyes"; then
+rm -f conftest*
 
-$as_echo "#define HAVE_OSS 1" >>confdefs.h
 
-else
- have_oss=no
-fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_oss4" >&5
+$as_echo "$have_oss4" >&6; }
+ fi
 
-if test "x$have_oss" = "xyes"; then
-	OUTPUT_PLUGINS="$OUTPUT_PLUGINS OSS"
+ CPPFLAGS="$OLD_CPPFLAGS"
 fi
 
 
 
-
-
-# Check whether --enable-oss4 was given.
-if test "${enable_oss4+set}" = set; then :
- enableval=$enable_oss4; enable_oss4=$enableval
-else
- enable_oss4=yes
-
+if test "$enable_oss" = "yes" && test "$have_oss" = "no" ; then
+ enable_oss="no"
 fi
 
-
-if test "x$enable_oss4" = "xyes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OSS4 include dir" >&5
-$as_echo_n "checking for OSS4 include dir... " >&6; }
-
- if test -f "/etc/oss.conf"; then
- . "/etc/oss.conf"
- else
- OSSLIBDIR="/usr/lib/oss"
- fi
-
- if test -f "$OSSLIBDIR/include/sys/soundcard.h"; then
- OSS4_CPPFLAGS="-I$OSSLIBDIR/include/sys"
- elif test -f "$OSSLIBDIR/include/soundcard.h"; then
- OSS4_CPPFLAGS="-I$OSSLIBDIR/include"
- fi
-
- if test -n "$OSS4_CPPFLAGS"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OSS4_CPPFLAGS" >&5
-$as_echo "$OSS4_CPPFLAGS" >&6; }
- have_oss4=yes
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
-$as_echo "not found" >&6; }
- have_oss4=no
- fi
-
- if test "x$have_oss4" = "xyes"; then
- CPPFLAGS_save=$CPPFLAGS
- CPPFLAGS=$OSS4_CPPFLAGS
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OSS4" >&5
-$as_echo_n "checking for OSS4... " >&6; }
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <soundcard.h>
- #if OSS_VERSION >= 0x040000
- yes
- #endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "yes" >/dev/null 2>&1; then :
- have_oss4=yes
-else
- have_oss4=no
-
+if test "$enable_oss" = "yes"; then
+ OUTPUT_PLUGINS="$OUTPUT_PLUGINS OSS"
 fi
-rm -f conftest*
 
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_oss4" >&5
-$as_echo "$have_oss4" >&6; }
- CPPFLAGS=$CPPFLAGS_save
- fi
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: *** OSS4 output plugin disabled per user request ***" >&5
-$as_echo "*** OSS4 output plugin disabled per user request ***" >&6; }
- have_oss4=no
+if test "$enable_oss4" = "yes" && test "$have_oss4" = "no" ; then
+ enable_oss4="no"
 fi
 
-if test "x$have_oss4" = "xyes"; then
+if test "$enable_oss4" = "yes"; then
 OUTPUT_PLUGINS="$OUTPUT_PLUGINS oss4"
-
 fi
 
 
@@ -15641,31 +13725,6 @@
 
 fi
 
-for ac_header in unistd.h
-do :
- ac_fn_c_check_header_mongrel "$LINENO" "unistd.h" "ac_cv_header_unistd_h" "$ac_includes_default"
-if test "x$ac_cv_header_unistd_h" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_UNISTD_H 1
-_ACEOF
-
-fi
-
-done
-
-for ac_header in fts.h
-do :
- ac_fn_c_check_header_mongrel "$LINENO" "fts.h" "ac_cv_header_fts_h" "$ac_includes_default"
-if test "x$ac_cv_header_fts_h" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_FTS_H 1
-_ACEOF
-
-fi
-
-done
-
-
 
 # Check whether --enable-cdaudio was given.
 if test "${enable_cdaudio+set}" = set; then :
@@ -15924,86 +13983,6 @@
 fi
 fi
 
- if test "${ac_cv_header_linux_cdrom_h}" = "yes" || test "${ac_cv_header_sys_cdio_h}" = "yes"; then
- HAVE_CDROM_TRUE=
- HAVE_CDROM_FALSE='#'
-else
- HAVE_CDROM_TRUE='#'
- HAVE_CDROM_FALSE=
-fi
-
- if test "${ac_cv_header_linux_joystick_h}" = "yes"; then
- HAVE_LINUX_JOYSTICK_TRUE=
- HAVE_LINUX_JOYSTICK_FALSE='#'
-else
- HAVE_LINUX_JOYSTICK_TRUE='#'
- HAVE_LINUX_JOYSTICK_FALSE=
-fi
-
-
-CPPFLAGS="$CPPFLAGS $AUDACIOUS_CFLAGS $DBUS_CFLAGS"
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if __ELF__ is defined" >&5
-$as_echo_n "checking if __ELF__ is defined... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#ifdef __ELF__
- yes
- #endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "yes" >/dev/null 2>&1; then :
- is_elf=yes
-else
- is_elf=no
-
-fi
-rm -f conftest*
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${is_elf}" >&5
-$as_echo "${is_elf}" >&6; }
-
-
-have_solaris=no
-ARCH_DEFINES=""
-case "$host" in
- *-*-openbsd* | *-*-netbsd* | *-*-mirbsd*)
- if test "${is_elf}" = "no"
- then
-
-$as_echo "#define SYMBOL_PREFIX \"_\"" >>confdefs.h
-
- fi
- ;;
- *-*-darwin*)
-
-$as_echo "#define SYMBOL_PREFIX \"_\"" >>confdefs.h
-
- ;;
- *-hpux-*)
- ARCH_DEFINES="-DHPUX"
- ;;
- *-*-solaris* | *-*-sunos*)
- have_solaris=yes
- ;;
-esac
-
-arch_type=other
-x86_asm=no
-case "$host" in
- i386-*-* | i486-*-* | i586-*-* | i686-*-* | i86pc-*-*)
- arch_type=ix86
- case "$host" in
- *-*-netbsd* | *-*openbsd* | *-*-mirbsd*)
- ;;
- *)
- ARCH_DEFINES="-DI386_ASSEM"
- x86_asm=yes
- ;;
- esac
- ;;
-esac
 
 
 # Check whether --enable-scrobbler was given.
@@ -16314,9 +14293,9 @@
 
 # Check whether --enable-smb was given.
 if test "${enable_smb+set}" = set; then :
- enableval=$enable_smb; enable_smb=$enableval
+ enableval=$enable_smb; enable_smb="$enableval"
 else
- enable_smb=yes
+ enable_smb="no"
 fi
 
 
@@ -16605,93 +14584,6 @@
 fi
 
 
-# Check whether --enable-moodbar was given.
-if test "${enable_moodbar+set}" = set; then :
- enableval=$enable_moodbar; enable_moodbar=$enableval
-else
- enable_moodbar=yes
-fi
-
-
-if test "x$enable_moodbar" = "xyes"; then
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK218" >&5
-$as_echo_n "checking for GTK218... " >&6; }
-
-if test -n "$GTK218_CFLAGS"; then
- pkg_cv_GTK218_CFLAGS="$GTK218_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.18\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.18") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_GTK218_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.18" 2>/dev/null`
-		 test "x$?" != "x0" && pkg_failed=yes
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-if test -n "$GTK218_LIBS"; then
- pkg_cv_GTK218_LIBS="$GTK218_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.18\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.18") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_GTK218_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.18" 2>/dev/null`
-		 test "x$?" != "x0" && pkg_failed=yes
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes
-else
- _pkg_short_errors_supported=no
-fi
- if test $_pkg_short_errors_supported = yes; then
-	 GTK218_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-2.0 >= 2.18" 2>&1`
- else
-	 GTK218_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-2.0 >= 2.18" 2>&1`
- fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$GTK218_PKG_ERRORS" >&5
-
-	enable_moodbar=no
-elif test $pkg_failed = untried; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	enable_moodbar=no
-else
-	GTK218_CFLAGS=$pkg_cv_GTK218_CFLAGS
-	GTK218_LIBS=$pkg_cv_GTK218_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	enable_moodbar=yes
-fi
-fi
-
-if test "x$enable_moodbar" = "xyes"; then
- VISUALIZATION_PLUGINS="$VISUALIZATION_PLUGINS moodbar"
-fi
-
-
 # Check whether --enable-filewriter was given.
 if test "${enable_filewriter+set}" = set; then :
 enableval=$enable_filewriter; enable_filewriter=$enableval
@@ -17227,33 +15119,6 @@
 fi
 
 
-
-
- if test "x$arch_type" = "xix86"; then
- ARCH_X86_TRUE=
- ARCH_X86_FALSE='#'
-else
- ARCH_X86_TRUE='#'
- ARCH_X86_FALSE=
-fi
-
- if test "x$x86_asm" = xyes; then
- USE_X86ASM_TRUE=
- USE_X86ASM_FALSE='#'
-else
- USE_X86ASM_TRUE='#'
- USE_X86ASM_FALSE=
-fi
-
- if test "x$have_solaris" = xyes; then
- HAVE_SOLARIS_TRUE=
- HAVE_SOLARIS_FALSE='#'
-else
- HAVE_SOLARIS_TRUE='#'
- HAVE_SOLARIS_FALSE=
-fi
-
-
 plugindir=`pkg-config audacious --variable=plugin_dir`
 
 
@@ -17286,16 +15151,6 @@
 localedir="$datadir/locale"
 
 
-CFLAGS="$CFLAGS $EXTRA_CFLAGS"
-
-if test "x$enable_user_plugin_dir" = "xno"; then
-
-$as_echo "#define DISABLE_USER_PLUGIN_DIR /**/" >>confdefs.h
-
-fi
-
-
-
 
 
 
@@ -17425,7 +15280,6 @@
 LTLIBOBJS=$ac_ltlibobjs
 
 
-
 if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
 as_fn_error $? "conditional \"AMDEP\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -17434,39 +15288,11 @@
 as_fn_error $? "conditional \"am__fastdepCCAS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${am__fastdepCCAS_TRUE}" && test -z "${am__fastdepCCAS_FALSE}"; then
- as_fn_error $? "conditional \"am__fastdepCCAS\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 
 if test -z "${USE_IPV6_TRUE}" && test -z "${USE_IPV6_FALSE}"; then
 as_fn_error $? "conditional \"USE_IPV6\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${USE_CHARDET_TRUE}" && test -z "${USE_CHARDET_FALSE}"; then
- as_fn_error $? "conditional \"USE_CHARDET\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_CDROM_TRUE}" && test -z "${HAVE_CDROM_FALSE}"; then
- as_fn_error $? "conditional \"HAVE_CDROM\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_LINUX_JOYSTICK_TRUE}" && test -z "${HAVE_LINUX_JOYSTICK_FALSE}"; then
- as_fn_error $? "conditional \"HAVE_LINUX_JOYSTICK\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${ARCH_X86_TRUE}" && test -z "${ARCH_X86_FALSE}"; then
- as_fn_error $? "conditional \"ARCH_X86\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${USE_X86ASM_TRUE}" && test -z "${USE_X86ASM_FALSE}"; then
- as_fn_error $? "conditional \"USE_X86ASM\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_SOLARIS_TRUE}" && test -z "${HAVE_SOLARIS_FALSE}"; then
- as_fn_error $? "conditional \"HAVE_SOLARIS\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 
 : "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0
@@ -17876,7 +15702,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by audacious-plugins $as_me 3.0.3, which was
+This file was extended by audacious-plugins $as_me 3.1, which was
 generated by GNU Autoconf 2.68. Invocation command line was
 
 CONFIG_FILES = $CONFIG_FILES
@@ -17942,7 +15768,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-audacious-plugins config.status 3.0.3
+audacious-plugins config.status 3.1
 configured by $0, generated by GNU Autoconf 2.68,
 with options \\"\$ac_cs_config\\"
 
@@ -18897,8 +16723,7 @@
 echo
 echo " Output Plugins"
 echo " --------------"
-echo " Open Sound System (oss): $have_oss"
-echo " Open Sound System v4 (oss4): $have_oss4"
+echo " Open Sound System (oss4): $enable_oss4"
 echo " Advanced Linux Sound Arch. (alsa): $have_alsa"
 echo " PulseAudio (pulse): $have_pulse"
 echo " RoarAudio (roaraudio): $have_roar"
@@ -18912,6 +16737,7 @@
 echo " Null Audio output (null): yes"
 echo " Windows waveOut (experimental): $have_winmm"
 echo " OpenAL (experimental): $enable_openal"
+echo " Open Sound System v3 (deprecated): $enable_oss"
 echo
 echo " Input Plugins"
 echo " -------------"
@@ -18941,6 +16767,7 @@
 echo
 echo " General"
 echo " -------"
+echo " Alarm: yes"
 echo " Song Change: $enable_songchange"
 echo " Status Icon: $have_statusicon"
 echo " Audacious OSD: $have_aosd"
@@ -18956,13 +16783,14 @@
 echo
 echo " Effect"
 echo " ------"
+echo " Channel Mixer: yes"
+echo " Crystalizer: yes"
 echo " Dynamic Range Compressor: yes"
-echo " Voice Removal: yes"
-echo " Extra Stereo: yes"
 echo " Echo/Surround: yes"
+echo " Extra Stereo: yes"
+echo " LADSPA Host: yes"
 echo " SndStretch: yes"
-echo " Crystalizer: yes"
-echo " Mixdown: yes"
+echo " Voice Removal: yes"
 echo " Bauer stereophonic-to-binaural (bs2b): $have_bs2b"
 echo " Sample Rate Converter (resample): $enable_resample"
 echo
@@ -18970,14 +16798,13 @@
 echo " -------------"
 echo " Blur Scope: yes"
 echo " Cairo Spectrum Analyzer: yes"
-echo " Moodbar data renderer: $enable_moodbar"
 echo
 echo " Transport"
 echo " ---------"
-echo " gio transport (experimental): $enable_gio"
 echo " neon-based http/https: $have_neon"
 echo " libmms-based mms: $have_mms"
-echo " SMB transport: $enable_smb"
+echo " GIO transport (experimental): $enable_gio"
+echo " SMB transport (experimental): $enable_smb"
 echo
 echo " Container"
 echo " ---------"

audacious-plugins-3.0.3.tar.bz2/configure.ac -> audacious-plugins-3.1.tar.bz2/configure.ac Changed

@@ -1,150 +1,62 @@
-dnl Process this file with autoconf to produce a configure script.
+dnl ***
+dnl *** Process this file with autoconf to produce a configure script.
+dnl ***
 
-AC_INIT([audacious-plugins], [3.0.3])
-AC_COPYRIGHT([(C) 2005-2011 Audacious Team])
+dnl Initialize
+dnl ==========
 AC_PREREQ([2.59])
+AC_INIT([audacious-plugins], [3.1])
+AC_COPYRIGHT([(C) 2005-2011 Audacious Team])
 
-AC_CANONICAL_HOST
-AC_CANONICAL_TARGET
-AC_CONFIG_HEADERS([config.h])
-
-dnl XXX kludge for FreeBSD
-if test -d "/usr/X11R6/include"; then
-	CPPFLAGS="$CPPFLAGS -I/usr/X11R6/include"
-fi
-
-dnl append audacious header path to CPPFLAGS when --prefix is specified.
-if test "x$prefix" != "xNONE" ; then
- CPPFLAGS="$CPPFLAGS -I${includedir}"
-fi
-
-dnl OMK bootstrap
 AC_SUBST([PACKAGE], [AC_PACKAGE_TARNAME])
 AC_SUBST([VERSION], [AC_PACKAGE_VERSION])
+AC_DEFINE_UNQUOTED([PACKAGE], "$PACKAGE", [Name of package])
+AC_DEFINE_UNQUOTED([VERSION], "$VERSION", [Version number of package])
 
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
-AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])
-
-dnl Check for C compiler
-
-AC_PROG_CC
-AC_PROG_CXX
-AC_ISC_POSIX
-AC_C_BIGENDIAN
-
-if test "x$GCC" = "xyes"; then
-	CFLAGS="$CFLAGS -pipe -Wall"
-	CXXFLAGS="$CXXFLAGS -pipe -Wall"
-fi
-
-dnl Chainsaw says this is broken.
-dnl LDFLAGS="$LDFLAGS -z defs"
-
-dnl Large file support
-dnl ==================
-AC_SYS_LARGEFILE
-
-dnl Locate a program and check that its version is acceptable.
-dnl AC_PROG_CHECK_VER(var, namelist, version-switch,
-dnl 		 [version-extract-regexp], version-glob [, do-if-fail])
-AC_DEFUN([AC_CHECK_PROG_VER],
-[AC_CHECK_PROGS([$1], [$2])
-if test -z "[$]$1"; then
- ac_verc_fail=yes
-else
- # Found it, now check the version.
- AC_MSG_CHECKING([version of [$]$1])
-changequote(<<<,>>>)dnl
- ac_prog_version=`<<<$>>>$1 $3 2>&1 ifelse(<<<$4>>>,,,
- <<<| sed -n 's/^.*patsubst(<<<$4>>>,/,\/).*$/\1/p'>>>)`
- case $ac_prog_version in
- '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
- <<<$5>>>)
-changequote([,])dnl
- ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
- *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
-
- esac
- AC_MSG_RESULT([$ac_prog_version])
-fi
-ifelse([$6],,,
-[if test $ac_verc_fail = yes; then
- $6
-fi])
-])
-
-GCC42_CFLAGS="-fgnu89-inline"
-AC_CHECK_PROG_VER(CC, ${ac_tool_prefix}gcc ${ac_tool_prefix}cc, -v,
- [version $[egcygnustpi-]*[0-9.]*$], [4.[2-9]* ],
- GCC42_CFLAGS="")
-
-dnl Check for assembler
-
-AM_PROG_AS
+AC_CANONICAL_HOST
+AC_CANONICAL_TARGET
+AC_CONFIG_HEADERS([config.h])
 
-dnl Checks for various programs
+AUD_COMMON_PROGS
 
-AC_PROG_LN_S
-AC_PROG_MAKE_SET
+BUILDSYS_INIT
+BUILDSYS_SHARED_LIB
 
-AC_PATH_PROG(RM, rm)
-AC_PATH_PROG(MV, mv)
-AC_PATH_PROG(CP, cp)
-AC_PATH_PROG(AR, ar)
-AC_PATH_PROG(TR, tr)
-AC_PATH_PROG(RANLIB, ranlib)
+dnl Headers and functions
+dnl =====================
+AC_CHECK_FUNCS([fcntl fsync mkdtemp])
 
-dnl Gettext -nenolod
+dnl gettext
+dnl =======
 AM_GNU_GETTEXT([external])
+if test "$MSGFMT" = ":" ; then
+ AC_MSG_ERROR([msgfmt was not found; have you installed gettext?])
+fi
 
-dnl Check for common functions
-dnl ==========================
-
-AC_CHECK_FUNCS([fcntl fsync mkdtemp strnlen strtoul])
-
-dnl OSS stuff (Why is this here?)
-dnl =============================
+dnl Check for Audacious
+dnl ===================
 
-AC_ARG_WITH(dev-dsp,
- [ --with-dev-dsp=path Path to OSS DSP data pipe, default is /dev/dsp.],
- [dev_dsp=$withval],
- [dev_dsp=/dev/dsp]
-)
-AC_DEFINE_UNQUOTED(DEV_DSP, "$dev_dsp",
- [Path to OSS DSP, really just a data pipe, default is /dev/dsp.]
+PKG_CHECK_MODULES(AUDACIOUS, [audacious >= 3.1],
+ [ADD_PC_REQUIRES([audacious >= 3.1])],
+ [AC_MSG_ERROR([Cannot find Audacious 3.1; have you installed Audacious yet?])]
 )
 
-AC_ARG_WITH(dev-mixer,
- [ --with-dev-mixer=path Path to OSS sound mixer, default is /dev/mixer.],
- [dev_mixer=$withval],
- [dev_mixer=/dev/mixer]
-)
-AC_DEFINE_UNQUOTED(DEV_MIXER, "$dev_mixer",
- [Path to OSS mixer, default is /dev/mixer.]
-)
+CPPFLAGS="$CPPFLAGS $AUDACIOUS_CFLAGS"
+LIBS="$LIBS $AUDACIOUS_LIBS"
 
-dnl These plugins are always built.
+dnl Default Set of Plugins
+dnl ======================
 
 INPUT_PLUGINS="tonegen metronom vtx"
 OUTPUT_PLUGINS="null"
-EFFECT_PLUGINS="compressor crossfade crystalizer mixdown sndstretch stereo_plugin voice_removal echo_plugin"
-GENERAL_PLUGINS="albumart"
+EFFECT_PLUGINS="compressor crossfade crystalizer ladspa mixer sndstretch stereo_plugin voice_removal echo_plugin"
+GENERAL_PLUGINS="alarm albumart"
 VISUALIZATION_PLUGINS="blur_scope cairo-spectrum"
 CONTAINER_PLUGINS="m3u pls asx"
 TRANSPORT_PLUGINS="unix-io"
 
-dnl Check for Audacious
-
-PKG_CHECK_MODULES(AUDACIOUS, [audacious >= 3.0],
- [ADD_PC_REQUIRES([audacious >= 3.0])],
- [AC_MSG_ERROR([Cannot find Audacious 3.0 or later, have you installed audacious yet?])]
-)
-
-CFLAGS="$CFLAGS $AUDACIOUS_CFLAGS"
-CPPFLAGS="$CPPFLAGS $AUDACIOUS_CPPFLAGS"
-LIBS="$LIBS $AUDACIOUS_LIBS"
-
-dnl Check for GTK/GLib/GThread/Pango
+dnl Check for GTK+
+dnl ==============
 
 AC_ARG_ENABLE([gtk3],
 [AS_HELP_STRING([--disable-gtk3], [Use GTK2 even if GTK3 is present])],
@@ -162,7 +74,8 @@
 AC_SUBST([GTK_LIBS])
 AC_SUBST([GTK_CFLAGS])
 
-AUD_COMMON_PROGS
+dnl Check for GIO
+dnl =============
 
 AC_ARG_ENABLE(gio,
 AS_HELP_STRING([--enable-gio], [enable GIO support (default=disabled)]),
@@ -202,34 +115,6 @@
 AM_CONDITIONAL(USE_IPV6,test "x$enable_ipv6" = "xyes")
 AC_SUBST(USE_IPV6)
 
-dnl chardet support
-dnl ========================
-AC_ARG_ENABLE(chardet,
-	[ --enable-chardet	 enable character set detection support (default=no)],
-			enable_chardet=$enableval, enable_chardet=no)
-if test "x$enable_chardet" = "xyes"; then
- AC_DEFINE(USE_CHARDET, 1, [Define if character set detection enabled] )
-fi
-AM_CONDITIONAL(USE_CHARDET,test "x$enable_chardet" = "xyes")
-AC_SUBST(USE_CHARDET)
-
-dnl plugin stuff
-dnl ========================
-
-BUILDSYS_INIT
-BUILDSYS_SHARED_LIB
-
-AC_MSG_CHECKING([if you are running Apple-GCC])
-case "$target" in
-	*-apple-*)
-		AC_MSG_RESULT([yes, sorry you poor bastard])
-		LDFLAGS="$LDFLAGS -Wl,-framework -Wl,CoreFoundation -Wl,-framework -Wl,CoreServices"
-		;;
-	*)
-		AC_MSG_RESULT([no])
-		;;
-esac
-
 dnl Console
 dnl =======
 
@@ -430,18 +315,6 @@
 fi
 fi
 
-dnl *** Rocklight
-
-AC_ARG_ENABLE(rocklight,
- AS_HELP_STRING([--disable-rocklight], [disable Rocklight vis plugin (default=enabled)]),
- [enable_rocklight="$enableval"],
- [enable_rocklight="yes"]
-)
-
-if test "x$enable_rocklight" = "xyes"; then
- VISUALIZATION_PLUGINS="$VISUALIZATION_PLUGINS rocklight"
-fi
-
 dnl *** Global Hotkey general plugin (only built on X11)
 
 AC_ARG_ENABLE(hotkey,
@@ -824,131 +697,74 @@
 	INPUT_PLUGINS="$INPUT_PLUGINS sid"
 fi
 
-dnl *** OSS output
+dnl OSS output
+dnl ==========
 
 AC_ARG_ENABLE(oss,
- [ --disable-oss disable the OSS output plugin (default=enabled)],
- [enable_oss=$enableval],
- [enable_oss=yes]
+ [ --enable-oss enable OSS3 output plugin],
+ [enable_oss="$enableval"],
+ [enable_oss="no"]
 )
 
-have_oss=no
-if test "x$enable_oss" = "xyes"; then
- AC_MSG_CHECKING(for OSS include dir)
- OSS_CFLAGS=""
- if test -f "/etc/oss.conf" ; then
- for i in `cat /etc/oss.conf`; do
- t=`echo $i | sed -e 's/OSSLIBDIR=//'`
- if test "x$i" != "x$t" ; then
- if test -f "$t/include/sys/soundcard.h" -o -f "$i/include/soundcard.h" ; then
- OSS_CFLAGS="-I$t/include"
- fi
- fi
- done
- fi
- if test -n "$OSS_CFLAGS" ; then
- AC_MSG_RESULT([$OSS_CFLAGS])
- else
- AC_MSG_RESULT([not found])
- fi
- CFLAGS_save=$CFLAGS
- CFLAGS="$CFLAGS $OSS_CFLAGS"
- AC_CHECK_HEADERS(soundcard.h)
- AC_CHECK_HEADERS(sys/soundcard.h)
- AC_CHECK_HEADERS(machine/soundcard.h)
- CFLAGS=$CFLAGS_save
-
- if test "x${ac_cv_header_soundcard_h}" = "xyes" || test "x${ac_cv_header_sys_soundcard_h}" = "xyes" || test "x${ac_cv_header_machine_soundcard_h}" = "xyes"; then
- have_oss=yes
- fi
-
- if test "x${have_oss}" = "xyes"; then
-	AC_MSG_CHECKING(whether we need -lossaudio)
- AC_TRY_LINK([
-		#include <sys/ioctl.h>
-		#ifdef HAVE_SYS_SOUNDCARD_H
-		#include <sys/soundcard.h>
-		#else
-		#include <soundcard.h>
-		#endif
- ], [
-		int fd, value;
-		ioctl(fd, SOUND_MIXER_READ_VOLUME, &value);
-	], AC_MSG_RESULT(no), [
-		OSS_LIBS="-lossaudio"
-		AC_MSG_RESULT(yes)
- ])
- fi
-fi
-
-if test "x$have_oss" = "xyes"; then
- AC_DEFINE(HAVE_OSS, 1, [Define if the OSS output plugin should be built])
-else
- have_oss=no
-fi
-
-if test "x$have_oss" = "xyes"; then
-	OUTPUT_PLUGINS="$OUTPUT_PLUGINS OSS"
-fi
-AC_SUBST(OSS_CFLAGS)
-AC_SUBST(OSS_LIBS)
-
-
-dnl *** OSS4 output
-
 AC_ARG_ENABLE(oss4,
- [ --disable-oss4 disable the OSS4 output plugin],
- [enable_oss4=$enableval],
- [enable_oss4=yes]
+ [ --disable-oss4 disable OSS4 output plugin],
+ [enable_oss4="$enableval"],
+ [enable_oss4="yes"]
 )
 
-if test "x$enable_oss4" = "xyes"; then
- AC_MSG_CHECKING(for OSS4 include dir)
+have_oss="no"
+have_oss4="no"
+OSS_CFLAGS=""
 
+if test "$enable_oss" = "yes" || test "$enable_oss4" = "yes" ; then
 if test -f "/etc/oss.conf"; then
 . "/etc/oss.conf"
- else
- OSSLIBDIR="/usr/lib/oss"
+ OSS_CFLAGS="-I$OSSLIBDIR/include"
 fi
 
- if test -f "$OSSLIBDIR/include/sys/soundcard.h"; then
- OSS4_CPPFLAGS="-I$OSSLIBDIR/include/sys"
- elif test -f "$OSSLIBDIR/include/soundcard.h"; then
- OSS4_CPPFLAGS="-I$OSSLIBDIR/include"
- fi
+ OLD_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $OSS_CFLAGS"
 
- if test -n "$OSS4_CPPFLAGS"; then
- AC_MSG_RESULT([$OSS4_CPPFLAGS])
- have_oss4=yes
- else
- AC_MSG_RESULT([not found])
- have_oss4=no
- fi
+ AC_CHECK_HEADERS([sys/soundcard.h soundcard.h],
+ [have_oss="yes"], [have_oss="$have_oss"])
 
- if test "x$have_oss4" = "xyes"; then
- CPPFLAGS_save=$CPPFLAGS
- CPPFLAGS=$OSS4_CPPFLAGS
+ if test "$enable_oss4" = "yes" && test "$have_oss" = "yes" ; then
 AC_MSG_CHECKING(for OSS4)
+
 AC_EGREP_CPP(yes,
- [#include <soundcard.h>
- #if OSS_VERSION >= 0x040000
- yes
+ [#ifdef HAVE_SYS_SOUNDCARD_H
+ #include <sys/soundcard.h>
+ #else
+ #include <soundcard.h>
 #endif
- ],
- [have_oss4=yes],
- [have_oss4=no]
- )
+ #if OSS_VERSION >= 0x40000 || SOUND_VERSION >= 0x40000
+ yes
+ #endif],
+ [have_oss4="yes"],
+ [have_oss4="no"])
+
 AC_MSG_RESULT([$have_oss4])
- CPPFLAGS=$CPPFLAGS_save
 fi
-else
- AC_MSG_RESULT([*** OSS4 output plugin disabled per user request ***])
- have_oss4=no
+
+ CPPFLAGS="$OLD_CPPFLAGS"
+fi
+
+AC_SUBST(OSS_CFLAGS)
+
+if test "$enable_oss" = "yes" && test "$have_oss" = "no" ; then
+ enable_oss="no"
 fi
 
-if test "x$have_oss4" = "xyes"; then
+if test "$enable_oss" = "yes"; then
+ OUTPUT_PLUGINS="$OUTPUT_PLUGINS OSS"
+fi
+
+if test "$enable_oss4" = "yes" && test "$have_oss4" = "no" ; then
+ enable_oss4="no"
+fi
+
+if test "$enable_oss4" = "yes"; then
 OUTPUT_PLUGINS="$OUTPUT_PLUGINS oss4"
- AC_SUBST(OSS4_CPPFLAGS)
 fi
 
 dnl *** ALSA output plugin
@@ -1079,10 +895,8 @@
 AC_SUBST(AMIDIPLUG_BACKENDS)
 fi
 
-AC_CHECK_HEADERS(unistd.h)
-AC_CHECK_HEADERS(fts.h)
-
-dnl CD-Audio New Generation
+dnl Audio CD
+dnl ========
 
 AC_ARG_ENABLE(cdaudio,
 [ --disable-cdaudio disable cdaudio-ng input plugin (default=enabled) ],
@@ -1122,58 +936,6 @@
 )
 fi
 
-AM_CONDITIONAL(HAVE_CDROM, test "${ac_cv_header_linux_cdrom_h}" = "yes" || test "${ac_cv_header_sys_cdio_h}" = "yes")
-AM_CONDITIONAL(HAVE_LINUX_JOYSTICK,test "${ac_cv_header_linux_joystick_h}" = "yes")
-
-CPPFLAGS="$CPPFLAGS $AUDACIOUS_CFLAGS $DBUS_CFLAGS"
-
-AC_MSG_CHECKING(if __ELF__ is defined)
-AC_EGREP_CPP(yes,
- [#ifdef __ELF__
- yes
- #endif
- ],
- [is_elf=yes],
- [is_elf=no]
-)
-AC_MSG_RESULT([${is_elf}])
-
-
-have_solaris=no
-ARCH_DEFINES=""
-case "$host" in
- *-*-openbsd* | *-*-netbsd* | *-*-mirbsd*)
- if test "${is_elf}" = "no"
- then
- AC_DEFINE(SYMBOL_PREFIX, "_", [Define to symbol prefix, if any])
- fi
- ;;
- *-*-darwin*)
- AC_DEFINE(SYMBOL_PREFIX, "_", [Define to symbol prefix, if any])
- ;;
- *-hpux-*)
- ARCH_DEFINES="-DHPUX"
- ;;
- *-*-solaris* | *-*-sunos*)
- have_solaris=yes
- ;;
-esac
-
-arch_type=other
-x86_asm=no
-case "$host" in
- i386-*-* | i486-*-* | i586-*-* | i686-*-* | i86pc-*-*)
- arch_type=ix86
- case "$host" in
- *-*-netbsd* | *-*openbsd* | *-*-mirbsd*)
- ;;
- *)
- ARCH_DEFINES="-DI386_ASSEM"
- x86_asm=yes
- ;;
- esac
- ;;
-esac
 
 dnl *** scrobbler ***
 
@@ -1228,8 +990,8 @@
 dnl ===
 
 AC_ARG_ENABLE(smb,
- AS_HELP_STRING([--disable-smb], [disable SMB transport (default=enabled)]),
- [enable_smb=$enableval], [enable_smb=yes])
+ AS_HELP_STRING([--enable-smb], [enable SMB transport (default=disabled)]),
+ [enable_smb="$enableval"], [enable_smb="no"])
 
 if test $enable_smb = yes ; then
 AC_CHECK_HEADERS([libsmbclient.h], [enable_smb=yes], [enable_smb=no])
@@ -1288,22 +1050,6 @@
 AC_MSG_RESULT([*** cue plugin disabled by request ***])
 fi
 
-dnl Moodbar
-dnl =========
-
-AC_ARG_ENABLE(moodbar,
- [ --disable-moodbar disable Moodbar data renderer (default=enabled)],
- [enable_moodbar=$enableval], [enable_moodbar=yes])
-
-if test "x$enable_moodbar" = "xyes"; then
- PKG_CHECK_MODULES(GTK218, [gtk+-2.0 >= 2.18], [enable_moodbar=yes],
- [enable_moodbar=no])
-fi
-
-if test "x$enable_moodbar" = "xyes"; then
- VISUALIZATION_PLUGINS="$VISUALIZATION_PLUGINS moodbar"
-fi
-
 dnl FileWriter
 dnl ==========
 
@@ -1449,13 +1195,6 @@
 
 dnl *** End of all plugin checks ***
 
-AC_SUBST(ARCH_DEFINES)
-
-dnl XXX delete ASAP -nenolod
-AM_CONDITIONAL(ARCH_X86, test "x$arch_type" = "xix86")
-AM_CONDITIONAL(USE_X86ASM, test "x$x86_asm" = xyes)
-AM_CONDITIONAL(HAVE_SOLARIS, test "x$have_solaris" = xyes)
-
 plugindir=`pkg-config audacious --variable=plugin_dir`
 AC_SUBST(plugindir)
 
@@ -1490,14 +1229,6 @@
 localedir="$datadir/locale"
 AC_SUBST(localedir)
 
-CFLAGS="$CFLAGS $EXTRA_CFLAGS"
-
-if test "x$enable_user_plugin_dir" = "xno"; then
- AC_DEFINE(DISABLE_USER_PLUGIN_DIR,, [Define to disable per user plugin directory])
-fi
-
-AC_SUBST(plugindir)
-
 AC_SUBST(EFFECT_PLUGINS)
 AC_SUBST(GENERAL_PLUGINS)
 AC_SUBST(INPUT_PLUGINS)
@@ -1522,8 +1253,7 @@
 echo
 echo " Output Plugins"
 echo " --------------"
-echo " Open Sound System (oss): $have_oss"
-echo " Open Sound System v4 (oss4): $have_oss4"
+echo " Open Sound System (oss4): $enable_oss4"
 echo " Advanced Linux Sound Arch. (alsa): $have_alsa"
 echo " PulseAudio (pulse): $have_pulse"
 echo " RoarAudio (roaraudio): $have_roar"
@@ -1537,6 +1267,7 @@
 echo " Null Audio output (null): yes"
 echo " Windows waveOut (experimental): $have_winmm"
 echo " OpenAL (experimental): $enable_openal"
+echo " Open Sound System v3 (deprecated): $enable_oss"
 echo
 echo " Input Plugins"
 echo " -------------"
@@ -1566,6 +1297,7 @@
 echo
 echo " General"
 echo " -------"
+echo " Alarm: yes"
 echo " Song Change: $enable_songchange"
 echo " Status Icon: $have_statusicon"
 echo " Audacious OSD: $have_aosd"
@@ -1581,13 +1313,14 @@
 echo
 echo " Effect"
 echo " ------"
+echo " Channel Mixer: yes"
+echo " Crystalizer: yes"
 echo " Dynamic Range Compressor: yes"
-echo " Voice Removal: yes"
-echo " Extra Stereo: yes"
 echo " Echo/Surround: yes"
+echo " Extra Stereo: yes"
+echo " LADSPA Host: yes"
 echo " SndStretch: yes"
-echo " Crystalizer: yes"
-echo " Mixdown: yes"
+echo " Voice Removal: yes"
 echo " Bauer stereophonic-to-binaural (bs2b): $have_bs2b"
 echo " Sample Rate Converter (resample): $enable_resample"
 echo
@@ -1595,14 +1328,13 @@
 echo " -------------"
 echo " Blur Scope: yes"
 echo " Cairo Spectrum Analyzer: yes"
-echo " Moodbar data renderer: $enable_moodbar"
 echo
 echo " Transport"
 echo " ---------"
-echo " gio transport (experimental): $enable_gio"
 echo " neon-based http/https: $have_neon"
 echo " libmms-based mms: $have_mms"
-echo " SMB transport: $enable_smb"
+echo " GIO transport (experimental): $enable_gio"
+echo " SMB transport (experimental): $enable_smb"
 echo
 echo " Container"
 echo " ---------"

audacious-plugins-3.0.3.tar.bz2/extra.mk.in -> audacious-plugins-3.1.tar.bz2/extra.mk.in Changed

@@ -1,80 +1,29 @@
-@SET_MAKE@
+USE_NLS ?= @USE_NLS@
+VERSION ?= @VERSION@
+
+# overrides setting in buildsys.mk
+plugindir = @plugindir@
+
+CONTAINER_PLUGIN_DIR ?= @CONTAINER_PLUGIN_DIR@
+CONTAINER_PLUGINS ?= @CONTAINER_PLUGINS@
+EFFECT_PLUGINS ?= @EFFECT_PLUGINS@
+EFFECT_PLUGIN_DIR ?= @EFFECT_PLUGIN_DIR@
+GENERAL_PLUGINS ?= @GENERAL_PLUGINS@
+GENERAL_PLUGIN_DIR ?= @GENERAL_PLUGIN_DIR@
+INPUT_PLUGINS ?= @INPUT_PLUGINS@
+INPUT_PLUGIN_DIR ?= @INPUT_PLUGIN_DIR@
+OUTPUT_PLUGINS ?= @OUTPUT_PLUGINS@
+OUTPUT_PLUGIN_DIR ?= @OUTPUT_PLUGIN_DIR@
+TRANSPORT_PLUGIN_DIR ?= @TRANSPORT_PLUGIN_DIR@
+TRANSPORT_PLUGINS ?= @TRANSPORT_PLUGINS@
+VISUALIZATION_PLUGINS ?= @VISUALIZATION_PLUGINS@
+VISUALIZATION_PLUGIN_DIR ?= @VISUALIZATION_PLUGIN_DIR@
 
-srcdir ?= @srcdir@
-top_srcdir ?= @top_srcdir@
-VPATH ?= @srcdir@
-pkgdatadir ?= $(datadir)/@PACKAGE@
-pkglibdir ?= $(libdir)/@PACKAGE@
-pkgincludedir ?= $(includedir)/@PACKAGE@
-top_builddir ?= .
-am__cd ?= CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL ?= @INSTALL@
-install_sh_DATA ?= $(install_sh) -c -m 644
-install_sh_PROGRAM ?= $(install_sh) -c
-install_sh_SCRIPT ?= $(install_sh) -c
-INSTALL_HEADER ?= $(INSTALL_DATA)
-transform ?= $(program_transform_name)
-NORMAL_INSTALL ?= :
-PRE_INSTALL ?= :
-POST_INSTALL ?= :
-NORMAL_UNINSTALL ?= :
-PRE_UNINSTALL ?= :
-POST_UNINSTALL ?= :
-build_triplet ?= @build@
-host_triplet ?= @host@
-target_triplet ?= @target@
-subdir ?= .
-ACLOCAL_M4 ?= $(top_srcdir)/aclocal.m4
-CONFIG_HEADER ?= config.h
-CONFIG_CLEAN_FILES ?= audacious.1 audacious.spec audacious.pc \
-	intl/Makefile
-SOURCES =
-DIST_SOURCES =
-man1dir ?= $(mandir)/man1
-am__installdirs ?= "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(pkgconfigdir)"
-NROFF ?= nroff
-MANS ?= $(man_MANS)
-am__vpath_adj_setup ?= srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj ?= case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir ?= `echo $$p | sed -e 's|^.*/||'`;
-pkgconfigDATA_INSTALL ?= $(INSTALL_DATA)
-DATA ?= $(pkgconfig_DATA)
-ETAGS ?= etags
-CTAGS ?= ctags
-DIST_SUBDIRS ?= $(SUBDIRS)
-DISTFILES ?= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-distdir ?= $(PACKAGE)-$(VERSION)
-top_distdir ?= $(distdir)
-am__remove_distdir ?= \
-  { test ! -d $(distdir) \
-    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
-         && rm -fr $(distdir); }; }
-DIST_ARCHIVES ?= $(distdir).tar.gz
-GZIP_ENV ?= --best
-distuninstallcheck_listfiles ?= find . -type f -print
-distcleancheck_listfiles ?= find . -type f -print
-ACLOCAL ?= @ACLOCAL@
-ALLOCA ?= @ALLOCA@
-ALSA_CFLAGS ?= @ALSA_CFLAGS@
-ALSA_LIBS ?= @ALSA_LIBS@
-AMDEP_FALSE ?= @AMDEP_FALSE@
-AMDEP_TRUE ?= @AMDEP_TRUE@
 AMIDIPLUG_BACKEND_DIR ?= @AMIDIPLUG_BACKEND_DIR@
 AMIDIPLUG_BACKENDS ?= @AMIDIPLUG_BACKENDS@
-AMTAR ?= @AMTAR@
-AR ?= @AR@
-ARCH_DEFINES ?= @ARCH_DEFINES@
-ARCH_X86_FALSE ?= @ARCH_X86_FALSE@
-ARCH_X86_TRUE ?= @ARCH_X86_TRUE@
-ARTSC_CFLAGS ?= @ARTSC_CFLAGS@
-ARTSC_LIBS ?= @ARTSC_LIBS@
-AUTOCONF ?= @AUTOCONF@
-AUTOHEADER ?= @AUTOHEADER@
-AUTOMAKE ?= @AUTOMAKE@
-AWK ?= @AWK@
+
+ALSA_CFLAGS ?= @ALSA_CFLAGS@
+ALSA_LIBS ?= @ALSA_LIBS@
 BINIO_CFLAGS ?= @BINIO_CFLAGS@
 BINIO_LIBS ?= @BINIO_LIBS@
 BS2B_CFLAGS ?= @BS2B_CFLAGS@
@@ -82,319 +31,80 @@
 BUILDERS_CFLAGS ?= @BUILDERS_CFLAGS@
 BUILDERS_LDFLAGS ?= @BUILDERS_LDFLAGS@
 BUILDERS_LIBS ?= @BUILDERS_LIBS@
-BUILD_INCLUDED_LIBINTL ?= @BUILD_INCLUDED_LIBINTL@
 CAIRO_CFLAGS ?= @CAIRO_CFLAGS@
 CAIRO_LIBS ?= @CAIRO_LIBS@
-CATOBJEXT ?= @CATOBJEXT@
-CCAS ?= @CCAS@
-CCASFLAGS ?= @CCASFLAGS@
-CCDEPMODE ?= @CCDEPMODE@
-CXXCPP ?= @CXXCPP@
-CXXDEPMODE ?= @CXXDEPMODE@
-CYGPATH_W ?= @CYGPATH_W@
-DATADIRNAME ?= @DATADIRNAME@
+CDIO_LIBS ?= @CDIO_LIBS@
+CDIO_CFLAGS ?= @CDIO_CFLAGS@
+CDDB_LIBS ?= @CDDB_LIBS@
+CDDB_CFLAGS ?= @CDDB_CFLAGS@
+CUE_CFLAGS ?= @CUE_CFLAGS@
+CUE_LIBS ?= @CUE_LIBS@
+CURL_CFLAGS ?= @CURL_CFLAGS@
+CURL_LIBS ?= @CURL_LIBS@
 DBUS_CFLAGS ?= @DBUS_CFLAGS@
 DBUS_LIBS ?= @DBUS_LIBS@
-DCT64 ?= @DCT64@
-DEFS ?= @DEFS@
-DEPDIR ?= @DEPDIR@
-ECHO ?= @ECHO@
-ECHO_C ?= @ECHO_C@
-ECHO_N ?= @ECHO_N@
-ECHO_T ?= @ECHO_T@
-EFFECT_PLUGINS ?= @EFFECT_PLUGINS@
-EFFECT_PLUGIN_DIR ?= @EFFECT_PLUGIN_DIR@
-EGREP ?= @EGREP@
-ENABLE_AAC_FALSE ?= @ENABLE_AAC_FALSE@
-ENABLE_AAC_TRUE ?= @ENABLE_AAC_TRUE@
-ENABLE_AMIDIPLUG_FALSE ?= @ENABLE_AMIDIPLUG_FALSE@
-ENABLE_AMIDIPLUG_TRUE ?= @ENABLE_AMIDIPLUG_TRUE@
-ENABLE_CROSSFADE_FALSE ?= @ENABLE_CROSSFADE_FALSE@
-ENABLE_CROSSFADE_TRUE ?= @ENABLE_CROSSFADE_TRUE@
-ENABLE_MPG123_FALSE ?= @ENABLE_MPG123_FALSE@
-ENABLE_MPG123_TRUE ?= @ENABLE_MPG123_TRUE@
-ENABLE_MUSEPACK_FALSE ?= @ENABLE_MUSEPACK_FALSE@
-ENABLE_MUSEPACK_TRUE ?= @ENABLE_MUSEPACK_TRUE@
-ENABLE_TIMIDITY_FALSE ?= @ENABLE_TIMIDITY_FALSE@
-ENABLE_TIMIDITY_TRUE ?= @ENABLE_TIMIDITY_TRUE@
-ENABLE_WMA_FALSE ?= @ENABLE_WMA_FALSE@
-ENABLE_WMA_TRUE ?= @ENABLE_WMA_TRUE@
-ESD_CFLAGS ?= @ESD_CFLAGS@
-ESD_LIBS ?= @ESD_LIBS@
-EXEEXT ?= @EXEEXT@
 FAAD_CFLAGS ?= @FAAD_CFLAGS@
 FAAD_LIBS ?= @FAAD_LIBS@
+FFMPEG_CFLAGS ?= @FFMPEG_CFLAGS@
+FFMPEG_LIBS ?= @FFMPEG_LIBS@
+FILEWRITER_CFLAGS ?= @FILEWRITER_CFLAGS@
+FILEWRITER_LIBS ?= @FILEWRITER_LIBS@
 FLUIDSYNTH_CFLAGS ?= @FLUIDSYNTH_CFLAGS@
 FLUIDSYNTH_LIBS ?= @FLUIDSYNTH_LIBS@
-GCONF_CFLAGS ?= @GCONF_CFLAGS@
-GCONF_LIBS ?= @GCONF_LIBS@
 GDKX11_CFLAGS ?= @GDKX11_CFLAGS@
 GDKX11_LIBS ?= @GDKX11_LIBS@
-GENCAT ?= @GENCAT@
-GENERAL_PLUGINS ?= @GENERAL_PLUGINS@
-GENERAL_PLUGIN_DIR ?= @GENERAL_PLUGIN_DIR@
-GLIBC21 ?= @GLIBC21@
 GLIB_CFLAGS ?= @GLIB_CFLAGS@
 GLIB_LIBS ?= @GLIB_LIBS@
-GIO_LIBS ?= @GIO_LIBS@
 GMODULE_CFLAGS ?= @GMODULE_CFLAGS@
 GMODULE_LIBS ?= @GMODULE_LIBS@
-GMSGFMT ?= @GMSGFMT@
-GNOMEVFS_CFLAGS ?= @GNOMEVFS_CFLAGS@
-GNOMEVFS_LIBS ?= @GNOMEVFS_LIBS@
 GTK_CFLAGS ?= @GTK_CFLAGS@
 GTK_LIBS ?= @GTK_LIBS@
-HARDSID_LIBS ?= @HARDSID_LIBS@
-HAVE_ADPLUG_FALSE ?= @HAVE_ADPLUG_FALSE@
-HAVE_ADPLUG_TRUE ?= @HAVE_ADPLUG_TRUE@
-HAVE_ALSA_FALSE ?= @HAVE_ALSA_FALSE@
-HAVE_ALSA_TRUE ?= @HAVE_ALSA_TRUE@
-HAVE_CDROM_FALSE ?= @HAVE_CDROM_FALSE@
-HAVE_CDROM_TRUE ?= @HAVE_CDROM_TRUE@
-HAVE_ESD_FALSE ?= @HAVE_ESD_FALSE@
-HAVE_ESD_TRUE ?= @HAVE_ESD_TRUE@
-HAVE_FLAC_FALSE ?= @HAVE_FLAC_FALSE@
-HAVE_FLAC_TRUE ?= @HAVE_FLAC_TRUE@
-HAVE_GCONF_FALSE ?= @HAVE_GCONF_FALSE@
-HAVE_GCONF_TRUE ?= @HAVE_GCONF_TRUE@
-HAVE_GNOME_VFS_FALSE ?= @HAVE_GNOME_VFS_FALSE@
-HAVE_GNOME_VFS_TRUE ?= @HAVE_GNOME_VFS_TRUE@
-HAVE_JACK_FALSE ?= @HAVE_JACK_FALSE@
-HAVE_JACK_TRUE ?= @HAVE_JACK_TRUE@
-HAVE_NULL_TRUE ?= @HAVE_NULL_TRUE@
-HAVE_LIBSAMPLERATE_FALSE ?= @HAVE_LIBSAMPLERATE_FALSE@
-HAVE_LIBSAMPLERATE_TRUE ?= @HAVE_LIBSAMPLERATE_TRUE@
-HAVE_LIBSNDFILE_FALSE ?= @HAVE_LIBSNDFILE_FALSE@
-HAVE_LIBSNDFILE_TRUE ?= @HAVE_LIBSNDFILE_TRUE@
-HAVE_LIBVISUAL_FALSE ?= @HAVE_LIBVISUAL_FALSE@
-HAVE_LIBVISUAL_TRUE ?= @HAVE_LIBVISUAL_TRUE@
-HAVE_LINUX_JOYSTICK_FALSE ?= @HAVE_LINUX_JOYSTICK_FALSE@
-HAVE_LINUX_JOYSTICK_TRUE ?= @HAVE_LINUX_JOYSTICK_TRUE@
-HAVE_LIRC_FALSE ?= @HAVE_LIRC_FALSE@
-HAVE_LIRC_TRUE ?= @HAVE_LIRC_TRUE@
-HAVE_MODPLUG_FALSE ?= @HAVE_MODPLUG_FALSE@
-HAVE_MODPLUG_TRUE ?= @HAVE_MODPLUG_TRUE@
-HAVE_OGGVORBIS_FALSE ?= @HAVE_OGGVORBIS_FALSE@
-HAVE_OGGVORBIS_TRUE ?= @HAVE_OGGVORBIS_TRUE@
-HAVE_OSS_FALSE ?= @HAVE_OSS_FALSE@
-HAVE_OSS_TRUE ?= @HAVE_OSS_TRUE@
-HAVE_SIDPLAY_FALSE ?= @HAVE_SIDPLAY_FALSE@
-HAVE_SIDPLAY_TRUE ?= @HAVE_SIDPLAY_TRUE@
-HAVE_SOLARIS_FALSE ?= @HAVE_SOLARIS_FALSE@
-HAVE_SOLARIS_TRUE ?= @HAVE_SOLARIS_TRUE@
-HAVE_SUN_FALSE ?= @HAVE_SUN_FALSE@
-HAVE_SUN_TRUE ?= @HAVE_SUN_TRUE@
-INPUT_PLUGINS ?= @INPUT_PLUGINS@
-INPUT_PLUGIN_DIR ?= @INPUT_PLUGIN_DIR@
-INSTALL_DATA ?= @INSTALL_DATA@
-INSTALL_PROGRAM ?= @INSTALL_PROGRAM@
-INSTALL_SCRIPT ?= @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM ?= @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT ?= @INSTOBJEXT@
-INTLBISON ?= @INTLBISON@
-INTLLIBS ?= @INTLLIBS@
-INTLOBJS ?= @INTLOBJS@
-INTL_LIBTOOL_SUFFIX_PREFIX ?= @INTL_LIBTOOL_SUFFIX_PREFIX@
 JACK_CFLAGS ?= @JACK_CFLAGS@
 JACK_LIBS ?= @JACK_LIBS@
-LDFLAGS ?= @LDFLAGS@
-LEDCODE ?= @LEDCODE@
-FLAC_CFLAGS ?= @FLAC_CFLAGS@
-FLAC_LIBS ?= @FLAC_LIBS@
-LIBGLADE_CFLAGS ?= @LIBGLADE_CFLAGS@
-LIBGLADE_LIBS ?= @LIBGLADE_LIBS@
-LIBNMS_CFLAGS ?= @LIBNMS_CFLAGS@
-LIBNMS_LIBS ?= @LIBNMS_LIBS@
-LIBNMS_SRC ?= @LIBNMS_SRC@
-LIBICONV ?= @LIBICONV@
-LIBINTL ?= @LIBINTL@
-LIBOBJS ?= @LIBOBJS@
-LIBS ?= @LIBS@
-LIBTOOL ?= @LIBTOOL@
-LIBVISUAL_CFLAGS ?= @LIBVISUAL_CFLAGS@
-LIBVISUAL_LIBS ?= @LIBVISUAL_LIBS@
-LN_S ?= @LN_S@
-LTLIBICONV ?= @LTLIBICONV@
-LTLIBINTL ?= @LTLIBINTL@
-LTLIBOBJS ?= @LTLIBOBJS@
-MAKEINFO ?= @MAKEINFO@
-MKINSTALLDIRS ?= @MKINSTALLDIRS@
+LIBFLAC_LIBS ?= @LIBFLAC_LIBS@
+LIBFLAC_CFLAGS ?= @LIBFLAC_CFLAGS@
+LIBROAR_CFLAGS ?= @LIBROAR_CFLAGS@
+LIBROAR_LIBS ?= @LIBROAR_LIBS@
+MMS_CFLAGS ?= @MMS_CFLAGS@
+MMS_LIBS ?= @MMS_LIBS@
 MODPLUG_CFLAGS ?= @MODPLUG_CFLAGS@
 MODPLUG_LIBS ?= @MODPLUG_LIBS@
-MSGFMT ?= @MSGFMT@
-MSGMERGE ?= @MSGMERGE@
+MOWGLI_CFLAGS ?= @MOWGLI_CFLAGS@
+MOWGLI_LIBS ?= @MOWGLI_LIBS@
+MPG123_CFLAGS ?= @MPG123_CFLAGS@
+MPG123_LIBS ?= @MPG123_LIBS@
 MTP_CFLAGS ?= @MTP_CFLAGS@
 MTP_LIBS ?= @MTP_LIBS@
+NEON_CFLAGS ?= @NEON_CFLAGS@
+NEON_LIBS ?= @NEON_LIBS@
 NOTIFY_CFLAGS ?= @NOTIFY_CFLAGS@
 NOTIFY_LIBS ?= @NOTIFY_LIBS@
-OBJEXT ?= @OBJEXT@
 OGG_VORBIS_CFLAGS ?= @OGG_VORBIS_CFLAGS@
 OGG_VORBIS_LIBS ?= @OGG_VORBIS_LIBS@
-OSS_LIBS ?= @OSS_LIBS@
-OSS4_CPPFLAGS ?= @OSS4_CPPFLAGS@
-OUTPUT_PLUGINS ?= @OUTPUT_PLUGINS@
-OUTPUT_PLUGIN_DIR ?= @OUTPUT_PLUGIN_DIR@
-PACKAGE ?= @PACKAGE@
-PACKAGE_BUGREPORT ?= @PACKAGE_BUGREPORT@
-PACKAGE_NAME ?= @PACKAGE_NAME@
-PACKAGE_STRING ?= @PACKAGE_STRING@
-PACKAGE_TARNAME ?= @PACKAGE_TARNAME@
-PACKAGE_VERSION ?= @PACKAGE_VERSION@
+OPENAL_CFLAGS ?= @OPENAL_CFLAGS@
+OPENAL_LIBS ?= @OPENAL_LIBS@
+OSS_CFLAGS ?= @OSS_CFLAGS@
 PANGO_CFLAGS ?= @PANGO_CFLAGS@
 PANGO_LIBS ?= @PANGO_LIBS@
 PANGOCAIRO_CFLAGS ?= @PANGOCAIRO_CFLAGS@
 PANGOCAIRO_LIBS ?= @PANGOCAIRO_LIBS@
-PATH_SEPARATOR ?= @PATH_SEPARATOR@
-PC_REQUIRES ?= @PC_REQUIRES@
-PKG_CONFIG ?= @PKG_CONFIG@
-PLUGIN_LDFLAGS ?= @PLUGIN_LDFLAGS@
-POSUB ?= @POSUB@
 PTHREAD_CFLAGS ?= @PTHREAD_CFLAGS@
 PTHREAD_LIBS ?= @PTHREAD_LIBS@
-RANLIB ?= @RANLIB@
-RESID_LIBS ?= @RESID_LIBS@
 SAMPLERATE_CFLAGS ?= @SAMPLERATE_CFLAGS@
 SAMPLERATE_LIBS ?= @SAMPLERATE_LIBS@
 SDL_CFLAGS ?= @SDL_CFLAGS@
-SDL_CONFIG ?= @SDL_CONFIG@
 SDL_LIBS ?= @SDL_LIBS@
-SET_MAKE ?= @SET_MAKE@
-SHELL ?= @SHELL@
-SHOUT_CFLAGS ?= @SHOUT_CFLAGS@
-SHOUT_LIBS ?= @SHOUT_LIBS@
 SIDPLAY1_CFLAGS ?= @SIDPLAY1_CFLAGS@
 SIDPLAY1_LIBS ?= @SIDPLAY1_LIBS@
 SIDPLAY2_CFLAGS ?= @SIDPLAY2_CFLAGS@
 SIDPLAY2_LIBS ?= @SIDPLAY2_LIBS@
 SNDFILE_CFLAGS ?= @SNDFILE_CFLAGS@
 SNDFILE_LIBS ?= @SNDFILE_LIBS@
-STRIP ?= @STRIP@
-TAGLIB_CFLAGS ?= @TAGLIB_CFLAGS@
-TAGLIB_CONFIG ?= @TAGLIB_CONFIG@
-TAGLIB_LIBS ?= @TAGLIB_LIBS@
-TR ?= @TR@
-USE_INCLUDED_LIBINTL ?= @USE_INCLUDED_LIBINTL@
-USE_NLS ?= @USE_NLS@
-USE_X86ASM_FALSE ?= @USE_X86ASM_FALSE@
-USE_X86ASM_TRUE ?= @USE_X86ASM_TRUE@
-VERSION ?= @VERSION@
-VISUALIZATION_PLUGINS ?= @VISUALIZATION_PLUGINS@
-VISUALIZATION_PLUGIN_DIR ?= @VISUALIZATION_PLUGIN_DIR@
-XGETTEXT ?= @XGETTEXT@
-ac_ct_AR ?= @ac_ct_AR@
-ac_ct_CC ?= @ac_ct_CC@
-ac_ct_CXX ?= @ac_ct_CXX@
-ac_ct_RANLIB ?= @ac_ct_RANLIB@
-ac_ct_STRIP ?= @ac_ct_STRIP@
-am__fastdepCC_FALSE ?= @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE ?= @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE ?= @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE ?= @am__fastdepCXX_TRUE@
-am__include ?= @am__include@
-am__leading_dot ?= @am__leading_dot@
-am__quote ?= @am__quote@
-am__tar ?= @am__tar@
-am__untar ?= @am__untar@
-bindir ?= @bindir@
-build ?= @build@
-build_alias ?= @build_alias@
-build_cpu ?= @build_cpu@
-build_os ?= @build_os@
-build_vendor ?= @build_vendor@
-datadir ?= @datadir@
-datarootdir ?= @datarootdir@
-exec_prefix ?= @exec_prefix@
-host ?= @host@
-host_alias ?= @host_alias@
-host_cpu ?= @host_cpu@
-host_os ?= @host_os@
-host_vendor ?= @host_vendor@
-includedir ?= @includedir@
-infodir ?= @infodir@
-install_sh ?= @install_sh@
-libdir ?= @libdir@
-libexecdir ?= @libexecdir@
-localedir ?= @localedir@
-localstatedir ?= @localstatedir@
-mandir ?= @mandir@
-mkdir_p ?= @mkdir_p@
-oldincludedir ?= @oldincludedir@
-pluginsubs ?= @pluginsubs@
-prefix ?= @prefix@
-program_transform_name ?= @program_transform_name@
-sbindir ?= @sbindir@
-sharedstatedir ?= @sharedstatedir@
-sysconfdir ?= @sysconfdir@
-target ?= @target@
-target_alias ?= @target_alias@
-target_cpu ?= @target_cpu@
-target_os ?= @target_os@
-target_vendor ?= @target_vendor@
-WAV_SNDFILE ?= @WAV_SNDFILE@
-VFS_BACKEND ?= @VFS_BACKEND@
-CONFIGDB_BACKEND ?= @CONFIGDB_BACKEND@
-CURL_CFLAGS ?= @CURL_CFLAGS@
-CURL_LIBS ?= @CURL_LIBS@
-NEON_CFLAGS ?= @NEON_CFLAGS@
-NEON_LIBS ?= @NEON_LIBS@
-CHARDET_LIBS ?= @CHARDET_LIBS@
-SUBDIR_GUESS ?= @SUBDIR_GUESS@
-LIBNOTIFY_CFLAGS ?= @LIBNOTIFY_CFLAGS@
-LIBNOTIFY_LIBS ?= @LIBNOTIFY_LIBS@
-XML_CFLAGS ?= @XML_CFLAGS@
-XML_LIBS ?= @XML_LIBS@
-CONTAINER_PLUGIN_DIR ?= @CONTAINER_PLUGIN_DIR@
-CONTAINER_PLUGINS ?= @CONTAINER_PLUGINS@
-SHARED_SUFFIX ?= @SHARED_SUFFIX@
-PICFLAGS ?= @PICFLAGS@
-PICLDFLAGS ?= @PICLDFLAGS@
-LIBLDFLAGS ?= @LIBLDFLAGS@
 WAVPACK_CFLAGS ?= @WAVPACK_CFLAGS@
 WAVPACK_LIBS ?= @WAVPACK_LIBS@
 XCOMPOSITE_CFLAGS ?= @XCOMPOSITE_CFLAGS@
 XCOMPOSITE_LIBS ?= @XCOMPOSITE_LIBS@
+XML_CFLAGS ?= @XML_CFLAGS@
+XML_LIBS ?= @XML_LIBS@
 XRENDER_CFLAGS ?= @XRENDER_CFLAGS@
 XRENDER_LIBS ?= @XRENDER_LIBS@
-XXF86VM_CFLAGS ?= @XXF86VM_CFLAGS@
-XXF86VM_LIBS ?= @XXF86VM_LIBS@
-LIBPROJECTM_CFLAGS ?= @LIBPROJECTM_CFLAGS@
-LIBPROJECTM_LIBS ?= @LIBPROJECTM_LIBS@
-LIBPROJECTM1_CFLAGS ?= @LIBPROJECTM1_CFLAGS@
-LIBPROJECTM1_LIBS ?= @LIBPROJECTM1_LIBS@
-MMS_CFLAGS ?= @MMS_CFLAGS@
-MMS_LIBS ?= @MMS_LIBS@
-MPG123_CFLAGS ?= @MPG123_CFLAGS@
-MPG123_LIBS ?= @MPG123_LIBS@
-IMLIB2_CFLAGS ?= @IMLIB2_CFLAGS@
-IMLIB2_LIBS ?= @IMLIB2_LIBS@
-SIMD_CFLAGS ?= @SIMD_CFLAGS@
-FILEWRITER_CFLAGS ?= @FILEWRITER_CFLAGS@
-FILEWRITER_LIBS ?= @FILEWRITER_LIBS@
-GCC42_CFLAGS ?= @GCC42_CFLAGS@
-CDIO_LIBS ?= @CDIO_LIBS@
-CDIO_CFLAGS ?= @CDIO_CFLAGS@
-CDDB_LIBS ?= @CDDB_LIBS@
-CDDB_CFLAGS ?= @CDDB_CFLAGS@
-TRANSPORT_PLUGIN_DIR ?= @TRANSPORT_PLUGIN_DIR@
-TRANSPORT_PLUGINS ?= @TRANSPORT_PLUGINS@
-LIBFLAC_LIBS ?= @LIBFLAC_LIBS@
-LIBFLAC_CFLAGS ?= @LIBFLAC_CFLAGS@
-MOWGLI_CFLAGS ?= @MOWGLI_CFLAGS@
-MOWGLI_LIBS ?= @MOWGLI_LIBS@
-pluginlibdir = @plugindir@
-plugindir = ${pluginlibdir}
-GTKGLEXT_CFLAGS ?= @GTKGLEXT_CFLAGS@
-GTKGLEXT_LIBS ?= @GTKGLEXT_LIBS@
-TR = @TR@
-PLUGIN_DEFNAME := `echo ${subst ${PLUGIN_SUFFIX},,${PLUGIN}} | LC_ALL=C tr '[:lower:]' '[:upper:]' | tr '-' '_'`
-FFMPEG_CFLAGS ?= @FFMPEG_CFLAGS@
-FFMPEG_LIBS ?= @FFMPEG_LIBS@
-CUE_CFLAGS ?= @CUE_CFLAGS@
-CUE_LIBS ?= @CUE_LIBS@
-DEBUG ?= @DEBUG@
-LIBROAR_CFLAGS ?= @LIBROAR_CFLAGS@
-LIBROAR_LIBS ?= @LIBROAR_LIBS@
-GDL_CFLAGS ?= @GDL_CFLAGS@
-GDL_LIBS ?= @GDL_LIBS@
-OPENAL_CFLAGS ?= @OPENAL_CFLAGS@
-OPENAL_LIBS ?= @OPENAL_LIBS@

audacious-plugins-3.0.3.tar.bz2/m4/sid.m4 -> audacious-plugins-3.1.tar.bz2/m4/sid.m4 Changed

audacious-plugins-3.0.3.tar.bz2/po/POTFILES.in -> audacious-plugins-3.1.tar.bz2/po/POTFILES.in Changed

@@ -1,5 +1,6 @@
 # Please don't update this file manually - use ./update-potfiles.sh instead!
 src/aac/libmp4.c
+src/alarm/interface.c
 src/alsa/config.c
 src/alsa/plugin.c
 src/amidi-plug/amidi-plug.c
@@ -16,6 +17,7 @@
 src/aosd/aosd_trigger.c
 src/aosd/aosd_ui.c
 src/blur_scope/config.c
+src/bs2b/plugin.c
 src/cdaudio-ng/cdaudio-ng.c
 src/cdaudio-ng/configure.c
 src/cd-menu-items/cd-menu-items.c
@@ -51,7 +53,6 @@
 src/console/Ym2612_Emu.cxx
 src/crossfade/plugin.c
 src/crystalizer/crystalizer.c
-src/daemon/daemon.c
 src/echo_plugin/gui.c
 src/ffaudio/ffaudio-core.c
 src/filewriter/filewriter.c
@@ -71,8 +72,10 @@
 src/jack/bio2jack.c
 src/jack/configure.c
 src/jack/jack.c
+src/ladspa/plugin.c
 src/lyricwiki/lyricwiki.c
 src/metronom/metronom.c
+src/mixer/plugin.c
 src/mpg123/mpg123.c
 src/mtp_up/mtp.c
 src/notify/libnotify-aosd_event.c
@@ -88,12 +91,6 @@
 src/scrobbler/plugin.c
 src/scrobbler/scrobbler.c
 src/sdlout/plugin.c
-src/sid/xmms-sid.glade
-src/sid/xs_about.c
-src/sid/xs_config.c
-src/sid/xs_fileinfo.c
-src/sid/xs_glade.c
-src/sid/xs_interface.c
 src/skins/plugin.c
 src/skins/skins_cfg.c
 src/skins/ui_equalizer.c
@@ -107,11 +104,12 @@
 src/song_change/song_change.c
 src/statusicon/statusicon.c
 src/stereo_plugin/stereo.c
+src/streambrowser/gui/streambrowser_win.c
+src/streambrowser/streambrowser.c
 src/tonegen/tonegen.c
 src/unix-io/gtk.c
 src/usf/recompiler_cpu.c
 src/usf/rsp_recompiler_cpu.c
-src/vorbis/configure.c
 src/vorbis/vorbis.c
 src/vtx/about.c
 src/wavpack/wavpack.c

audacious-plugins-3.0.3.tar.bz2/po/audacious-plugins.pot -> audacious-plugins-3.1.tar.bz2/po/audacious-plugins.pot Changed

@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://jira.atheme.org/\n"
-"POT-Creation-Date: 2011-09-18 14:13-0400\n"
+"POT-Creation-Date: 2011-10-24 16:38-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -30,6 +30,277 @@
 msgid "About MP4 AAC decoder plugin"
 msgstr ""
 
+#: src/alarm/interface.c:34
+msgid "About XMMS Alarm"
+msgstr ""
+
+#: src/alarm/interface.c:41
+msgid "XMMS Alarm"
+msgstr ""
+
+#: src/alarm/interface.c:50
+msgid ""
+"An XMMS plugin which can be used\n"
+"to start playing at a certain time.\n"
+"\n"
+"Send all complaints to:\n"
+"Adam Feakin <adamf@snika.uklinux.net>\n"
+"Daniel Stodden <stodden@in.tum.de>\n"
+"\n"
+"http://www.snika.uklinux.net/xmms-alarm/"
+msgstr ""
+
+#: src/alarm/interface.c:65
+msgid "Close"
+msgstr ""
+
+#: src/alarm/interface.c:95
+msgid "Alarm"
+msgstr ""
+
+#: src/alarm/interface.c:102
+msgid "This is your wakeup call."
+msgstr ""
+
+#: src/alarm/interface.c:117 src/alarm/interface.c:1338
+msgid "OK"
+msgstr ""
+
+#: src/alarm/interface.c:151
+msgid "Sorry"
+msgstr ""
+
+#: src/alarm/interface.c:158
+msgid "Warning"
+msgstr ""
+
+#: src/alarm/interface.c:167
+msgid ""
+"For safety reasons the \"quiet\" time must be at least 65 seconds longer "
+"than the fading time, it must also be more than 10 seconds. This basically "
+"means that there is a bug in the code and until I find a way of really "
+"fixing it this message will appear :)\n"
+"\n"
+"Your fading settings have NOT been saved\n"
+"\n"
+"--\n"
+"Adam"
+msgstr ""
+
+#: src/alarm/interface.c:183
+msgid "Oh Well"
+msgstr ""
+
+#: src/alarm/interface.c:339
+msgid "Alarm Settings"
+msgstr ""
+
+#: src/alarm/interface.c:354 src/alarm/interface.c:526
+#: src/alarm/interface.c:898
+msgid "Time"
+msgstr ""
+
+#: src/alarm/interface.c:395
+msgid "hours"
+msgstr ""
+
+#: src/alarm/interface.c:456
+msgid "h"
+msgstr ""
+
+#: src/alarm/interface.c:486
+msgid "minutes"
+msgstr ""
+
+#: src/alarm/interface.c:504
+msgid "Quiet after:"
+msgstr ""
+
+#: src/alarm/interface.c:514
+msgid "Alarm at (default):"
+msgstr ""
+
+#: src/alarm/interface.c:534
+msgid "Choose the days for the alarm to come on"
+msgstr ""
+
+#: src/alarm/interface.c:562 src/alarm/interface.c:610
+#: src/alarm/interface.c:658 src/alarm/interface.c:706
+#: src/alarm/interface.c:754 src/alarm/interface.c:802
+#: src/alarm/interface.c:850 src/bs2b/plugin.c:198 src/OSS/configure.c:153
+#: src/skins/ui_manager.c:450 src/skins/ui_manager.c:471
+msgid "Default"
+msgstr ""
+
+#: src/alarm/interface.c:888
+msgid "Day"
+msgstr ""
+
+#: src/alarm/interface.c:908
+msgid "Tuesday"
+msgstr ""
+
+#: src/alarm/interface.c:919
+msgid "Wednesday"
+msgstr ""
+
+#: src/alarm/interface.c:930
+msgid "Thursday"
+msgstr ""
+
+#: src/alarm/interface.c:941
+msgid "Friday"
+msgstr ""
+
+#: src/alarm/interface.c:952
+msgid "Saturday"
+msgstr ""
+
+#: src/alarm/interface.c:963
+msgid "Sunday"
+msgstr ""
+
+#: src/alarm/interface.c:973
+msgid "Monday"
+msgstr ""
+
+#: src/alarm/interface.c:984
+msgid "Days"
+msgstr ""
+
+#: src/alarm/interface.c:1000
+msgid "Fading"
+msgstr ""
+
+#: src/alarm/interface.c:1037
+msgid "seconds"
+msgstr ""
+
+#: src/alarm/interface.c:1045 src/alarm/interface.c:1160
+msgid "Volume"
+msgstr ""
+
+#: src/alarm/interface.c:1071
+msgid "Current"
+msgstr ""
+
+#: src/alarm/interface.c:1079
+msgid "Start at"
+msgstr ""
+
+#: src/alarm/interface.c:1107 src/alarm/interface.c:1151
+msgid "%"
+msgstr ""
+
+#: src/alarm/interface.c:1123
+msgid "Final"
+msgstr ""
+
+#: src/alarm/interface.c:1176
+msgid "Additional Command"
+msgstr ""
+
+#: src/alarm/interface.c:1202
+msgid "enable"
+msgstr ""
+
+#: src/alarm/interface.c:1210
+msgid "Playlist (optional)"
+msgstr ""
+
+#: src/alarm/interface.c:1236
+msgid "Browse..."
+msgstr ""
+
+#: src/alarm/interface.c:1244 src/alarm/interface.c:1408
+msgid "Reminder"
+msgstr ""
+
+#: src/alarm/interface.c:1261
+msgid "Use reminder"
+msgstr ""
+
+#: src/alarm/interface.c:1277 src/sndstretch/sndstretch_xmms.c:358
+msgid "Options"
+msgstr ""
+
+#: src/alarm/interface.c:1285
+msgid "What do these options mean?"
+msgstr ""
+
+#: src/alarm/interface.c:1313
+msgid ""
+"\n"
+"Time\n"
+" Alarm at: \n"
+" The time for the alarm to come on.\n"
+"\n"
+" Quiet After: \n"
+" Stop alarm after this amount of time.\n"
+" (if the wakeup dialog is not closed)\n"
+"\n"
+"\n"
+"Days\n"
+" Day:\n"
+" Select the days for the alarm to activate.\n"
+"\n"
+" Time:\n"
+" Choose the time for the alarm on each day,\n"
+" or select the toggle button to use the default\n"
+" time.\n"
+"\n"
+"\n"
+"Volume\n"
+" Fading: \n"
+" Fade the volume up to the chosen volume \n"
+" for this amount of time.\n"
+"\n"
+" Start at: \n"
+" Start fading from this volume.\n"
+"\n"
+" Final: \n"
+" The volume to stop fading at. If the fading\n"
+" time is 0 then set volume to this and start\n"
+" playing.\n"
+"\n"
+"\n"
+"Options:\n"
+" Additional Command:\n"
+" Run this command at the alarm time.\n"
+"\n"
+" Playlist: \n"
+" Load this playlist for playing songs from \n"
+" (must have .m3u extension). If no playlist\n"
+" is given then the songs which are currently\n"
+" in the list will be used.\n"
+" The URL of an mp3/ogg stream can also be\n"
+" entered here, but loading of playlists from\n"
+" URLs is not currently supported by xmms.\n"
+"\n"
+" Reminder:\n"
+" Display a reminder when the alarm goes off,\n"
+" type the reminder in the box and turn on the\n"
+" toggle button if you want it to be shown.\n"
+msgstr ""
+
+#: src/alarm/interface.c:1315 src/skins/ui_manager.c:382
+msgid "Help"
+msgstr ""
+
+#: src/alarm/interface.c:1347 src/cdaudio-ng/configure.c:249
+#: src/crystalizer/crystalizer.c:130 src/echo_plugin/gui.c:125
+#: src/jack/configure.c:148 src/null/null.c:108 src/stereo_plugin/stereo.c:125
+msgid "Cancel"
+msgstr ""
+
+#: src/alarm/interface.c:1415
+msgid "Your reminder for today is.."
+msgstr ""
+
+#: src/alarm/interface.c:1440
+msgid "Thankyou"
+msgstr ""
+
 #: src/alsa/config.c:210
 msgid "Default PCM device"
 msgstr ""
@@ -38,23 +309,23 @@
 msgid "Default mixer device"
 msgstr ""
 
-#: src/alsa/config.c:447
+#: src/alsa/config.c:438
 msgid "ALSA Output Plugin Preferences"
 msgstr ""
 
-#: src/alsa/config.c:454
+#: src/alsa/config.c:445
 msgid "PCM device:"
 msgstr ""
 
-#: src/alsa/config.c:456 src/OSS/configure.c:246
+#: src/alsa/config.c:447 src/OSS/configure.c:237
 msgid "Mixer device:"
 msgstr ""
 
-#: src/alsa/config.c:458
+#: src/alsa/config.c:449
 msgid "Mixer element:"
 msgstr ""
 
-#: src/alsa/config.c:461
+#: src/alsa/config.c:452
 msgid "Work around drain hangup"
 msgstr ""
 
@@ -320,7 +591,7 @@
 "backend"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.c:169 src/sid/xs_interface.c:1769
+#: src/amidi-plug/i_fileinfo.c:169
 msgid "Name:"
 msgstr ""
 
@@ -561,8 +832,7 @@
 msgid "Skin file:"
 msgstr ""
 
-#: src/aosd/aosd_ui.c:672 src/sid/xs_interface.c:1044
-#: src/sid/xs_interface.c:1236 src/sid/xs_interface.c:1292
+#: src/aosd/aosd_ui.c:672
 msgid "Browse"
 msgstr ""
 
@@ -643,7 +913,6 @@
 msgstr ""
 
 #: src/aosd/aosd_ui.c:1101 src/cdaudio-ng/configure.c:171
-#: src/sid/xs_interface.c:1302
 msgid "Misc"
 msgstr ""
 
@@ -674,15 +943,31 @@
 msgid "Blur Scope: Color selection"
 msgstr ""
 
-#: src/blur_scope/config.c:83 src/jack/configure.c:111
+#: src/blur_scope/config.c:83 src/jack/configure.c:106
 msgid "Options:"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:264
+#: src/bs2b/plugin.c:157
+msgid "Bauer stereophonic-to-binaural Preferences"
+msgstr ""
+
+#: src/bs2b/plugin.c:168
+msgid "Feed level:"
+msgstr ""
+
+#: src/bs2b/plugin.c:182
+msgid "Cut frequency:"
+msgstr ""
+
+#: src/bs2b/plugin.c:196
+msgid "Presets:"
+msgstr ""
+
+#: src/cdaudio-ng/cdaudio-ng.c:241
 msgid "About Audio CD Plugin"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:265
+#: src/cdaudio-ng/cdaudio-ng.c:242
 msgid ""
 "Copyright (c) 2007, by Calin Crisan <ccrisan@gmail.com> and The Audacious "
 "Team.\n"
@@ -697,15 +982,15 @@
 "Copyright 2009 John Lindgren"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:558
+#: src/cdaudio-ng/cdaudio-ng.c:550
 msgid "Audio CD"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:913
+#: src/cdaudio-ng/cdaudio-ng.c:922
 msgid "Drive is empty."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:915
+#: src/cdaudio-ng/cdaudio-ng.c:924
 msgid "Unsupported disk type."
 msgstr ""
 
@@ -753,18 +1038,12 @@
 msgid "Override default device: "
 msgstr ""
 
-#: src/cdaudio-ng/configure.c:244 src/crystalizer/crystalizer.c:131
-#: src/echo_plugin/gui.c:123 src/jack/configure.c:146 src/null/null.c:112
-#: src/stereo_plugin/stereo.c:125
+#: src/cdaudio-ng/configure.c:244 src/crystalizer/crystalizer.c:123
+#: src/echo_plugin/gui.c:118 src/jack/configure.c:141 src/null/null.c:107
+#: src/stereo_plugin/stereo.c:118
 msgid "Ok"
 msgstr ""
 
-#: src/cdaudio-ng/configure.c:249 src/crystalizer/crystalizer.c:138
-#: src/echo_plugin/gui.c:130 src/jack/configure.c:153 src/null/null.c:113
-#: src/stereo_plugin/stereo.c:132
-msgid "Cancel"
-msgstr ""
-
 #: src/cd-menu-items/cd-menu-items.c:34
 msgid "Play CD"
 msgstr ""
@@ -773,80 +1052,80 @@
 msgid "Add CD"
 msgstr ""
 
-#: src/compressor/plugin.c:67
+#: src/compressor/plugin.c:63
 msgid "About Dynamic Range Compression Plugin"
 msgstr ""
 
-#: src/compressor/plugin.c:99
+#: src/compressor/plugin.c:95
 msgid "Dynamic Range Compressor Preferences"
 msgstr ""
 
-#: src/compressor/plugin.c:111
+#: src/compressor/plugin.c:107
 msgid "Center volume:"
 msgstr ""
 
-#: src/compressor/plugin.c:124
+#: src/compressor/plugin.c:120
 msgid "Dynamic range:"
 msgstr ""
 
-#: src/console/configure.c:138
+#: src/console/configure.c:136
 msgid "Game Console Music Decoder"
 msgstr ""
 
-#: src/console/configure.c:155
+#: src/console/configure.c:153
 msgid "General"
 msgstr ""
 
-#: src/console/configure.c:157 src/skins/ui_manager.c:176
+#: src/console/configure.c:155 src/skins/ui_manager.c:176
 msgid "Playback"
 msgstr ""
 
-#: src/console/configure.c:172
+#: src/console/configure.c:170
 msgid "Bass:"
 msgstr ""
 
-#: src/console/configure.c:176 src/console/configure.c:187
-#: src/console/configure.c:208
+#: src/console/configure.c:174 src/console/configure.c:185
+#: src/console/configure.c:206
 msgid "secs"
 msgstr ""
 
-#: src/console/configure.c:183
+#: src/console/configure.c:181
 msgid "Treble:"
 msgstr ""
 
-#: src/console/configure.c:204
+#: src/console/configure.c:202
 msgid "Default song length:"
 msgstr ""
 
-#: src/console/configure.c:210 src/sid/xs_interface.c:666
+#: src/console/configure.c:208
 msgid "Resampling"
 msgstr ""
 
-#: src/console/configure.c:216
+#: src/console/configure.c:214
 msgid "Enable audio resampling"
 msgstr ""
 
-#: src/console/configure.c:231
+#: src/console/configure.c:229
 msgid "Resampling rate:"
 msgstr ""
 
-#: src/console/configure.c:235 src/sid/xs_interface.c:354
+#: src/console/configure.c:233
 msgid "Hz"
 msgstr ""
 
-#: src/console/configure.c:246
+#: src/console/configure.c:244
 msgid "SPC"
 msgstr ""
 
-#: src/console/configure.c:247
+#: src/console/configure.c:245
 msgid "Ignore length from SPC tags"
 msgstr ""
 
-#: src/console/configure.c:248
+#: src/console/configure.c:246
 msgid "Increase reverb"
 msgstr ""
 
-#: src/console/configure.c:273
+#: src/console/configure.c:271
 msgid ""
 "The default song length, expressed in seconds, is used for songs that do not "
 "provide length information (i.e. looping tracks)."
@@ -864,28 +1143,28 @@
 " Shay Green <gblargg@gmail.com>\n"
 msgstr ""
 
-#: src/crossfade/plugin.c:65
+#: src/crossfade/plugin.c:60
 msgid "About Crossfade"
 msgstr ""
 
-#: src/crossfade/plugin.c:97
+#: src/crossfade/plugin.c:92
 msgid "Crossfade Preferences"
 msgstr ""
 
-#: src/crossfade/plugin.c:109
+#: src/crossfade/plugin.c:104
 msgid "Overlap (in seconds):"
 msgstr ""
 
-#: src/crossfade/plugin.c:140 src/crossfade/plugin.c:146
+#: src/crossfade/plugin.c:135 src/crossfade/plugin.c:141
 msgid "Crossfade Error"
 msgstr ""
 
-#: src/crossfade/plugin.c:140
+#: src/crossfade/plugin.c:135
 msgid ""
 "Crossfading failed because the songs had a different number of channels."
 msgstr ""
 
-#: src/crossfade/plugin.c:148
+#: src/crossfade/plugin.c:143
 msgid ""
 "Crossfading failed because the songs had different sample rates.\n"
 "\n"
@@ -893,23 +1172,19 @@
 "same rate."
 msgstr ""
 
-#: src/crystalizer/crystalizer.c:108
+#: src/crystalizer/crystalizer.c:100
 msgid "Configure Crystalizer"
 msgstr ""
 
-#: src/crystalizer/crystalizer.c:110 src/stereo_plugin/stereo.c:104
+#: src/crystalizer/crystalizer.c:102 src/stereo_plugin/stereo.c:97
 msgid "Effect intensity:"
 msgstr ""
 
-#: src/crystalizer/crystalizer.c:144 src/echo_plugin/gui.c:136
-#: src/stereo_plugin/stereo.c:138
+#: src/crystalizer/crystalizer.c:136 src/echo_plugin/gui.c:131
+#: src/stereo_plugin/stereo.c:131
 msgid "Apply"
 msgstr ""
 
-#: src/daemon/daemon.c:58
-msgid "Daemon Interface (like old headless mode)"
-msgstr ""
-
 #: src/echo_plugin/gui.c:15
 msgid ""
 "Echo Plugin\n"
@@ -922,23 +1197,23 @@
 msgid "About Echo Plugin"
 msgstr ""
 
-#: src/echo_plugin/gui.c:72
+#: src/echo_plugin/gui.c:67
 msgid "Configure Echo"
 msgstr ""
 
-#: src/echo_plugin/gui.c:88
+#: src/echo_plugin/gui.c:83
 msgid "Delay: (ms)"
 msgstr ""
 
-#: src/echo_plugin/gui.c:93
+#: src/echo_plugin/gui.c:88
 msgid "Feedback: (%)"
 msgstr ""
 
-#: src/echo_plugin/gui.c:98
+#: src/echo_plugin/gui.c:93
 msgid "Volume: (%)"
 msgstr ""
 
-#: src/ffaudio/ffaudio-core.c:789
+#: src/ffaudio/ffaudio-core.c:795
 #, c-format
 msgid ""
 "Multi-format audio decoding plugin for Audacious based on\n"
@@ -954,83 +1229,63 @@
 "libavutil %s (%s)\n"
 msgstr ""
 
-#: src/ffaudio/ffaudio-core.c:803
+#: src/ffaudio/ffaudio-core.c:809
 msgid "About FFaudio Plugin"
 msgstr ""
 
-#: src/filewriter/filewriter.c:155
+#: src/filewriter/filewriter.c:166
 msgid "About FileWriter-Plugin"
 msgstr ""
 
-#: src/filewriter/filewriter.c:156
-msgid ""
-"FileWriter-Plugin\n"
-"\n"
-"This program is free software; you can redistribute it and/or modify\n"
-"it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
-"(at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
-"GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
-msgstr ""
-
-#: src/filewriter/filewriter.c:450
+#: src/filewriter/filewriter.c:455
 msgid "File Writer Configuration"
 msgstr ""
 
-#: src/filewriter/filewriter.c:462
+#: src/filewriter/filewriter.c:467
 msgid "Output file format:"
 msgstr ""
 
-#: src/filewriter/filewriter.c:480
+#: src/filewriter/filewriter.c:485
 msgid "Configure"
 msgstr ""
 
-#: src/filewriter/filewriter.c:495
+#: src/filewriter/filewriter.c:500
 msgid "Save into original directory"
 msgstr ""
 
-#: src/filewriter/filewriter.c:500
+#: src/filewriter/filewriter.c:505
 msgid "Save into custom directory"
 msgstr ""
 
-#: src/filewriter/filewriter.c:510
+#: src/filewriter/filewriter.c:515
 msgid "Output file folder:"
 msgstr ""
 
-#: src/filewriter/filewriter.c:514
+#: src/filewriter/filewriter.c:519
 msgid "Pick a folder"
 msgstr ""
 
-#: src/filewriter/filewriter.c:533
+#: src/filewriter/filewriter.c:538
 msgid "Get filename from:"
 msgstr ""
 
-#: src/filewriter/filewriter.c:536
+#: src/filewriter/filewriter.c:541
 msgid "original file tags"
 msgstr ""
 
-#: src/filewriter/filewriter.c:542
+#: src/filewriter/filewriter.c:547
 msgid "original filename"
 msgstr ""
 
-#: src/filewriter/filewriter.c:552
+#: src/filewriter/filewriter.c:557
 msgid "Don't strip file name extension"
 msgstr ""
 
-#: src/filewriter/filewriter.c:567
+#: src/filewriter/filewriter.c:572
 msgid "Prepend track number to filename"
 msgstr ""
 
-#: src/filewriter/mp3.c:38 src/filewriter/mp3.c:783
+#: src/filewriter/mp3.c:38 src/filewriter/mp3.c:771
 msgid "Auto"
 msgstr ""
 
@@ -1038,143 +1293,143 @@
 msgid "Joint Stereo"
 msgstr ""
 
-#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183 src/sid/xs_interface.c:308
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183
 msgid "Stereo"
 msgstr ""
 
-#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183 src/sid/xs_interface.c:301
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183
 msgid "Mono"
 msgstr ""
 
-#: src/filewriter/mp3.c:724
+#: src/filewriter/mp3.c:712
 msgid "MP3 Configuration"
 msgstr ""
 
-#: src/filewriter/mp3.c:747
+#: src/filewriter/mp3.c:735
 msgid "Algorithm Quality:"
 msgstr ""
 
-#: src/filewriter/mp3.c:772
+#: src/filewriter/mp3.c:760
 msgid "Output Samplerate:"
 msgstr ""
 
-#: src/filewriter/mp3.c:800
+#: src/filewriter/mp3.c:788
 msgid "(Hz)"
 msgstr ""
 
-#: src/filewriter/mp3.c:807
+#: src/filewriter/mp3.c:795
 msgid "Bitrate / Compression ratio:"
 msgstr ""
 
-#: src/filewriter/mp3.c:831
+#: src/filewriter/mp3.c:819
 msgid "Bitrate (kbps):"
 msgstr ""
 
-#: src/filewriter/mp3.c:864
+#: src/filewriter/mp3.c:852
 msgid "Compression ratio:"
 msgstr ""
 
-#: src/filewriter/mp3.c:888
+#: src/filewriter/mp3.c:876
 msgid "Audio Mode:"
 msgstr ""
 
-#: src/filewriter/mp3.c:913
+#: src/filewriter/mp3.c:901
 msgid "Misc:"
 msgstr ""
 
-#: src/filewriter/mp3.c:924
+#: src/filewriter/mp3.c:912
 msgid "Enforce strict ISO complience"
 msgstr ""
 
-#: src/filewriter/mp3.c:935
+#: src/filewriter/mp3.c:923
 msgid "Error protection"
 msgstr ""
 
-#: src/filewriter/mp3.c:947 src/filewriter/vorbis.c:245
+#: src/filewriter/mp3.c:935 src/filewriter/vorbis.c:243
 msgid "Quality"
 msgstr ""
 
-#: src/filewriter/mp3.c:957
+#: src/filewriter/mp3.c:945
 msgid "Enable VBR/ABR"
 msgstr ""
 
-#: src/filewriter/mp3.c:967
+#: src/filewriter/mp3.c:955
 msgid "Type:"
 msgstr ""
 
-#: src/filewriter/mp3.c:1000
+#: src/filewriter/mp3.c:988
 msgid "VBR Options:"
 msgstr ""
 
-#: src/filewriter/mp3.c:1016
+#: src/filewriter/mp3.c:1004
 msgid "Minimum bitrate (kbps):"
 msgstr ""
 
-#: src/filewriter/mp3.c:1043
+#: src/filewriter/mp3.c:1031
 msgid "Maximum bitrate (kbps):"
 msgstr ""
 
-#: src/filewriter/mp3.c:1066
+#: src/filewriter/mp3.c:1054
 msgid "Strictly enforce minimum bitrate"
 msgstr ""
 
-#: src/filewriter/mp3.c:1078
+#: src/filewriter/mp3.c:1066
 msgid "ABR Options:"
 msgstr ""
 
-#: src/filewriter/mp3.c:1088
+#: src/filewriter/mp3.c:1076
 msgid "Average bitrate (kbps):"
 msgstr ""
 
-#: src/filewriter/mp3.c:1116
+#: src/filewriter/mp3.c:1104
 msgid "VBR quality level:"
 msgstr ""
 
-#: src/filewriter/mp3.c:1135
+#: src/filewriter/mp3.c:1123
 msgid "Don't write Xing VBR header"
 msgstr ""
 
-#: src/filewriter/mp3.c:1149
+#: src/filewriter/mp3.c:1137
 msgid "VBR/ABR"
 msgstr ""
 
-#: src/filewriter/mp3.c:1159
+#: src/filewriter/mp3.c:1147
 msgid "Frame params:"
 msgstr ""
 
-#: src/filewriter/mp3.c:1171
+#: src/filewriter/mp3.c:1159
 msgid "Mark as copyright"
 msgstr ""
 
-#: src/filewriter/mp3.c:1182
+#: src/filewriter/mp3.c:1170
 msgid "Mark as original"
 msgstr ""
 
-#: src/filewriter/mp3.c:1194
+#: src/filewriter/mp3.c:1182
 msgid "ID3 params:"
 msgstr ""
 
-#: src/filewriter/mp3.c:1205
+#: src/filewriter/mp3.c:1193
 msgid "Force addition of version 2 tag"
 msgstr ""
 
-#: src/filewriter/mp3.c:1215
+#: src/filewriter/mp3.c:1203
 msgid "Only add v1 tag"
 msgstr ""
 
-#: src/filewriter/mp3.c:1222
+#: src/filewriter/mp3.c:1210
 msgid "Only add v2 tag"
 msgstr ""
 
-#: src/filewriter/mp3.c:1243
+#: src/filewriter/mp3.c:1231
 msgid "Tags"
 msgstr ""
 
-#: src/filewriter/vorbis.c:238
+#: src/filewriter/vorbis.c:236
 msgid "Vorbis Encoder Configuration"
 msgstr ""
 
-#: src/filewriter/vorbis.c:258
+#: src/filewriter/vorbis.c:256
 msgid "Quality level (0 - 10):"
 msgstr ""
 
@@ -1225,7 +1480,7 @@
 msgid "Entry number"
 msgstr ""
 
-#: src/gtkui/columns.c:36 src/sid/xs_interface.c:1103
+#: src/gtkui/columns.c:36
 msgid "Title"
 msgstr ""
 
@@ -1269,15 +1524,15 @@
 msgid "Bitrate"
 msgstr ""
 
-#: src/gtkui/columns.c:286
+#: src/gtkui/columns.c:278
 msgid "Choose Columns"
 msgstr ""
 
-#: src/gtkui/columns.c:300
+#: src/gtkui/columns.c:292
 msgid "Available:"
 msgstr ""
 
-#: src/gtkui/columns.c:334
+#: src/gtkui/columns.c:326
 msgid "Chosen:"
 msgstr ""
 
@@ -1301,264 +1556,272 @@
 msgid "Undock"
 msgstr ""
 
-#: src/gtkui/layout.c:123
+#: src/gtkui/layout.c:123 src/ladspa/plugin.c:643
 msgid "Disable"
 msgstr ""
 
-#: src/gtkui/menus.c:132
+#: src/gtkui/menus.c:130
 msgid "_Open Files ..."
 msgstr ""
 
-#: src/gtkui/menus.c:133
+#: src/gtkui/menus.c:131
 msgid "Open _URL ..."
 msgstr ""
 
-#: src/gtkui/menus.c:134
+#: src/gtkui/menus.c:132
 msgid "_Add File ..."
 msgstr ""
 
-#: src/gtkui/menus.c:135
+#: src/gtkui/menus.c:133
 msgid "Add U_RL ..."
 msgstr ""
 
-#: src/gtkui/menus.c:137
+#: src/gtkui/menus.c:135
 msgid "A_bout ..."
 msgstr ""
 
-#: src/gtkui/menus.c:138
+#: src/gtkui/menus.c:136
 msgid "_Preferences ..."
 msgstr ""
 
-#: src/gtkui/menus.c:139 src/skins/ui_manager.c:412
+#: src/gtkui/menus.c:137 src/skins/ui_manager.c:406
 msgid "_Quit"
 msgstr ""
 
-#: src/gtkui/menus.c:142
+#: src/gtkui/menus.c:140
 msgid "_Play"
 msgstr ""
 
-#: src/gtkui/menus.c:143
+#: src/gtkui/menus.c:141
 msgid "Paus_e"
 msgstr ""
 
-#: src/gtkui/menus.c:144
+#: src/gtkui/menus.c:142
 msgid "_Stop"
 msgstr ""
 
-#: src/gtkui/menus.c:145
+#: src/gtkui/menus.c:143
 msgid "Pre_vious"
 msgstr ""
 
-#: src/gtkui/menus.c:146
+#: src/gtkui/menus.c:144
 msgid "_Next"
 msgstr ""
 
-#: src/gtkui/menus.c:148
+#: src/gtkui/menus.c:146
 msgid "_Repeat"
 msgstr ""
 
-#: src/gtkui/menus.c:149
+#: src/gtkui/menus.c:147
 msgid "S_huffle"
 msgstr ""
 
-#: src/gtkui/menus.c:150
+#: src/gtkui/menus.c:148
 msgid "N_o Playlist Advance"
 msgstr ""
 
-#: src/gtkui/menus.c:151
+#: src/gtkui/menus.c:149
 msgid "Stop _After This Song"
 msgstr ""
 
-#: src/gtkui/menus.c:153 src/gtkui/menus.c:210
+#: src/gtkui/menus.c:151 src/gtkui/menus.c:209
 msgid "Song _Info ..."
 msgstr ""
 
-#: src/gtkui/menus.c:154
+#: src/gtkui/menus.c:152
 msgid "Jump to _Time ..."
 msgstr ""
 
-#: src/gtkui/menus.c:155
+#: src/gtkui/menus.c:153
 msgid "_Jump to Song ..."
 msgstr ""
 
-#: src/gtkui/menus.c:158
+#: src/gtkui/menus.c:156
 msgid "By Track _Number"
 msgstr ""
 
-#: src/gtkui/menus.c:159
+#: src/gtkui/menus.c:157
 msgid "By _Title"
 msgstr ""
 
-#: src/gtkui/menus.c:160
+#: src/gtkui/menus.c:158
 msgid "By _Artist"
 msgstr ""
 
-#: src/gtkui/menus.c:161
+#: src/gtkui/menus.c:159
 msgid "By A_lbum"
 msgstr ""
 
-#: src/gtkui/menus.c:162
+#: src/gtkui/menus.c:160
 msgid "By Release _Date"
 msgstr ""
 
-#: src/gtkui/menus.c:163
+#: src/gtkui/menus.c:161
 msgid "By _File Path"
 msgstr ""
 
-#: src/gtkui/menus.c:164
+#: src/gtkui/menus.c:162
 msgid "By _Custom Title"
 msgstr ""
 
-#: src/gtkui/menus.c:166
+#: src/gtkui/menus.c:164
 msgid "R_everse Order"
 msgstr ""
 
-#: src/gtkui/menus.c:167
+#: src/gtkui/menus.c:165
 msgid "_Random Order"
 msgstr ""
 
-#: src/gtkui/menus.c:170 src/gtkui/menus.c:212
+#: src/gtkui/menus.c:168 src/gtkui/menus.c:211
 msgid "_Refresh"
 msgstr ""
 
-#: src/gtkui/menus.c:172
+#: src/gtkui/menus.c:170
 msgid "_Sort"
 msgstr ""
 
-#: src/gtkui/menus.c:174
+#: src/gtkui/menus.c:172
 msgid "_New"
 msgstr ""
 
-#: src/gtkui/menus.c:175
+#: src/gtkui/menus.c:173 src/gtkui/menus.c:222
 msgid "_Close"
 msgstr ""
 
-#: src/gtkui/menus.c:177
+#: src/gtkui/menus.c:175
 msgid "_Import ..."
 msgstr ""
 
-#: src/gtkui/menus.c:178
+#: src/gtkui/menus.c:176
 msgid "_Export ..."
 msgstr ""
 
-#: src/gtkui/menus.c:180
+#: src/gtkui/menus.c:178
 msgid "_Playlist Manager ..."
 msgstr ""
 
-#: src/gtkui/menus.c:183
+#: src/gtkui/menus.c:179
+msgid "_Queue Manager ..."
+msgstr ""
+
+#: src/gtkui/menus.c:182
 msgid "Volume _Up"
 msgstr ""
 
-#: src/gtkui/menus.c:184
+#: src/gtkui/menus.c:183
 msgid "Volume _Down"
 msgstr ""
 
-#: src/gtkui/menus.c:186
+#: src/gtkui/menus.c:185
 msgid "_Equalizer"
 msgstr ""
 
-#: src/gtkui/menus.c:188
+#: src/gtkui/menus.c:187
 msgid "E_ffects"
 msgstr ""
 
-#: src/gtkui/menus.c:191
+#: src/gtkui/menus.c:190
 msgid "_Interface"
 msgstr ""
 
-#: src/gtkui/menus.c:193
+#: src/gtkui/menus.c:192
 msgid "Show _Menu Bar"
 msgstr ""
 
-#: src/gtkui/menus.c:194
+#: src/gtkui/menus.c:193
 msgid "Show I_nfo Bar"
 msgstr ""
 
-#: src/gtkui/menus.c:195
+#: src/gtkui/menus.c:194
 msgid "Show _Status Bar"
 msgstr ""
 
-#: src/gtkui/menus.c:197
+#: src/gtkui/menus.c:196
 msgid "Show Column _Headers"
 msgstr ""
 
-#: src/gtkui/menus.c:198
+#: src/gtkui/menus.c:197
 msgid "Choose _Columns ..."
 msgstr ""
 
-#: src/gtkui/menus.c:199
+#: src/gtkui/menus.c:198
 msgid "Scrol_l on Song Change"
 msgstr ""
 
-#: src/gtkui/menus.c:202
+#: src/gtkui/menus.c:201
 msgid "_File"
 msgstr ""
 
-#: src/gtkui/menus.c:203
+#: src/gtkui/menus.c:202
 msgid "_Playback"
 msgstr ""
 
-#: src/gtkui/menus.c:204
+#: src/gtkui/menus.c:203
 msgid "P_laylist"
 msgstr ""
 
-#: src/gtkui/menus.c:205 src/gtkui/menus.c:219
+#: src/gtkui/menus.c:204 src/gtkui/menus.c:218
 msgid "_Services"
 msgstr ""
 
-#: src/gtkui/menus.c:206
+#: src/gtkui/menus.c:205
 msgid "_Output"
 msgstr ""
 
-#: src/gtkui/menus.c:207
+#: src/gtkui/menus.c:206
 msgid "_View"
 msgstr ""
 
-#: src/gtkui/menus.c:211
+#: src/gtkui/menus.c:210
 msgid "_Queue/Unqueue"
 msgstr ""
 
-#: src/gtkui/menus.c:214
+#: src/gtkui/menus.c:213
 msgid "Cu_t"
 msgstr ""
 
-#: src/gtkui/menus.c:215
+#: src/gtkui/menus.c:214
 msgid "_Copy"
 msgstr ""
 
-#: src/gtkui/menus.c:216
+#: src/gtkui/menus.c:215
 msgid "_Paste"
 msgstr ""
 
-#: src/gtkui/menus.c:217
+#: src/gtkui/menus.c:216
 msgid "Select _All"
 msgstr ""
 
-#: src/gtkui/menus.c:222
+#: src/gtkui/menus.c:221
 msgid "_Rename"
 msgstr ""
 
-#: src/gtkui/ui_gtk.c:75
+#: src/gtkui/ui_gtk.c:95
 msgid "GTK Interface"
 msgstr ""
 
-#: src/gtkui/ui_gtk.c:132 src/skins/ui_main.c:303
+#: src/gtkui/ui_gtk.c:156 src/skins/ui_main.c:302
 #, c-format
 msgid "%s - Audacious"
 msgstr ""
 
-#: src/gtkui/ui_gtk.c:138 src/skins/ui_main.c:305 src/skins/ui_main.c:1498
+#: src/gtkui/ui_gtk.c:162
+msgid "Buffering ..."
+msgstr ""
+
+#: src/gtkui/ui_gtk.c:165 src/skins/ui_main.c:304 src/skins/ui_main.c:1499
 msgid "Audacious"
 msgstr ""
 
-#: src/gtkui/ui_gtk.c:177 src/skins/plugin.c:185
+#: src/gtkui/ui_gtk.c:211 src/skins/plugin.c:183
 msgid "Error"
 msgstr ""
 
-#: src/gtkui/ui_statusbar.c:102 src/skins/ui_main.c:460
+#: src/gtkui/ui_statusbar.c:102 src/skins/ui_main.c:459
 msgid "mono"
 msgstr ""
 
-#: src/gtkui/ui_statusbar.c:104 src/skins/ui_main.c:459
+#: src/gtkui/ui_statusbar.c:104 src/skins/ui_main.c:458
 msgid "stereo"
 msgstr ""
 
@@ -1614,7 +1877,7 @@
 msgid "Volume Down"
 msgstr ""
 
-#: src/hotkey/gui.c:81 src/skins/ui_manager.c:424 src/skins/ui_manager.c:425
+#: src/hotkey/gui.c:81 src/skins/ui_manager.c:418 src/skins/ui_manager.c:419
 msgid "Jump to File"
 msgstr ""
 
@@ -1692,31 +1955,31 @@
 "\n"
 msgstr ""
 
-#: src/jack/configure.c:71
+#: src/jack/configure.c:66
 msgid "Connect to all available jack ports"
 msgstr ""
 
-#: src/jack/configure.c:78
+#: src/jack/configure.c:73
 msgid "Connect only the output ports"
 msgstr ""
 
-#: src/jack/configure.c:85
+#: src/jack/configure.c:80
 msgid "Connect to no ports"
 msgstr ""
 
-#: src/jack/configure.c:103
+#: src/jack/configure.c:98
 msgid "jack Plugin configuration"
 msgstr ""
 
-#: src/jack/configure.c:121
+#: src/jack/configure.c:116
 msgid "Connection mode:"
 msgstr ""
 
-#: src/jack/configure.c:133
+#: src/jack/configure.c:128
 msgid "Enable debug printing"
 msgstr ""
 
-#: src/jack/jack.c:438
+#: src/jack/jack.c:422
 msgid ""
 "XMMS jack Driver 0.17\n"
 "\n"
@@ -1727,23 +1990,63 @@
 "Giacomo Lozito from develia.org"
 msgstr ""
 
-#: src/jack/jack.c:443
+#: src/jack/jack.c:427
 msgid "About JACK Output Plugin 0.17"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.c:226
+#: src/ladspa/plugin.c:414
+msgid "About LADSPA Host"
+msgstr ""
+
+#: src/ladspa/plugin.c:515
+#, c-format
+msgid "%s Settings"
+msgstr ""
+
+#: src/ladspa/plugin.c:583
+msgid "LADSPA Host Settings"
+msgstr ""
+
+#: src/ladspa/plugin.c:592
+msgid "Module paths:"
+msgstr ""
+
+#: src/ladspa/plugin.c:597
+msgid ""
+"Separate multiple paths with a colon.\n"
+"These paths are searched in addition to LADSPA_PATH.\n"
+"After adding new paths, press Enter to scan for new plugins."
+msgstr ""
+
+#: src/ladspa/plugin.c:613
+msgid "Available plugins:"
+msgstr ""
+
+#: src/ladspa/plugin.c:625
+msgid "Enable"
+msgstr ""
+
+#: src/ladspa/plugin.c:631
+msgid "Enabled plugins:"
+msgstr ""
+
+#: src/ladspa/plugin.c:646
+msgid "Settings"
+msgstr ""
+
+#: src/lyricwiki/lyricwiki.c:227
 msgid ""
 "\n"
 "Looking for lyrics..."
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.c:249
+#: src/lyricwiki/lyricwiki.c:250
 msgid ""
 "\n"
 "Connecting to lyrics.wikia.com..."
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.c:337
+#: src/lyricwiki/lyricwiki.c:338
 msgid ""
 "\n"
 "No lyrics were found."
@@ -1772,6 +2075,22 @@
 msgid "Tact generator: %d bpm %d/%d"
 msgstr ""
 
+#: src/mixer/plugin.c:64
+msgid "About Channel Mixer"
+msgstr ""
+
+#: src/mixer/plugin.c:93
+msgid "Channel Mixer Settings"
+msgstr ""
+
+#: src/mixer/plugin.c:102
+msgid "Output channels:"
+msgstr ""
+
+#: src/mixer/plugin.c:112
+msgid "Changes take effect at the next song change."
+msgstr ""
+
 #: src/mpg123/mpg123.c:183
 msgid "Surround"
 msgstr ""
@@ -1810,35 +2129,35 @@
 msgid "About Null Output"
 msgstr ""
 
-#: src/null/null.c:94
+#: src/null/null.c:89
 msgid "Null output preferences"
 msgstr ""
 
-#: src/null/null.c:105
+#: src/null/null.c:100
 msgid "Run in real time"
 msgstr ""
 
-#: src/oss4/configure.c:89
+#: src/oss4/configure.c:76
 msgid "1. Default device"
 msgstr ""
 
-#: src/oss4/configure.c:151
+#: src/oss4/configure.c:132
 msgid "OSS4 Output Plugin Preferences"
 msgstr ""
 
-#: src/oss4/configure.c:163 src/OSS/configure.c:203
+#: src/oss4/configure.c:144 src/OSS/configure.c:194
 msgid "Audio device:"
 msgstr ""
 
-#: src/oss4/configure.c:189 src/OSS/configure.c:226 src/OSS/configure.c:269
+#: src/oss4/configure.c:172 src/OSS/configure.c:217 src/OSS/configure.c:260
 msgid "Use alternate device:"
 msgstr ""
 
-#: src/oss4/configure.c:202
+#: src/oss4/configure.c:187
 msgid "Save volume between sessions"
 msgstr ""
 
-#: src/oss4/configure.c:206
+#: src/oss4/configure.c:191
 msgid "Enable format conversions made by the OSS software."
 msgstr ""
 
@@ -1846,71 +2165,44 @@
 msgid "About OSS4 Plugin"
 msgstr ""
 
-#: src/oss4/plugin.c:52
-msgid ""
-"OSS4 Output Plugin for Audacious\n"
-"Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
-"\n"
-"I would like to thank people on #audacious, especially Tony Vroon and John "
-"Lindgren and of course the authors of the previous OSS plugin.\n"
-"\n"
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with "
-"this program. If not, see <http://www.gnu.org/licenses/>.\n"
-msgstr ""
-
-#: src/oss4/utils.c:204
+#: src/oss4/utils.c:211
 msgid "OSS4 error"
 msgstr ""
 
-#: src/OSS/configure.c:146
+#: src/OSS/configure.c:137
 #, c-format
 msgid "Default (%s)"
 msgstr ""
 
-#: src/OSS/configure.c:162 src/skins/ui_manager.c:456
-#: src/skins/ui_manager.c:477
-msgid "Default"
-msgstr ""
-
-#: src/OSS/configure.c:187
+#: src/OSS/configure.c:178
 msgid "OSS Driver configuration"
 msgstr ""
 
-#: src/OSS/configure.c:290
+#: src/OSS/configure.c:281
 msgid "Devices"
 msgstr ""
 
-#: src/OSS/configure.c:292
+#: src/OSS/configure.c:283
 msgid "Buffering:"
 msgstr ""
 
-#: src/OSS/configure.c:305
+#: src/OSS/configure.c:296
 msgid "Pre-buffer (percent):"
 msgstr ""
 
-#: src/OSS/configure.c:316
+#: src/OSS/configure.c:307
 msgid "Buffering"
 msgstr ""
 
-#: src/OSS/configure.c:317
+#: src/OSS/configure.c:308
 msgid "Mixer Settings:"
 msgstr ""
 
-#: src/OSS/configure.c:323
+#: src/OSS/configure.c:314
 msgid "Volume controls Master not PCM"
 msgstr ""
 
-#: src/OSS/configure.c:329
+#: src/OSS/configure.c:320
 msgid "Mixer"
 msgstr ""
 
@@ -1918,99 +2210,59 @@
 msgid "About OSS Driver"
 msgstr ""
 
-#: src/OSS/OSS.c:41
-msgid ""
-"Audacious OSS Driver\n"
-"\n"
-" This program is free software; you can redistribute it and/or modify\n"
-"it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
-"(at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
-"GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
-msgstr ""
-
 #: src/pulse_audio/pulse_audio.c:687
 msgid "About Audacious PulseAudio Output Plugin"
 msgstr ""
 
-#: src/pulse_audio/pulse_audio.c:688
-msgid ""
-"Audacious PulseAudio Output Plugin\n"
-"\n"
-" This program is free software; you can redistribute it and/or modify\n"
-"it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
-"(at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
-"GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
-msgstr ""
-
-#: src/resample/plugin.c:91
+#: src/resample/plugin.c:89
 msgid "About Sample Rate Converter Plugin"
 msgstr ""
 
-#: src/resample/plugin.c:146
+#: src/resample/plugin.c:144
 msgid "Sample Rate Converter Preferences"
 msgstr ""
 
-#: src/resample/plugin.c:158
+#: src/resample/plugin.c:156
 msgid "Rate mappings:"
 msgstr ""
 
-#: src/resample/plugin.c:181
+#: src/resample/plugin.c:179
 msgid "All others:"
 msgstr ""
 
-#: src/resample/plugin.c:193
+#: src/resample/plugin.c:191
 msgid "Method:"
 msgstr ""
 
-#: src/scrobbler/configure.c:128 src/scrobbler/configure.c:204
+#: src/scrobbler/configure.c:122 src/scrobbler/configure.c:197
 msgid "Change password"
 msgstr ""
 
-#: src/scrobbler/configure.c:150
+#: src/scrobbler/configure.c:143
 msgid "Services"
 msgstr ""
 
-#: src/scrobbler/configure.c:172
+#: src/scrobbler/configure.c:165
 msgid "Username:"
 msgstr ""
 
-#: src/scrobbler/configure.c:178
+#: src/scrobbler/configure.c:171
 msgid "Password:"
 msgstr ""
 
-#: src/scrobbler/configure.c:186
+#: src/scrobbler/configure.c:179
 msgid "Scrobbler URL:"
 msgstr ""
 
-#: src/scrobbler/configure.c:218
+#: src/scrobbler/configure.c:211
 msgid "Last.FM"
 msgstr ""
 
-#: src/scrobbler/configure.c:262
+#: src/scrobbler/configure.c:238
 msgid "Scrobbler"
 msgstr ""
 
-#: src/scrobbler/plugin.c:213
+#: src/scrobbler/plugin.c:194
 msgid ""
 "Audacious AudioScrobbler Plugin\n"
 "\n"
@@ -2018,7 +2270,7 @@
 "com>\n"
 msgstr ""
 
-#: src/scrobbler/plugin.c:215
+#: src/scrobbler/plugin.c:196
 msgid "About Scrobbler Plugin"
 msgstr ""
 
@@ -2030,629 +2282,49 @@
 msgid "SDL error"
 msgstr ""
 
-#: src/sid/xs_about.c:84
-#, c-format
-msgid "About %s"
-msgstr ""
-
-#: src/sid/xs_about.c:214 src/sid/xs_interface.c:1825
-msgid "Close"
-msgstr ""
-
-#: src/sid/xs_config.c:326
-msgid " Error"
-msgstr ""
-
-#: src/sid/xs_config.c:326
-msgid "OK"
-msgstr ""
-
-#: src/sid/xs_fileinfo.c:151
-msgid "General info"
-msgstr ""
-
-#: src/sid/xs_fileinfo.c:164
-#, c-format
-msgid "Tune #%i: "
-msgstr ""
-
-#: src/sid/xs_glade.c:90 src/sid/xs_glade.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr ""
-
-#: src/sid/xs_interface.c:234
-msgid "Audacious-SID configuration"
-msgstr ""
-
-#: src/sid/xs_interface.c:270
-msgid "8-bit"
-msgstr ""
-
-#: src/sid/xs_interface.c:277
-msgid "16-bit"
-msgstr ""
-
-#: src/sid/xs_interface.c:284
-msgid "Resolution:"
-msgstr ""
-
-#: src/sid/xs_interface.c:315
-msgid "Autopanning"
-msgstr ""
-
-#: src/sid/xs_interface.c:322
-msgid "Channels:"
-msgstr ""
-
-#: src/sid/xs_interface.c:366
-msgid "Samplerate:"
-msgstr ""
-
-#: src/sid/xs_interface.c:383
-msgid "Use oversampling"
-msgstr ""
-
-#: src/sid/xs_interface.c:394
-msgid "Factor:"
-msgstr ""
-
-#: src/sid/xs_interface.c:406
-msgid "Large factors require more CPU-power"
-msgstr ""
-
-#: src/sid/xs_interface.c:412
-msgid "Oversampling:"
-msgstr ""
-
-#: src/sid/xs_interface.c:417
-msgid "Audio"
-msgstr ""
-
-#: src/sid/xs_interface.c:445
-msgid "Force speed"
-msgstr ""
-
-#: src/sid/xs_interface.c:449
-msgid ""
-"If enabled, this option \"forces\" the emulation engine to use the selected "
-"clock speed/frequency. Otherwise the speed is determined from played file "
-"itself."
-msgstr ""
-
-#: src/sid/xs_interface.c:451
-msgid "PAL (50 Hz)"
-msgstr ""
-
-#: src/sid/xs_interface.c:455
-msgid ""
-"PAL is the european TV standard, which uses 50Hz vertical refresh frequency. "
-"Most of SID-tunes have been made for PAL computers."
-msgstr ""
-
-#: src/sid/xs_interface.c:459
-msgid "NTSC (60 Hz)"
-msgstr ""
-
-#: src/sid/xs_interface.c:463
-msgid ""
-"NTSC is the TV standard with 60Hz vertical refresh rate (and other features "
-"that differ from PAL). It is mainly used in United States, Japan and certain "
-"other countries."
-msgstr ""
-
-#: src/sid/xs_interface.c:467
-msgid "Clock speed:"
-msgstr ""
-
-#: src/sid/xs_interface.c:484
-msgid "Force model"
-msgstr ""
-
-#: src/sid/xs_interface.c:488
-msgid ""
-"If enabled, this option \"forces\" the emulation engine to use the selected "
-"SID-chip model. Otherwise the preferred SID model is determined from the "
-"file (if PSIDv2NG type) or if not available, this setting is used."
-msgstr ""
-
-#: src/sid/xs_interface.c:490
-msgid "MOS 6581"
-msgstr ""
-
-#: src/sid/xs_interface.c:494
-msgid ""
-"MOS/CSG 6581 is the earlier major version of SID chip. It differs from 8580 "
-"in few ways, having much fuller filter (which, due to design error, is never "
-"same between two different SID-chips) and has the \"volume adjustment bug\", "
-"which enables playing of digital samples."
-msgstr ""
-
-#: src/sid/xs_interface.c:498
-msgid "MOS 8580"
-msgstr ""
-
-#: src/sid/xs_interface.c:505
-msgid "SID model:"
-msgstr ""
-
-#: src/sid/xs_interface.c:522
-msgid "SIDPlay 1 (frame-based)"
-msgstr ""
-
-#: src/sid/xs_interface.c:526
-msgid ""
-"Use libSIDPlay 1.x emulation, faster but not so accurate. Good in most "
-"cases, though."
-msgstr ""
-
-#: src/sid/xs_interface.c:530
-msgid "SIDPlay 2 (cycle-based)"
-msgstr ""
-
-#: src/sid/xs_interface.c:534
-msgid ""
-"Use libSIDPlay 2.x emulation, which requires powerful CPU due to more exact "
-"emulation."
-msgstr ""
-
-#: src/sid/xs_interface.c:538
-msgid "Emulation library selection:"
-msgstr ""
-
-#: src/sid/xs_interface.c:555
-msgid "Real C64 (SIDPlay 2 only)"
-msgstr ""
-
-#: src/sid/xs_interface.c:562
-msgid "Bank switching"
-msgstr ""
-
-#: src/sid/xs_interface.c:569
-msgid "Transparent ROM"
-msgstr ""
-
-#: src/sid/xs_interface.c:576
-msgid "PlaySID environment"
-msgstr ""
-
-#: src/sid/xs_interface.c:583
-msgid "Memory mode:"
-msgstr ""
-
-#: src/sid/xs_interface.c:588
-msgid "Emu#1"
-msgstr ""
-
-#: src/sid/xs_interface.c:611
-msgid "Optimization mode (faster, inaccurate)"
-msgstr ""
-
-#: src/sid/xs_interface.c:615
-msgid ""
-"This setting can be used to enable libSIDPlay2's \"optimization mode\", "
-"which in downgrades the emulation from cycle-exact to something similar to "
-"frame-exact. The result is lower CPU usage, but worse accuracy."
-msgstr ""
-
-#: src/sid/xs_interface.c:617
-msgid "reSID-emulation"
-msgstr ""
-
-#: src/sid/xs_interface.c:621
-msgid ""
-"reSID is the software SID-chip simulator based on SID reverse-engineering, "
-"created by Dag Lem. It is probably the closest thing to real SID available "
-"as software-only emulation."
-msgstr ""
-
-#: src/sid/xs_interface.c:625
-msgid "HardSID"
-msgstr ""
-
-#: src/sid/xs_interface.c:629
-msgid ""
-"HardSID is a EISA/PCI card for PC-compatibles, which can be fitted with a "
-"real SID-chip. Software can be used to control the HardSID and combined with "
-"software emulation of rest of C64 via libSIDPlay2 HardSID can be used to "
-"achieve \"near 100%\" similarity to real C64. For more information, see "
-"http://www.hardsid.com/"
-msgstr ""
-
-#: src/sid/xs_interface.c:633
-msgid "SIDPlay 2 options:"
-msgstr ""
-
-#: src/sid/xs_interface.c:650
-msgid "Fast (nearest neighbour)"
-msgstr ""
-
-#: src/sid/xs_interface.c:654
-msgid ""
-"Fastest and also worst sounding sampling method, simply picks nearest "
-"neighbouring sample."
-msgstr ""
-
-#: src/sid/xs_interface.c:658
-msgid "Linear interpolation"
-msgstr ""
-
-#: src/sid/xs_interface.c:662
-msgid ""
-"Uses linear interpolation between samples, yielding higher audio quality "
-"with less sampling noise."
-msgstr ""
-
-#: src/sid/xs_interface.c:673
-msgid "Resampling (FIR)"
-msgstr ""
-
-#: src/sid/xs_interface.c:680
-msgid "reSID sampling options:"
-msgstr ""
-
-#: src/sid/xs_interface.c:685
-msgid "Emu#2"
-msgstr ""
-
-#: src/sid/xs_interface.c:697
-msgid "Emulate filters"
-msgstr ""
-
-#: src/sid/xs_interface.c:701
-msgid ""
-"This option enables emulation of SID filter. The filter is an essential part "
-"of SID's sound capacity, but accurate emulation of it may require quite much "
-"CPU power. However, if filter emulation is disabled, tunes won't sound "
-"authentic at all if they utilize the filter."
-msgstr ""
-
-#: src/sid/xs_interface.c:726
-msgid "FS"
-msgstr ""
-
-#: src/sid/xs_interface.c:743
-msgid "FM"
-msgstr ""
-
-#: src/sid/xs_interface.c:760
-msgid "FT"
-msgstr ""
-
-#: src/sid/xs_interface.c:771
-msgid "Reset values"
-msgstr ""
-
-#: src/sid/xs_interface.c:776
-msgid "SIDPlay1"
-msgstr ""
-
-#: src/sid/xs_interface.c:817
-msgid "Export"
-msgstr ""
-
-#: src/sid/xs_interface.c:825
-msgid "Use"
-msgstr ""
-
-#: src/sid/xs_interface.c:833 src/skins/ui_manager.c:447
-msgid "Save"
-msgstr ""
-
-#: src/sid/xs_interface.c:841 src/skins/ui_manager.c:446
-msgid "Import"
-msgstr ""
-
-#: src/sid/xs_interface.c:849 src/skins/ui_manager.c:448
-msgid "Delete"
-msgstr ""
-
-#: src/sid/xs_interface.c:863
-msgid "Filter curve:"
-msgstr ""
-
-#: src/sid/xs_interface.c:868
-msgid "SIDPlay2"
-msgstr ""
-
-#: src/sid/xs_interface.c:874
-msgid "Filters"
-msgstr ""
-
-#: src/sid/xs_interface.c:897
-msgid "Play at least for specified time"
-msgstr ""
-
-#: src/sid/xs_interface.c:901
-msgid ""
-"If enabled, the tune is played at least for the specified time, adding "
-"silence to the end if necessary."
-msgstr ""
-
-#: src/sid/xs_interface.c:908 src/sid/xs_interface.c:962
-#: src/sid/xs_interface.c:1142
-msgid "Playtime:"
-msgstr ""
-
-#: src/sid/xs_interface.c:921 src/sid/xs_interface.c:975
-#: src/sid/xs_interface.c:1155
-msgid "seconds"
-msgstr ""
-
-#: src/sid/xs_interface.c:928
-msgid "Minimum playtime:"
-msgstr ""
-
-#: src/sid/xs_interface.c:945
-msgid "Play for specified time maximum"
-msgstr ""
-
-#: src/sid/xs_interface.c:949
-msgid ""
-"If enabled, tune is played until specified duration is reached (aka maximum "
-"playtime)."
-msgstr ""
-
-#: src/sid/xs_interface.c:951
-msgid "Only when song length is unknown"
-msgstr ""
-
-#: src/sid/xs_interface.c:955
-msgid ""
-"If enabled, the maximum playtime is applied only if song/tune length is not "
-"known."
-msgstr ""
-
-#: src/sid/xs_interface.c:982
-msgid "Maximum playtime:"
-msgstr ""
-
-#: src/sid/xs_interface.c:999
-msgid "Use XSIDPLAY-compatible database"
-msgstr ""
-
-#: src/sid/xs_interface.c:1003
-msgid ""
-"This option enables using of XSIDPLAY compatible song length database. "
-"(Refer to Audacious-SID documentation for more information)"
-msgstr ""
-
-#: src/sid/xs_interface.c:1010
-msgid "DB-file:"
-msgstr ""
-
-#: src/sid/xs_interface.c:1020
-msgid "Database path and filename"
-msgstr ""
-
-#: src/sid/xs_interface.c:1027
-msgid "Browse for song length-database file"
-msgstr ""
-
-#: src/sid/xs_interface.c:1049
-msgid "Song length database:"
-msgstr ""
-
-#: src/sid/xs_interface.c:1054
-msgid "Songlength"
-msgstr ""
-
-#: src/sid/xs_interface.c:1072
-msgid "Override generic Tuplez format string"
-msgstr ""
-
-#: src/sid/xs_interface.c:1076
-msgid ""
-"By enabling this option you can specify a custom Tuplez formatting string "
-"for SID-files. The SID-plugin specific Tuplez tags are described shortly "
-"below."
-msgstr ""
-
-#: src/sid/xs_interface.c:1087
-msgid "Tuplez format string for SID-files"
-msgstr ""
-
-#: src/sid/xs_interface.c:1090
-msgid ""
-"SID-specific Tuplez fields:\n"
-"\n"
-"sid-format\t\t- Specific fileformat\n"
-"sid-model\t\t- 6581 or 8580\n"
-"sid-speed\t\t- Timing or speed: PAL/NTSC/etc.\n"
-"\n"
-"Other \"special\" fields set:\n"
-"\n"
-"subsong-num, subsong-id"
-msgstr ""
-
-#: src/sid/xs_interface.c:1098
-msgid "Song title format:"
-msgstr ""
-
-#: src/sid/xs_interface.c:1125
-msgid "Add sub-tunes to playlist"
-msgstr ""
-
-#: src/sid/xs_interface.c:1129
-msgid ""
-"If enabled, sub-tunes of each file will be added to playlist. If disabled, "
-"only the default sub-tune will be added."
-msgstr ""
-
-#: src/sid/xs_interface.c:1131
-msgid "Only tunes with specified minimum duration"
-msgstr ""
-
-#: src/sid/xs_interface.c:1135
-msgid "Only add sub-tunes that have a duration of at least specified time."
-msgstr ""
-
-#: src/sid/xs_interface.c:1162
-msgid "Sub-tune handling:"
-msgstr ""
-
-#: src/sid/xs_interface.c:1179
-msgid "Use STIL database"
-msgstr ""
-
-#: src/sid/xs_interface.c:1183
-msgid ""
-"If this option is enabled (and the database & HVSC settings below are "
-"correctly set), Audacious-SID will use and display additional information "
-"from STIL database when HVSC SIDs are played."
-msgstr ""
-
-#: src/sid/xs_interface.c:1190
-msgid "STIL file:"
-msgstr ""
-
-#: src/sid/xs_interface.c:1206
-msgid ""
-"Path and filename of STIL database file (STIL.txt), usually found from "
-"HVSC's DOCUMENTS-subdirectory."
-msgstr ""
-
-#: src/sid/xs_interface.c:1219
-msgid "Browse for STIL-database file"
-msgstr ""
-
-#: src/sid/xs_interface.c:1246
-msgid "HVSC path:"
-msgstr ""
-
-#: src/sid/xs_interface.c:1262
-msgid ""
-"Path to base-directory of your High Voltage SID Collection (HVSC), for "
-"example /media/C64Music/"
-msgstr ""
-
-#: src/sid/xs_interface.c:1275
-msgid "Browse for HVSC path"
-msgstr ""
-
-#: src/sid/xs_interface.c:1297
-msgid "SID Tune Information List (STIL) database:"
-msgstr ""
-
-#: src/sid/xs_interface.c:1321
-msgid "Cancel any changes"
-msgstr ""
-
-#: src/sid/xs_interface.c:1328
-msgid "Accept and update changes"
-msgstr ""
-
-#: src/sid/xs_interface.c:1628
-msgid "Audacious-SID Fileinfo"
-msgstr ""
-
-#: src/sid/xs_interface.c:1649
-msgid "Filename:"
-msgstr ""
-
-#: src/sid/xs_interface.c:1657
-msgid "Songname:"
-msgstr ""
-
-#: src/sid/xs_interface.c:1665
-msgid "Composer:"
-msgstr ""
-
-#: src/sid/xs_interface.c:1673
-msgid "Copyright:"
-msgstr ""
-
-#: src/sid/xs_interface.c:1717
-msgid "Song Information:"
-msgstr ""
-
-#: src/sid/xs_interface.c:1752
-msgid "Author:"
-msgstr ""
-
-#: src/sid/xs_interface.c:1786
-msgid "Duration:"
-msgstr ""
-
-#: src/sid/xs_interface.c:1820
-msgid "Sub-tune Information:"
-msgstr ""
-
-#: src/sid/xs_interface.c:1881
-msgid "Select HVSC song length database"
-msgstr ""
-
-#: src/sid/xs_interface.c:1922
-msgid "Select STIL-database"
-msgstr ""
-
-#: src/sid/xs_interface.c:1963
-msgid "Select HVSC location prefix"
-msgstr ""
-
-#: src/sid/xs_interface.c:2004
-msgid "Select SIDPlay2 filters file for importing"
-msgstr ""
-
-#: src/sid/xs_interface.c:2045
-msgid "Select SIDPlay2 filters file for exporting"
-msgstr ""
-
-#: src/sid/xs_interface.c:2093 src/sid/xs_interface.c:2106
-msgid "Confirm selected action"
-msgstr ""
-
-#: src/sid/xs_interface.c:2123
-msgid "Yes"
-msgstr ""
-
-#: src/sid/xs_interface.c:2129
-msgid "No"
-msgstr ""
-
-#: src/skins/plugin.c:167
+#: src/skins/plugin.c:165
 msgid "About Skinned GUI"
 msgstr ""
 
-#: src/skins/plugin.c:168
+#: src/skins/plugin.c:166
 msgid ""
 "Copyright (c) 2008, by Tomasz Moń <desowin@gmail.com>\n"
 "\n"
 msgstr ""
 
-#: src/skins/skins_cfg.c:254
+#: src/skins/skins_cfg.c:207
 msgid "_Player:"
 msgstr ""
 
-#: src/skins/skins_cfg.c:254
+#: src/skins/skins_cfg.c:208
 msgid "Select main player window font:"
 msgstr ""
 
-#: src/skins/skins_cfg.c:255
+#: src/skins/skins_cfg.c:210
 msgid "_Playlist:"
 msgstr ""
 
-#: src/skins/skins_cfg.c:255
+#: src/skins/skins_cfg.c:211
 msgid "Select playlist font:"
 msgstr ""
 
-#: src/skins/skins_cfg.c:259
+#: src/skins/skins_cfg.c:215
 msgid "_Fonts"
 msgstr ""
 
-#: src/skins/skins_cfg.c:261
+#: src/skins/skins_cfg.c:218
 msgid "Use bitmap fonts (supports ASCII only)"
 msgstr ""
 
-#: src/skins/skins_cfg.c:263
+#: src/skins/skins_cfg.c:220
 msgid "Scroll song title in both directions"
 msgstr ""
 
-#: src/skins/skins_cfg.c:346
+#: src/skins/skins_cfg.c:298
 msgid "_Skin"
 msgstr ""
 
-#: src/skins/skins_cfg.c:393
+#: src/skins/skins_cfg.c:345
 msgid "Interface Preferences"
 msgstr ""
 
@@ -2700,83 +2372,83 @@
 msgid "16 kHz"
 msgstr ""
 
-#: src/skins/ui_equalizer.c:378
+#: src/skins/ui_equalizer.c:379
 msgid "Audacious Equalizer"
 msgstr ""
 
-#: src/skins/ui_equalizer.c:884
+#: src/skins/ui_equalizer.c:896
 msgid "Presets"
 msgstr ""
 
-#: src/skins/ui_main.c:444
+#: src/skins/ui_main.c:443
 msgid "kbps"
 msgstr ""
 
-#: src/skins/ui_main.c:452
+#: src/skins/ui_main.c:451
 msgid "kHz"
 msgstr ""
 
-#: src/skins/ui_main.c:459
+#: src/skins/ui_main.c:458
 msgid "surround"
 msgstr ""
 
-#: src/skins/ui_main.c:807
+#: src/skins/ui_main.c:806
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr ""
 
-#: src/skins/ui_main.c:828
+#: src/skins/ui_main.c:827
 #, c-format
 msgid "Volume: %d%%"
 msgstr ""
 
-#: src/skins/ui_main.c:851
+#: src/skins/ui_main.c:850
 #, c-format
 msgid "Balance: %d%% left"
 msgstr ""
 
-#: src/skins/ui_main.c:853
+#: src/skins/ui_main.c:852
 msgid "Balance: center"
 msgstr ""
 
-#: src/skins/ui_main.c:855
+#: src/skins/ui_main.c:854
 #, c-format
 msgid "Balance: %d%% right"
 msgstr ""
 
-#: src/skins/ui_main.c:981
+#: src/skins/ui_main.c:980
 msgid "Options Menu"
 msgstr ""
 
-#: src/skins/ui_main.c:985
+#: src/skins/ui_main.c:984
 msgid "Disable 'Always On Top'"
 msgstr ""
 
-#: src/skins/ui_main.c:987
+#: src/skins/ui_main.c:986
 msgid "Enable 'Always On Top'"
 msgstr ""
 
-#: src/skins/ui_main.c:990
+#: src/skins/ui_main.c:989
 msgid "File Info Box"
 msgstr ""
 
-#: src/skins/ui_main.c:995
+#: src/skins/ui_main.c:994
 msgid "Visualization Menu"
 msgstr ""
 
-#: src/skins/ui_main.c:1645
+#: src/skins/ui_main.c:1648
 msgid "Single mode."
 msgstr ""
 
-#: src/skins/ui_main.c:1647
+#: src/skins/ui_main.c:1650
 msgid "Playlist mode."
 msgstr ""
 
-#: src/skins/ui_main.c:1669
+#: src/skins/ui_main.c:1672
 msgid "Stopping after song."
 msgstr ""
 
-#: src/skins/ui_main.c:1671
+#: src/skins/ui_main.c:1674
 msgid "Not stopping after song."
 msgstr ""
 
@@ -3002,423 +2674,421 @@
 msgstr ""
 
 #: src/skins/ui_manager.c:229
-msgid "Save All Playlists"
-msgstr ""
-
-#: src/skins/ui_manager.c:230
-msgid ""
-"Saves all the playlists that are open. Note that this is done automatically "
-"when Audacious quits."
-msgstr ""
-
-#: src/skins/ui_manager.c:234
 msgid "Refresh List"
 msgstr ""
 
-#: src/skins/ui_manager.c:235
+#: src/skins/ui_manager.c:230
 msgid "Refreshes metadata associated with a playlist entry."
 msgstr ""
 
-#: src/skins/ui_manager.c:238
-msgid "List Manager"
+#: src/skins/ui_manager.c:233
+msgid "Playlist Manager"
 msgstr ""
 
-#: src/skins/ui_manager.c:239
-msgid "Opens the playlist manager."
+#: src/skins/ui_manager.c:234
+msgid "Queue Manager"
 msgstr ""
 
-#: src/skins/ui_manager.c:243
+#: src/skins/ui_manager.c:237
 msgid "View"
 msgstr ""
 
-#: src/skins/ui_manager.c:244
+#: src/skins/ui_manager.c:238
 msgid "Interface"
 msgstr ""
 
-#: src/skins/ui_manager.c:245
+#: src/skins/ui_manager.c:239
 msgid "Interface Preferences ..."
 msgstr ""
 
-#: src/skins/ui_manager.c:249
+#: src/skins/ui_manager.c:243
 msgid "Add Internet Address..."
 msgstr ""
 
-#: src/skins/ui_manager.c:250
+#: src/skins/ui_manager.c:244
 msgid "Adds a remote track to the playlist."
 msgstr ""
 
-#: src/skins/ui_manager.c:253
+#: src/skins/ui_manager.c:247
 msgid "Add Files..."
 msgstr ""
 
-#: src/skins/ui_manager.c:254
+#: src/skins/ui_manager.c:248
 msgid "Adds files to the playlist."
 msgstr ""
 
-#: src/skins/ui_manager.c:259
+#: src/skins/ui_manager.c:253
 msgid "Search and Select"
 msgstr ""
 
-#: src/skins/ui_manager.c:260
+#: src/skins/ui_manager.c:254
 msgid ""
 "Searches the playlist and selects playlist entries based on specific "
 "criteria."
 msgstr ""
 
-#: src/skins/ui_manager.c:263
+#: src/skins/ui_manager.c:257
 msgid "Invert Selection"
 msgstr ""
 
-#: src/skins/ui_manager.c:264
+#: src/skins/ui_manager.c:258
 msgid "Inverts the selected and unselected entries."
 msgstr ""
 
-#: src/skins/ui_manager.c:267
+#: src/skins/ui_manager.c:261
 msgid "Select All"
 msgstr ""
 
-#: src/skins/ui_manager.c:268
+#: src/skins/ui_manager.c:262
 msgid "Selects all of the playlist entries."
 msgstr ""
 
-#: src/skins/ui_manager.c:271
+#: src/skins/ui_manager.c:265
 msgid "Select None"
 msgstr ""
 
-#: src/skins/ui_manager.c:272
+#: src/skins/ui_manager.c:266
 msgid "Deselects all of the playlist entries."
 msgstr ""
 
-#: src/skins/ui_manager.c:277
+#: src/skins/ui_manager.c:271
 msgid "Remove All"
 msgstr ""
 
-#: src/skins/ui_manager.c:278
+#: src/skins/ui_manager.c:272
 msgid "Removes all entries from the playlist."
 msgstr ""
 
-#: src/skins/ui_manager.c:281
+#: src/skins/ui_manager.c:275
 msgid "Clear Queue"
 msgstr ""
 
-#: src/skins/ui_manager.c:282
+#: src/skins/ui_manager.c:276
 msgid "Clears the queue associated with this playlist."
 msgstr ""
 
-#: src/skins/ui_manager.c:285
+#: src/skins/ui_manager.c:279
 msgid "Remove Unavailable Files"
 msgstr ""
 
-#: src/skins/ui_manager.c:286
+#: src/skins/ui_manager.c:280
 msgid "Removes unavailable files from the playlist."
 msgstr ""
 
-#: src/skins/ui_manager.c:289
+#: src/skins/ui_manager.c:283
 msgid "Remove Duplicates"
 msgstr ""
 
-#: src/skins/ui_manager.c:291 src/skins/ui_manager.c:323
-#: src/skins/ui_manager.c:353
+#: src/skins/ui_manager.c:285 src/skins/ui_manager.c:317
+#: src/skins/ui_manager.c:347
 msgid "By Title"
 msgstr ""
 
-#: src/skins/ui_manager.c:292
+#: src/skins/ui_manager.c:286
 msgid "Removes duplicate entries from the playlist by title."
 msgstr ""
 
-#: src/skins/ui_manager.c:295 src/skins/ui_manager.c:335
-#: src/skins/ui_manager.c:365
+#: src/skins/ui_manager.c:289 src/skins/ui_manager.c:329
+#: src/skins/ui_manager.c:359
 msgid "By Filename"
 msgstr ""
 
-#: src/skins/ui_manager.c:296
+#: src/skins/ui_manager.c:290
 msgid "Removes duplicate entries from the playlist by filename."
 msgstr ""
 
-#: src/skins/ui_manager.c:299 src/skins/ui_manager.c:339
-#: src/skins/ui_manager.c:369
+#: src/skins/ui_manager.c:293 src/skins/ui_manager.c:333
+#: src/skins/ui_manager.c:363
 msgid "By Path + Filename"
 msgstr ""
 
-#: src/skins/ui_manager.c:300
+#: src/skins/ui_manager.c:294
 msgid "Removes duplicate entries from the playlist by their full path."
 msgstr ""
 
-#: src/skins/ui_manager.c:303
+#: src/skins/ui_manager.c:297
 msgid "Remove Unselected"
 msgstr ""
 
-#: src/skins/ui_manager.c:304
+#: src/skins/ui_manager.c:298
 msgid "Remove unselected entries from the playlist."
 msgstr ""
 
-#: src/skins/ui_manager.c:307
+#: src/skins/ui_manager.c:301
 msgid "Remove Selected"
 msgstr ""
 
-#: src/skins/ui_manager.c:308
+#: src/skins/ui_manager.c:302
 msgid "Remove selected entries from the playlist."
 msgstr ""
 
-#: src/skins/ui_manager.c:313
+#: src/skins/ui_manager.c:307
 msgid "Randomize List"
 msgstr ""
 
-#: src/skins/ui_manager.c:314
+#: src/skins/ui_manager.c:308
 msgid "Randomizes the playlist."
 msgstr ""
 
-#: src/skins/ui_manager.c:317
+#: src/skins/ui_manager.c:311
 msgid "Reverse List"
 msgstr ""
 
-#: src/skins/ui_manager.c:318
+#: src/skins/ui_manager.c:312
 msgid "Reverses the playlist."
 msgstr ""
 
-#: src/skins/ui_manager.c:321
+#: src/skins/ui_manager.c:315
 msgid "Sort List"
 msgstr ""
 
-#: src/skins/ui_manager.c:324 src/skins/ui_manager.c:354
+#: src/skins/ui_manager.c:318 src/skins/ui_manager.c:348
 msgid "Sorts the list by title."
 msgstr ""
 
-#: src/skins/ui_manager.c:327 src/skins/ui_manager.c:357
+#: src/skins/ui_manager.c:321 src/skins/ui_manager.c:351
 msgid "By Album"
 msgstr ""
 
-#: src/skins/ui_manager.c:328 src/skins/ui_manager.c:358
+#: src/skins/ui_manager.c:322 src/skins/ui_manager.c:352
 msgid "Sorts the list by album."
 msgstr ""
 
-#: src/skins/ui_manager.c:331 src/skins/ui_manager.c:361
+#: src/skins/ui_manager.c:325 src/skins/ui_manager.c:355
 msgid "By Artist"
 msgstr ""
 
-#: src/skins/ui_manager.c:332 src/skins/ui_manager.c:362
+#: src/skins/ui_manager.c:326 src/skins/ui_manager.c:356
 msgid "Sorts the list by artist."
 msgstr ""
 
-#: src/skins/ui_manager.c:336 src/skins/ui_manager.c:366
+#: src/skins/ui_manager.c:330 src/skins/ui_manager.c:360
 msgid "Sorts the list by filename."
 msgstr ""
 
-#: src/skins/ui_manager.c:340 src/skins/ui_manager.c:370
+#: src/skins/ui_manager.c:334 src/skins/ui_manager.c:364
 msgid "Sorts the list by full pathname."
 msgstr ""
 
-#: src/skins/ui_manager.c:343 src/skins/ui_manager.c:373
+#: src/skins/ui_manager.c:337 src/skins/ui_manager.c:367
 msgid "By Date"
 msgstr ""
 
-#: src/skins/ui_manager.c:344 src/skins/ui_manager.c:374
+#: src/skins/ui_manager.c:338 src/skins/ui_manager.c:368
 msgid "Sorts the list by modification time."
 msgstr ""
 
-#: src/skins/ui_manager.c:347 src/skins/ui_manager.c:377
+#: src/skins/ui_manager.c:341 src/skins/ui_manager.c:371
 msgid "By Track Number"
 msgstr ""
 
-#: src/skins/ui_manager.c:348 src/skins/ui_manager.c:378
+#: src/skins/ui_manager.c:342 src/skins/ui_manager.c:372
 msgid "Sorts the list by track number."
 msgstr ""
 
-#: src/skins/ui_manager.c:351
+#: src/skins/ui_manager.c:345
 msgid "Sort Selected"
 msgstr ""
 
-#: src/skins/ui_manager.c:387
+#: src/skins/ui_manager.c:381
 msgid "File"
 msgstr ""
 
-#: src/skins/ui_manager.c:388
-msgid "Help"
-msgstr ""
-
-#: src/skins/ui_manager.c:390
+#: src/skins/ui_manager.c:384
 msgid "Plugin Services"
 msgstr ""
 
-#: src/skins/ui_manager.c:392 src/skins/ui_manager.c:395
+#: src/skins/ui_manager.c:386 src/skins/ui_manager.c:389
 msgid "View Track Details"
 msgstr ""
 
-#: src/skins/ui_manager.c:393 src/skins/ui_manager.c:396
+#: src/skins/ui_manager.c:387 src/skins/ui_manager.c:390
 msgid "View track details"
 msgstr ""
 
-#: src/skins/ui_manager.c:398 src/skins/ui_manager.c:399
+#: src/skins/ui_manager.c:392 src/skins/ui_manager.c:393
 msgid "About Audacious"
 msgstr ""
 
-#: src/skins/ui_manager.c:401
+#: src/skins/ui_manager.c:395
 msgid "Play File"
 msgstr ""
 
-#: src/skins/ui_manager.c:402
+#: src/skins/ui_manager.c:396
 msgid "Load and play a file"
 msgstr ""
 
-#: src/skins/ui_manager.c:404
+#: src/skins/ui_manager.c:398
 msgid "Play Location"
 msgstr ""
 
-#: src/skins/ui_manager.c:405
+#: src/skins/ui_manager.c:399
 msgid "Play media from the selected location"
 msgstr ""
 
-#: src/skins/ui_manager.c:407
+#: src/skins/ui_manager.c:401
 msgid "Plugin services"
 msgstr ""
 
-#: src/skins/ui_manager.c:409
+#: src/skins/ui_manager.c:403
 msgid "Preferences"
 msgstr ""
 
-#: src/skins/ui_manager.c:410
+#: src/skins/ui_manager.c:404
 msgid "Open preferences window"
 msgstr ""
 
-#: src/skins/ui_manager.c:413
+#: src/skins/ui_manager.c:407
 msgid "Quit Audacious"
 msgstr ""
 
-#: src/skins/ui_manager.c:415 src/skins/ui_manager.c:416
+#: src/skins/ui_manager.c:409 src/skins/ui_manager.c:410
 msgid "Set A-B"
 msgstr ""
 
-#: src/skins/ui_manager.c:418 src/skins/ui_manager.c:419
+#: src/skins/ui_manager.c:412 src/skins/ui_manager.c:413
 msgid "Clear A-B"
 msgstr ""
 
-#: src/skins/ui_manager.c:421 src/skins/ui_manager.c:422
+#: src/skins/ui_manager.c:415 src/skins/ui_manager.c:416
 msgid "Jump to Playlist Start"
 msgstr ""
 
-#: src/skins/ui_manager.c:427 src/skins/ui_manager.c:428
+#: src/skins/ui_manager.c:421 src/skins/ui_manager.c:422
 msgid "Jump to Time"
 msgstr ""
 
-#: src/skins/ui_manager.c:430
+#: src/skins/ui_manager.c:424
 msgid "Queue Toggle"
 msgstr ""
 
-#: src/skins/ui_manager.c:431
+#: src/skins/ui_manager.c:425
 msgid "Enables/disables the entry in the playlist's queue."
 msgstr ""
 
-#: src/skins/ui_manager.c:434
+#: src/skins/ui_manager.c:428
 msgid "Copy"
 msgstr ""
 
-#: src/skins/ui_manager.c:436
+#: src/skins/ui_manager.c:430
 msgid "Cut"
 msgstr ""
 
-#: src/skins/ui_manager.c:438
+#: src/skins/ui_manager.c:432
 msgid "Paste"
 msgstr ""
 
-#: src/skins/ui_manager.c:445
+#: src/skins/ui_manager.c:439
 msgid "Load"
 msgstr ""
 
-#: src/skins/ui_manager.c:450 src/skins/ui_manager.c:471
-#: src/skins/ui_manager.c:486
+#: src/skins/ui_manager.c:440
+msgid "Import"
+msgstr ""
+
+#: src/skins/ui_manager.c:441
+msgid "Save"
+msgstr ""
+
+#: src/skins/ui_manager.c:442
+msgid "Delete"
+msgstr ""
+
+#: src/skins/ui_manager.c:444 src/skins/ui_manager.c:465
+#: src/skins/ui_manager.c:480
 msgid "Preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:451
+#: src/skins/ui_manager.c:445
 msgid "Load preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:453 src/skins/ui_manager.c:474
-#: src/skins/ui_manager.c:489
+#: src/skins/ui_manager.c:447 src/skins/ui_manager.c:468
+#: src/skins/ui_manager.c:483
 msgid "Auto-load preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:454
+#: src/skins/ui_manager.c:448
 msgid "Load auto-load preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:457
+#: src/skins/ui_manager.c:451
 msgid "Load default preset into equalizer"
 msgstr ""
 
-#: src/skins/ui_manager.c:459
+#: src/skins/ui_manager.c:453
 msgid "Zero"
 msgstr ""
 
-#: src/skins/ui_manager.c:460
+#: src/skins/ui_manager.c:454
 msgid "Set equalizer preset levels to zero"
 msgstr ""
 
-#: src/skins/ui_manager.c:462
+#: src/skins/ui_manager.c:456
 msgid "From file"
 msgstr ""
 
-#: src/skins/ui_manager.c:463
+#: src/skins/ui_manager.c:457
 msgid "Load preset from file"
 msgstr ""
 
-#: src/skins/ui_manager.c:465
+#: src/skins/ui_manager.c:459
 msgid "From WinAMP EQF file"
 msgstr ""
 
-#: src/skins/ui_manager.c:466
+#: src/skins/ui_manager.c:460
 msgid "Load preset from WinAMP EQF file"
 msgstr ""
 
-#: src/skins/ui_manager.c:468
+#: src/skins/ui_manager.c:462
 msgid "WinAMP Presets"
 msgstr ""
 
-#: src/skins/ui_manager.c:469
+#: src/skins/ui_manager.c:463
 msgid "Import WinAMP presets"
 msgstr ""
 
-#: src/skins/ui_manager.c:472
+#: src/skins/ui_manager.c:466
 msgid "Save preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:475
+#: src/skins/ui_manager.c:469
 msgid "Save auto-load preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:478
+#: src/skins/ui_manager.c:472
 msgid "Save default preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:480
+#: src/skins/ui_manager.c:474
 msgid "To file"
 msgstr ""
 
-#: src/skins/ui_manager.c:481
+#: src/skins/ui_manager.c:475
 msgid "Save preset to file"
 msgstr ""
 
-#: src/skins/ui_manager.c:483
+#: src/skins/ui_manager.c:477
 msgid "To WinAMP EQF file"
 msgstr ""
 
-#: src/skins/ui_manager.c:484
+#: src/skins/ui_manager.c:478
 msgid "Save preset to WinAMP EQF file"
 msgstr ""
 
-#: src/skins/ui_manager.c:487
+#: src/skins/ui_manager.c:481
 msgid "Delete preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:490
+#: src/skins/ui_manager.c:484
 msgid "Delete auto-load preset"
 msgstr ""
 
-#: src/skins/ui_playlist.c:245
+#: src/skins/ui_playlist.c:244
 msgid "Search entries in active playlist"
 msgstr ""
 
-#: src/skins/ui_playlist.c:253
+#: src/skins/ui_playlist.c:252
 msgid ""
 "Select entries in playlist by filling one or more fields. Fields use regular "
 "expressions syntax, case-insensitive. If you don't know how regular "
@@ -3426,39 +3096,39 @@
 "for."
 msgstr ""
 
-#: src/skins/ui_playlist.c:261
+#: src/skins/ui_playlist.c:260
 msgid "Title: "
 msgstr ""
 
-#: src/skins/ui_playlist.c:268
+#: src/skins/ui_playlist.c:267
 msgid "Album: "
 msgstr ""
 
-#: src/skins/ui_playlist.c:275
+#: src/skins/ui_playlist.c:274
 msgid "Artist: "
 msgstr ""
 
-#: src/skins/ui_playlist.c:282
+#: src/skins/ui_playlist.c:281
 msgid "Filename: "
 msgstr ""
 
-#: src/skins/ui_playlist.c:290
+#: src/skins/ui_playlist.c:289
 msgid "Clear previous selection before searching"
 msgstr ""
 
-#: src/skins/ui_playlist.c:293
+#: src/skins/ui_playlist.c:292
 msgid "Automatically toggle queue for matching entries"
 msgstr ""
 
-#: src/skins/ui_playlist.c:296
+#: src/skins/ui_playlist.c:295
 msgid "Create a new playlist with matching entries"
 msgstr ""
 
-#: src/skins/ui_playlist.c:763
+#: src/skins/ui_playlist.c:762
 msgid "Audacious Playlist Editor"
 msgstr ""
 
-#: src/skins/ui_playlist.c:810
+#: src/skins/ui_playlist.c:809
 #, c-format
 msgid "%s (%d of %d)"
 msgstr ""
@@ -3480,84 +3150,57 @@
 msgid "About sndfile plugin"
 msgstr ""
 
-#: src/sndfile/plugin.c:455
-msgid ""
-"Adapted for Audacious usage by Tony Vroon <chainsaw@gentoo.org>\n"
-"from the xmms_sndfile plugin which is:\n"
-"Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
-"\n"
-"This program is free software ; you can redistribute it and/or modify \n"
-"it under the terms of the GNU General Public License as published by \n"
-"the Free Software Foundation ; either version 2 of the License, or \n"
-"(at your option) any later version. \n"
-" \n"
-"This program is distributed in the hope that it will be useful, \n"
-"but WITHOUT ANY WARRANTY ; without even the implied warranty of \n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. \n"
-"See the GNU General Public License for more details. \n"
-"\n"
-"You should have received a copy of the GNU General Public \n"
-"License along with this program ; if not, write to \n"
-"the Free Software Foundation, Inc., \n"
-"51 Franklin Street, Fifth Floor, \n"
-"Boston, MA 02110-1301 USA"
-msgstr ""
-
 #: src/sndstretch/sndstretch_xmms.c:155
 msgid "About SndStretch"
 msgstr ""
 
-#: src/sndstretch/sndstretch_xmms.c:313
+#: src/sndstretch/sndstretch_xmms.c:308
 msgid "Volume corr."
 msgstr ""
 
-#: src/sndstretch/sndstretch_xmms.c:314
+#: src/sndstretch/sndstretch_xmms.c:309
 msgid "Short Overlap"
 msgstr ""
 
-#: src/sndstretch/sndstretch_xmms.c:360
+#: src/sndstretch/sndstretch_xmms.c:355
 msgid "Speed"
 msgstr ""
 
-#: src/sndstretch/sndstretch_xmms.c:361
+#: src/sndstretch/sndstretch_xmms.c:356
 msgid "Pitch"
 msgstr ""
 
-#: src/sndstretch/sndstretch_xmms.c:362
+#: src/sndstretch/sndstretch_xmms.c:357
 msgid "Scale"
 msgstr ""
 
-#: src/sndstretch/sndstretch_xmms.c:363
-msgid "Options"
-msgstr ""
-
-#: src/sndstretch/sndstretch_xmms.c:382
+#: src/sndstretch/sndstretch_xmms.c:377
 msgid "SndStretch - Configuration"
 msgstr ""
 
-#: src/song_change/song_change.c:464
+#: src/song_change/song_change.c:447
 msgid "Command to run when Audacious starts a new song."
 msgstr ""
 
-#: src/song_change/song_change.c:465 src/song_change/song_change.c:469
-#: src/song_change/song_change.c:473 src/song_change/song_change.c:477
+#: src/song_change/song_change.c:449 src/song_change/song_change.c:455
+#: src/song_change/song_change.c:461 src/song_change/song_change.c:467
 msgid "Command:"
 msgstr ""
 
-#: src/song_change/song_change.c:468
+#: src/song_change/song_change.c:453
 msgid "Command to run toward the end of a song."
 msgstr ""
 
-#: src/song_change/song_change.c:472
+#: src/song_change/song_change.c:459
 msgid "Command to run when Audacious reaches the end of the playlist."
 msgstr ""
 
-#: src/song_change/song_change.c:476
+#: src/song_change/song_change.c:465
 msgid ""
 "Command to run when title changes for a song (i.e. network streams titles)."
 msgstr ""
 
-#: src/song_change/song_change.c:480
+#: src/song_change/song_change.c:471
 msgid ""
 "You can use the following format strings which\n"
 "will be substituted before calling the command\n"
@@ -3576,17 +3219,17 @@
 "%T: Track title"
 msgstr ""
 
-#: src/song_change/song_change.c:507
+#: src/song_change/song_change.c:498
 msgid ""
 "Parameters passed to the shell should be encapsulated in "
 "quotes. Doing otherwise is a security risk."
 msgstr ""
 
-#: src/song_change/song_change.c:518
+#: src/song_change/song_change.c:509
 msgid "Commands"
 msgstr ""
 
-#: src/song_change/song_change.c:555
+#: src/song_change/song_change.c:539
 msgid "Song Change"
 msgstr ""
 
@@ -3645,21 +3288,62 @@
 msgid "Close to the notification area (system tray)"
 msgstr ""
 
-#: src/stereo_plugin/stereo.c:41
+#: src/stereo_plugin/stereo.c:45
 msgid ""
 "Extra Stereo Plugin\n"
 "\n"
 "By Johan Levin 1999."
 msgstr ""
 
-#: src/stereo_plugin/stereo.c:65
+#: src/stereo_plugin/stereo.c:64
 msgid "About Extra Stereo Plugin"
 msgstr ""
 
-#: src/stereo_plugin/stereo.c:102
+#: src/stereo_plugin/stereo.c:95
 msgid "Configure Extra Stereo"
 msgstr ""
 
+#: src/streambrowser/gui/streambrowser_win.c:78
+msgid "Search:"
+msgstr ""
+
+#: src/streambrowser/gui/streambrowser_win.c:97
+#: src/streambrowser/gui/streambrowser_win.c:372
+msgid "Add Bookmark"
+msgstr ""
+
+#: src/streambrowser/gui/streambrowser_win.c:324
+msgid "Stream name"
+msgstr ""
+
+#: src/streambrowser/gui/streambrowser_win.c:331
+msgid "Now playing"
+msgstr ""
+
+#: src/streambrowser/gui/streambrowser_win.c:369
+msgid "Remove Bookmark"
+msgstr ""
+
+#: src/streambrowser/streambrowser.c:330
+msgid "About Stream Browser"
+msgstr ""
+
+#: src/streambrowser/streambrowser.c:331
+msgid ""
+"Copyright (c) 2008, by Calin Crisan <ccrisan@gmail.com> and The Audacious "
+"Team.\n"
+"\n"
+"This is a simple stream browser that includes the most popular streaming "
+"directories.\n"
+"Many thanks to the Streamtuner developers <http://www.nongnu.org/"
+"streamtuner>,\n"
+"\tand of course to the whole Audacious community.\n"
+"\n"
+"Also thank you Tony Vroon for mentoring & guiding me, again.\n"
+"\n"
+"This was a Google Summer of Code 2008 project."
+msgstr ""
+
 #: src/tonegen/tonegen.c:48
 msgid "About Tone Generator"
 msgstr ""
@@ -3686,27 +3370,11 @@
 msgid "About File I/O Plugin"
 msgstr ""
 
-#: src/vorbis/configure.c:31
-msgid "Override generic titles"
-msgstr ""
-
-#: src/vorbis/configure.c:32
-msgid "Title format:"
-msgstr ""
-
-#: src/vorbis/configure.c:36
-msgid "Ogg Vorbis Tags"
-msgstr ""
-
-#: src/vorbis/configure.c:69
-msgid "Ogg Vorbis Audio Plugin Configuration"
-msgstr ""
-
-#: src/vorbis/vorbis.c:581
+#: src/vorbis/vorbis.c:572
 msgid "About Ogg Vorbis Audio Plugin"
 msgstr ""
 
-#: src/vorbis/vorbis.c:586
+#: src/vorbis/vorbis.c:577
 msgid ""
 "Ogg Vorbis Plugin by the Xiph.org Foundation\n"
 "\n"

audacious-plugins-3.0.3.tar.bz2/po/ca.po -> audacious-plugins-3.1.tar.bz2/po/ca.po Changed

@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: audacious-plugins 1.5.1\n"
 "Report-Msgid-Bugs-To: http://jira.atheme.org/\n"
-"POT-Creation-Date: 2011-09-18 14:13-0400\n"
+"POT-Creation-Date: 2011-07-17 18:49-0400\n"
 "PO-Revision-Date: 2009-04-11 16:07+0200\n"
 "Last-Translator: Ernest Adrogué <eadrogue@gmx.net>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
@@ -1046,7 +1046,7 @@
 msgid "Volume: (%)"
 msgstr "Volum: (%)"
 
-#: src/ffaudio/ffaudio-core.c:789
+#: src/ffaudio/ffaudio-core.c:763
 #, c-format
 msgid ""
 "Multi-format audio decoding plugin for Audacious based on\n"
@@ -1062,7 +1062,7 @@
 "libavutil %s (%s)\n"
 msgstr ""
 
-#: src/ffaudio/ffaudio-core.c:803
+#: src/ffaudio/ffaudio-core.c:777
 #, fuzzy
 msgid "About FFaudio Plugin"
 msgstr "Quant al connector d'àudio FLAC"
@@ -3820,11 +3820,11 @@
 msgid "Delete auto-load preset"
 msgstr "Esborra el perfil automàtic"
 
-#: src/skins/ui_playlist.c:245
+#: src/skins/ui_playlist.c:244
 msgid "Search entries in active playlist"
 msgstr "Cerca elements en la llista de reproducció activa"
 
-#: src/skins/ui_playlist.c:253
+#: src/skins/ui_playlist.c:252
 msgid ""
 "Select entries in playlist by filling one or more fields. Fields use regular "
 "expressions syntax, case-insensitive. If you don't know how regular "
@@ -3836,39 +3836,39 @@
 "insensibles a la capitalització. Si no sabeu com funcionen les expressions "
 "regulars, podeu escriure literalment el text que busqueu."
 
-#: src/skins/ui_playlist.c:261
+#: src/skins/ui_playlist.c:260
 msgid "Title: "
 msgstr "Títol: "
 
-#: src/skins/ui_playlist.c:268
+#: src/skins/ui_playlist.c:267
 msgid "Album: "
 msgstr "Àlbum:"
 
-#: src/skins/ui_playlist.c:275
+#: src/skins/ui_playlist.c:274
 msgid "Artist: "
 msgstr "Artista: "
 
-#: src/skins/ui_playlist.c:282
+#: src/skins/ui_playlist.c:281
 msgid "Filename: "
 msgstr "Nom del fitxer: "
 
-#: src/skins/ui_playlist.c:290
+#: src/skins/ui_playlist.c:289
 msgid "Clear previous selection before searching"
 msgstr "Neteja la selecció anterior abans de cercar"
 
-#: src/skins/ui_playlist.c:293
+#: src/skins/ui_playlist.c:292
 msgid "Automatically toggle queue for matching entries"
 msgstr "Posa o treu de la cua automàticament els elements trobats"
 
-#: src/skins/ui_playlist.c:296
+#: src/skins/ui_playlist.c:295
 msgid "Create a new playlist with matching entries"
 msgstr "Crea una llista de reproducció nova amb els elements trobats"
 
-#: src/skins/ui_playlist.c:763
+#: src/skins/ui_playlist.c:762
 msgid "Audacious Playlist Editor"
 msgstr "Editor de llistes de l'Audacious"
 
-#: src/skins/ui_playlist.c:810
+#: src/skins/ui_playlist.c:809
 #, c-format
 msgid "%s (%d of %d)"
 msgstr ""
@@ -3886,11 +3886,11 @@
 msgid "Could not create directory (%s): %s\n"
 msgstr "No s'ha pogut crear el directori (%s): %s\n"
 
-#: src/sndfile/plugin.c:454
+#: src/sndfile/plugin.c:438
 msgid "About sndfile plugin"
 msgstr "Quant al connector sndfile"
 
-#: src/sndfile/plugin.c:455
+#: src/sndfile/plugin.c:439
 msgid ""
 "Adapted for Audacious usage by Tony Vroon <chainsaw@gentoo.org>\n"
 "from the xmms_sndfile plugin which is:\n"

audacious-plugins-3.0.3.tar.bz2/po/cs.po -> audacious-plugins-3.1.tar.bz2/po/cs.po Changed

@@ -19,10 +19,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: audacious-plugins audacious-plugins-3.0-beta1\n"
+"Project-Id-Version: audacious-plugins audacious-plugins-3.1-alpha1-1-g41e8449\n"
 "Report-Msgid-Bugs-To: http://jira.atheme.org/\n"
-"POT-Creation-Date: 2011-09-18 14:13-0400\n"
-"PO-Revision-Date: 2011-07-04 19:58+0200\n"
+"POT-Creation-Date: 2011-09-19 22:38+0200\n"
+"PO-Revision-Date: 2011-09-19 22:51+0200\n"
 "Last-Translator: Petr Písař <petr.pisar@atlas.cz>\n"
 "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
 "Language: cs\n"
@@ -46,6 +46,345 @@
 msgid "About MP4 AAC decoder plugin"
 msgstr "O modulu dekodéru MP4 AAC"
 
+#: src/alarm/interface.c:33
+msgid "About XMMS Alarm"
+msgstr "O XMMS budíku"
+
+#: src/alarm/interface.c:40
+msgid "XMMS Alarm"
+msgstr "XMMS budík"
+
+#: src/alarm/interface.c:49
+msgid ""
+"An XMMS plugin which can be used\n"
+"to start playing at a certain time.\n"
+"\n"
+"Send all complaints to:\n"
+"Adam Feakin <adamf@snika.uklinux.net>\n"
+"Daniel Stodden <stodden@in.tum.de>\n"
+"\n"
+"http://www.snika.uklinux.net/xmms-alarm/"
+msgstr ""
+"XMMS modul, který může být použit\n"
+"k načasovanému zahájení přehrávání.\n"
+"\n"
+"Všechny stížnosti zasílejte na:\n"
+"Adam Feakin <adamf@snika.uklinux.net>\n"
+"Daniel Stodden <stodden@in.tum.de>\n"
+"\n"
+"http://www.snika.uklinux.net/xmms-alarm/"
+
+#: src/alarm/interface.c:64 src/sid/xs_about.c:214 src/sid/xs_interface.c:1825
+msgid "Close"
+msgstr "Zavřít"
+
+#: src/alarm/interface.c:94
+msgid "Alarm"
+msgstr "Budík"
+
+#: src/alarm/interface.c:101
+msgid "This is your wakeup call."
+msgstr "Toto je váš budící signál."
+
+#: src/alarm/interface.c:116 src/alarm/interface.c:1337
+#: src/sid/xs_config.c:293
+msgid "OK"
+msgstr "Budiž"
+
+#: src/alarm/interface.c:150
+msgid "Sorry"
+msgstr "Je mi líto"
+
+#: src/alarm/interface.c:157
+msgid "Warning"
+msgstr "Varování"
+
+#: src/alarm/interface.c:166
+msgid ""
+"For safety reasons the \"quiet\" time must be at least 65 seconds longer "
+"than the fading time, it must also be more than 10 seconds. This basically "
+"means that there is a bug in the code and until I find a way of really "
+"fixing it this message will appear :)\n"
+"\n"
+"Your fading settings have NOT been saved\n"
+"\n"
+"--\n"
+"Adam"
+msgstr ""
+"Z bezpečnostních důvodů musí být doba „ticha“ alespoň o 65 sekund delší než "
+"doba zesilování, také musí být delší než 10 sekund. Toto v zásadě znamená, "
+"že v kódu je chyba a dokud nezjistím, jak ji opravdu opravit, tato zpráva se "
+"bude zobrazovat :)\n"
+"\n"
+"Vaše nastavení zesilování NEBYLO uloženo.\n"
+"\n"
+"–\n"
+"Adam"
+
+#: src/alarm/interface.c:182
+msgid "Oh Well"
+msgstr "Dobrá"
+
+#: src/alarm/interface.c:338
+msgid "Alarm Settings"
+msgstr "Nastavení budíku"
+
+#: src/alarm/interface.c:353 src/alarm/interface.c:525
+#: src/alarm/interface.c:897
+msgid "Time"
+msgstr "Čas"
+
+#: src/alarm/interface.c:394
+msgid "hours"
+msgstr "hodin"
+
+#: src/alarm/interface.c:455
+msgid "h"
+msgstr "h"
+
+#: src/alarm/interface.c:485
+msgid "minutes"
+msgstr "minut"
+
+#: src/alarm/interface.c:503
+msgid "Quiet after:"
+msgstr "Ticho po:"
+
+#: src/alarm/interface.c:513
+msgid "Alarm at (default):"
+msgstr "Budit v (standardní):"
+
+#: src/alarm/interface.c:533
+msgid "Choose the days for the alarm to come on"
+msgstr "Vyberte dny, kdy má budík budit"
+
+#: src/alarm/interface.c:561 src/alarm/interface.c:609
+#: src/alarm/interface.c:657 src/alarm/interface.c:705
+#: src/alarm/interface.c:753 src/alarm/interface.c:801
+#: src/alarm/interface.c:849 src/OSS/configure.c:153
+#: src/skins/ui_manager.c:450 src/skins/ui_manager.c:471
+msgid "Default"
+msgstr "Standardní"
+
+#: src/alarm/interface.c:887
+msgid "Day"
+msgstr "Den"
+
+#: src/alarm/interface.c:907
+msgid "Tuesday"
+msgstr "Úterý"
+
+#: src/alarm/interface.c:918
+msgid "Wednesday"
+msgstr "Středa"
+
+#: src/alarm/interface.c:929
+msgid "Thursday"
+msgstr "Čtvrtek"
+
+#: src/alarm/interface.c:940
+msgid "Friday"
+msgstr "Pátek"
+
+#: src/alarm/interface.c:951
+msgid "Saturday"
+msgstr "Sobota"
+
+#: src/alarm/interface.c:962
+msgid "Sunday"
+msgstr "Neděle"
+
+#: src/alarm/interface.c:972
+msgid "Monday"
+msgstr "Pondělí"
+
+#: src/alarm/interface.c:983
+msgid "Days"
+msgstr "Dny"
+
+#: src/alarm/interface.c:999
+msgid "Fading"
+msgstr "Zesilování"
+
+#: src/alarm/interface.c:1036 src/sid/xs_interface.c:921
+#: src/sid/xs_interface.c:975 src/sid/xs_interface.c:1155
+msgid "seconds"
+msgstr "sekund"
+
+#: src/alarm/interface.c:1044 src/alarm/interface.c:1159
+msgid "Volume"
+msgstr "Hlasitost"
+
+#: src/alarm/interface.c:1070
+msgid "Current"
+msgstr "Současná"
+
+#: src/alarm/interface.c:1078
+msgid "Start at"
+msgstr "Začít na"
+
+#: src/alarm/interface.c:1106 src/alarm/interface.c:1150
+msgid "%"
+msgstr "%"
+
+#: src/alarm/interface.c:1122
+msgid "Final"
+msgstr "Skončit na"
+
+#: src/alarm/interface.c:1175
+msgid "Additional Command"
+msgstr "Dodatečný příkaz"
+
+#: src/alarm/interface.c:1201
+msgid "enable"
+msgstr "zapnout"
+
+#: src/alarm/interface.c:1209
+msgid "Playlist (optional)"
+msgstr "Seznam skladeb (volitelné)"
+
+#: src/alarm/interface.c:1235
+msgid "Browse..."
+msgstr "Procházet…"
+
+#: src/alarm/interface.c:1243 src/alarm/interface.c:1407
+msgid "Reminder"
+msgstr "Upomínání"
+
+#: src/alarm/interface.c:1260
+msgid "Use reminder"
+msgstr "Upomínat"
+
+#: src/alarm/interface.c:1276 src/sndstretch/sndstretch_xmms.c:358
+msgid "Options"
+msgstr "Nastavení"
+
+#: src/alarm/interface.c:1284
+msgid "What do these options mean?"
+msgstr "Co tyto volby znamenají?"
+
+#: src/alarm/interface.c:1312
+msgid ""
+"\n"
+"Time\n"
+" Alarm at: \n"
+" The time for the alarm to come on.\n"
+"\n"
+" Quiet After: \n"
+" Stop alarm after this amount of time.\n"
+" (if the wakeup dialog is not closed)\n"
+"\n"
+"\n"
+"Days\n"
+" Day:\n"
+" Select the days for the alarm to activate.\n"
+"\n"
+" Time:\n"
+" Choose the time for the alarm on each day,\n"
+" or select the toggle button to use the default\n"
+" time.\n"
+"\n"
+"\n"
+"Volume\n"
+" Fading: \n"
+" Fade the volume up to the chosen volume \n"
+" for this amount of time.\n"
+"\n"
+" Start at: \n"
+" Start fading from this volume.\n"
+"\n"
+" Final: \n"
+" The volume to stop fading at. If the fading\n"
+" time is 0 then set volume to this and start\n"
+" playing.\n"
+"\n"
+"\n"
+"Options:\n"
+" Additional Command:\n"
+" Run this command at the alarm time.\n"
+"\n"
+" Playlist: \n"
+" Load this playlist for playing songs from \n"
+" (must have .m3u extension). If no playlist\n"
+" is given then the songs which are currently\n"
+" in the list will be used.\n"
+" The URL of an mp3/ogg stream can also be\n"
+" entered here, but loading of playlists from\n"
+" URLs is not currently supported by xmms.\n"
+"\n"
+" Reminder:\n"
+" Display a reminder when the alarm goes off,\n"
+" type the reminder in the box and turn on the\n"
+" toggle button if you want it to be shown.\n"
+msgstr ""
+"\n"
+"Čas\n"
+" Budit v: \n"
+" Čas budíčku.\n"
+"\n"
+" Ticho po: \n"
+" Zastavit budík po uplynutí této doby.\n"
+" (pokud nebude budící dialog uzavřen)\n"
+"\n"
+"\n"
+"Dny\n"
+" Den:\n"
+" Vyberte dny, kdy má budík fungovat.\n"
+"\n"
+" Čas:\n"
+" Vyberte čas budíčku pro každý den,\n"
+" nebo použijte standardní čas.\n"
+"\n"
+"\n"
+"Hlasitost\n"
+" Zesilování: \n"
+" Zesiluje až na vybranou hodnotu\n"
+" po vybranou dobu.\n"
+"\n"
+" Začít na: \n"
+" Zesilovat začne z této hlasitosti.\n"
+"\n"
+" Skončit na: \n"
+" Hlasitost na konci zesílení. Je-li doba zesilování 0,\n"
+" pak hlasitost bude tato.\n"
+"\n"
+"\n"
+"Volby:\n"
+" Dodatečný příkaz:\n"
+" Tento příkaz bude vykonán v době budíčku.\n"
+"\n"
+" Seznam skladeb: \n"
+" Načte tento seznam skladeb, z kterého bude hrát\n"
+" (musí mít příponu .m3u). Není-li seznam zadán\n"
+" bude použity skladby, které budou v aktuálním\n"
+" seznamu skladeb.\n"
+" URL MP3/OGG proudu zde také může být zadáno,\n"
+" ale načítání seznamu skladeb z URL není\n"
+" v současnosti podporováno.\n"
+"\n"
+" Upomínání:\n"
+" Při vypnutí budíku zobrazí vzkaz.\n"
+" Text vzkazu vepište do vstupního pole a zapněte tlačítko,\n"
+" přejete-li si zobrazovat vzkaz.\n"
+
+#: src/alarm/interface.c:1314 src/skins/ui_manager.c:382
+msgid "Help"
+msgstr "Nápověda"
+
+#: src/alarm/interface.c:1346 src/cdaudio-ng/configure.c:249
+#: src/crystalizer/crystalizer.c:130 src/echo_plugin/gui.c:125
+#: src/jack/configure.c:148 src/null/null.c:108 src/stereo_plugin/stereo.c:125
+msgid "Cancel"
+msgstr "Zrušit"
+
+#: src/alarm/interface.c:1414
+msgid "Your reminder for today is.."
+msgstr "Váš vzkaz pro dnešek je…"
+
+#: src/alarm/interface.c:1439
+msgid "Thankyou"
+msgstr "Děkuji"
+
 #: src/alsa/config.c:210
 msgid "Default PCM device"
 msgstr "Implicitní PCM zařízení"
@@ -54,23 +393,23 @@
 msgid "Default mixer device"
 msgstr "Implicitní směšovací zařízení"
 
-#: src/alsa/config.c:447
+#: src/alsa/config.c:438
 msgid "ALSA Output Plugin Preferences"
 msgstr "Nastavení výstupního modulu ALSY"
 
-#: src/alsa/config.c:454
+#: src/alsa/config.c:445
 msgid "PCM device:"
 msgstr "Zařízení PCM:"
 
-#: src/alsa/config.c:456 src/OSS/configure.c:246
+#: src/alsa/config.c:447 src/OSS/configure.c:237
 msgid "Mixer device:"
 msgstr "Zařízení směšovače:"
 
-#: src/alsa/config.c:458
+#: src/alsa/config.c:449
 msgid "Mixer element:"
 msgstr "Prvek směšovače:"
 
-#: src/alsa/config.c:461
+#: src/alsa/config.c:452
 msgid "Work around drain hangup"
 msgstr "Obejít zaseknutí při vyprazdňovaní"
 
@@ -758,15 +1097,15 @@
 msgid "Blur Scope: Color selection"
 msgstr "Blur scope: výběr barvy"
 
-#: src/blur_scope/config.c:83 src/jack/configure.c:111
+#: src/blur_scope/config.c:83 src/jack/configure.c:106
 msgid "Options:"
 msgstr "Volby:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:264
+#: src/cdaudio-ng/cdaudio-ng.c:241
 msgid "About Audio CD Plugin"
 msgstr "O zásuvném modulu zvukových CD"
 
-#: src/cdaudio-ng/cdaudio-ng.c:265
+#: src/cdaudio-ng/cdaudio-ng.c:242
 msgid ""
 "Copyright (c) 2007, by Calin Crisan <ccrisan@gmail.com> and The Audacious "
 "Team.\n"
@@ -790,15 +1129,15 @@
 "Toto byl projekt z Google Summer of Code 2007.\n"
 "Copyright 2009 John Lindgren"
 
-#: src/cdaudio-ng/cdaudio-ng.c:558
+#: src/cdaudio-ng/cdaudio-ng.c:550
 msgid "Audio CD"
 msgstr "Zvukové CD"
 
-#: src/cdaudio-ng/cdaudio-ng.c:913
+#: src/cdaudio-ng/cdaudio-ng.c:922
 msgid "Drive is empty."
 msgstr "Mechanika je prázdná"
 
-#: src/cdaudio-ng/cdaudio-ng.c:915
+#: src/cdaudio-ng/cdaudio-ng.c:924
 msgid "Unsupported disk type."
 msgstr "Nepodporovaný druh disku."
 
@@ -846,18 +1185,12 @@
 msgid "Override default device: "
 msgstr "Přebít výchozí zařízení: "
 
-#: src/cdaudio-ng/configure.c:244 src/crystalizer/crystalizer.c:131
-#: src/echo_plugin/gui.c:123 src/jack/configure.c:146 src/null/null.c:112
-#: src/stereo_plugin/stereo.c:125
+#: src/cdaudio-ng/configure.c:244 src/crystalizer/crystalizer.c:123
+#: src/echo_plugin/gui.c:118 src/jack/configure.c:141 src/null/null.c:107
+#: src/stereo_plugin/stereo.c:118
 msgid "Ok"
 msgstr "OK"
 
-#: src/cdaudio-ng/configure.c:249 src/crystalizer/crystalizer.c:138
-#: src/echo_plugin/gui.c:130 src/jack/configure.c:153 src/null/null.c:113
-#: src/stereo_plugin/stereo.c:132
-msgid "Cancel"
-msgstr "Zrušit"
-
 #: src/cd-menu-items/cd-menu-items.c:34
 msgid "Play CD"
 msgstr "Přehrát CD"
@@ -866,80 +1199,80 @@
 msgid "Add CD"
 msgstr "Přidat CD"
 
-#: src/compressor/plugin.c:67
+#: src/compressor/plugin.c:63
 msgid "About Dynamic Range Compression Plugin"
 msgstr "O modulu Komprese dynamického rozsahu"
 
-#: src/compressor/plugin.c:99
+#: src/compressor/plugin.c:95
 msgid "Dynamic Range Compressor Preferences"
 msgstr "Nastavení komprese dynamického rozsahu"
 
-#: src/compressor/plugin.c:111
+#: src/compressor/plugin.c:107
 msgid "Center volume:"
 msgstr "Hlasitost středu:"
 
-#: src/compressor/plugin.c:124
+#: src/compressor/plugin.c:120
 msgid "Dynamic range:"
 msgstr "Rozsah dynamiky:"
 
-#: src/console/configure.c:138
+#: src/console/configure.c:136
 msgid "Game Console Music Decoder"
 msgstr "Dekodér hudby pro herní konzole"
 
-#: src/console/configure.c:155
+#: src/console/configure.c:153
 msgid "General"
 msgstr "Obecné"
 
-#: src/console/configure.c:157 src/skins/ui_manager.c:176
+#: src/console/configure.c:155 src/skins/ui_manager.c:176
 msgid "Playback"
 msgstr "Přehrát"
 
-#: src/console/configure.c:172
+#: src/console/configure.c:170
 msgid "Bass:"
 msgstr "Hloubky:"
 
-#: src/console/configure.c:176 src/console/configure.c:187
-#: src/console/configure.c:208
+#: src/console/configure.c:174 src/console/configure.c:185
+#: src/console/configure.c:206
 msgid "secs"
 msgstr "s"
 
-#: src/console/configure.c:183
+#: src/console/configure.c:181
 msgid "Treble:"
 msgstr "Výšky:"
 
-#: src/console/configure.c:204
+#: src/console/configure.c:202
 msgid "Default song length:"
 msgstr "Implicitní délka skladby:"
 
-#: src/console/configure.c:210 src/sid/xs_interface.c:666
+#: src/console/configure.c:208 src/sid/xs_interface.c:666
 msgid "Resampling"
 msgstr "Převzorkování"
 
-#: src/console/configure.c:216
+#: src/console/configure.c:214
 msgid "Enable audio resampling"
 msgstr "Povolit převzorkování zvuku"
 
-#: src/console/configure.c:231
+#: src/console/configure.c:229
 msgid "Resampling rate:"
 msgstr "Převzorkovat na:"
 
-#: src/console/configure.c:235 src/sid/xs_interface.c:354
+#: src/console/configure.c:233 src/sid/xs_interface.c:354
 msgid "Hz"
 msgstr "Hz"
 
-#: src/console/configure.c:246
+#: src/console/configure.c:244
 msgid "SPC"
 msgstr "SPC"
 
-#: src/console/configure.c:247
+#: src/console/configure.c:245
 msgid "Ignore length from SPC tags"
 msgstr "Ignorovat délku z SPC popisků"
 
-#: src/console/configure.c:248
+#: src/console/configure.c:246
 msgid "Increase reverb"
 msgstr "Prodloužit dozvuk"
 
-#: src/console/configure.c:273
+#: src/console/configure.c:271
 msgid ""
 "The default song length, expressed in seconds, is used for songs that do not "
 "provide length information (i.e. looping tracks)."
@@ -963,29 +1296,29 @@
 "Implementace v Audacious: William Pitcock <nenold@dereferenced.org>,\n"
 " Shay Green <gblargg@gmail.com>\n"
 
-#: src/crossfade/plugin.c:65
+#: src/crossfade/plugin.c:60
 msgid "About Crossfade"
 msgstr "O modulu Crossfade (přechodu)"
 
-#: src/crossfade/plugin.c:97
+#: src/crossfade/plugin.c:92
 msgid "Crossfade Preferences"
 msgstr "Nastavení modulu Crossfade"
 
-#: src/crossfade/plugin.c:109
+#: src/crossfade/plugin.c:104
 msgid "Overlap (in seconds):"
 msgstr "Přesah (v sekundách):"
 
-#: src/crossfade/plugin.c:140 src/crossfade/plugin.c:146
+#: src/crossfade/plugin.c:135 src/crossfade/plugin.c:141
 msgid "Crossfade Error"
 msgstr "Chyba přechodu"
 
-#: src/crossfade/plugin.c:140
+#: src/crossfade/plugin.c:135
 msgid ""
 "Crossfading failed because the songs had a different number of channels."
 msgstr ""
 "Uplatnění použití přechodu selhalo, protože skladby mají jiný počet kanálů."
 
-#: src/crossfade/plugin.c:148
+#: src/crossfade/plugin.c:143
 msgid ""
 "Crossfading failed because the songs had different sample rates.\n"
 "\n"
@@ -998,16 +1331,16 @@
 "Skladby můžete převzorkovat na stejnou frekvenci pomocí efektu Převodníku "
 "vzorkovací frekvence."
 
-#: src/crystalizer/crystalizer.c:108
+#: src/crystalizer/crystalizer.c:100
 msgid "Configure Crystalizer"
 msgstr "Nastavit krystalizér"
 
-#: src/crystalizer/crystalizer.c:110 src/stereo_plugin/stereo.c:104
+#: src/crystalizer/crystalizer.c:102 src/stereo_plugin/stereo.c:97
 msgid "Effect intensity:"
 msgstr "Síla efektu:"
 
-#: src/crystalizer/crystalizer.c:144 src/echo_plugin/gui.c:136
-#: src/stereo_plugin/stereo.c:138
+#: src/crystalizer/crystalizer.c:136 src/echo_plugin/gui.c:131
+#: src/stereo_plugin/stereo.c:131
 msgid "Apply"
 msgstr "Použít"
 
@@ -1031,23 +1364,23 @@
 msgid "About Echo Plugin"
 msgstr "O modulu ozvěny"
 
-#: src/echo_plugin/gui.c:72
+#: src/echo_plugin/gui.c:67
 msgid "Configure Echo"
 msgstr "Nastavit ozvěnu"
 
-#: src/echo_plugin/gui.c:88
+#: src/echo_plugin/gui.c:83
 msgid "Delay: (ms)"
 msgstr "Zpoždění: (ms)"
 
-#: src/echo_plugin/gui.c:93
+#: src/echo_plugin/gui.c:88
 msgid "Feedback: (%)"
 msgstr "Zpětná vazba: (%)"
 
-#: src/echo_plugin/gui.c:98
+#: src/echo_plugin/gui.c:93
 msgid "Volume: (%)"
 msgstr "Hlasitost: (%)"
 
-#: src/ffaudio/ffaudio-core.c:789
+#: src/ffaudio/ffaudio-core.c:795
 #, c-format
 msgid ""
 "Multi-format audio decoding plugin for Audacious based on\n"
@@ -1074,15 +1407,15 @@
 "libavformat %s (%s)\n"
 "libavutil %s (%s)\n"
 
-#: src/ffaudio/ffaudio-core.c:803
+#: src/ffaudio/ffaudio-core.c:809
 msgid "About FFaudio Plugin"
 msgstr "O modulu FFaudio"
 
-#: src/filewriter/filewriter.c:155
+#: src/filewriter/filewriter.c:166
 msgid "About FileWriter-Plugin"
 msgstr "O modulu FileWriter"
 
-#: src/filewriter/filewriter.c:156
+#: src/filewriter/filewriter.c:167
 msgid ""
 "FileWriter-Plugin\n"
 "\n"
@@ -1116,55 +1449,55 @@
 "tak nestalo, obraťte se na Free Software Foundation, Inc.,\n"
 "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/filewriter/filewriter.c:450
+#: src/filewriter/filewriter.c:455
 msgid "File Writer Configuration"
 msgstr "Nastavení zápisu do souboru"
 
-#: src/filewriter/filewriter.c:462
+#: src/filewriter/filewriter.c:467
 msgid "Output file format:"
 msgstr "Formát výstupního souboru:"
 
-#: src/filewriter/filewriter.c:480
+#: src/filewriter/filewriter.c:485
 msgid "Configure"
 msgstr "Nastavit"
 
-#: src/filewriter/filewriter.c:495
+#: src/filewriter/filewriter.c:500
 msgid "Save into original directory"
 msgstr "Ukládat do původního adresáře"
 
-#: src/filewriter/filewriter.c:500
+#: src/filewriter/filewriter.c:505
 msgid "Save into custom directory"
 msgstr "Ukládat do vlastního adresáře"
 
-#: src/filewriter/filewriter.c:510
+#: src/filewriter/filewriter.c:515
 msgid "Output file folder:"
 msgstr "Složka s výstupními soubory:"
 
-#: src/filewriter/filewriter.c:514
+#: src/filewriter/filewriter.c:519
 msgid "Pick a folder"
 msgstr "Vybrat složku"
 
-#: src/filewriter/filewriter.c:533
+#: src/filewriter/filewriter.c:538
 msgid "Get filename from:"
 msgstr "Získat jméno souboru z:"
 
-#: src/filewriter/filewriter.c:536
+#: src/filewriter/filewriter.c:541
 msgid "original file tags"
 msgstr "původních značek v souboru"
 
-#: src/filewriter/filewriter.c:542
+#: src/filewriter/filewriter.c:547
 msgid "original filename"
 msgstr "jména původního souboru"
 
-#: src/filewriter/filewriter.c:552
+#: src/filewriter/filewriter.c:557
 msgid "Don't strip file name extension"
 msgstr "Nezkracovat příponu jména souboru"
 
-#: src/filewriter/filewriter.c:567
+#: src/filewriter/filewriter.c:572
 msgid "Prepend track number to filename"
 msgstr "Předřadit jménu souboru číslo stopy"
 
-#: src/filewriter/mp3.c:38 src/filewriter/mp3.c:783
+#: src/filewriter/mp3.c:38 src/filewriter/mp3.c:771
 msgid "Auto"
 msgstr "Auto"
 
@@ -1180,135 +1513,135 @@
 msgid "Mono"
 msgstr "Mono"
 
-#: src/filewriter/mp3.c:724
+#: src/filewriter/mp3.c:712
 msgid "MP3 Configuration"
 msgstr "Nastavení MP3"
 
-#: src/filewriter/mp3.c:747
+#: src/filewriter/mp3.c:735
 msgid "Algorithm Quality:"
 msgstr "Kvalita algoritmu:"
 
-#: src/filewriter/mp3.c:772
+#: src/filewriter/mp3.c:760
 msgid "Output Samplerate:"
 msgstr "Výstupní vzorkovací kmitočet"
 
-#: src/filewriter/mp3.c:800
+#: src/filewriter/mp3.c:788
 msgid "(Hz)"
 msgstr "(Hz)"
 
-#: src/filewriter/mp3.c:807
+#: src/filewriter/mp3.c:795
 msgid "Bitrate / Compression ratio:"
 msgstr "Datový tok / Kompresní poměr:"
 
-#: src/filewriter/mp3.c:831
+#: src/filewriter/mp3.c:819
 msgid "Bitrate (kbps):"
 msgstr "Datový tok (kb/s):"
 
-#: src/filewriter/mp3.c:864
+#: src/filewriter/mp3.c:852
 msgid "Compression ratio:"
 msgstr "Kompresní poměr:"
 
-#: src/filewriter/mp3.c:888
+#: src/filewriter/mp3.c:876
 msgid "Audio Mode:"
 msgstr "Zvukový režim:"
 
-#: src/filewriter/mp3.c:913
+#: src/filewriter/mp3.c:901
 msgid "Misc:"
 msgstr "Různé:"
 
-#: src/filewriter/mp3.c:924
+#: src/filewriter/mp3.c:912
 msgid "Enforce strict ISO complience"
 msgstr "Vynutit přísnou shodu s ISO"
 
-#: src/filewriter/mp3.c:935
+#: src/filewriter/mp3.c:923
 msgid "Error protection"
 msgstr "Ochrana před chybami"
 
-#: src/filewriter/mp3.c:947 src/filewriter/vorbis.c:245
+#: src/filewriter/mp3.c:935 src/filewriter/vorbis.c:243
 msgid "Quality"
 msgstr "Kvalita"
 
-#: src/filewriter/mp3.c:957
+#: src/filewriter/mp3.c:945
 msgid "Enable VBR/ABR"
 msgstr "Povolit VBR/ABR"
 
-#: src/filewriter/mp3.c:967
+#: src/filewriter/mp3.c:955
 msgid "Type:"
 msgstr "Druh:"
 
-#: src/filewriter/mp3.c:1000
+#: src/filewriter/mp3.c:988
 msgid "VBR Options:"
 msgstr "Nastavení VBR:"
 
-#: src/filewriter/mp3.c:1016
+#: src/filewriter/mp3.c:1004
 msgid "Minimum bitrate (kbps):"
 msgstr "Nejmenší datový tok (kb/s):"
 
-#: src/filewriter/mp3.c:1043
+#: src/filewriter/mp3.c:1031
 msgid "Maximum bitrate (kbps):"
 msgstr "Největší datový tok (kb/s):"
 
-#: src/filewriter/mp3.c:1066
+#: src/filewriter/mp3.c:1054
 msgid "Strictly enforce minimum bitrate"
 msgstr "Přísně vynucovat nejmenší datový tok"
 
-#: src/filewriter/mp3.c:1078
+#: src/filewriter/mp3.c:1066
 msgid "ABR Options:"
 msgstr "Nastavení ABR:"
 
-#: src/filewriter/mp3.c:1088
+#: src/filewriter/mp3.c:1076
 msgid "Average bitrate (kbps):"
 msgstr "Průměrný datový tok (kb/s):"
 
-#: src/filewriter/mp3.c:1116
+#: src/filewriter/mp3.c:1104
 msgid "VBR quality level:"
 msgstr "Úroveň kvality VBR:"
 
-#: src/filewriter/mp3.c:1135
+#: src/filewriter/mp3.c:1123
 msgid "Don't write Xing VBR header"
 msgstr "Nezapisovat VBR hlavičku Xing"
 
-#: src/filewriter/mp3.c:1149
+#: src/filewriter/mp3.c:1137
 msgid "VBR/ABR"
 msgstr "VBR/ABR"
 
-#: src/filewriter/mp3.c:1159
+#: src/filewriter/mp3.c:1147
 msgid "Frame params:"
 msgstr "Parametry rámců:"
 
-#: src/filewriter/mp3.c:1171
+#: src/filewriter/mp3.c:1159
 msgid "Mark as copyright"
 msgstr "Označit jako podléhající autorskému právu"
 
-#: src/filewriter/mp3.c:1182
+#: src/filewriter/mp3.c:1170
 msgid "Mark as original"
 msgstr "Označit jako původní"
 
-#: src/filewriter/mp3.c:1194
+#: src/filewriter/mp3.c:1182
 msgid "ID3 params:"
 msgstr "Parametry ID3:"
 
-#: src/filewriter/mp3.c:1205
+#: src/filewriter/mp3.c:1193
 msgid "Force addition of version 2 tag"
 msgstr "Vynutit přidání popisků verze 2"
 
-#: src/filewriter/mp3.c:1215
+#: src/filewriter/mp3.c:1203
 msgid "Only add v1 tag"
 msgstr "Přidávat jen popisky verze 1"
 
-#: src/filewriter/mp3.c:1222
+#: src/filewriter/mp3.c:1210
 msgid "Only add v2 tag"
 msgstr "Přidávat jen popisky verze 2"
 
-#: src/filewriter/mp3.c:1243
+#: src/filewriter/mp3.c:1231
 msgid "Tags"
 msgstr "Popisky"
 
-#: src/filewriter/vorbis.c:238
+#: src/filewriter/vorbis.c:236
 msgid "Vorbis Encoder Configuration"
 msgstr "Nastavení vorbis kodéru"
 
-#: src/filewriter/vorbis.c:258
+#: src/filewriter/vorbis.c:256
 msgid "Quality level (0 - 10):"
 msgstr "Úroveň kvality (0–10):"
 
@@ -1414,15 +1747,15 @@
 msgid "Bitrate"
 msgstr "Datový tok"
 
-#: src/gtkui/columns.c:286
+#: src/gtkui/columns.c:278
 msgid "Choose Columns"
 msgstr "Vybrat sloupce"
 
-#: src/gtkui/columns.c:300
+#: src/gtkui/columns.c:292
 msgid "Available:"
 msgstr "Dostupné:"
 
-#: src/gtkui/columns.c:334
+#: src/gtkui/columns.c:326
 msgid "Chosen:"
 msgstr "Vybráno:"
 
@@ -1446,264 +1779,268 @@
 msgid "Undock"
 msgstr "Neumisťovat"
 
-#: src/gtkui/layout.c:123
+#: src/gtkui/layout.c:123 src/ladspa/plugin.c:616
 msgid "Disable"
 msgstr "Zakázat"
 
-#: src/gtkui/menus.c:132
+#: src/gtkui/menus.c:130
 msgid "_Open Files ..."
 msgstr "_Otevřít soubory…"
 
-#: src/gtkui/menus.c:133
+#: src/gtkui/menus.c:131
 msgid "Open _URL ..."
 msgstr "Otevřít _URL…"
 
-#: src/gtkui/menus.c:134
+#: src/gtkui/menus.c:132
 msgid "_Add File ..."
 msgstr "Přid_at soubor…"
 
-#: src/gtkui/menus.c:135
+#: src/gtkui/menus.c:133
 msgid "Add U_RL ..."
 msgstr "Přidat U_RL…"
 
-#: src/gtkui/menus.c:137
+#: src/gtkui/menus.c:135
 msgid "A_bout ..."
 msgstr "_O programu… "
 
-#: src/gtkui/menus.c:138
+#: src/gtkui/menus.c:136
 msgid "_Preferences ..."
 msgstr "Nasta_vení…"
 
-#: src/gtkui/menus.c:139 src/skins/ui_manager.c:412
+#: src/gtkui/menus.c:137 src/skins/ui_manager.c:406
 msgid "_Quit"
 msgstr "_Konec"
 
-#: src/gtkui/menus.c:142
+#: src/gtkui/menus.c:140
 msgid "_Play"
 msgstr "_Hrát"
 
-#: src/gtkui/menus.c:143
+#: src/gtkui/menus.c:141
 msgid "Paus_e"
 msgstr "P_ozastavit"
 
-#: src/gtkui/menus.c:144
+#: src/gtkui/menus.c:142
 msgid "_Stop"
 msgstr "Za_stavit"
 
-#: src/gtkui/menus.c:145
+#: src/gtkui/menus.c:143
 msgid "Pre_vious"
 msgstr "Před_chozí"
 
-#: src/gtkui/menus.c:146
+#: src/gtkui/menus.c:144
 msgid "_Next"
 msgstr "_Další"
 
-#: src/gtkui/menus.c:148
+#: src/gtkui/menus.c:146
 msgid "_Repeat"
 msgstr "_Opakovat"
 
-#: src/gtkui/menus.c:149
+#: src/gtkui/menus.c:147
 msgid "S_huffle"
 msgstr "Ná_hodné přehrávání"
 
-#: src/gtkui/menus.c:150
+#: src/gtkui/menus.c:148
 msgid "N_o Playlist Advance"
 msgstr "Žádné p_okračování dle seznamu skladeb"
 
-#: src/gtkui/menus.c:151
+#: src/gtkui/menus.c:149
 msgid "Stop _After This Song"
 msgstr "Z_astavuje po skladbě."
 
-#: src/gtkui/menus.c:153 src/gtkui/menus.c:210
+#: src/gtkui/menus.c:151 src/gtkui/menus.c:209
 msgid "Song _Info ..."
 msgstr "_Informace o skladbě…"
 
-#: src/gtkui/menus.c:154
+#: src/gtkui/menus.c:152
 msgid "Jump to _Time ..."
 msgstr "Přejí_t na čas…"
 
-#: src/gtkui/menus.c:155
+#: src/gtkui/menus.c:153
 msgid "_Jump to Song ..."
 msgstr "Pře_jít na skladbu…"
 
-#: src/gtkui/menus.c:158
+#: src/gtkui/menus.c:156
 msgid "By Track _Number"
 msgstr "Podle čísla _stopy"
 
-#: src/gtkui/menus.c:159
+#: src/gtkui/menus.c:157
 msgid "By _Title"
 msgstr "Podle ná_zvu"
 
-#: src/gtkui/menus.c:160
+#: src/gtkui/menus.c:158
 msgid "By _Artist"
 msgstr "Podle _umělce"
 
-#: src/gtkui/menus.c:161
+#: src/gtkui/menus.c:159
 msgid "By A_lbum"
 msgstr "Podle a_lba"
 
-#: src/gtkui/menus.c:162
+#: src/gtkui/menus.c:160
 msgid "By Release _Date"
 msgstr "Podle data vy_dání"
 
-#: src/gtkui/menus.c:163
+#: src/gtkui/menus.c:161
 msgid "By _File Path"
 msgstr "Podle _cesty k souboru"
 
-#: src/gtkui/menus.c:164
+#: src/gtkui/menus.c:162
 msgid "By _Custom Title"
 msgstr "_Vlastní název"
 
-#: src/gtkui/menus.c:166
+#: src/gtkui/menus.c:164
 msgid "R_everse Order"
 msgstr "_Obrátit pořadí"
 
-#: src/gtkui/menus.c:167
+#: src/gtkui/menus.c:165
 msgid "_Random Order"
 msgstr "Ná_hodné pořadí"
 
-#: src/gtkui/menus.c:170 src/gtkui/menus.c:212
+#: src/gtkui/menus.c:168 src/gtkui/menus.c:211
 msgid "_Refresh"
 msgstr "_Obnovit"
 
-#: src/gtkui/menus.c:172
+#: src/gtkui/menus.c:170
 msgid "_Sort"
 msgstr "_Seřadit"
 
-#: src/gtkui/menus.c:174
+#: src/gtkui/menus.c:172
 msgid "_New"
 msgstr "_Nový"
 
-#: src/gtkui/menus.c:175
+#: src/gtkui/menus.c:173 src/gtkui/menus.c:222
 msgid "_Close"
 msgstr "_Zavřít"
 
-#: src/gtkui/menus.c:177
+#: src/gtkui/menus.c:175
 msgid "_Import ..."
 msgstr "_Importovat…"
 
-#: src/gtkui/menus.c:178
+#: src/gtkui/menus.c:176
 msgid "_Export ..."
 msgstr "_Exportovat…"
 
-#: src/gtkui/menus.c:180
+#: src/gtkui/menus.c:178
 msgid "_Playlist Manager ..."
 msgstr "S_právce seznamů skladeb…"
 
-#: src/gtkui/menus.c:183
+#: src/gtkui/menus.c:179
+msgid "_Queue Manager ..."
+msgstr "Správce _fronty…"
+
+#: src/gtkui/menus.c:182
 msgid "Volume _Up"
 msgstr "Ze_sílit"
 
-#: src/gtkui/menus.c:184
+#: src/gtkui/menus.c:183
 msgid "Volume _Down"
 msgstr "Z_tišit"
 
-#: src/gtkui/menus.c:186
+#: src/gtkui/menus.c:185
 msgid "_Equalizer"
 msgstr "_Ekvalizér"
 
-#: src/gtkui/menus.c:188
+#: src/gtkui/menus.c:187
 msgid "E_ffects"
 msgstr "E_fekty"
 
-#: src/gtkui/menus.c:191
+#: src/gtkui/menus.c:190
 msgid "_Interface"
 msgstr "_Rozhraní"
 
-#: src/gtkui/menus.c:193
+#: src/gtkui/menus.c:192
 msgid "Show _Menu Bar"
 msgstr "Zobrazit h_lavní nabídku"
 
-#: src/gtkui/menus.c:194
+#: src/gtkui/menus.c:193
 msgid "Show I_nfo Bar"
 msgstr "Zobrazit oblast i_nformací"
 
-#: src/gtkui/menus.c:195
+#: src/gtkui/menus.c:194
 msgid "Show _Status Bar"
 msgstr "Zobrazit _stavový panel"
 
-#: src/gtkui/menus.c:197
+#: src/gtkui/menus.c:196
 msgid "Show Column _Headers"
 msgstr "Zobrazit zá_hlaví sloupců"
 
-#: src/gtkui/menus.c:198
+#: src/gtkui/menus.c:197
 msgid "Choose _Columns ..."
 msgstr "Vybrat sloup_ce…"
 
-#: src/gtkui/menus.c:199
+#: src/gtkui/menus.c:198
 msgid "Scrol_l on Song Change"
 msgstr "Odro_lovat na změněnou skladbu"
 
-#: src/gtkui/menus.c:202
+#: src/gtkui/menus.c:201
 msgid "_File"
 msgstr "_Soubor"
 
-#: src/gtkui/menus.c:203
+#: src/gtkui/menus.c:202
 msgid "_Playback"
 msgstr "_Přehrát"
 
-#: src/gtkui/menus.c:204
+#: src/gtkui/menus.c:203
 msgid "P_laylist"
 msgstr "Seznam sk_ladeb"
 
-#: src/gtkui/menus.c:205 src/gtkui/menus.c:219
+#: src/gtkui/menus.c:204 src/gtkui/menus.c:218
 msgid "_Services"
 msgstr "_Služby"
 
-#: src/gtkui/menus.c:206
+#: src/gtkui/menus.c:205
 msgid "_Output"
 msgstr "_Výstup"
 
-#: src/gtkui/menus.c:207
+#: src/gtkui/menus.c:206
 msgid "_View"
 msgstr "_Zobrazení"
 
-#: src/gtkui/menus.c:211
+#: src/gtkui/menus.c:210
 msgid "_Queue/Unqueue"
 msgstr "Ode_brat/přidat z/do fronty"
 
-#: src/gtkui/menus.c:214
+#: src/gtkui/menus.c:213
 msgid "Cu_t"
 msgstr "V_yjmout"
 
-#: src/gtkui/menus.c:215
+#: src/gtkui/menus.c:214
 msgid "_Copy"
 msgstr "_Kopírovat"
 
-#: src/gtkui/menus.c:216
+#: src/gtkui/menus.c:215
 msgid "_Paste"
 msgstr "V_ložit"
 
-#: src/gtkui/menus.c:217
+#: src/gtkui/menus.c:216
 msgid "Select _All"
 msgstr "Vybr_at vše"
 
-#: src/gtkui/menus.c:222
+#: src/gtkui/menus.c:221
 msgid "_Rename"
 msgstr "_Přejmenovat"
 
-#: src/gtkui/ui_gtk.c:75
+#: src/gtkui/ui_gtk.c:95
 msgid "GTK Interface"
 msgstr "Rozhraní GTK"
 
-#: src/gtkui/ui_gtk.c:132 src/skins/ui_main.c:303
+#: src/gtkui/ui_gtk.c:154 src/skins/ui_main.c:302
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s – Audacious"
 
-#: src/gtkui/ui_gtk.c:138 src/skins/ui_main.c:305 src/skins/ui_main.c:1498
+#: src/gtkui/ui_gtk.c:160 src/skins/ui_main.c:304 src/skins/ui_main.c:1499
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_gtk.c:177 src/skins/plugin.c:185
+#: src/gtkui/ui_gtk.c:206 src/skins/plugin.c:185
 msgid "Error"
 msgstr "Chyba"
 
-#: src/gtkui/ui_statusbar.c:102 src/skins/ui_main.c:460
+#: src/gtkui/ui_statusbar.c:102 src/skins/ui_main.c:459
 msgid "mono"
 msgstr "mono"
 
-#: src/gtkui/ui_statusbar.c:104 src/skins/ui_main.c:459
+#: src/gtkui/ui_statusbar.c:104 src/skins/ui_main.c:458
 msgid "stereo"
 msgstr "stereo"
 
@@ -1760,7 +2097,7 @@
 msgid "Volume Down"
 msgstr "Ztišit"
 
-#: src/hotkey/gui.c:81 src/skins/ui_manager.c:424 src/skins/ui_manager.c:425
+#: src/hotkey/gui.c:81 src/skins/ui_manager.c:418 src/skins/ui_manager.c:419
 msgid "Jump to File"
 msgstr "Přejít na soubor"
 
@@ -1856,31 +2193,31 @@
 "\t\t\tJeremy Tan <nsx@nsx.homeip.net>\n"
 "\n"
 
-#: src/jack/configure.c:71
+#: src/jack/configure.c:66
 msgid "Connect to all available jack ports"
 msgstr "Připojit se na všechny dostupné porty jacku"
 
-#: src/jack/configure.c:78
+#: src/jack/configure.c:73
 msgid "Connect only the output ports"
 msgstr "Připojit se pouze na výstupní porty"
 
-#: src/jack/configure.c:85
+#: src/jack/configure.c:80
 msgid "Connect to no ports"
 msgstr "Na žádné porty se nepřipojovat"
 
-#: src/jack/configure.c:103
+#: src/jack/configure.c:98
 msgid "jack Plugin configuration"
 msgstr "Nastavení modulu jack"
 
-#: src/jack/configure.c:121
+#: src/jack/configure.c:116
 msgid "Connection mode:"
 msgstr "Režim připojení:"
 
-#: src/jack/configure.c:133
+#: src/jack/configure.c:128
 msgid "Enable debug printing"
 msgstr "Povolit ladící výpisy"
 
-#: src/jack/jack.c:438
+#: src/jack/jack.c:422
 msgid ""
 "XMMS jack Driver 0.17\n"
 "\n"
@@ -1898,10 +2235,43 @@
 "Pro Audacious převedl\n"
 "Giacomo Lozito z develia.org"
 
-#: src/jack/jack.c:443
+#: src/jack/jack.c:427
 msgid "About JACK Output Plugin 0.17"
 msgstr "O výstupním modulu JACK 0.17"
 
+#: src/ladspa/plugin.c:396
+msgid "About LADSPA Host"
+msgstr "O hostiteli LADSPA"
+
+#: src/ladspa/plugin.c:497
+#, c-format
+msgid "%s Settings"
+msgstr "Nastavení %s"
+
+#: src/ladspa/plugin.c:565
+msgid "LADSPA Host Settings"
+msgstr "Nastavení hostitele LADSPA"
+
+#: src/ladspa/plugin.c:574
+msgid "Module path:"
+msgstr "Cesta k modulu:"
+
+#: src/ladspa/plugin.c:586
+msgid "Available plugins:"
+msgstr "Dostupné moduly:"
+
+#: src/ladspa/plugin.c:598
+msgid "Enable"
+msgstr "Povolit"
+
+#: src/ladspa/plugin.c:604
+msgid "Enabled plugins:"
+msgstr "Povolené moduly:"
+
+#: src/ladspa/plugin.c:619
+msgid "Settings"
+msgstr "Nastavení"
+
 #: src/lyricwiki/lyricwiki.c:226
 msgid ""
 "\n"
@@ -1954,13 +2324,29 @@
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Generátor taktu: %d dob/min %d⁄%d"
 
+#: src/mixer/plugin.c:63
+msgid "About Channel Mixer"
+msgstr "O směšovači kanálů"
+
+#: src/mixer/plugin.c:92
+msgid "Channel Mixer Settings"
+msgstr "Nastavení směšovače kanálů"
+
+#: src/mixer/plugin.c:101
+msgid "Output channels:"
+msgstr "Výstupní kanály:"
+
+#: src/mixer/plugin.c:111
+msgid "Changes take effect at the next song change."
+msgstr "Změny se projeví při přepnutí na další skladbu."
+
 #: src/mpg123/mpg123.c:183
 msgid "Surround"
 msgstr "Prostorový zvuk"
 
 #: src/mtp_up/mtp.c:298
 msgid "Upload in progress..."
-msgstr "Nahrávám…"
+msgstr "Nahrává se…"
 
 #: src/mtp_up/mtp.c:310
 msgid "Upload to MTP Device"
@@ -1971,14 +2357,12 @@
 msgstr "Odpojit zařízení MTP"
 
 #: src/notify/libnotify-aosd_event.c:47
-#, fuzzy
 msgid "Stopped"
-msgstr "Zastavit"
+msgstr "Zastaveno"
 
 #: src/notify/libnotify-aosd_event.c:47
-#, fuzzy
 msgid "Audacious is not playing."
-msgstr "Audacious – varování o viditelnosti"
+msgstr "Audacious nyní nehraje."
 
 #: src/null/null.c:64
 msgid "Null output plugin "
@@ -1996,124 +2380,56 @@
 msgid "About Null Output"
 msgstr "O slepém výstupu"
 
-#: src/null/null.c:94
+#: src/null/null.c:89
 msgid "Null output preferences"
 msgstr "Nastavení slepého výstupu"
 
-#: src/null/null.c:105
+#: src/null/null.c:100
 msgid "Run in real time"
 msgstr "Běžet v reálném čase"
 
-#: src/oss4/configure.c:89
-msgid "1. Default device"
-msgstr "1. Implicitní zařízení"
+#: src/OSS/configure.c:137
+#, c-format
+msgid "Default (%s)"
+msgstr "Standardně (%s)"
 
-#: src/oss4/configure.c:151
-msgid "OSS4 Output Plugin Preferences"
-msgstr "Nastavení výstupního modulu OSS4"
+#: src/OSS/configure.c:178
+msgid "OSS Driver configuration"
+msgstr "Nastavení ovladače OSS"
 
-#: src/oss4/configure.c:163 src/OSS/configure.c:203
+#: src/OSS/configure.c:194 src/oss4/configure.c:154
 msgid "Audio device:"
 msgstr "Zvukové zařízení:"
 
-#: src/oss4/configure.c:189 src/OSS/configure.c:226 src/OSS/configure.c:269
+#: src/OSS/configure.c:217 src/OSS/configure.c:260 src/oss4/configure.c:182
 msgid "Use alternate device:"
 msgstr "Použít jiné zařízení:"
 
-#: src/oss4/configure.c:202
-msgid "Save volume between sessions"
-msgstr "Mezi relacemi ukládat hlasitost"
-
-#: src/oss4/configure.c:206
-msgid "Enable format conversions made by the OSS software."
-msgstr "Zapnout převody formátu prostřednictvím OSS."
-
-#: src/oss4/plugin.c:51
-msgid "About OSS4 Plugin"
-msgstr "O modulu OSS4"
-
-#: src/oss4/plugin.c:52
-msgid ""
-"OSS4 Output Plugin for Audacious\n"
-"Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
-"\n"
-"I would like to thank people on #audacious, especially Tony Vroon and John "
-"Lindgren and of course the authors of the previous OSS plugin.\n"
-"\n"
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with "
-"this program. If not, see <http://www.gnu.org/licenses/>.\n"
-msgstr ""
-"Výstupní modul OSS4 pro Audacious\n"
-"Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
-"\n"
-"Rád bych poděkoval lidem na #audacious, zvláště Tony Vroonovi a Johnu "
-"Lindgrenovi a samozřejmě autorům předchozího modulu OSS.\n"
-"\n"
-"Tento program je svobodný software; můžete jej šířit a/nebo měnit\n"
-"v souladu s podmínkami GNU General Public License (GPL) vydané\n"
-"Free Software Foundation a to buď ve verzi 3 nebo (dle vaší volby)\n"
-"libovolné novější.\n"
-"\n"
-"Program je šířen v naději, že bude užitečný, ale BEZ JAKÉKOLIV\n"
-"ZÁRUKY, a to ani odvozené záruky OBCHODOVATELNOSTI nebo VHODNOSTI PRO\n"
-"URČITÝ ÚČEL. Více informací najdete v GNU GPL.\n"
-"\n"
-"S tímto programem byste měli obdržet kopii GNU GPL. Pokud se\n"
-"tak nestalo, vizte <http://www.gnu.org/licenses/>.\n"
-
-#: src/oss4/utils.c:204
-msgid "OSS4 error"
-msgstr "Chyba OSS4"
-
-#: src/OSS/configure.c:146
-#, c-format
-msgid "Default (%s)"
-msgstr "Standardně (%s)"
-
-#: src/OSS/configure.c:162 src/skins/ui_manager.c:456
-#: src/skins/ui_manager.c:477
-msgid "Default"
-msgstr "Standardní"
-
-#: src/OSS/configure.c:187
-msgid "OSS Driver configuration"
-msgstr "Nastavení ovladače OSS"
-
-#: src/OSS/configure.c:290
+#: src/OSS/configure.c:281
 msgid "Devices"
 msgstr "Zařízení"
 
-#: src/OSS/configure.c:292
+#: src/OSS/configure.c:283
 msgid "Buffering:"
 msgstr "Vyrovnávání:"
 
-#: src/OSS/configure.c:305
+#: src/OSS/configure.c:296
 msgid "Pre-buffer (percent):"
 msgstr "Načíst předem (v procentech):"
 
-#: src/OSS/configure.c:316
+#: src/OSS/configure.c:307
 msgid "Buffering"
 msgstr "Vyrovnávání"
 
-#: src/OSS/configure.c:317
+#: src/OSS/configure.c:308
 msgid "Mixer Settings:"
 msgstr "Nastavení mixéru:"
 
-#: src/OSS/configure.c:323
+#: src/OSS/configure.c:314
 msgid "Volume controls Master not PCM"
 msgstr "Hlasitost ovládána Master kanálem místo PCM"
 
-#: src/OSS/configure.c:329
+#: src/OSS/configure.c:320
 msgid "Mixer"
 msgstr "Mixér"
 
@@ -2155,6 +2471,30 @@
 "nestalo, obraťte se na Free Software Foundation, Inc.,\n"
 "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
+#: src/oss4/configure.c:84
+msgid "1. Default device"
+msgstr "1. Implicitní zařízení"
+
+#: src/oss4/configure.c:142
+msgid "OSS4 Output Plugin Preferences"
+msgstr "Nastavení výstupního modulu OSS4"
+
+#: src/oss4/configure.c:197
+msgid "Save volume between sessions"
+msgstr "Mezi relacemi ukládat hlasitost"
+
+#: src/oss4/configure.c:201
+msgid "Enable format conversions made by the OSS software."
+msgstr "Zapnout převody formátu prostřednictvím OSS."
+
+#: src/oss4/plugin.c:51
+msgid "About OSS4 Plugin"
+msgstr "O modulu OSS4"
+
+#: src/oss4/utils.c:204
+msgid "OSS4 error"
+msgstr "Chyba OSS4"
+
 #: src/pulse_audio/pulse_audio.c:687
 msgid "About Audacious PulseAudio Output Plugin"
 msgstr "O výstupním modulu PulseAudio pro Audacious"
@@ -2193,56 +2533,56 @@
 "tak nestalo, obraťte se na Free Software Foundation, Inc.,\n"
 "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/resample/plugin.c:91
+#: src/resample/plugin.c:89
 msgid "About Sample Rate Converter Plugin"
 msgstr "O modulu Převodník vzorkovací frekvence"
 
-#: src/resample/plugin.c:146
+#: src/resample/plugin.c:144
 msgid "Sample Rate Converter Preferences"
 msgstr "Nastavení Převodníku vzorkovací frekvence"
 
-#: src/resample/plugin.c:158
+#: src/resample/plugin.c:156
 msgid "Rate mappings:"
 msgstr "Přiřazení frekvencí:"
 
 # FIXME: Rod? Rate mappings?
-#: src/resample/plugin.c:181
+#: src/resample/plugin.c:179
 msgid "All others:"
 msgstr "Všechna ostatní:"
 
-#: src/resample/plugin.c:193
+#: src/resample/plugin.c:191
 msgid "Method:"
 msgstr "Metoda:"
 
-#: src/scrobbler/configure.c:128 src/scrobbler/configure.c:204
+#: src/scrobbler/configure.c:122 src/scrobbler/configure.c:197
 msgid "Change password"
 msgstr "Změnit heslo"
 
-#: src/scrobbler/configure.c:150
+#: src/scrobbler/configure.c:143
 msgid "Services"
 msgstr "Služby"
 
-#: src/scrobbler/configure.c:172
+#: src/scrobbler/configure.c:165
 msgid "Username:"
 msgstr "Přístupové jméno:"
 
-#: src/scrobbler/configure.c:178
+#: src/scrobbler/configure.c:171
 msgid "Password:"
 msgstr "Heslo:"
 
-#: src/scrobbler/configure.c:186
+#: src/scrobbler/configure.c:179
 msgid "Scrobbler URL:"
 msgstr "URL Scrobbleru:"
 
-#: src/scrobbler/configure.c:218
+#: src/scrobbler/configure.c:211
 msgid "Last.FM"
 msgstr "Last.FM"
 
-#: src/scrobbler/configure.c:262
+#: src/scrobbler/configure.c:238
 msgid "Scrobbler"
 msgstr "Scrobbler"
 
-#: src/scrobbler/plugin.c:213
+#: src/scrobbler/plugin.c:194
 msgid ""
 "Audacious AudioScrobbler Plugin\n"
 "\n"
@@ -2253,7 +2593,7 @@
 "\n"
 "Původně vytvořil Audun Hove <audun@nlc.no> a Pipian <pipian@pipian.com>\n"
 
-#: src/scrobbler/plugin.c:215
+#: src/scrobbler/plugin.c:196
 msgid "About Scrobbler Plugin"
 msgstr "O modulu Scrobbler"
 
@@ -2270,18 +2610,10 @@
 msgid "About %s"
 msgstr "O %s"
 
-#: src/sid/xs_about.c:214 src/sid/xs_interface.c:1825
-msgid "Close"
-msgstr "Zavřít"
-
-#: src/sid/xs_config.c:326
+#: src/sid/xs_config.c:293
 msgid " Error"
 msgstr " Chyba"
 
-#: src/sid/xs_config.c:326
-msgid "OK"
-msgstr "Budiž"
-
 #: src/sid/xs_fileinfo.c:151
 msgid "General info"
 msgstr "Obecné informace"
@@ -2607,15 +2939,15 @@
 msgid "Use"
 msgstr "Použít"
 
-#: src/sid/xs_interface.c:833 src/skins/ui_manager.c:447
+#: src/sid/xs_interface.c:833 src/skins/ui_manager.c:441
 msgid "Save"
 msgstr "Uložit"
 
-#: src/sid/xs_interface.c:841 src/skins/ui_manager.c:446
+#: src/sid/xs_interface.c:841 src/skins/ui_manager.c:440
 msgid "Import"
 msgstr "Importovat"
 
-#: src/sid/xs_interface.c:849 src/skins/ui_manager.c:448
+#: src/sid/xs_interface.c:849 src/skins/ui_manager.c:442
 msgid "Delete"
 msgstr "Smazat"
 
@@ -2648,11 +2980,6 @@
 msgid "Playtime:"
 msgstr "Doba přehrávání:"
 
-#: src/sid/xs_interface.c:921 src/sid/xs_interface.c:975
-#: src/sid/xs_interface.c:1155
-msgid "seconds"
-msgstr "sekund"
-
 #: src/sid/xs_interface.c:928
 msgid "Minimum playtime:"
 msgstr "Minimální doba přehrávání:"
@@ -2922,39 +3249,39 @@
 "Copyright © 2008, Tomasz Moń <desowin@gmail.com>\n"
 "\n"
 
-#: src/skins/skins_cfg.c:254
+#: src/skins/skins_cfg.c:207
 msgid "_Player:"
 msgstr "_Přehrávač:"
 
-#: src/skins/skins_cfg.c:254
+#: src/skins/skins_cfg.c:208
 msgid "Select main player window font:"
 msgstr "Font v hlavním okně přehrávače:"
 
-#: src/skins/skins_cfg.c:255
+#: src/skins/skins_cfg.c:210
 msgid "_Playlist:"
 msgstr "_Seznamu skladeb:"
 
-#: src/skins/skins_cfg.c:255
+#: src/skins/skins_cfg.c:211
 msgid "Select playlist font:"
 msgstr "Vyberte font pro seznam skladeb:"
 
-#: src/skins/skins_cfg.c:259
+#: src/skins/skins_cfg.c:215
 msgid "_Fonts"
 msgstr "_Fonty"
 
-#: src/skins/skins_cfg.c:261
+#: src/skins/skins_cfg.c:218
 msgid "Use bitmap fonts (supports ASCII only)"
 msgstr "Použít bitmapové fonty (podporuje pouze ASCII)"
 
-#: src/skins/skins_cfg.c:263
+#: src/skins/skins_cfg.c:220
 msgid "Scroll song title in both directions"
 msgstr "Převíjet název skladby oběma směry"
 
-#: src/skins/skins_cfg.c:346
+#: src/skins/skins_cfg.c:297
 msgid "_Skin"
 msgstr "_Vzhled"
 
-#: src/skins/skins_cfg.c:393
+#: src/skins/skins_cfg.c:344
 msgid "Interface Preferences"
 msgstr "Nastavení rozhraní"
 
@@ -3002,83 +3329,83 @@
 msgid "16 kHz"
 msgstr "16 kHz"
 
-#: src/skins/ui_equalizer.c:378
+#: src/skins/ui_equalizer.c:379
 msgid "Audacious Equalizer"
 msgstr "Ekvalizér"
 
-#: src/skins/ui_equalizer.c:884
+#: src/skins/ui_equalizer.c:896
 msgid "Presets"
 msgstr "Předvolby"
 
-#: src/skins/ui_main.c:444
+#: src/skins/ui_main.c:443
 msgid "kbps"
 msgstr "kb/s"
 
-#: src/skins/ui_main.c:452
+#: src/skins/ui_main.c:451
 msgid "kHz"
 msgstr "kHz"
 
-#: src/skins/ui_main.c:459
+#: src/skins/ui_main.c:458
 msgid "surround"
 msgstr "prostorový zvuk"
 
-#: src/skins/ui_main.c:807
+#: src/skins/ui_main.c:806
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr "Přejít na %d:%-2.2d / %d:%-2.2d"
 
-#: src/skins/ui_main.c:828
+#: src/skins/ui_main.c:827
 #, c-format
 msgid "Volume: %d%%"
 msgstr "Hlasitost: %d %%"
 
-#: src/skins/ui_main.c:851
+#: src/skins/ui_main.c:850
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "Vyvážení: %d %% vlevo"
 
-#: src/skins/ui_main.c:853
+#: src/skins/ui_main.c:852
 msgid "Balance: center"
 msgstr "Vyvážení: střed"
 
-#: src/skins/ui_main.c:855
+#: src/skins/ui_main.c:854
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "Vyvážení: %d %% vpravo"
 
-#: src/skins/ui_main.c:981
+#: src/skins/ui_main.c:980
 msgid "Options Menu"
 msgstr "Nabídka nastavení"
 
-#: src/skins/ui_main.c:985
+#: src/skins/ui_main.c:984
 msgid "Disable 'Always On Top'"
 msgstr "Vypnout „Vždy na vrchu“"
 
-#: src/skins/ui_main.c:987
+#: src/skins/ui_main.c:986
 msgid "Enable 'Always On Top'"
 msgstr "Zapnout „Vždy na vrchu“"
 
-#: src/skins/ui_main.c:990
+#: src/skins/ui_main.c:989
 msgid "File Info Box"
 msgstr "Informace o souboru"
 
-#: src/skins/ui_main.c:995
+#: src/skins/ui_main.c:994
 msgid "Visualization Menu"
 msgstr "Nabídka znázornění"
 
-#: src/skins/ui_main.c:1645
+#: src/skins/ui_main.c:1646
 msgid "Single mode."
 msgstr "Režim jedné skladby."
 
-#: src/skins/ui_main.c:1647
+#: src/skins/ui_main.c:1648
 msgid "Playlist mode."
 msgstr "Režim seznamu skladeb."
 
-#: src/skins/ui_main.c:1669
+#: src/skins/ui_main.c:1670
 msgid "Stopping after song."
 msgstr "Zastavuje po skladbě."
 
-#: src/skins/ui_main.c:1671
+#: src/skins/ui_main.c:1672
 msgid "Not stopping after song."
 msgstr "Po skladbě nezastavuje."
 
@@ -3304,426 +3631,410 @@
 msgstr "Uloží vybraný seznam skladeb."
 
 #: src/skins/ui_manager.c:229
-msgid "Save All Playlists"
-msgstr "Uložit všechny seznamy skladeb"
-
-#: src/skins/ui_manager.c:230
-msgid ""
-"Saves all the playlists that are open. Note that this is done automatically "
-"when Audacious quits."
-msgstr ""
-"Uloží všechny seznamy skladeb, které jsou otevřeny. Vezměte na vědomí, že "
-"toto bude rovněž provedeno při ukončení Audacious."
-
-#: src/skins/ui_manager.c:234
 msgid "Refresh List"
 msgstr "Obnovit seznam"
 
-#: src/skins/ui_manager.c:235
+#: src/skins/ui_manager.c:230
 msgid "Refreshes metadata associated with a playlist entry."
 msgstr "Obnovuje metadata náležící skladbě ze seznamu."
 
-#: src/skins/ui_manager.c:238
-msgid "List Manager"
-msgstr "Správce seznamů"
+#: src/skins/ui_manager.c:233
+msgid "Playlist Manager"
+msgstr "Správce seznamů skladeb"
 
-#: src/skins/ui_manager.c:239
-msgid "Opens the playlist manager."
-msgstr "Otevře správce seznamu skladeb."
+#: src/skins/ui_manager.c:234
+msgid "Queue Manager"
+msgstr "Správce fronty"
 
-#: src/skins/ui_manager.c:243
+#: src/skins/ui_manager.c:237
 msgid "View"
 msgstr "Zobrazení"
 
-#: src/skins/ui_manager.c:244
+#: src/skins/ui_manager.c:238
 msgid "Interface"
 msgstr "Rozhraní"
 
-#: src/skins/ui_manager.c:245
+#: src/skins/ui_manager.c:239
 msgid "Interface Preferences ..."
 msgstr "Nastavení rozhraní…"
 
-#: src/skins/ui_manager.c:249
+#: src/skins/ui_manager.c:243
 msgid "Add Internet Address..."
 msgstr "Přidat internetovou adresu…"
 
-#: src/skins/ui_manager.c:250
+#: src/skins/ui_manager.c:244
 msgid "Adds a remote track to the playlist."
 msgstr "Do seznamu přidá vzdálenou stopu."
 
-#: src/skins/ui_manager.c:253
+#: src/skins/ui_manager.c:247
 msgid "Add Files..."
 msgstr "Přidat soubory…"
 
-#: src/skins/ui_manager.c:254
+#: src/skins/ui_manager.c:248
 msgid "Adds files to the playlist."
 msgstr "Přidá soubory do seznamu skladeb."
 
-#: src/skins/ui_manager.c:259
+#: src/skins/ui_manager.c:253
 msgid "Search and Select"
 msgstr "Hledání a výběr"
 
-#: src/skins/ui_manager.c:260
+#: src/skins/ui_manager.c:254
 msgid ""
 "Searches the playlist and selects playlist entries based on specific "
 "criteria."
 msgstr ""
 "Prohledá seznam skladeb a vybere skladby ze seznamu podle zadaných omezení."
 
-#: src/skins/ui_manager.c:263
+#: src/skins/ui_manager.c:257
 msgid "Invert Selection"
 msgstr "Invertovat výběr"
 
-#: src/skins/ui_manager.c:264
+#: src/skins/ui_manager.c:258
 msgid "Inverts the selected and unselected entries."
 msgstr "Zamění vybrané a nevybrané položky."
 
-#: src/skins/ui_manager.c:267
+#: src/skins/ui_manager.c:261
 msgid "Select All"
 msgstr "Vybrat vše"
 
-#: src/skins/ui_manager.c:268
+#: src/skins/ui_manager.c:262
 msgid "Selects all of the playlist entries."
 msgstr "Vybere všechny skladby v seznamu."
 
-#: src/skins/ui_manager.c:271
+#: src/skins/ui_manager.c:265
 msgid "Select None"
 msgstr "Nevybrat žádné"
 
-#: src/skins/ui_manager.c:272
+#: src/skins/ui_manager.c:266
 msgid "Deselects all of the playlist entries."
 msgstr "Žádná skladba v seznamu nebude vybraná."
 
-#: src/skins/ui_manager.c:277
+#: src/skins/ui_manager.c:271
 msgid "Remove All"
 msgstr "Odebrat všechny"
 
-#: src/skins/ui_manager.c:278
+#: src/skins/ui_manager.c:272
 msgid "Removes all entries from the playlist."
 msgstr "Ze seznamu odstraní všechny skladby."
 
-#: src/skins/ui_manager.c:281
+#: src/skins/ui_manager.c:275
 msgid "Clear Queue"
 msgstr "Vyprázdnit frontu"
 
-#: src/skins/ui_manager.c:282
+#: src/skins/ui_manager.c:276
 msgid "Clears the queue associated with this playlist."
 msgstr "Vyprázdní frontu spojenou s tímto seznamem skladeb."
 
-#: src/skins/ui_manager.c:285
+#: src/skins/ui_manager.c:279
 msgid "Remove Unavailable Files"
 msgstr "Odstranit nedostupné soubory"
 
-#: src/skins/ui_manager.c:286
+#: src/skins/ui_manager.c:280
 msgid "Removes unavailable files from the playlist."
 msgstr "Ze seznamu skladeb odstraní nedostupné soubory."
 
-#: src/skins/ui_manager.c:289
+#: src/skins/ui_manager.c:283
 msgid "Remove Duplicates"
 msgstr "Odebrat duplikáty"
 
-#: src/skins/ui_manager.c:291 src/skins/ui_manager.c:323
-#: src/skins/ui_manager.c:353
+#: src/skins/ui_manager.c:285 src/skins/ui_manager.c:317
+#: src/skins/ui_manager.c:347
 msgid "By Title"
 msgstr "Podle názvu"
 
-#: src/skins/ui_manager.c:292
+#: src/skins/ui_manager.c:286
 msgid "Removes duplicate entries from the playlist by title."
 msgstr "Ze seznamu odstraní skladby na základě jejich názvu."
 
-#: src/skins/ui_manager.c:295 src/skins/ui_manager.c:335
-#: src/skins/ui_manager.c:365
+#: src/skins/ui_manager.c:289 src/skins/ui_manager.c:329
+#: src/skins/ui_manager.c:359
 msgid "By Filename"
 msgstr "Podle jména souboru"
 
-#: src/skins/ui_manager.c:296
+#: src/skins/ui_manager.c:290
 msgid "Removes duplicate entries from the playlist by filename."
 msgstr "Ze seznamu odstraní skladby na základě jména souboru."
 
-#: src/skins/ui_manager.c:299 src/skins/ui_manager.c:339
-#: src/skins/ui_manager.c:369
+#: src/skins/ui_manager.c:293 src/skins/ui_manager.c:333
+#: src/skins/ui_manager.c:363
 msgid "By Path + Filename"
 msgstr "Podle cesty a jména souboru"
 
-#: src/skins/ui_manager.c:300
+#: src/skins/ui_manager.c:294
 msgid "Removes duplicate entries from the playlist by their full path."
 msgstr "Ze seznamu odstraní skladby na základě celé cesty."
 
-#: src/skins/ui_manager.c:303
+#: src/skins/ui_manager.c:297
 msgid "Remove Unselected"
 msgstr "Odebrat neoznačené"
 
-#: src/skins/ui_manager.c:304
+#: src/skins/ui_manager.c:298
 msgid "Remove unselected entries from the playlist."
 msgstr "Odebrat neoznačené skladby se seznamu."
 
-#: src/skins/ui_manager.c:307
+#: src/skins/ui_manager.c:301
 msgid "Remove Selected"
 msgstr "Odebrat označené"
 
-#: src/skins/ui_manager.c:308
+#: src/skins/ui_manager.c:302
 msgid "Remove selected entries from the playlist."
 msgstr "Odebrat označené skladby ze seznamu."
 
-#: src/skins/ui_manager.c:313
+#: src/skins/ui_manager.c:307
 msgid "Randomize List"
 msgstr "Zamíchat pořadí"
 
-#: src/skins/ui_manager.c:314
+#: src/skins/ui_manager.c:308
 msgid "Randomizes the playlist."
 msgstr "Sklady v seznamu seřadí náhodně."
 
-#: src/skins/ui_manager.c:317
+#: src/skins/ui_manager.c:311
 msgid "Reverse List"
 msgstr "Otočit seznam"
 
-#: src/skins/ui_manager.c:318
+#: src/skins/ui_manager.c:312
 msgid "Reverses the playlist."
 msgstr "Obrátí pořadí skladeb v seznamu."
 
-#: src/skins/ui_manager.c:321
+#: src/skins/ui_manager.c:315
 msgid "Sort List"
 msgstr "Seřadit seznam"
 
-#: src/skins/ui_manager.c:324 src/skins/ui_manager.c:354
+#: src/skins/ui_manager.c:318 src/skins/ui_manager.c:348
 msgid "Sorts the list by title."
 msgstr "Seřadí seznam podle názvu."
 
-#: src/skins/ui_manager.c:327 src/skins/ui_manager.c:357
+#: src/skins/ui_manager.c:321 src/skins/ui_manager.c:351
 msgid "By Album"
 msgstr "Podle alba"
 
-#: src/skins/ui_manager.c:328 src/skins/ui_manager.c:358
+#: src/skins/ui_manager.c:322 src/skins/ui_manager.c:352
 msgid "Sorts the list by album."
 msgstr "Seřadí seznam podle alba."
 
-#: src/skins/ui_manager.c:331 src/skins/ui_manager.c:361
+#: src/skins/ui_manager.c:325 src/skins/ui_manager.c:355
 msgid "By Artist"
 msgstr "Podle umělce"
 
-#: src/skins/ui_manager.c:332 src/skins/ui_manager.c:362
+#: src/skins/ui_manager.c:326 src/skins/ui_manager.c:356
 msgid "Sorts the list by artist."
 msgstr "Skladby v seznam seřadí podle jména umělce."
 
-#: src/skins/ui_manager.c:336 src/skins/ui_manager.c:366
+#: src/skins/ui_manager.c:330 src/skins/ui_manager.c:360
 msgid "Sorts the list by filename."
 msgstr "Skladby v seznamu seřadí podle jména souboru"
 
-#: src/skins/ui_manager.c:340 src/skins/ui_manager.c:370
+#: src/skins/ui_manager.c:334 src/skins/ui_manager.c:364
 msgid "Sorts the list by full pathname."
 msgstr "Skladby v seznamu seřadí podle celé cesty."
 
-#: src/skins/ui_manager.c:343 src/skins/ui_manager.c:373
+#: src/skins/ui_manager.c:337 src/skins/ui_manager.c:367
 msgid "By Date"
 msgstr "Podle data"
 
-#: src/skins/ui_manager.c:344 src/skins/ui_manager.c:374
+#: src/skins/ui_manager.c:338 src/skins/ui_manager.c:368
 msgid "Sorts the list by modification time."
 msgstr "Skladby v seznamu seřadí podle času poslední změny v obsahu souboru."
 
-#: src/skins/ui_manager.c:347 src/skins/ui_manager.c:377
+#: src/skins/ui_manager.c:341 src/skins/ui_manager.c:371
 msgid "By Track Number"
 msgstr "Podle čísla stopy"
 
-#: src/skins/ui_manager.c:348 src/skins/ui_manager.c:378
+#: src/skins/ui_manager.c:342 src/skins/ui_manager.c:372
 msgid "Sorts the list by track number."
 msgstr "Skladby v seznamu seřadí podle čísla stopy."
 
-#: src/skins/ui_manager.c:351
+#: src/skins/ui_manager.c:345
 msgid "Sort Selected"
 msgstr "Seřadit vybrané"
 
-#: src/skins/ui_manager.c:387
+#: src/skins/ui_manager.c:381
 msgid "File"
 msgstr "Soubor"
 
-#: src/skins/ui_manager.c:388
-msgid "Help"
-msgstr "Nápověda"
-
-#: src/skins/ui_manager.c:390
+#: src/skins/ui_manager.c:384
 msgid "Plugin Services"
 msgstr "Služby modulů"
 
-#: src/skins/ui_manager.c:392 src/skins/ui_manager.c:395
+#: src/skins/ui_manager.c:386 src/skins/ui_manager.c:389
 msgid "View Track Details"
 msgstr "Zobrazit informace o skladbě"
 
-#: src/skins/ui_manager.c:393 src/skins/ui_manager.c:396
+#: src/skins/ui_manager.c:387 src/skins/ui_manager.c:390
 msgid "View track details"
 msgstr "Zobrazit informace o skladbě"
 
-#: src/skins/ui_manager.c:398 src/skins/ui_manager.c:399
+#: src/skins/ui_manager.c:392 src/skins/ui_manager.c:393
 msgid "About Audacious"
 msgstr "O Audacious"
 
-#: src/skins/ui_manager.c:401
+#: src/skins/ui_manager.c:395
 msgid "Play File"
 msgstr "Přehrát soubor"
 
-#: src/skins/ui_manager.c:402
+#: src/skins/ui_manager.c:396
 msgid "Load and play a file"
 msgstr "Načíst a přehrát soubor"
 
-#: src/skins/ui_manager.c:404
+#: src/skins/ui_manager.c:398
 msgid "Play Location"
 msgstr "Hrát z adresy"
 
-#: src/skins/ui_manager.c:405
+#: src/skins/ui_manager.c:399
 msgid "Play media from the selected location"
 msgstr "Hrát média z vybraného místa"
 
-#: src/skins/ui_manager.c:407
+#: src/skins/ui_manager.c:401
 msgid "Plugin services"
 msgstr "Služby modulů"
 
-#: src/skins/ui_manager.c:409
+#: src/skins/ui_manager.c:403
 msgid "Preferences"
 msgstr "Nastavení"
 
-#: src/skins/ui_manager.c:410
+#: src/skins/ui_manager.c:404
 msgid "Open preferences window"
 msgstr "Otevřít okno s nastavením"
 
-#: src/skins/ui_manager.c:413
+#: src/skins/ui_manager.c:407
 msgid "Quit Audacious"
 msgstr "O Audacious"
 
-#: src/skins/ui_manager.c:415 src/skins/ui_manager.c:416
+#: src/skins/ui_manager.c:409 src/skins/ui_manager.c:410
 msgid "Set A-B"
 msgstr "Nastavit A-B"
 
-#: src/skins/ui_manager.c:418 src/skins/ui_manager.c:419
+#: src/skins/ui_manager.c:412 src/skins/ui_manager.c:413
 msgid "Clear A-B"
 msgstr "Vyprázdnit A-B"
 
-#: src/skins/ui_manager.c:421 src/skins/ui_manager.c:422
+#: src/skins/ui_manager.c:415 src/skins/ui_manager.c:416
 msgid "Jump to Playlist Start"
 msgstr "Přejít na začátek seznamu skladeb"
 
-#: src/skins/ui_manager.c:427 src/skins/ui_manager.c:428
+#: src/skins/ui_manager.c:421 src/skins/ui_manager.c:422
 msgid "Jump to Time"
 msgstr "Přejít na čas"
 
-#: src/skins/ui_manager.c:430
+#: src/skins/ui_manager.c:424
 msgid "Queue Toggle"
 msgstr "Přepnout frontu"
 
-#: src/skins/ui_manager.c:431
+#: src/skins/ui_manager.c:425
 msgid "Enables/disables the entry in the playlist's queue."
 msgstr "Povolí/zakáže položku ve frontě seznamu skladeb."
 
-#: src/skins/ui_manager.c:434
+#: src/skins/ui_manager.c:428
 msgid "Copy"
 msgstr "Kopírovat"
 
-#: src/skins/ui_manager.c:436
+#: src/skins/ui_manager.c:430
 msgid "Cut"
 msgstr "Oříznout"
 
-#: src/skins/ui_manager.c:438
+#: src/skins/ui_manager.c:432
 msgid "Paste"
 msgstr "Vložit"
 
-#: src/skins/ui_manager.c:445
+#: src/skins/ui_manager.c:439
 msgid "Load"
 msgstr "Načíst"
 
-#: src/skins/ui_manager.c:450 src/skins/ui_manager.c:471
-#: src/skins/ui_manager.c:486
+#: src/skins/ui_manager.c:444 src/skins/ui_manager.c:465
+#: src/skins/ui_manager.c:480
 msgid "Preset"
 msgstr "Předvolby"
 
-#: src/skins/ui_manager.c:451
+#: src/skins/ui_manager.c:445
 msgid "Load preset"
 msgstr "Načíst předvolbu"
 
-#: src/skins/ui_manager.c:453 src/skins/ui_manager.c:474
-#: src/skins/ui_manager.c:489
+#: src/skins/ui_manager.c:447 src/skins/ui_manager.c:468
+#: src/skins/ui_manager.c:483
 msgid "Auto-load preset"
 msgstr "Souborová předvolba"
 
-#: src/skins/ui_manager.c:454
+#: src/skins/ui_manager.c:448
 msgid "Load auto-load preset"
 msgstr "Načíst souborovou předvolbu"
 
-#: src/skins/ui_manager.c:457
+#: src/skins/ui_manager.c:451
 msgid "Load default preset into equalizer"
 msgstr "Načíst standardní předvolbu do ekvalizéru"
 
-#: src/skins/ui_manager.c:459
+#: src/skins/ui_manager.c:453
 msgid "Zero"
 msgstr "Vynulovat"
 
-#: src/skins/ui_manager.c:460
+#: src/skins/ui_manager.c:454
 msgid "Set equalizer preset levels to zero"
 msgstr "Vynulovat předvolby ekvalizéru"
 
-#: src/skins/ui_manager.c:462
+#: src/skins/ui_manager.c:456
 msgid "From file"
 msgstr "Ze souboru"
 
-#: src/skins/ui_manager.c:463
+#: src/skins/ui_manager.c:457
 msgid "Load preset from file"
 msgstr "Načíst předvolbu ze souboru"
 
-#: src/skins/ui_manager.c:465
+#: src/skins/ui_manager.c:459
 msgid "From WinAMP EQF file"
 msgstr "Ze souboru WinAMP EQF"
 
-#: src/skins/ui_manager.c:466
+#: src/skins/ui_manager.c:460
 msgid "Load preset from WinAMP EQF file"
 msgstr "Načíst předvolbu ze souboru WinAMP EQF"
 
-#: src/skins/ui_manager.c:468
+#: src/skins/ui_manager.c:462
 msgid "WinAMP Presets"
 msgstr "Předvolby WinAMPu"
 
-#: src/skins/ui_manager.c:469
+#: src/skins/ui_manager.c:463
 msgid "Import WinAMP presets"
 msgstr "Importovat předvolby WinAMPu"
 
-#: src/skins/ui_manager.c:472
+#: src/skins/ui_manager.c:466
 msgid "Save preset"
 msgstr "Uložit předvolbu"
 
-#: src/skins/ui_manager.c:475
+#: src/skins/ui_manager.c:469
 msgid "Save auto-load preset"
 msgstr "Uložit souborovou předvolbu"
 
-#: src/skins/ui_manager.c:478
+#: src/skins/ui_manager.c:472
 msgid "Save default preset"
 msgstr "Uložit standardní předvolbu"
 
-#: src/skins/ui_manager.c:480
+#: src/skins/ui_manager.c:474
 msgid "To file"
 msgstr "Do souboru"
 
-#: src/skins/ui_manager.c:481
+#: src/skins/ui_manager.c:475
 msgid "Save preset to file"
 msgstr "Uložit předvolbu do souboru"
 
-#: src/skins/ui_manager.c:483
+#: src/skins/ui_manager.c:477
 msgid "To WinAMP EQF file"
 msgstr "Do souboru WinAMP EQF"
 
-#: src/skins/ui_manager.c:484
+#: src/skins/ui_manager.c:478
 msgid "Save preset to WinAMP EQF file"
 msgstr "Uložit předvolbu do souboru WinAMP EQF"
 
-#: src/skins/ui_manager.c:487
+#: src/skins/ui_manager.c:481
 msgid "Delete preset"
 msgstr "Smazat předvolbu"
 
-#: src/skins/ui_manager.c:490
+#: src/skins/ui_manager.c:484
 msgid "Delete auto-load preset"
 msgstr "Smazat souborovou předvolbu"
 
-#: src/skins/ui_playlist.c:245
+#: src/skins/ui_playlist.c:244
 msgid "Search entries in active playlist"
 msgstr "Vyhledat skladby v současném seznamu skladeb"
 
-#: src/skins/ui_playlist.c:253
+#: src/skins/ui_playlist.c:252
 msgid ""
 "Select entries in playlist by filling one or more fields. Fields use regular "
 "expressions syntax, case-insensitive. If you don't know how regular "
@@ -3735,40 +4046,40 @@
 "regulárním výrazům nerozumíte, jednoduše vložte části textu, které chcete "
 "vyhledat."
 
-#: src/skins/ui_playlist.c:261
+#: src/skins/ui_playlist.c:260
 msgid "Title: "
 msgstr "Název: "
 
-#: src/skins/ui_playlist.c:268
+#: src/skins/ui_playlist.c:267
 msgid "Album: "
 msgstr "Album: "
 
-#: src/skins/ui_playlist.c:275
+#: src/skins/ui_playlist.c:274
 msgid "Artist: "
 msgstr "Umělec: "
 
-#: src/skins/ui_playlist.c:282
+#: src/skins/ui_playlist.c:281
 msgid "Filename: "
 msgstr "Jméno souboru: "
 
-#: src/skins/ui_playlist.c:290
+#: src/skins/ui_playlist.c:289
 msgid "Clear previous selection before searching"
 msgstr "Před hledáním vymazat předchozí výběr"
 
-#: src/skins/ui_playlist.c:293
+#: src/skins/ui_playlist.c:292
 msgid "Automatically toggle queue for matching entries"
 msgstr "Shodující se položky automaticky zařadit/vyřadit z fronty"
 
-#: src/skins/ui_playlist.c:296
+#: src/skins/ui_playlist.c:295
 msgid "Create a new playlist with matching entries"
 msgstr "Ze shodujících se položek vytvořit nový seznam skladeb"
 
-#: src/skins/ui_playlist.c:763
+#: src/skins/ui_playlist.c:762
 msgid "Audacious Playlist Editor"
 msgstr "Zobrazit editor seznamu skladeb"
 
 # FIXME: plural
-#: src/skins/ui_playlist.c:810
+#: src/skins/ui_playlist.c:809
 #, c-format
 msgid "%s (%d of %d)"
 msgstr "%s (%d z %d)"
@@ -3835,60 +4146,56 @@
 msgid "About SndStretch"
 msgstr "O modulu SndStrech"
 
-#: src/sndstretch/sndstretch_xmms.c:313
+#: src/sndstretch/sndstretch_xmms.c:308
 msgid "Volume corr."
 msgstr "Oprava hlasitosti"
 
-#: src/sndstretch/sndstretch_xmms.c:314
+#: src/sndstretch/sndstretch_xmms.c:309
 msgid "Short Overlap"
 msgstr "Krátké přesahy"
 
-#: src/sndstretch/sndstretch_xmms.c:360
+#: src/sndstretch/sndstretch_xmms.c:355
 msgid "Speed"
 msgstr "Rychlost"
 
-#: src/sndstretch/sndstretch_xmms.c:361
+#: src/sndstretch/sndstretch_xmms.c:356
 msgid "Pitch"
 msgstr "Výška"
 
-#: src/sndstretch/sndstretch_xmms.c:362
+#: src/sndstretch/sndstretch_xmms.c:357
 msgid "Scale"
 msgstr "Natažení"
 
-#: src/sndstretch/sndstretch_xmms.c:363
-msgid "Options"
-msgstr "Nastavení"
-
-#: src/sndstretch/sndstretch_xmms.c:382
+#: src/sndstretch/sndstretch_xmms.c:377
 msgid "SndStretch - Configuration"
 msgstr "SndStrech – Nastavení"
 
-#: src/song_change/song_change.c:464
+#: src/song_change/song_change.c:447
 msgid "Command to run when Audacious starts a new song."
 msgstr "Příkaz, který se provede, když Audacious začne novou skladbu."
 
-#: src/song_change/song_change.c:465 src/song_change/song_change.c:469
-#: src/song_change/song_change.c:473 src/song_change/song_change.c:477
+#: src/song_change/song_change.c:449 src/song_change/song_change.c:455
+#: src/song_change/song_change.c:461 src/song_change/song_change.c:467
 msgid "Command:"
 msgstr "Příkaz:"
 
-#: src/song_change/song_change.c:468
+#: src/song_change/song_change.c:453
 msgid "Command to run toward the end of a song."
 msgstr "Příkaz, který se provede na konci skladby."
 
-#: src/song_change/song_change.c:472
+#: src/song_change/song_change.c:459
 msgid "Command to run when Audacious reaches the end of the playlist."
 msgstr ""
 "Příkaz, který se provede, když Audacious dosáhne konce seznamu skladeb."
 
-#: src/song_change/song_change.c:476
+#: src/song_change/song_change.c:465
 msgid ""
 "Command to run when title changes for a song (i.e. network streams titles)."
 msgstr ""
 "Příkaz, který se provede při změně názvu skladbu (tj. názvy v síťových "
 "proudech)."
 
-#: src/song_change/song_change.c:480
+#: src/song_change/song_change.c:471
 msgid ""
 "You can use the following format strings which\n"
 "will be substituted before calling the command\n"
@@ -3922,7 +4229,7 @@
 "%b: Album\n"
 "%T: Název stopy"
 
-#: src/song_change/song_change.c:507
+#: src/song_change/song_change.c:498
 msgid ""
 "Parameters passed to the shell should be encapsulated in "
 "quotes. Doing otherwise is a security risk."
@@ -3930,11 +4237,11 @@
 "Parametry předávané shellu by měly být uzavřeny do "
 "uvozovek. Nerespektování této rady představuje bezpečnostní riziko."
 
-#: src/song_change/song_change.c:518
+#: src/song_change/song_change.c:509
 msgid "Commands"
 msgstr "Příkazy"
 
-#: src/song_change/song_change.c:555
+#: src/song_change/song_change.c:539
 msgid "Song Change"
 msgstr "Změna skladby"
 
@@ -4001,7 +4308,7 @@
 msgid "Close to the notification area (system tray)"
 msgstr "Zavřít do oznamovací oblasti (systémové oblasti)"
 
-#: src/stereo_plugin/stereo.c:41
+#: src/stereo_plugin/stereo.c:45
 msgid ""
 "Extra Stereo Plugin\n"
 "\n"
@@ -4011,14 +4318,66 @@
 "\n"
 "Napsal Johan Levin, 1999."
 
-#: src/stereo_plugin/stereo.c:65
+#: src/stereo_plugin/stereo.c:64
 msgid "About Extra Stereo Plugin"
 msgstr "O modulu Extra sterou"
 
-#: src/stereo_plugin/stereo.c:102
+#: src/stereo_plugin/stereo.c:95
 msgid "Configure Extra Stereo"
 msgstr "Nastavit Extra sterou"
 
+#: src/streambrowser/gui/streambrowser_win.c:78
+msgid "Search:"
+msgstr "Hledat:"
+
+#: src/streambrowser/gui/streambrowser_win.c:97
+#: src/streambrowser/gui/streambrowser_win.c:372
+msgid "Add Bookmark"
+msgstr "Přidat záložku"
+
+#: src/streambrowser/gui/streambrowser_win.c:324
+msgid "Stream name"
+msgstr "Název proudu"
+
+#: src/streambrowser/gui/streambrowser_win.c:331
+msgid "Now playing"
+msgstr "Právě hraje"
+
+#: src/streambrowser/gui/streambrowser_win.c:369
+msgid "Remove Bookmark"
+msgstr "Odstranit záložku"
+
+#: src/streambrowser/streambrowser.c:330
+msgid "About Stream Browser"
+msgstr "O prohlížeči proudů"
+
+#: src/streambrowser/streambrowser.c:331
+msgid ""
+"Copyright (c) 2008, by Calin Crisan <ccrisan@gmail.com> and The Audacious "
+"Team.\n"
+"\n"
+"This is a simple stream browser that includes the most popular streaming "
+"directories.\n"
+"Many thanks to the Streamtuner developers <http://www.nongnu.org/"
+"streamtuner>,\n"
+"\tand of course to the whole Audacious community.\n"
+"\n"
+"Also thank you Tony Vroon for mentoring & guiding me, again.\n"
+"\n"
+"This was a Google Summer of Code 2008 project."
+msgstr ""
+"Copyright © 2008 Calin Crisan <ccrisan@gmail.com> a tým Audacious.\n"
+"\n"
+"Toto je jednoduchý prohlížeč proudů, který obsahuje nejpopulárnější adresáře "
+"proudů.\n"
+"Mnoho díků patří vývojářům Streamtuneru <http://www.nongnu.org/"
+"streamtuner>,\n"
+"\ta samozřejmě celé komunitě kolem Audacious.\n"
+"\n"
+"Také děkuji tobě, Tony Vroone, za rady a vedení, opět.\n"
+"\n"
+"Toto byl projekt z Google Summer of Code 2008."
+
 #: src/tonegen/tonegen.c:48
 msgid "About Tone Generator"
 msgstr "O generátoru tónů"
@@ -4050,27 +4409,11 @@
 msgid "About File I/O Plugin"
 msgstr "O modulu vstupu/výstupu ze/do souboru"
 
-#: src/vorbis/configure.c:31
-msgid "Override generic titles"
-msgstr "Přepsat původní názvy"
-
-#: src/vorbis/configure.c:32
-msgid "Title format:"
-msgstr "Formát názvu:"
-
-#: src/vorbis/configure.c:36
-msgid "Ogg Vorbis Tags"
-msgstr "Popisky Ogg Vorbis"
-
-#: src/vorbis/configure.c:69
-msgid "Ogg Vorbis Audio Plugin Configuration"
-msgstr "Nastavení modulu Ogg Vorbis Audio"
-
-#: src/vorbis/vorbis.c:581
+#: src/vorbis/vorbis.c:572
 msgid "About Ogg Vorbis Audio Plugin"
 msgstr "O modulu Ogg Vorbis Audio"
 
-#: src/vorbis/vorbis.c:586
+#: src/vorbis/vorbis.c:577
 msgid ""
 "Ogg Vorbis Plugin by the Xiph.org Foundation\n"
 "\n"
@@ -4146,6 +4489,69 @@
 "Části kódu modulu napsal Miles Egan\n"
 "Navštivte stránku Wavpacku na http://www.wavpack.com/\n"
 
+#~ msgid ""
+#~ "OSS4 Output Plugin for Audacious\n"
+#~ "Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+#~ "\n"
+#~ "I would like to thank people on #audacious, especially Tony Vroon and "
+#~ "John Lindgren and of course the authors of the previous OSS plugin.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "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.\n"
+#~ "\n"
+#~ "You should have received a copy of the GNU General Public License along "
+#~ "with this program. If not, see <http://www.gnu.org/licenses/>.\n"
+#~ msgstr ""
+#~ "Výstupní modul OSS4 pro Audacious\n"
+#~ "Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+#~ "\n"
+#~ "Rád bych poděkoval lidem na #audacious, zvláště Tony Vroonovi a Johnu "
+#~ "Lindgrenovi a samozřejmě autorům předchozího modulu OSS.\n"
+#~ "\n"
+#~ "Tento program je svobodný software; můžete jej šířit a/nebo měnit\n"
+#~ "v souladu s podmínkami GNU General Public License (GPL) vydané\n"
+#~ "Free Software Foundation a to buď ve verzi 3 nebo (dle vaší volby)\n"
+#~ "libovolné novější.\n"
+#~ "\n"
+#~ "Program je šířen v naději, že bude užitečný, ale BEZ JAKÉKOLIV\n"
+#~ "ZÁRUKY, a to ani odvozené záruky OBCHODOVATELNOSTI nebo VHODNOSTI PRO\n"
+#~ "URČITÝ ÚČEL. Více informací najdete v GNU GPL.\n"
+#~ "\n"
+#~ "S tímto programem byste měli obdržet kopii GNU GPL. Pokud se\n"
+#~ "tak nestalo, vizte <http://www.gnu.org/licenses/>.\n"
+
+#~ msgid "Save All Playlists"
+#~ msgstr "Uložit všechny seznamy skladeb"
+
+#~ msgid ""
+#~ "Saves all the playlists that are open. Note that this is done "
+#~ "automatically when Audacious quits."
+#~ msgstr ""
+#~ "Uloží všechny seznamy skladeb, které jsou otevřeny. Vezměte na vědomí, že "
+#~ "toto bude rovněž provedeno při ukončení Audacious."
+
+#~ msgid "Opens the playlist manager."
+#~ msgstr "Otevře správce seznamu skladeb."
+
+#~ msgid "Override generic titles"
+#~ msgstr "Přepsat původní názvy"
+
+#~ msgid "Title format:"
+#~ msgstr "Formát názvu:"
+
+#~ msgid "Ogg Vorbis Tags"
+#~ msgstr "Popisky Ogg Vorbis"
+
+#~ msgid "Ogg Vorbis Audio Plugin Configuration"
+#~ msgstr "Nastavení modulu Ogg Vorbis Audio"
+
 #~ msgid "About "
 #~ msgstr "O "
 
@@ -4279,272 +4685,12 @@
 #~ msgid "Timer: "
 #~ msgstr "Časovač: "
 
-#~ msgid "About XMMS Alarm"
-#~ msgstr "O XMMS budíku"
-
-#~ msgid "XMMS Alarm"
-#~ msgstr "XMMS budík"
-
-#~ msgid ""
-#~ "An XMMS plugin which can be used\n"
-#~ "to start playing at a certain time.\n"
-#~ "\n"
-#~ "Send all complaints to:\n"
-#~ "Adam Feakin <adamf@snika.uklinux.net>\n"
-#~ "Daniel Stodden <stodden@in.tum.de>\n"
-#~ "\n"
-#~ "http://www.snika.uklinux.net/xmms-alarm/"
-#~ msgstr ""
-#~ "XMMS modul, který může být použit\n"
-#~ "k načasovanému zahájení přehrávání.\n"
-#~ "\n"
-#~ "Všechny stížnosti zasílejte na:\n"
-#~ "Adam Feakin <adamf@snika.uklinux.net>\n"
-#~ "Daniel Stodden <stodden@in.tum.de>\n"
-#~ "\n"
-#~ "http://www.snika.uklinux.net/xmms-alarm/"
-
-#~ msgid "Alarm"
-#~ msgstr "Budík"
-
-#~ msgid "This is your wakeup call."
-#~ msgstr "Toto je váš budící signál."
-
 #~ msgid "Select Playlist"
 #~ msgstr "Vybrat seznam skladeb"
 
-#~ msgid "Sorry"
-#~ msgstr "Je mi líto"
-
-#~ msgid "Warning"
-#~ msgstr "Varování"
-
-#~ msgid ""
-#~ "For safety reasons the \"quiet\" time must be at least 65 seconds longer "
-#~ "than the fading time, it must also be more than 10 seconds. This "
-#~ "basically means that there is a bug in the code and until I find a way of "
-#~ "really fixing it this message will appear :)\n"
-#~ "\n"
-#~ "Your fading settings have NOT been saved\n"
-#~ "\n"
-#~ "--\n"
-#~ "Adam"
-#~ msgstr ""
-#~ "Z bezpečnostních důvodů musí být doba „ticha“ alespoň o 65 sekund delší "
-#~ "než doba zesilování, také musí být delší než 10 sekund. Toto v zásadě "
-#~ "znamená, že v kódu je chyba a dokud nezjistím, jak ji opravdu opravit, "
-#~ "tato zpráva se bude zobrazovat :)\n"
-#~ "\n"
-#~ "Vaše nastavení zesilování NEBYLO uloženo.\n"
-#~ "\n"
-#~ "–\n"
-#~ "Adam"
-
-#~ msgid "Oh Well"
-#~ msgstr "Dobrá"
-
-#~ msgid "Alarm Settings"
-#~ msgstr "Nastavení budíku"
-
-#~ msgid "Time"
-#~ msgstr "Čas"
-
-#~ msgid "hours"
-#~ msgstr "hodin"
-
-#~ msgid "h"
-#~ msgstr "h"
-
-#~ msgid "minutes"
-#~ msgstr "minut"
-
-#~ msgid "Quiet after:"
-#~ msgstr "Ticho po:"
-
-#~ msgid "Alarm at (default):"
-#~ msgstr "Budit v (standardní):"
-
-#~ msgid "Choose the days for the alarm to come on"
-#~ msgstr "Vyberte dny, kdy má budík budit"
-
-#~ msgid "Day"
-#~ msgstr "Den"
-
-#~ msgid "Tuesday"
-#~ msgstr "Úterý"
-
-#~ msgid "Wednesday"
-#~ msgstr "Středa"
-
-#~ msgid "Thursday"
-#~ msgstr "Čtvrtek"
-
-#~ msgid "Friday"
-#~ msgstr "Pátek"
-
-#~ msgid "Saturday"
-#~ msgstr "Sobota"
-
-#~ msgid "Sunday"
-#~ msgstr "Neděle"
-
-#~ msgid "Monday"
-#~ msgstr "Pondělí"
-
-#~ msgid "Days"
-#~ msgstr "Dny"
-
-#~ msgid "Fading"
-#~ msgstr "Zesilování"
-
-#~ msgid "Volume"
-#~ msgstr "Hlasitost"
-
-#~ msgid "Current"
-#~ msgstr "Současná"
-
 #~ msgid "reset to current output volume"
 #~ msgstr "navrátit na současnou hlasitost výstupu"
 
-#~ msgid "Start at"
-#~ msgstr "Začít na"
-
-#~ msgid "%"
-#~ msgstr "%"
-
-#~ msgid "Final"
-#~ msgstr "Skončit na"
-
-#~ msgid "Additional Command"
-#~ msgstr "Dodatečný příkaz"
-
-#~ msgid "enable"
-#~ msgstr "zapnout"
-
-#~ msgid "Playlist (optional)"
-#~ msgstr "Seznam skladeb (volitelné)"
-
-#~ msgid "Browse..."
-#~ msgstr "Procházet…"
-
-#~ msgid "Reminder"
-#~ msgstr "Upomínání"
-
-#~ msgid "Use reminder"
-#~ msgstr "Upomínat"
-
-#~ msgid "What do these options mean?"
-#~ msgstr "Co tyto volby znamenají?"
-
-#~ msgid ""
-#~ "\n"
-#~ "Time\n"
-#~ " Alarm at: \n"
-#~ " The time for the alarm to come on.\n"
-#~ "\n"
-#~ " Quiet After: \n"
-#~ " Stop alarm after this amount of time.\n"
-#~ " (if the wakeup dialog is not closed)\n"
-#~ "\n"
-#~ "\n"
-#~ "Days\n"
-#~ " Day:\n"
-#~ " Select the days for the alarm to activate.\n"
-#~ "\n"
-#~ " Time:\n"
-#~ " Choose the time for the alarm on each day,\n"
-#~ " or select the toggle button to use the default\n"
-#~ " time.\n"
-#~ "\n"
-#~ "\n"
-#~ "Volume\n"
-#~ " Fading: \n"
-#~ " Fade the volume up to the chosen volume \n"
-#~ " for this amount of time.\n"
-#~ "\n"
-#~ " Start at: \n"
-#~ " Start fading from this volume.\n"
-#~ "\n"
-#~ " Final: \n"
-#~ " The volume to stop fading at. If the fading\n"
-#~ " time is 0 then set volume to this and start\n"
-#~ " playing.\n"
-#~ "\n"
-#~ "\n"
-#~ "Options:\n"
-#~ " Additional Command:\n"
-#~ " Run this command at the alarm time.\n"
-#~ "\n"
-#~ " Playlist: \n"
-#~ " Load this playlist for playing songs from \n"
-#~ " (must have .m3u extension). If no playlist\n"
-#~ " is given then the songs which are currently\n"
-#~ " in the list will be used.\n"
-#~ " The URL of an mp3/ogg stream can also be\n"
-#~ " entered here, but loading of playlists from\n"
-#~ " URLs is not currently supported by xmms.\n"
-#~ "\n"
-#~ " Reminder:\n"
-#~ " Display a reminder when the alarm goes off,\n"
-#~ " type the reminder in the box and turn on the\n"
-#~ " toggle button if you want it to be shown.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Čas\n"
-#~ " Budit v: \n"
-#~ " Čas budíčku.\n"
-#~ "\n"
-#~ " Ticho po: \n"
-#~ " Zastavit budík po uplynutí této doby.\n"
-#~ " (pokud nebude budící dialog uzavřen)\n"
-#~ "\n"
-#~ "\n"
-#~ "Dny\n"
-#~ " Den:\n"
-#~ " Vyberte dny, kdy má budík fungovat.\n"
-#~ "\n"
-#~ " Čas:\n"
-#~ " Vyberte čas budíčku pro každý den,\n"
-#~ " nebo použijte standardní čas.\n"
-#~ "\n"
-#~ "\n"
-#~ "Hlasitost\n"
-#~ " Zesilování: \n"
-#~ " Zesiluje až na vybranou hodnotu\n"
-#~ " po vybranou dobu.\n"
-#~ "\n"
-#~ " Začít na: \n"
-#~ " Zesilovat začne z této hlasitosti.\n"
-#~ "\n"
-#~ " Skončit na: \n"
-#~ " Hlasitost na konci zesílení. Je-li doba zesilování 0,\n"
-#~ " pak hlasitost bude tato.\n"
-#~ "\n"
-#~ "\n"
-#~ "Volby:\n"
-#~ " Dodatečný příkaz:\n"
-#~ " Tento příkaz bude vykonán v době budíčku.\n"
-#~ "\n"
-#~ " Seznam skladeb: \n"
-#~ " Načte tento seznam skladeb, z kterého bude hrát\n"
-#~ " (musí mít příponu .m3u). Není-li seznam zadán\n"
-#~ " bude použity skladby, které budou v aktuálním\n"
-#~ " seznamu skladeb.\n"
-#~ " URL MP3/OGG proudu zde také může být zadáno,\n"
-#~ " ale načítání seznamu skladeb z URL není\n"
-#~ " v současnosti podporováno.\n"
-#~ "\n"
-#~ " Upomínání:\n"
-#~ " Při vypnutí budíku zobrazí vzkaz.\n"
-#~ " Text vzkazu vepište do vstupního pole a zapněte tlačítko,\n"
-#~ " přejete-li si zobrazovat vzkaz.\n"
-
-#~ msgid "Your reminder for today is.."
-#~ msgstr "Váš vzkaz pro dnešek je…"
-
-#~ msgid "Thankyou"
-#~ msgstr "Děkuji"
-
 #~ msgid "Pairing request for '%s'"
 #~ msgstr "Požadavek na spárování „%s“"
 
@@ -4929,9 +5075,6 @@
 #~ msgid "UID"
 #~ msgstr "UID"
 
-#~ msgid "Installed plugins"
-#~ msgstr "Nainstalované moduly"
-
 #~ msgid "Running plugins"
 #~ msgstr "Bežící moduly"
 
@@ -5054,9 +5197,6 @@
 #~ msgid "Sampling Rate"
 #~ msgstr "Vzorkovací kmitočet"
 
-#~ msgid "Enable"
-#~ msgstr "Povolit"
-
 #~ msgid "Depth"
 #~ msgstr "Hloubka"
 
@@ -5280,50 +5420,6 @@
 #~ msgid "Spectrum Analyzer"
 #~ msgstr "Analyzátor spektra"
 
-#~ msgid "Search:"
-#~ msgstr "Hledat:"
-
-#~ msgid "Add Bookmark"
-#~ msgstr "Přidat záložku"
-
-#~ msgid "Stream name"
-#~ msgstr "Název proudu"
-
-#~ msgid "Now playing"
-#~ msgstr "Právě hraje"
-
-#~ msgid "Remove Bookmark"
-#~ msgstr "Odstranit záložku"
-
-#~ msgid "About Stream Browser"
-#~ msgstr "O prohlížeči proudů"
-
-#~ msgid ""
-#~ "Copyright (c) 2008, by Calin Crisan <ccrisan@gmail.com> and The Audacious "
-#~ "Team.\n"
-#~ "\n"
-#~ "This is a simple stream browser that includes the most popular streaming "
-#~ "directories.\n"
-#~ "Many thanks to the Streamtuner developers <http://www.nongnu.org/"
-#~ "streamtuner>,\n"
-#~ "\tand of course to the whole Audacious community.\n"
-#~ "\n"
-#~ "Also thank you Tony Vroon for mentoring & guiding me, again.\n"
-#~ "\n"
-#~ "This was a Google Summer of Code 2008 project."
-#~ msgstr ""
-#~ "Copyright © 2008 Calin Crisan <ccrisan@gmail.com> a tým Audacious.\n"
-#~ "\n"
-#~ "Toto je jednoduchý prohlížeč proudů, který obsahuje nejpopulárnější "
-#~ "adresáře proudů.\n"
-#~ "Mnoho díků patří vývojářům Streamtuneru <http://www.nongnu.org/"
-#~ "streamtuner>,\n"
-#~ "\ta samozřejmě celé komunitě kolem Audacious.\n"
-#~ "\n"
-#~ "Také děkuji tobě, Tony Vroone, za rady a vedení, opět.\n"
-#~ "\n"
-#~ "Toto byl projekt z Google Summer of Code 2008."
-
 #~ msgid "Can't jump to time when no track is being played.\n"
 #~ msgstr "Když nehraje žádná skladba, nelze přejít na čas.\n"
 
@@ -5765,9 +5861,6 @@
 #~ msgid "Streambrowser"
 #~ msgstr "Prohlížeč proudů"
 
-#~ msgid "About the Sun Driver"
-#~ msgstr "O ovladači pro Sun"
-
 #~ msgid ""
 #~ "XMMS BSD Sun Driver\n"
 #~ "\n"
@@ -6908,9 +7001,6 @@
 #~ msgid "bits per sample: %d"
 #~ msgstr "bitů na vzorek: %d"
 
-#~ msgid "channels: %d"
-#~ msgstr "kanálů: %d"
-
 #~ msgid "length: %d:%.2d"
 #~ msgstr "délka: %d:%.2d"
 
@@ -7538,9 +7628,6 @@
 #~ msgid "Eighth (~6 fps)"
 #~ msgstr "Osminová (~6 Hz)"
 
-#~ msgid "Audio Settings"
-#~ msgstr "Nastavení zvuku"
-
 #~ msgid "Force reopen audio when audio type changed"
 #~ msgstr "Vynutit znovuotevření zvuku, když se typ zvuku změní"

audacious-plugins-3.0.3.tar.bz2/po/cy.po -> audacious-plugins-3.1.tar.bz2/po/cy.po Changed

@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: audacious-plugins 1.3\n"
 "Report-Msgid-Bugs-To: http://jira.atheme.org/\n"
-"POT-Creation-Date: 2011-09-18 14:13-0400\n"
+"POT-Creation-Date: 2011-07-17 18:49-0400\n"
 "PO-Revision-Date: 2007-02-12 03:37-0600\n"
 "Last-Translator: William Pitcock <nenolod@sacredspiral.co.uk>\n"
 "Language-Team: Welsh <i18n+cy@sacredspiral.co.uk>\n"
@@ -1002,7 +1002,7 @@
 msgid "Volume: (%)"
 msgstr "Sain:(%)"
 
-#: src/ffaudio/ffaudio-core.c:789
+#: src/ffaudio/ffaudio-core.c:763
 #, c-format
 msgid ""
 "Multi-format audio decoding plugin for Audacious based on\n"
@@ -1018,7 +1018,7 @@
 "libavutil %s (%s)\n"
 msgstr ""
 
-#: src/ffaudio/ffaudio-core.c:803
+#: src/ffaudio/ffaudio-core.c:777
 #, fuzzy
 msgid "About FFaudio Plugin"
 msgstr "Ategynnau Sain FLAC"
@@ -3753,11 +3753,11 @@
 msgid "Delete auto-load preset"
 msgstr ""
 
-#: src/skins/ui_playlist.c:245
+#: src/skins/ui_playlist.c:244
 msgid "Search entries in active playlist"
 msgstr ""
 
-#: src/skins/ui_playlist.c:253
+#: src/skins/ui_playlist.c:252
 msgid ""
 "Select entries in playlist by filling one or more fields. Fields use regular "
 "expressions syntax, case-insensitive. If you don't know how regular "
@@ -3765,43 +3765,43 @@
 "for."
 msgstr ""
 
-#: src/skins/ui_playlist.c:261
+#: src/skins/ui_playlist.c:260
 #, fuzzy
 msgid "Title: "
 msgstr "Teitl:"
 
-#: src/skins/ui_playlist.c:268
+#: src/skins/ui_playlist.c:267
 #, fuzzy
 msgid "Album: "
 msgstr "Albwm:"
 
-#: src/skins/ui_playlist.c:275
+#: src/skins/ui_playlist.c:274
 #, fuzzy
 msgid "Artist: "
 msgstr "Artist:"
 
-#: src/skins/ui_playlist.c:282
+#: src/skins/ui_playlist.c:281
 #, fuzzy
 msgid "Filename: "
 msgstr "Enw Defnyddiwr:"
 
-#: src/skins/ui_playlist.c:290
+#: src/skins/ui_playlist.c:289
 msgid "Clear previous selection before searching"
 msgstr ""
 
-#: src/skins/ui_playlist.c:293
+#: src/skins/ui_playlist.c:292
 msgid "Automatically toggle queue for matching entries"
 msgstr ""
 
-#: src/skins/ui_playlist.c:296
+#: src/skins/ui_playlist.c:295
 msgid "Create a new playlist with matching entries"
 msgstr ""
 
-#: src/skins/ui_playlist.c:763
+#: src/skins/ui_playlist.c:762
 msgid "Audacious Playlist Editor"
 msgstr ""
 
-#: src/skins/ui_playlist.c:810
+#: src/skins/ui_playlist.c:809
 #, c-format
 msgid "%s (%d of %d)"
 msgstr ""
@@ -3821,12 +3821,12 @@
 "Methu gwirio'r cyfeiradur %s\n"
 "Gwall: %s"
 
-#: src/sndfile/plugin.c:454
+#: src/sndfile/plugin.c:438
 #, fuzzy
 msgid "About sndfile plugin"
 msgstr "Ategyn Sain WAV (sndfile)"
 
-#: src/sndfile/plugin.c:455
+#: src/sndfile/plugin.c:439
 msgid ""
 "Adapted for Audacious usage by Tony Vroon <chainsaw@gentoo.org>\n"
 "from the xmms_sndfile plugin which is:\n"

audacious-plugins-3.0.3.tar.bz2/po/de.po -> audacious-plugins-3.1.tar.bz2/po/de.po Changed

@@ -2,11 +2,11 @@
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: http://jira.atheme.org/\n"
-"POT-Creation-Date: 2011-09-18 14:13-0400\n"
-"PO-Revision-Date: 2011-09-06 23:54+0100\n"
+"POT-Creation-Date: 2011-10-25 16:29+0200\n"
+"PO-Revision-Date: 2011-10-29 15:18+0100\n"
 "Last-Translator: Thomas Lange\n"
-"Language-Team: german\n"
-"Language: \n"
+"Language-Team: German\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -28,6 +28,344 @@
 msgid "About MP4 AAC decoder plugin"
 msgstr "Über MP4-AAC-Player-Plugin"
 
+#: src/alarm/interface.c:34
+msgid "About XMMS Alarm"
+msgstr "Über XMMS Alarm"
+
+#: src/alarm/interface.c:41
+msgid "XMMS Alarm"
+msgstr "XMMS-Alarm"
+
+#: src/alarm/interface.c:50
+msgid ""
+"An XMMS plugin which can be used\n"
+"to start playing at a certain time.\n"
+"\n"
+"Send all complaints to:\n"
+"Adam Feakin <adamf@snika.uklinux.net>\n"
+"Daniel Stodden <stodden@in.tum.de>\n"
+"\n"
+"http://www.snika.uklinux.net/xmms-alarm/"
+msgstr ""
+"Ein XMMS-Plugin, das verwendet werden kann,\n"
+"um zu einem bestimmten Zeitpunkt die\n"
+"Wiedergabe zu starten.\n"
+"\n"
+"Alle Beschwerden senden an:\n"
+"Adam Feakin <adamf@snika.uklinux.net>\n"
+"Daniel Stodden <stodden@in.tum.de>\n"
+"\n"
+"http://www.snika.uklinux.net/xmms-alarm/"
+
+#: src/alarm/interface.c:65
+msgid "Close"
+msgstr "Schließen"
+
+#: src/alarm/interface.c:95
+msgid "Alarm"
+msgstr "Alarm"
+
+#: src/alarm/interface.c:102
+msgid "This is your wakeup call."
+msgstr "Dies ist dein Aufwach-Signal."
+
+#: src/alarm/interface.c:117 src/alarm/interface.c:1338
+msgid "OK"
+msgstr "OK"
+
+#: src/alarm/interface.c:151
+msgid "Sorry"
+msgstr "Entschuldigung"
+
+#: src/alarm/interface.c:158
+msgid "Warning"
+msgstr "Warnung"
+
+#: src/alarm/interface.c:167
+msgid ""
+"For safety reasons the \"quiet\" time must be at least 65 seconds longer "
+"than the fading time, it must also be more than 10 seconds. This basically "
+"means that there is a bug in the code and until I find a way of really "
+"fixing it this message will appear :)\n"
+"\n"
+"Your fading settings have NOT been saved\n"
+"\n"
+"--\n"
+"Adam"
+msgstr ""
+"Aus Sicherheitsgründen muss die \"ruhig\"-Zeitangabe mindestens 65 Sekunden "
+"länger als die Übergangszeitangabe sein, außerdem muss sie länger als 10 "
+"Sekunden sein. Das bedeutet, dass ein Bug im Code vorhanden ist. Bis ich "
+"einen wirklich funktionierenden Fix gefunden habe, wird diese Meldung "
+"erscheinen. :)\n"
+"\n"
+"Deine Einstellungen wurden NICHT gespeichert.\n"
+"\n"
+"--\n"
+"Adam"
+
+#: src/alarm/interface.c:183
+msgid "Oh Well"
+msgstr "Jo mei"
+
+#: src/alarm/interface.c:339
+msgid "Alarm Settings"
+msgstr "Alarm-Einstellungen"
+
+#: src/alarm/interface.c:354 src/alarm/interface.c:526
+#: src/alarm/interface.c:898
+msgid "Time"
+msgstr "Zeit"
+
+#: src/alarm/interface.c:395
+msgid "hours"
+msgstr "Stunden"
+
+#: src/alarm/interface.c:456
+msgid "h"
+msgstr "Uhr"
+
+#: src/alarm/interface.c:486
+msgid "minutes"
+msgstr "Minuten"
+
+#: src/alarm/interface.c:504
+msgid "Quiet after:"
+msgstr "Still nach:"
+
+#: src/alarm/interface.c:514
+msgid "Alarm at (default):"
+msgstr "Alarm um (standardmäßig):"
+
+#: src/alarm/interface.c:534
+msgid "Choose the days for the alarm to come on"
+msgstr "Tage wählen, an denen der Alarm ausgelöst werden soll"
+
+#: src/alarm/interface.c:562 src/alarm/interface.c:610
+#: src/alarm/interface.c:658 src/alarm/interface.c:706
+#: src/alarm/interface.c:754 src/alarm/interface.c:802
+#: src/alarm/interface.c:850 src/bs2b/plugin.c:198 src/OSS/configure.c:153
+#: src/skins/ui_manager.c:450 src/skins/ui_manager.c:471
+msgid "Default"
+msgstr "Standard"
+
+#: src/alarm/interface.c:888
+msgid "Day"
+msgstr "Tag"
+
+#: src/alarm/interface.c:908
+msgid "Tuesday"
+msgstr "Dienstag"
+
+#: src/alarm/interface.c:919
+msgid "Wednesday"
+msgstr "Mittwoch"
+
+#: src/alarm/interface.c:930
+msgid "Thursday"
+msgstr "Donnerstag"
+
+#: src/alarm/interface.c:941
+msgid "Friday"
+msgstr "Freitag"
+
+#: src/alarm/interface.c:952
+msgid "Saturday"
+msgstr "Samstag"
+
+#: src/alarm/interface.c:963
+msgid "Sunday"
+msgstr "Sonntag"
+
+#: src/alarm/interface.c:973
+msgid "Monday"
+msgstr "Montag"
+
+#: src/alarm/interface.c:984
+msgid "Days"
+msgstr "Tage"
+
+#: src/alarm/interface.c:1000
+msgid "Fading"
+msgstr "Übergang"
+
+#: src/alarm/interface.c:1037
+msgid "seconds"
+msgstr "Sekunden"
+
+#: src/alarm/interface.c:1045 src/alarm/interface.c:1160
+msgid "Volume"
+msgstr "Lautstärke"
+
+#: src/alarm/interface.c:1071
+msgid "Current"
+msgstr "Momentan"
+
+#: src/alarm/interface.c:1079
+msgid "Start at"
+msgstr "Beginnen bei"
+
+#: src/alarm/interface.c:1107 src/alarm/interface.c:1151
+msgid "%"
+msgstr "%"
+
+#: src/alarm/interface.c:1123
+msgid "Final"
+msgstr "Schluss"
+
+#: src/alarm/interface.c:1176
+msgid "Additional Command"
+msgstr "Zusätzlicher Befehl"
+
+#: src/alarm/interface.c:1202
+msgid "enable"
+msgstr "aktivieren"
+
+#: src/alarm/interface.c:1210
+msgid "Playlist (optional)"
+msgstr "Wiedergabeliste (optional)"
+
+#: src/alarm/interface.c:1236
+msgid "Browse..."
+msgstr "Suchen..."
+
+#: src/alarm/interface.c:1244 src/alarm/interface.c:1408
+msgid "Reminder"
+msgstr "Erinnern"
+
+#: src/alarm/interface.c:1261
+msgid "Use reminder"
+msgstr "Erinnerung benutzen"
+
+#: src/alarm/interface.c:1277 src/sndstretch/sndstretch_xmms.c:358
+msgid "Options"
+msgstr "Optionen"
+
+#: src/alarm/interface.c:1285
+msgid "What do these options mean?"
+msgstr "Was bedeuten diese Einstellungen?"
+
+#: src/alarm/interface.c:1313
+msgid ""
+"\n"
+"Time\n"
+" Alarm at: \n"
+" The time for the alarm to come on.\n"
+"\n"
+" Quiet After: \n"
+" Stop alarm after this amount of time.\n"
+" (if the wakeup dialog is not closed)\n"
+"\n"
+"\n"
+"Days\n"
+" Day:\n"
+" Select the days for the alarm to activate.\n"
+"\n"
+" Time:\n"
+" Choose the time for the alarm on each day,\n"
+" or select the toggle button to use the default\n"
+" time.\n"
+"\n"
+"\n"
+"Volume\n"
+" Fading: \n"
+" Fade the volume up to the chosen volume \n"
+" for this amount of time.\n"
+"\n"
+" Start at: \n"
+" Start fading from this volume.\n"
+"\n"
+" Final: \n"
+" The volume to stop fading at. If the fading\n"
+" time is 0 then set volume to this and start\n"
+" playing.\n"
+"\n"
+"\n"
+"Options:\n"
+" Additional Command:\n"
+" Run this command at the alarm time.\n"
+"\n"
+" Playlist: \n"
+" Load this playlist for playing songs from \n"
+" (must have .m3u extension). If no playlist\n"
+" is given then the songs which are currently\n"
+" in the list will be used.\n"
+" The URL of an mp3/ogg stream can also be\n"
+" entered here, but loading of playlists from\n"
+" URLs is not currently supported by xmms.\n"
+"\n"
+" Reminder:\n"
+" Display a reminder when the alarm goes off,\n"
+" type the reminder in the box and turn on the\n"
+" toggle button if you want it to be shown.\n"
+msgstr ""
+"\n"
+"Zeit\n"
+" Alarm um: \n"
+" Die Zeit, um die der Alarm ausgelöst wird.\n"
+"\n"
+" Still nach: \n"
+" Der Alarm wird nach dieser Zeit gestoppt.\n"
+" (sofern der Aufweck-Dialog nicht geschlossen wird)\n"
+"\n"
+"\n"
+"Tage\n"
+" Tag:\n"
+" Die Tage wählen, an denen der Alarm aktiviert wird.\n"
+"\n"
+" Zeit:\n"
+" Für jeden Tag einzeln die Zeit für den Alarm wählen,\n"
+" oder den Alarm zur Standard-Zeit aktivieren.\n"
+"\n"
+"\n"
+"Lautstärke\n"
+" Übergang: \n"
+" Passt die Lautstärke an die gewählte Lautstärke\n"
+" in diesem Zeitraum an.\n"
+"\n"
+" Beginnen bei: \n"
+" Starte den Übergang bei dieser Lautstärke.\n"
+"\n"
+" Schluss: \n"
+" Die Lautstärke, bei der der Übergang stoppt.\n"
+" Falls die Übergangszeit 0 beträgt, wird die\n"
+" Wiedergabe schon mit dieser Lautstärke gestartet.\n"
+"\n"
+"\n"
+"Optionen:\n"
+" Zusätzlicher Befehl:\n"
+" Führe diesen Befehl bei Auslösung des Alarms aus.\n"
+"\n"
+" Wiedergabeliste: \n"
+" Lade diese Wiedergabeliste zu Wiedergabe\n"
+" (muss die Erweiterung .m3u haben). Wenn keine Wiedergabeliste\n"
+" gegeben ist, werden die momentan in der\n"
+" Wiedergabeliste befindlichen Stücke verwendet.\n"
+" Die URL eines MP3/OGG-Streams kann auch hier\n"
+" angegeben werden, aber das Laden von Wiedergabelisten\n"
+" von URLs wird momentan noch nicht unterstützt.\n"
+"\n"
+" Erinnerung:\n"
+" Zeige eine Erinnerung an, wenn der Alarm ausgelöst wird.\n"
+
+#: src/alarm/interface.c:1315 src/skins/ui_manager.c:382
+msgid "Help"
+msgstr "Hilfe"
+
+#: src/alarm/interface.c:1347 src/cdaudio-ng/configure.c:249
+#: src/crystalizer/crystalizer.c:130 src/echo_plugin/gui.c:125
+#: src/jack/configure.c:148 src/null/null.c:108 src/stereo_plugin/stereo.c:125
+msgid "Cancel"
+msgstr "Abbrechen"
+
+#: src/alarm/interface.c:1415
+msgid "Your reminder for today is.."
+msgstr "Die Erinnerung für heute lautet.."
+
+#: src/alarm/interface.c:1440
+msgid "Thankyou"
+msgstr "Danke"
+
 #: src/alsa/config.c:210
 msgid "Default PCM device"
 msgstr "Standard-PCM-Device (%s)"
@@ -36,23 +374,23 @@
 msgid "Default mixer device"
 msgstr "Standard-Mixer-Device (%s)"
 
-#: src/alsa/config.c:447
+#: src/alsa/config.c:438
 msgid "ALSA Output Plugin Preferences"
 msgstr "ALSA-Ausgabeplugin-Einstellungen"
 
-#: src/alsa/config.c:454
+#: src/alsa/config.c:445
 msgid "PCM device:"
 msgstr "PCM-Gerät:"
 
-#: src/alsa/config.c:456 src/OSS/configure.c:246
+#: src/alsa/config.c:447 src/OSS/configure.c:237
 msgid "Mixer device:"
 msgstr "Mixer-Gerät:"
 
-#: src/alsa/config.c:458
+#: src/alsa/config.c:449
 msgid "Mixer element:"
 msgstr "Mixer-Element:"
 
-#: src/alsa/config.c:461
+#: src/alsa/config.c:452
 msgid "Work around drain hangup"
 msgstr "Workaround Drain-Hangup"
 
@@ -87,6 +425,14 @@
 "hardware synth will be directly played.\n"
 "Backend written by Giacomo Lozito."
 msgstr ""
+"Dieses Backend sendet MIDI Events an eine Gruppe von benutzerdefinierten "
+"ALSA Sequenzer-Ports. Das ALSA Sequenzer-Interface ist sehr vielseitig, es "
+"kann Ports sowohl für Hardware-Sequenzer (wie z.B. emu10k1) als auch für "
+"Software-Sequenzer und externe Geräte bereitstellen.\n"
+"Dieses Backend erzeugt kein Audiomaterial, MIDI Events werden direkt von "
+"Geräten/Programmen verarbeitet. Zur Hardware gesendete MIDI Events werden "
+"also z.B. direkt abgespielt.\n"
+"Backend geschrieben von Giacomo Lozito."
 
 #: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:38
 msgid "FluidSynth Backend "
@@ -101,6 +447,12 @@
 "by chosen ouput plugin.\n"
 "Backend written by Giacomo Lozito."
 msgstr ""
+"Diesed Backend erzeugt Audiomaterial durch Senden von MIDI Events an "
+"FluidSynth, ein Echtzeit-Software-Synthesizer basierend auf der SoundFont2 "
+"Spezifikation (www.fluidsynth.org).\n"
+"Erzeugtes Audiomaterial kann via Effektplugins beeinflusst werden und wird "
+"vom ausgewähltem Ausgabeplugin weiterverarbeitet.\n"
+"Backend geschrieben von Giacomo Lozito."
 
 #: src/amidi-plug/i_configure-alsa.c:228
 msgid "ALSA BACKEND CONFIGURATION"
@@ -172,7 +524,7 @@
 
 #: src/amidi-plug/i_configure-ap.c:271
 msgid "Drum shift: "
-msgstr ""
+msgstr "Drum-Shift: "
 
 #: src/amidi-plug/i_configure-ap.c:289
 msgid "Advanced settings"
@@ -328,7 +680,7 @@
 "TiMidity-\n"
 "Backend"
 
-#: src/amidi-plug/i_fileinfo.c:169 src/sid/xs_interface.c:1769
+#: src/amidi-plug/i_fileinfo.c:169
 msgid "Name:"
 msgstr "Name:"
 
@@ -416,6 +768,27 @@
 "for the good help with alpha testing\n"
 "\n"
 msgstr ""
+"\n"
+"Modularer MIDI Musikspieler\n"
+"http://www.develia.org/projects.php?p=amidiplug\n"
+"\n"
+"geschrieben von Giacomo Lozito\n"
+"< james@develia.org >\n"
+"\n"
+"\n"
+"Besonderen Dank an ...\n"
+"\n"
+"Clemens Ladisch und Jaroslav Kysela\n"
+"für ihre coolen Programme aplaymidi und amixer; Diese\n"
+"waren neben den alsa-lib Dokus sehr hilfreich, um mehr\n"
+"über die ALSA API zu lernen\n"
+"\n"
+"Alfredo Spadafina\n"
+"für das schöne Midi-Keyboard-Logo\n"
+"\n"
+"Tony Vroon\n"
+"für die gute Hilfe bei Alphatests\n"
+"\n"
 
 #: src/aosd/aosd_style.c:75
 msgid "Rectangle"
@@ -574,8 +947,7 @@
 msgid "Skin file:"
 msgstr "Skin-Datei:"
 
-#: src/aosd/aosd_ui.c:672 src/sid/xs_interface.c:1044
-#: src/sid/xs_interface.c:1236 src/sid/xs_interface.c:1292
+#: src/aosd/aosd_ui.c:672
 msgid "Browse"
 msgstr "Suchen"
 
@@ -659,7 +1031,6 @@
 msgstr "Auslöser"
 
 #: src/aosd/aosd_ui.c:1101 src/cdaudio-ng/configure.c:171
-#: src/sid/xs_interface.c:1302
 msgid "Misc"
 msgstr "Verschiedenes"
 
@@ -701,15 +1072,31 @@
 msgid "Blur Scope: Color selection"
 msgstr "Blur Scope: Farbauswahl"
 
-#: src/blur_scope/config.c:83 src/jack/configure.c:111
+#: src/blur_scope/config.c:83 src/jack/configure.c:106
 msgid "Options:"
 msgstr "Optionen:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:264
+#: src/bs2b/plugin.c:157
+msgid "Bauer stereophonic-to-binaural Preferences"
+msgstr "Bauer stereophonic-to-binaural Einstellungen"
+
+#: src/bs2b/plugin.c:168
+msgid "Feed level:"
+msgstr "Eingabepegel:"
+
+#: src/bs2b/plugin.c:182
+msgid "Cut frequency:"
+msgstr "Grenzfrequenz:"
+
+#: src/bs2b/plugin.c:196
+msgid "Presets:"
+msgstr "Voreinstellungen:"
+
+#: src/cdaudio-ng/cdaudio-ng.c:241
 msgid "About Audio CD Plugin"
 msgstr "Über AudioCD-Plugin"
 
-#: src/cdaudio-ng/cdaudio-ng.c:265
+#: src/cdaudio-ng/cdaudio-ng.c:242
 msgid ""
 "Copyright (c) 2007, by Calin Crisan <ccrisan@gmail.com> and The Audacious "
 "Team.\n"
@@ -736,15 +1123,15 @@
 "\n"
 "Copyright 2009 John Lindgren"
 
-#: src/cdaudio-ng/cdaudio-ng.c:558
+#: src/cdaudio-ng/cdaudio-ng.c:550
 msgid "Audio CD"
 msgstr "Audio CD"
 
-#: src/cdaudio-ng/cdaudio-ng.c:913
+#: src/cdaudio-ng/cdaudio-ng.c:922
 msgid "Drive is empty."
 msgstr "Laufwerk ist leer."
 
-#: src/cdaudio-ng/cdaudio-ng.c:915
+#: src/cdaudio-ng/cdaudio-ng.c:924
 msgid "Unsupported disk type."
 msgstr "Nicht unterstützter Disk-Typ."
 
@@ -792,18 +1179,12 @@
 msgid "Override default device: "
 msgstr "Anderes Gerät verwenden: "
 
-#: src/cdaudio-ng/configure.c:244 src/crystalizer/crystalizer.c:131
-#: src/echo_plugin/gui.c:123 src/jack/configure.c:146 src/null/null.c:112
-#: src/stereo_plugin/stereo.c:125
+#: src/cdaudio-ng/configure.c:244 src/crystalizer/crystalizer.c:123
+#: src/echo_plugin/gui.c:118 src/jack/configure.c:141 src/null/null.c:107
+#: src/stereo_plugin/stereo.c:118
 msgid "Ok"
 msgstr "OK"
 
-#: src/cdaudio-ng/configure.c:249 src/crystalizer/crystalizer.c:138
-#: src/echo_plugin/gui.c:130 src/jack/configure.c:153 src/null/null.c:113
-#: src/stereo_plugin/stereo.c:132
-msgid "Cancel"
-msgstr "Abbrechen"
-
 #: src/cd-menu-items/cd-menu-items.c:34
 msgid "Play CD"
 msgstr "CD wiedergeben"
@@ -812,80 +1193,80 @@
 msgid "Add CD"
 msgstr "CD hinzufügen"
 
-#: src/compressor/plugin.c:67
+#: src/compressor/plugin.c:63
 msgid "About Dynamic Range Compression Plugin"
 msgstr "Über Dynamic Range Compression Plugin"
 
-#: src/compressor/plugin.c:99
+#: src/compressor/plugin.c:95
 msgid "Dynamic Range Compressor Preferences"
 msgstr "Dynamic Range Compressor Einstellungen"
 
-#: src/compressor/plugin.c:111
+#: src/compressor/plugin.c:107
 msgid "Center volume:"
 msgstr "Center Lautstärke:"
 
-#: src/compressor/plugin.c:124
+#: src/compressor/plugin.c:120
 msgid "Dynamic range:"
 msgstr "Dynamischer Bereich:"
 
-#: src/console/configure.c:138
+#: src/console/configure.c:136
 msgid "Game Console Music Decoder"
 msgstr "Konsolen-Musik-Dekoder"
 
-#: src/console/configure.c:155
+#: src/console/configure.c:153
 msgid "General"
 msgstr "Allgemein"
 
-#: src/console/configure.c:157 src/skins/ui_manager.c:176
+#: src/console/configure.c:155 src/skins/ui_manager.c:176
 msgid "Playback"
 msgstr "Wiedergabe"
 
-#: src/console/configure.c:172
+#: src/console/configure.c:170
 msgid "Bass:"
 msgstr "Bass:"
 
-#: src/console/configure.c:176 src/console/configure.c:187
-#: src/console/configure.c:208
+#: src/console/configure.c:174 src/console/configure.c:185
+#: src/console/configure.c:206
 msgid "secs"
 msgstr "sek"
 
-#: src/console/configure.c:183
+#: src/console/configure.c:181
 msgid "Treble:"
 msgstr "Höhe:"
 
-#: src/console/configure.c:204
+#: src/console/configure.c:202
 msgid "Default song length:"
 msgstr "Standard-Liedlänge:"
 
-#: src/console/configure.c:210 src/sid/xs_interface.c:666
+#: src/console/configure.c:208
 msgid "Resampling"
 msgstr "Resampling"
 
-#: src/console/configure.c:216
+#: src/console/configure.c:214
 msgid "Enable audio resampling"
 msgstr "Audio-Resampling aktivieren"
 
-#: src/console/configure.c:231
+#: src/console/configure.c:229
 msgid "Resampling rate:"
 msgstr "Resampling-Frequenz:"
 
-#: src/console/configure.c:235 src/sid/xs_interface.c:354
+#: src/console/configure.c:233
 msgid "Hz"
 msgstr "Hz"
 
-#: src/console/configure.c:246
+#: src/console/configure.c:244
 msgid "SPC"
 msgstr "SPC"
 
-#: src/console/configure.c:247
+#: src/console/configure.c:245
 msgid "Ignore length from SPC tags"
 msgstr "Länge von SPC-Tags ignorieren"
 
-#: src/console/configure.c:248
+#: src/console/configure.c:246
 msgid "Increase reverb"
 msgstr "Hall verstärken"
 
-#: src/console/configure.c:273
+#: src/console/configure.c:271
 msgid ""
 "The default song length, expressed in seconds, is used for songs that do not "
 "provide length information (i.e. looping tracks)."
@@ -909,30 +1290,30 @@
 "Implementierung für Audacious von: William Pitcock <nenolod@nenolod.net>, \n"
 " Shay Green <gblargg@gmail.com>\n"
 
-#: src/crossfade/plugin.c:65
+#: src/crossfade/plugin.c:60
 msgid "About Crossfade"
 msgstr "Über Crossfade Plugin"
 
-#: src/crossfade/plugin.c:97
+#: src/crossfade/plugin.c:92
 msgid "Crossfade Preferences"
 msgstr "Crossfade Einstellungen"
 
-#: src/crossfade/plugin.c:109
+#: src/crossfade/plugin.c:104
 msgid "Overlap (in seconds):"
 msgstr "Überschneiden (in Sekunden):"
 
-#: src/crossfade/plugin.c:140 src/crossfade/plugin.c:146
+#: src/crossfade/plugin.c:135 src/crossfade/plugin.c:141
 msgid "Crossfade Error"
 msgstr "Crossfade Fehler"
 
-#: src/crossfade/plugin.c:140
+#: src/crossfade/plugin.c:135
 msgid ""
 "Crossfading failed because the songs had a different number of channels."
 msgstr ""
 "Crossfaiding fehlgeschlagen, weil die Lieder eine andere Anzahl an Kanälen "
 "hatten."
 
-#: src/crossfade/plugin.c:148
+#: src/crossfade/plugin.c:143
 msgid ""
 "Crossfading failed because the songs had different sample rates.\n"
 "\n"
@@ -944,23 +1325,19 @@
 "Sie können den Sample-Rate-Converter benutzen, um die Lieder auf die selbe "
 "Bitrate zu resamplen."
 
-#: src/crystalizer/crystalizer.c:108
+#: src/crystalizer/crystalizer.c:100
 msgid "Configure Crystalizer"
 msgstr "Crystalizer konfigurieren"
 
-#: src/crystalizer/crystalizer.c:110 src/stereo_plugin/stereo.c:104
+#: src/crystalizer/crystalizer.c:102 src/stereo_plugin/stereo.c:97
 msgid "Effect intensity:"
 msgstr "Effektstärke:"
 
-#: src/crystalizer/crystalizer.c:144 src/echo_plugin/gui.c:136
-#: src/stereo_plugin/stereo.c:138
+#: src/crystalizer/crystalizer.c:136 src/echo_plugin/gui.c:131
+#: src/stereo_plugin/stereo.c:131
 msgid "Apply"
 msgstr "Übernehmen"
 
-#: src/daemon/daemon.c:58
-msgid "Daemon Interface (like old headless mode)"
-msgstr "Daemon Interface (ähnlich dem alten Headlessmodus)"
-
 #: src/echo_plugin/gui.c:15
 msgid ""
 "Echo Plugin\n"
@@ -977,23 +1354,23 @@
 msgid "About Echo Plugin"
 msgstr "Über Echo-Plugin"
 
-#: src/echo_plugin/gui.c:72
+#: src/echo_plugin/gui.c:67
 msgid "Configure Echo"
 msgstr "Echo-Plugin konfigurieren"
 
-#: src/echo_plugin/gui.c:88
+#: src/echo_plugin/gui.c:83
 msgid "Delay: (ms)"
 msgstr "Verzögerung: (ms)"
 
-#: src/echo_plugin/gui.c:93
+#: src/echo_plugin/gui.c:88
 msgid "Feedback: (%)"
 msgstr "Rückkopplung: (%)"
 
-#: src/echo_plugin/gui.c:98
+#: src/echo_plugin/gui.c:93
 msgid "Volume: (%)"
 msgstr "Lautstärke: (%)"
 
-#: src/ffaudio/ffaudio-core.c:789
+#: src/ffaudio/ffaudio-core.c:795
 #, c-format
 msgid ""
 "Multi-format audio decoding plugin for Audacious based on\n"
@@ -1008,84 +1385,75 @@
 "libavformat %s (%s)\n"
 "libavutil %s (%s)\n"
 msgstr ""
+"Multi-Format Audio-Decoding-Plugin für Audacious basierend auf dem\n"
+"FFmpeg Multimedia Framework (http://www.ffmpeg.org/)\n"
+"Copyright (c) 2000-2009 Fabrice Bellard, et al.\n"
+"\n"
+"Audacious Plugin von:\n"
+" William Pitcock <nenolod@nenolod.net>,\n"
+" Matti Hämäläinen <ccr@tnsp.org>\n"
+"\n"
+"libavcodec %s (%s)\n"
+"libavformat %s (%s)\n"
+"libavutil %s (%s)\n"
 
-#: src/ffaudio/ffaudio-core.c:803
+#: src/ffaudio/ffaudio-core.c:809
 msgid "About FFaudio Plugin"
 msgstr "Über FFaudio Plugin"
 
-#: src/filewriter/filewriter.c:155
+#: src/filewriter/filewriter.c:166
 msgid "About FileWriter-Plugin"
 msgstr "Über FileWriter-Plugin"
 
-#: src/filewriter/filewriter.c:156
-msgid ""
-"FileWriter-Plugin\n"
-"\n"
-"This program is free software; you can redistribute it and/or modify\n"
-"it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
-"(at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
-"GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
-msgstr ""
-
-#: src/filewriter/filewriter.c:450
+#: src/filewriter/filewriter.c:455
 msgid "File Writer Configuration"
 msgstr "FileWriter-Konfiguration"
 
-#: src/filewriter/filewriter.c:462
+#: src/filewriter/filewriter.c:467
 msgid "Output file format:"
 msgstr "Ausgabedatei-Format:"
 
-#: src/filewriter/filewriter.c:480
+#: src/filewriter/filewriter.c:485
 msgid "Configure"
 msgstr "Konfigurieren"
 
-#: src/filewriter/filewriter.c:495
+#: src/filewriter/filewriter.c:500
 msgid "Save into original directory"
 msgstr "In Original-Verzeichnis speichern"
 
-#: src/filewriter/filewriter.c:500
+#: src/filewriter/filewriter.c:505
 msgid "Save into custom directory"
 msgstr "In anderes Verzeichnis speichern"
 
-#: src/filewriter/filewriter.c:510
+#: src/filewriter/filewriter.c:515
 msgid "Output file folder:"
 msgstr "Ausgabedatei-Verzeichnis:"
 
-#: src/filewriter/filewriter.c:514
+#: src/filewriter/filewriter.c:519
 msgid "Pick a folder"
 msgstr "Verzeichnis wählen"
 
-#: src/filewriter/filewriter.c:533
+#: src/filewriter/filewriter.c:538
 msgid "Get filename from:"
 msgstr "Dateiname erhalten von:"
 
-#: src/filewriter/filewriter.c:536
+#: src/filewriter/filewriter.c:541
 msgid "original file tags"
 msgstr "ursprünglichen Datei-Tags"
 
-#: src/filewriter/filewriter.c:542
+#: src/filewriter/filewriter.c:547
 msgid "original filename"
 msgstr "ursprünglichen Dateinamen"
 
-#: src/filewriter/filewriter.c:552
+#: src/filewriter/filewriter.c:557
 msgid "Don't strip file name extension"
 msgstr "Dateiendung nicht entfernen"
 
-#: src/filewriter/filewriter.c:567
+#: src/filewriter/filewriter.c:572
 msgid "Prepend track number to filename"
 msgstr "Titelnummer vor Dateinamen anhängen"
 
-#: src/filewriter/mp3.c:38 src/filewriter/mp3.c:783
+#: src/filewriter/mp3.c:38 src/filewriter/mp3.c:771
 msgid "Auto"
 msgstr "Automatisch"
 
@@ -1093,143 +1461,143 @@
 msgid "Joint Stereo"
 msgstr "Joint-Stereo"
 
-#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183 src/sid/xs_interface.c:308
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183
 msgid "Stereo"
 msgstr "Stereo"
 
-#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183 src/sid/xs_interface.c:301
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183
 msgid "Mono"
 msgstr "Mono"
 
-#: src/filewriter/mp3.c:724
+#: src/filewriter/mp3.c:712
 msgid "MP3 Configuration"
 msgstr "MP3-Konfiguration"
 
-#: src/filewriter/mp3.c:747
+#: src/filewriter/mp3.c:735
 msgid "Algorithm Quality:"
 msgstr "Algorithmen-Qualität:"
 
-#: src/filewriter/mp3.c:772
+#: src/filewriter/mp3.c:760
 msgid "Output Samplerate:"
 msgstr "Ausgabe-Abtastfrequenz:"
 
-#: src/filewriter/mp3.c:800
+#: src/filewriter/mp3.c:788
 msgid "(Hz)"
 msgstr "(Hz)"
 
-#: src/filewriter/mp3.c:807
+#: src/filewriter/mp3.c:795
 msgid "Bitrate / Compression ratio:"
 msgstr "Bitrate / Kompressionsverhältnis:"
 
-#: src/filewriter/mp3.c:831
+#: src/filewriter/mp3.c:819
 msgid "Bitrate (kbps):"
 msgstr "Bitrate (kbps):"
 
-#: src/filewriter/mp3.c:864
+#: src/filewriter/mp3.c:852
 msgid "Compression ratio:"
 msgstr "Kompressionsverhältnis:"
 
-#: src/filewriter/mp3.c:888
+#: src/filewriter/mp3.c:876
 msgid "Audio Mode:"
 msgstr "Audio-Modus:"
 
-#: src/filewriter/mp3.c:913
+#: src/filewriter/mp3.c:901
 msgid "Misc:"
 msgstr "Verschiedenes:"
 
-#: src/filewriter/mp3.c:924
+#: src/filewriter/mp3.c:912
 msgid "Enforce strict ISO complience"
 msgstr "Strikte ISO-Erfüllung erzwingen"
 
-#: src/filewriter/mp3.c:935
+#: src/filewriter/mp3.c:923
 msgid "Error protection"
 msgstr "Fehlerschutz"
 
-#: src/filewriter/mp3.c:947 src/filewriter/vorbis.c:245
+#: src/filewriter/mp3.c:935 src/filewriter/vorbis.c:243
 msgid "Quality"
 msgstr "Qualität"
 
-#: src/filewriter/mp3.c:957
+#: src/filewriter/mp3.c:945
 msgid "Enable VBR/ABR"
 msgstr "VBR/ABR aktivieren"
 
-#: src/filewriter/mp3.c:967
+#: src/filewriter/mp3.c:955
 msgid "Type:"
 msgstr "Typ:"
 
-#: src/filewriter/mp3.c:1000
+#: src/filewriter/mp3.c:988
 msgid "VBR Options:"
 msgstr "VBR-Optionen:"
 
-#: src/filewriter/mp3.c:1016
+#: src/filewriter/mp3.c:1004
 msgid "Minimum bitrate (kbps):"
 msgstr "Minimale Bitrate (kbps):"
 
-#: src/filewriter/mp3.c:1043
+#: src/filewriter/mp3.c:1031
 msgid "Maximum bitrate (kbps):"
 msgstr "Maximale Bitrate (kbps):"
 
-#: src/filewriter/mp3.c:1066
+#: src/filewriter/mp3.c:1054
 msgid "Strictly enforce minimum bitrate"
 msgstr "Minimale Bitrate erzwingen"
 
-#: src/filewriter/mp3.c:1078
+#: src/filewriter/mp3.c:1066
 msgid "ABR Options:"
 msgstr "ABR-Optionen:"
 
-#: src/filewriter/mp3.c:1088
+#: src/filewriter/mp3.c:1076
 msgid "Average bitrate (kbps):"
 msgstr "Durchschnittliche Bitrate (kbps):"
 
-#: src/filewriter/mp3.c:1116
+#: src/filewriter/mp3.c:1104
 msgid "VBR quality level:"
 msgstr "VBR-Qualitätsstufe:"
 
-#: src/filewriter/mp3.c:1135
+#: src/filewriter/mp3.c:1123
 msgid "Don't write Xing VBR header"
 msgstr "Xing-VBR-Header nicht schreiben"
 
-#: src/filewriter/mp3.c:1149
+#: src/filewriter/mp3.c:1137
 msgid "VBR/ABR"
 msgstr "VBR/ABR"
 
-#: src/filewriter/mp3.c:1159
+#: src/filewriter/mp3.c:1147
 msgid "Frame params:"
 msgstr "Frame-Parameter:"
 
-#: src/filewriter/mp3.c:1171
+#: src/filewriter/mp3.c:1159
 msgid "Mark as copyright"
 msgstr "Als Copyright kennzeichnen"
 
-#: src/filewriter/mp3.c:1182
+#: src/filewriter/mp3.c:1170
 msgid "Mark as original"
 msgstr "Als Original kennzeichnen"
 
-#: src/filewriter/mp3.c:1194
+#: src/filewriter/mp3.c:1182
 msgid "ID3 params:"
 msgstr "ID3-Parameter:"
 
-#: src/filewriter/mp3.c:1205
+#: src/filewriter/mp3.c:1193
 msgid "Force addition of version 2 tag"
 msgstr "Hinzufügen von Version-2-Tags erzwingen"
 
-#: src/filewriter/mp3.c:1215
+#: src/filewriter/mp3.c:1203
 msgid "Only add v1 tag"
 msgstr "Nur v1-Tag hinzufügen"
 
-#: src/filewriter/mp3.c:1222
+#: src/filewriter/mp3.c:1210
 msgid "Only add v2 tag"
 msgstr "Nur v2-Tag hinzufügen"
 
-#: src/filewriter/mp3.c:1243
+#: src/filewriter/mp3.c:1231
 msgid "Tags"
 msgstr "Tags"
 
-#: src/filewriter/vorbis.c:238
+#: src/filewriter/vorbis.c:236
 msgid "Vorbis Encoder Configuration"
 msgstr "Vorbis-Encoder-Konfiguration"
 
-#: src/filewriter/vorbis.c:258
+#: src/filewriter/vorbis.c:256
 msgid "Quality level (0 - 10):"
 msgstr "Qualitätsstufe (0 - 10):"
 
@@ -1291,7 +1659,7 @@
 msgid "Entry number"
 msgstr "Titelnummer"
 
-#: src/gtkui/columns.c:36 src/sid/xs_interface.c:1103
+#: src/gtkui/columns.c:36
 msgid "Title"
 msgstr "Titel"
 
@@ -1335,15 +1703,15 @@
 msgid "Bitrate"
 msgstr "Bitrate"
 
-#: src/gtkui/columns.c:286
+#: src/gtkui/columns.c:278
 msgid "Choose Columns"
 msgstr "Spalten auswählen"
 
-#: src/gtkui/columns.c:300
+#: src/gtkui/columns.c:292
 msgid "Available:"
 msgstr "Verfügbar:"
 
-#: src/gtkui/columns.c:334
+#: src/gtkui/columns.c:326
 msgid "Chosen:"
 msgstr "Ausgewählt:"
 
@@ -1367,264 +1735,272 @@
 msgid "Undock"
 msgstr "Abdocken"
 
-#: src/gtkui/layout.c:123
+#: src/gtkui/layout.c:123 src/ladspa/plugin.c:643
 msgid "Disable"
 msgstr "Deaktivieren"
 
-#: src/gtkui/menus.c:132
+#: src/gtkui/menus.c:130
 msgid "_Open Files ..."
 msgstr "_Dateien öffnen ..."
 
-#: src/gtkui/menus.c:133
+#: src/gtkui/menus.c:131
 msgid "Open _URL ..."
 msgstr "_URL öffnen ..."
 
-#: src/gtkui/menus.c:134
+#: src/gtkui/menus.c:132
 msgid "_Add File ..."
 msgstr "Dateien _hinzufügen ..."
 
-#: src/gtkui/menus.c:135
+#: src/gtkui/menus.c:133
 msgid "Add U_RL ..."
 msgstr "U_RL hinzufügen ..."
 
-#: src/gtkui/menus.c:137
+#: src/gtkui/menus.c:135
 msgid "A_bout ..."
 msgstr "_Info ..."
 
-#: src/gtkui/menus.c:138
+#: src/gtkui/menus.c:136
 msgid "_Preferences ..."
 msgstr "_Einstellungen ..."
 
-#: src/gtkui/menus.c:139 src/skins/ui_manager.c:412
+#: src/gtkui/menus.c:137 src/skins/ui_manager.c:406
 msgid "_Quit"
 msgstr "_Beenden"
 
-#: src/gtkui/menus.c:142
+#: src/gtkui/menus.c:140
 msgid "_Play"
 msgstr "_Wiedergeben"
 
-#: src/gtkui/menus.c:143
+#: src/gtkui/menus.c:141
 msgid "Paus_e"
 msgstr "_Pause"
 
-#: src/gtkui/menus.c:144
+#: src/gtkui/menus.c:142
 msgid "_Stop"
 msgstr "_Stopp"
 
-#: src/gtkui/menus.c:145
+#: src/gtkui/menus.c:143
 msgid "Pre_vious"
 msgstr "_Vorheriger"
 
-#: src/gtkui/menus.c:146
+#: src/gtkui/menus.c:144
 msgid "_Next"
 msgstr "_Nächster"
 
-#: src/gtkui/menus.c:148
+#: src/gtkui/menus.c:146
 msgid "_Repeat"
 msgstr "Wieder_holen"
 
-#: src/gtkui/menus.c:149
+#: src/gtkui/menus.c:147
 msgid "S_huffle"
 msgstr "_Zufällige Wiedergabe"
 
-#: src/gtkui/menus.c:150
+#: src/gtkui/menus.c:148
 msgid "N_o Playlist Advance"
 msgstr "Wiedergabeliste ni_cht weiterspielen"
 
-#: src/gtkui/menus.c:151
+#: src/gtkui/menus.c:149
 msgid "Stop _After This Song"
 msgstr "N_ach Titel stoppen"
 
-#: src/gtkui/menus.c:153 src/gtkui/menus.c:210
+#: src/gtkui/menus.c:151 src/gtkui/menus.c:209
 msgid "Song _Info ..."
 msgstr "Titel-_Info ..."
 
-#: src/gtkui/menus.c:154
+#: src/gtkui/menus.c:152
 msgid "Jump to _Time ..."
 msgstr "Zu Z_eitangabe springen ..."
 
-#: src/gtkui/menus.c:155
+#: src/gtkui/menus.c:153
 msgid "_Jump to Song ..."
 msgstr "Zu _Titel sp_ringen ..."
 
-#: src/gtkui/menus.c:158
+#: src/gtkui/menus.c:156
 msgid "By Track _Number"
 msgstr "Nach Titel_nummer"
 
-#: src/gtkui/menus.c:159
+#: src/gtkui/menus.c:157
 msgid "By _Title"
 msgstr "Nach _Titel"
 
-#: src/gtkui/menus.c:160
+#: src/gtkui/menus.c:158
 msgid "By _Artist"
 msgstr "Nach _Künstler"
 
-#: src/gtkui/menus.c:161
+#: src/gtkui/menus.c:159
 msgid "By A_lbum"
 msgstr "Nach _Album"
 
-#: src/gtkui/menus.c:162
+#: src/gtkui/menus.c:160
 msgid "By Release _Date"
 msgstr "Nach _Erscheinungsdatum"
 
-#: src/gtkui/menus.c:163
+#: src/gtkui/menus.c:161
 msgid "By _File Path"
 msgstr "Nach _Dateipfad"
 
-#: src/gtkui/menus.c:164
+#: src/gtkui/menus.c:162
 msgid "By _Custom Title"
 msgstr "Nach _benutzerdefiniertem Titel"
 
-#: src/gtkui/menus.c:166
+#: src/gtkui/menus.c:164
 msgid "R_everse Order"
 msgstr "V_ertausche Anordnung"
 
-#: src/gtkui/menus.c:167
+#: src/gtkui/menus.c:165
 msgid "_Random Order"
 msgstr "Zufällige Ano_rdnung"
 
-#: src/gtkui/menus.c:170 src/gtkui/menus.c:212
+#: src/gtkui/menus.c:168 src/gtkui/menus.c:211
 msgid "_Refresh"
 msgstr "_Aktualisieren"
 
-#: src/gtkui/menus.c:172
+#: src/gtkui/menus.c:170
 msgid "_Sort"
 msgstr "_Sortieren"
 
-#: src/gtkui/menus.c:174
+#: src/gtkui/menus.c:172
 msgid "_New"
 msgstr "_Neu"
 
-#: src/gtkui/menus.c:175
+#: src/gtkui/menus.c:173 src/gtkui/menus.c:222
 msgid "_Close"
 msgstr "S_chließen"
 
-#: src/gtkui/menus.c:177
+#: src/gtkui/menus.c:175
 msgid "_Import ..."
 msgstr "_Importieren ..."
 
-#: src/gtkui/menus.c:178
+#: src/gtkui/menus.c:176
 msgid "_Export ..."
 msgstr "_Exportieren ..."
 
-#: src/gtkui/menus.c:180
+#: src/gtkui/menus.c:178
 msgid "_Playlist Manager ..."
 msgstr "_Wiedergabelisten-Manager ..."
 
-#: src/gtkui/menus.c:183
+#: src/gtkui/menus.c:179
+msgid "_Queue Manager ..."
+msgstr "Warte_schlangen-Manager ..."
+
+#: src/gtkui/menus.c:182
 msgid "Volume _Up"
 msgstr "Lautstärke er_höhen"
 
-#: src/gtkui/menus.c:184
+#: src/gtkui/menus.c:183
 msgid "Volume _Down"
 msgstr "Lautstärke _verringern"
 
-#: src/gtkui/menus.c:186
+#: src/gtkui/menus.c:185
 msgid "_Equalizer"
 msgstr "_Equalizer"
 
-#: src/gtkui/menus.c:188
+#: src/gtkui/menus.c:187
 msgid "E_ffects"
 msgstr "E_ffekte"
 
-#: src/gtkui/menus.c:191
+#: src/gtkui/menus.c:190
 msgid "_Interface"
 msgstr "_Interface"
 
-#: src/gtkui/menus.c:193
+#: src/gtkui/menus.c:192
 msgid "Show _Menu Bar"
 msgstr "_Menüleiste anzeigen"
 
-#: src/gtkui/menus.c:194
+#: src/gtkui/menus.c:193
 msgid "Show I_nfo Bar"
 msgstr "I_nfobereich anzeigen"
 
-#: src/gtkui/menus.c:195
+#: src/gtkui/menus.c:194
 msgid "Show _Status Bar"
 msgstr "_Statusleiste anzeigen"
 
-#: src/gtkui/menus.c:197
+#: src/gtkui/menus.c:196
 msgid "Show Column _Headers"
 msgstr "Spaltenüberschriften _anzeigen"
 
-#: src/gtkui/menus.c:198
+#: src/gtkui/menus.c:197
 msgid "Choose _Columns ..."
 msgstr "Spalten aus_wählen ..."
 
-#: src/gtkui/menus.c:199
+#: src/gtkui/menus.c:198
 msgid "Scrol_l on Song Change"
 msgstr "Mit Titelwechsel scrol_len"
 
-#: src/gtkui/menus.c:202
+#: src/gtkui/menus.c:201
 msgid "_File"
 msgstr "_Datei"
 
-#: src/gtkui/menus.c:203
+#: src/gtkui/menus.c:202
 msgid "_Playback"
 msgstr "_Wiedergabe"
 
-#: src/gtkui/menus.c:204
+#: src/gtkui/menus.c:203
 msgid "P_laylist"
 msgstr "W_iedergabeliste"
 
-#: src/gtkui/menus.c:205 src/gtkui/menus.c:219
+#: src/gtkui/menus.c:204 src/gtkui/menus.c:218
 msgid "_Services"
 msgstr "Di_enste"
 
-#: src/gtkui/menus.c:206
+#: src/gtkui/menus.c:205
 msgid "_Output"
 msgstr "_Ausgabe"
 
-#: src/gtkui/menus.c:207
+#: src/gtkui/menus.c:206
 msgid "_View"
 msgstr "An_sicht"
 
-#: src/gtkui/menus.c:211
+#: src/gtkui/menus.c:210
 msgid "_Queue/Unqueue"
 msgstr "In/Aus _Warteschlange"
 
-#: src/gtkui/menus.c:214
+#: src/gtkui/menus.c:213
 msgid "Cu_t"
 msgstr "Aus_schneiden"
 
-#: src/gtkui/menus.c:215
+#: src/gtkui/menus.c:214
 msgid "_Copy"
 msgstr "_Kopieren"
 
-#: src/gtkui/menus.c:216
+#: src/gtkui/menus.c:215
 msgid "_Paste"
 msgstr "_Einfügen"
 
-#: src/gtkui/menus.c:217
+#: src/gtkui/menus.c:216
 msgid "Select _All"
 msgstr "_Alles auswählen"
 
-#: src/gtkui/menus.c:222
+#: src/gtkui/menus.c:221
 msgid "_Rename"
 msgstr "_Umbenennen"
 
-#: src/gtkui/ui_gtk.c:75
+#: src/gtkui/ui_gtk.c:95
 msgid "GTK Interface"
 msgstr "GTK Interface"
 
-#: src/gtkui/ui_gtk.c:132 src/skins/ui_main.c:303
+#: src/gtkui/ui_gtk.c:156 src/skins/ui_main.c:302
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.c:138 src/skins/ui_main.c:305 src/skins/ui_main.c:1498
+#: src/gtkui/ui_gtk.c:162
+msgid "Buffering ..."
+msgstr "Puffern ..."
+
+#: src/gtkui/ui_gtk.c:165 src/skins/ui_main.c:304 src/skins/ui_main.c:1499
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_gtk.c:177 src/skins/plugin.c:185
+#: src/gtkui/ui_gtk.c:211 src/skins/plugin.c:183
 msgid "Error"
 msgstr "Fehler"
 
-#: src/gtkui/ui_statusbar.c:102 src/skins/ui_main.c:460
+#: src/gtkui/ui_statusbar.c:102 src/skins/ui_main.c:459
 msgid "mono"
 msgstr "Mono"
 
-#: src/gtkui/ui_statusbar.c:104 src/skins/ui_main.c:459
+#: src/gtkui/ui_statusbar.c:104 src/skins/ui_main.c:458
 msgid "stereo"
 msgstr "Stereo"
 
@@ -1680,7 +2056,7 @@
 msgid "Volume Down"
 msgstr "Lautstärke verringern"
 
-#: src/hotkey/gui.c:81 src/skins/ui_manager.c:424 src/skins/ui_manager.c:425
+#: src/hotkey/gui.c:81 src/skins/ui_manager.c:418 src/skins/ui_manager.c:419
 msgid "Jump to File"
 msgstr "Zu Datei springen"
 
@@ -1776,31 +2152,31 @@
 "\t\t\tJeremy Tan <nsx@nsx.homeip.net>\n"
 "\n"
 
-#: src/jack/configure.c:71
+#: src/jack/configure.c:66
 msgid "Connect to all available jack ports"
 msgstr "Zu allen verfügbaren jack-Ports verbinden"
 
-#: src/jack/configure.c:78
+#: src/jack/configure.c:73
 msgid "Connect only the output ports"
 msgstr "Nur zu Ausgabe-Ports verbinden"
 
-#: src/jack/configure.c:85
+#: src/jack/configure.c:80
 msgid "Connect to no ports"
 msgstr "Zu keinem Port verbinden"
 
-#: src/jack/configure.c:103
+#: src/jack/configure.c:98
 msgid "jack Plugin configuration"
 msgstr "jack-Plugin-Konfiguration"
 
-#: src/jack/configure.c:121
+#: src/jack/configure.c:116
 msgid "Connection mode:"
 msgstr "Verbindungs-Modus:"
 
-#: src/jack/configure.c:133
+#: src/jack/configure.c:128
 msgid "Enable debug printing"
 msgstr "Debug-Ausgabe aktivieren"
 
-#: src/jack/jack.c:438
+#: src/jack/jack.c:422
 msgid ""
 "XMMS jack Driver 0.17\n"
 "\n"
@@ -1810,12 +2186,63 @@
 "Audacious port by\n"
 "Giacomo Lozito from develia.org"
 msgstr ""
+"XMMS jack Treiber 0.17\n"
+"\n"
+"xmms-jack.sf.net\n"
+"Chris Morgan<cmorgan@alum.wpi.edu>\n"
+"\n"
+"Audacious Portierung durch\n"
+"Giacomo Lozito von develia.org"
 
-#: src/jack/jack.c:443
+#: src/jack/jack.c:427
 msgid "About JACK Output Plugin 0.17"
 msgstr "Über JACK Output Plugin 0.17"
 
-#: src/lyricwiki/lyricwiki.c:226
+#: src/ladspa/plugin.c:414
+msgid "About LADSPA Host"
+msgstr "Über LADSPA Host"
+
+#: src/ladspa/plugin.c:515
+#, c-format
+msgid "%s Settings"
+msgstr "%s Einstellungen"
+
+#: src/ladspa/plugin.c:583
+msgid "LADSPA Host Settings"
+msgstr "LADSPA Einstellungen"
+
+#: src/ladspa/plugin.c:592
+msgid "Module paths:"
+msgstr "Modulpfade:"
+
+#: src/ladspa/plugin.c:597
+msgid ""
+"Separate multiple paths with a colon.\n"
+"These paths are searched in addition to LADSPA_PATH.\n"
+"After adding new paths, press Enter to scan for new plugins."
+msgstr ""
+"Trenne mehrere Pfade mit einem Doppelpunkt.\n"
+"Diese Pfade werden zusätzlich zum LADSPA_PATH durchsucht.\n"
+"Nach dem Hinzufügen neuer Pfade Enter drücken, um neue Plugins zu suchen.</"
+"small>"
+
+#: src/ladspa/plugin.c:613
+msgid "Available plugins:"
+msgstr "Verfügbare Plugins:"
+
+#: src/ladspa/plugin.c:625
+msgid "Enable"
+msgstr "Aktivieren"
+
+#: src/ladspa/plugin.c:631
+msgid "Enabled plugins:"
+msgstr "Aktive Plugins:"
+
+#: src/ladspa/plugin.c:646
+msgid "Settings"
+msgstr "Einstellungen"
+
+#: src/lyricwiki/lyricwiki.c:227
 msgid ""
 "\n"
 "Looking for lyrics..."
@@ -1823,7 +2250,7 @@
 "\n"
 "Suche nach Liedtexten..."
 
-#: src/lyricwiki/lyricwiki.c:249
+#: src/lyricwiki/lyricwiki.c:250
 msgid ""
 "\n"
 "Connecting to lyrics.wikia.com..."
@@ -1831,7 +2258,7 @@
 "\n"
 "Verbinde zu lyrics.wikia.com..."
 
-#: src/lyricwiki/lyricwiki.c:337
+#: src/lyricwiki/lyricwiki.c:338
 msgid ""
 "\n"
 "No lyrics were found."
@@ -1867,6 +2294,22 @@
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Takt-Generator: %d bpm %d/%d"
 
+#: src/mixer/plugin.c:64
+msgid "About Channel Mixer"
+msgstr "Über Channel-Mixer"
+
+#: src/mixer/plugin.c:93
+msgid "Channel Mixer Settings"
+msgstr "Channel-Mixer-Einstellungen"
+
+#: src/mixer/plugin.c:102
+msgid "Output channels:"
+msgstr "Ausgabe-Kanäle:"
+
+#: src/mixer/plugin.c:112
+msgid "Changes take effect at the next song change."
+msgstr "Änderungen werden mit dem nächsten Titelwechsel wirksam"
+
 #: src/mpg123/mpg123.c:183
 msgid "Surround"
 msgstr "Surround"
@@ -1907,35 +2350,35 @@
 msgid "About Null Output"
 msgstr "Über Null-Ausgabe-Plugin"
 
-#: src/null/null.c:94
+#: src/null/null.c:89
 msgid "Null output preferences"
 msgstr "Null-Ausgabe-Einstellungen"
 
-#: src/null/null.c:105
+#: src/null/null.c:100
 msgid "Run in real time"
 msgstr "In Echtzeit ablaufen lassen"
 
-#: src/oss4/configure.c:89
+#: src/oss4/configure.c:76
 msgid "1. Default device"
 msgstr "1. Standardgerät"
 
-#: src/oss4/configure.c:151
+#: src/oss4/configure.c:132
 msgid "OSS4 Output Plugin Preferences"
 msgstr "OSS4-Ausgabeplugin-Einstellungen"
 
-#: src/oss4/configure.c:163 src/OSS/configure.c:203
+#: src/oss4/configure.c:144 src/OSS/configure.c:194
 msgid "Audio device:"
 msgstr "Audiogerät:"
 
-#: src/oss4/configure.c:189 src/OSS/configure.c:226 src/OSS/configure.c:269
+#: src/oss4/configure.c:172 src/OSS/configure.c:217 src/OSS/configure.c:260
 msgid "Use alternate device:"
 msgstr "Alternatives Gerät benutzen:"
 
-#: src/oss4/configure.c:202
+#: src/oss4/configure.c:187
 msgid "Save volume between sessions"
 msgstr "Lautstärke speichern"
 
-#: src/oss4/configure.c:206
+#: src/oss4/configure.c:191
 msgid "Enable format conversions made by the OSS software."
 msgstr "Formatkonvertierung aktivieren"
 
@@ -1943,91 +2386,44 @@
 msgid "About OSS4 Plugin"
 msgstr "Über OSS4-Plugin"
 
-#: src/oss4/plugin.c:52
-#, fuzzy
-msgid ""
-"OSS4 Output Plugin for Audacious\n"
-"Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
-"\n"
-"I would like to thank people on #audacious, especially Tony Vroon and John "
-"Lindgren and of course the authors of the previous OSS plugin.\n"
-"\n"
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with "
-"this program. If not, see <http://www.gnu.org/licenses/>.\n"
-msgstr ""
-"An Audacious angepasst von Tony Vroon <chainsaw@gentoo.org>\n"
-"vom xmms_sndfile-Plugin:\n"
-"Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
-"\n"
-"This program is free software ; you can redistribute it and/or modify \n"
-"it under the terms of the GNU General Public License as published by \n"
-"the Free Software Foundation ; either version 2 of the License, or \n"
-"(at your option) any later version. \n"
-" \n"
-"This program is distributed in the hope that it will be useful, \n"
-"but WITHOUT ANY WARRANTY ; without even the implied warranty of \n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. \n"
-"See the GNU General Public License for more details. \n"
-"\n"
-"You should have received a copy of the GNU General Public \n"
-"License along with this program ; if not, write to \n"
-"the Free Software Foundation, Inc., \n"
-"51 Franklin Street, Fifth Floor, \n"
-"Boston, MA 02110-1301 USA"
-
-#: src/oss4/utils.c:204
+#: src/oss4/utils.c:211
 msgid "OSS4 error"
 msgstr "OSS4 Fehler"
 
-#: src/OSS/configure.c:146
+#: src/OSS/configure.c:137
 #, c-format
 msgid "Default (%s)"
 msgstr "Standard (%s)"
 
-#: src/OSS/configure.c:162 src/skins/ui_manager.c:456
-#: src/skins/ui_manager.c:477
-msgid "Default"
-msgstr "Standard"
-
-#: src/OSS/configure.c:187
+#: src/OSS/configure.c:178
 msgid "OSS Driver configuration"
 msgstr "OSS-Treiber-Konfiguration"
 
-#: src/OSS/configure.c:290
+#: src/OSS/configure.c:281
 msgid "Devices"
 msgstr "Geräte"
 
-#: src/OSS/configure.c:292
+#: src/OSS/configure.c:283
 msgid "Buffering:"
 msgstr "Zwischenspeichern:"
 
-#: src/OSS/configure.c:305
+#: src/OSS/configure.c:296
 msgid "Pre-buffer (percent):"
 msgstr "Vorpuffer (Prozent):"
 
-#: src/OSS/configure.c:316
+#: src/OSS/configure.c:307
 msgid "Buffering"
 msgstr "Zwischenspeichern"
 
-#: src/OSS/configure.c:317
+#: src/OSS/configure.c:308
 msgid "Mixer Settings:"
 msgstr "Mixer-Einstellungen:"
 
-#: src/OSS/configure.c:323
+#: src/OSS/configure.c:314
 msgid "Volume controls Master not PCM"
 msgstr "Master anstatt PCM regeln"
 
-#: src/OSS/configure.c:329
+#: src/OSS/configure.c:320
 msgid "Mixer"
 msgstr "Mixer"
 
@@ -2035,99 +2431,59 @@
 msgid "About OSS Driver"
 msgstr "Über OSS-Treiber"
 
-#: src/OSS/OSS.c:41
-msgid ""
-"Audacious OSS Driver\n"
-"\n"
-" This program is free software; you can redistribute it and/or modify\n"
-"it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
-"(at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
-"GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
-msgstr ""
-
 #: src/pulse_audio/pulse_audio.c:687
 msgid "About Audacious PulseAudio Output Plugin"
 msgstr "Über Audacious-PulseAudio-Ausgabe-Plugin"
 
-#: src/pulse_audio/pulse_audio.c:688
-msgid ""
-"Audacious PulseAudio Output Plugin\n"
-"\n"
-" This program is free software; you can redistribute it and/or modify\n"
-"it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
-"(at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
-"GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
-msgstr ""
-
-#: src/resample/plugin.c:91
+#: src/resample/plugin.c:89
 msgid "About Sample Rate Converter Plugin"
 msgstr "Über Sample-Rate-Konverter-Plugin"
 
-#: src/resample/plugin.c:146
+#: src/resample/plugin.c:144
 msgid "Sample Rate Converter Preferences"
 msgstr "Sample-Rate-Konverter Einstellungen"
 
-#: src/resample/plugin.c:158
+#: src/resample/plugin.c:156
 msgid "Rate mappings:"
 msgstr "Rate-Mappings:"
 
-#: src/resample/plugin.c:181
+#: src/resample/plugin.c:179
 msgid "All others:"
 msgstr "Alle anderen:"
 
-#: src/resample/plugin.c:193
+#: src/resample/plugin.c:191
 msgid "Method:"
 msgstr "Methode:"
 
-#: src/scrobbler/configure.c:128 src/scrobbler/configure.c:204
+#: src/scrobbler/configure.c:122 src/scrobbler/configure.c:197
 msgid "Change password"
 msgstr "Passwort ändern"
 
-#: src/scrobbler/configure.c:150
+#: src/scrobbler/configure.c:143
 msgid "Services"
 msgstr "Dienste"
 
-#: src/scrobbler/configure.c:172
+#: src/scrobbler/configure.c:165
 msgid "Username:"
 msgstr "Benutzername:"
 
-#: src/scrobbler/configure.c:178
+#: src/scrobbler/configure.c:171
 msgid "Password:"
 msgstr "Passwort:"
 
-#: src/scrobbler/configure.c:186
+#: src/scrobbler/configure.c:179
 msgid "Scrobbler URL:"
 msgstr "Scrobbler-URL:"
 
-#: src/scrobbler/configure.c:218
+#: src/scrobbler/configure.c:211
 msgid "Last.FM"
 msgstr "Last.FM"
 
-#: src/scrobbler/configure.c:262
+#: src/scrobbler/configure.c:238
 msgid "Scrobbler"
 msgstr "Scrobbler"
 
-#: src/scrobbler/plugin.c:213
+#: src/scrobbler/plugin.c:194
 msgid ""
 "Audacious AudioScrobbler Plugin\n"
 "\n"
@@ -2139,7 +2495,7 @@
 "Ursprünglich geschrieben von Audun Hove <audun@nlc.no> und Pipian "
 "<pipian@pipian.com>\n"
 
-#: src/scrobbler/plugin.c:215
+#: src/scrobbler/plugin.c:196
 msgid "About Scrobbler Plugin"
 msgstr "Über Scrobbler-Plugin"
 
@@ -2151,628 +2507,11 @@
 msgid "SDL error"
 msgstr "SDL Fehler"
 
-#: src/sid/xs_about.c:84
-#, c-format
-msgid "About %s"
-msgstr "Über %s"
-
-#: src/sid/xs_about.c:214 src/sid/xs_interface.c:1825
-msgid "Close"
-msgstr "Schließen"
-
-#: src/sid/xs_config.c:326
-msgid " Error"
-msgstr " Fehler"
-
-#: src/sid/xs_config.c:326
-msgid "OK"
-msgstr "OK"
-
-#: src/sid/xs_fileinfo.c:151
-msgid "General info"
-msgstr "Allgemeine Info"
-
-#: src/sid/xs_fileinfo.c:164
-#, c-format
-msgid "Tune #%i: "
-msgstr "#%i abgleichen: "
-
-#: src/sid/xs_glade.c:90 src/sid/xs_glade.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "Konnte Pixmap-Datei nicht finden: %s"
-
-#: src/sid/xs_interface.c:234
-msgid "Audacious-SID configuration"
-msgstr "Audacious-SID-Konfiguration"
-
-#: src/sid/xs_interface.c:270
-msgid "8-bit"
-msgstr "8 Bit"
-
-#: src/sid/xs_interface.c:277
-msgid "16-bit"
-msgstr "16 Bit"
-
-#: src/sid/xs_interface.c:284
-msgid "Resolution:"
-msgstr "Auflösung:"
-
-#: src/sid/xs_interface.c:315
-msgid "Autopanning"
-msgstr ""
-
-#: src/sid/xs_interface.c:322
-msgid "Channels:"
-msgstr "Kanäle:"
-
-#: src/sid/xs_interface.c:366
-msgid "Samplerate:"
-msgstr "Abtastfrequenz:"
-
-#: src/sid/xs_interface.c:383
-msgid "Use oversampling"
-msgstr "Oversampling benutzen"
-
-#: src/sid/xs_interface.c:394
-msgid "Factor:"
-msgstr "Faktor:"
-
-#: src/sid/xs_interface.c:406
-msgid "Large factors require more CPU-power"
-msgstr "Große Faktoren benötigen mehr Rechenleistung"
-
-#: src/sid/xs_interface.c:412
-msgid "Oversampling:"
-msgstr "Oversampling:"
-
-#: src/sid/xs_interface.c:417
-msgid "Audio"
-msgstr "Audio"
-
-#: src/sid/xs_interface.c:445
-msgid "Force speed"
-msgstr "Geschwindigkeit erzwingen"
-
-#: src/sid/xs_interface.c:449
-msgid ""
-"If enabled, this option \"forces\" the emulation engine to use the selected "
-"clock speed/frequency. Otherwise the speed is determined from played file "
-"itself."
-msgstr ""
-"Falls aktiviert, \"zwingt\" diese Option die Emulations-Engine, die "
-"ausgewählte Geschwindigkeit/Frequenz zu nutzen. Ansonsten wird die "
-"Geschwindigkeit aus der Datei selbst bestimmt."
-
-#: src/sid/xs_interface.c:451
-msgid "PAL (50 Hz)"
-msgstr "PAL (50 Hz)"
-
-#: src/sid/xs_interface.c:455
-msgid ""
-"PAL is the european TV standard, which uses 50Hz vertical refresh frequency. "
-"Most of SID-tunes have been made for PAL computers."
-msgstr ""
-"PAL ist der europäische TV-Standard, welcher 50 Hz als Bildwiederholfrequenz "
-"benutzt. Die meisten der SID-Tuner sind für den PAL-Standard gebaut."
-
-#: src/sid/xs_interface.c:459
-msgid "NTSC (60 Hz)"
-msgstr "NTSC (60 Hz)"
-
-#: src/sid/xs_interface.c:463
-msgid ""
-"NTSC is the TV standard with 60Hz vertical refresh rate (and other features "
-"that differ from PAL). It is mainly used in United States, Japan and certain "
-"other countries."
-msgstr ""
-"NTSC ist ein TV-Standard mit 60 Hz Bildwiederholfrequenz (und anderen "
-"Abweichungen zu PAL). Er wird vor allem in den USA, Japan und einigen "
-"anderen Ländern benutzt."
-
-#: src/sid/xs_interface.c:467
-msgid "Clock speed:"
-msgstr "Taktfrequenz:"
-
-#: src/sid/xs_interface.c:484
-msgid "Force model"
-msgstr "Model erzwingen"
-
-#: src/sid/xs_interface.c:488
-msgid ""
-"If enabled, this option \"forces\" the emulation engine to use the selected "
-"SID-chip model. Otherwise the preferred SID model is determined from the "
-"file (if PSIDv2NG type) or if not available, this setting is used."
-msgstr ""
-"Falls aktiviert, \"zwingt\" diese Option die Emulationsengine das "
-"ausgewählte SID-Chip-Model zu nutzen. Anderenfalls wird das bevorzugte SID-"
-"Model aus der Datei (wenn vom Typ PSIDv2NG) oder dieser Einstellung bestimmt."
-
-#: src/sid/xs_interface.c:490
-msgid "MOS 6581"
-msgstr "MOS 6581"
-
-#: src/sid/xs_interface.c:494
-msgid ""
-"MOS/CSG 6581 is the earlier major version of SID chip. It differs from 8580 "
-"in few ways, having much fuller filter (which, due to design error, is never "
-"same between two different SID-chips) and has the \"volume adjustment bug\", "
-"which enables playing of digital samples."
-msgstr ""
-
-#: src/sid/xs_interface.c:498
-msgid "MOS 8580"
-msgstr "MOS 8580"
-
-#: src/sid/xs_interface.c:505
-msgid "SID model:"
-msgstr "SID-Modell:"
-
-#: src/sid/xs_interface.c:522
-msgid "SIDPlay 1 (frame-based)"
-msgstr "SIDPlay 1 (Frame-basiert)"
-
-#: src/sid/xs_interface.c:526
-msgid ""
-"Use libSIDPlay 1.x emulation, faster but not so accurate. Good in most "
-"cases, though."
-msgstr ""
-"LibSIDPlay 1.x Emulation benutzen, schneller aber ungenauer. Dennoch in "
-"vielen Fällen gut."
-
-#: src/sid/xs_interface.c:530
-msgid "SIDPlay 2 (cycle-based)"
-msgstr "SIDPlay 2 (zyklus-basiert)"
-
-#: src/sid/xs_interface.c:534
-msgid ""
-"Use libSIDPlay 2.x emulation, which requires powerful CPU due to more exact "
-"emulation."
-msgstr ""
-"libSIDPlay 2.x Emulation benutzen, welche mehr CPU-Leistung für mehr "
-"Genauigkeit benötigt."
-
-#: src/sid/xs_interface.c:538
-msgid "Emulation library selection:"
-msgstr "Auswahl der Emulations-Bibliothek:"
-
-#: src/sid/xs_interface.c:555
-msgid "Real C64 (SIDPlay 2 only)"
-msgstr "Echter C64 (nur SIDPlay 2)"
-
-#: src/sid/xs_interface.c:562
-msgid "Bank switching"
-msgstr ""
-
-#: src/sid/xs_interface.c:569
-msgid "Transparent ROM"
-msgstr ""
-
-#: src/sid/xs_interface.c:576
-msgid "PlaySID environment"
-msgstr "PlaySID-Umgebung"
-
-#: src/sid/xs_interface.c:583
-msgid "Memory mode:"
-msgstr "Speichermodus:"
-
-#: src/sid/xs_interface.c:588
-msgid "Emu#1"
-msgstr "Emu#1"
-
-#: src/sid/xs_interface.c:611
-msgid "Optimization mode (faster, inaccurate)"
-msgstr "Optimierungs-Modus (schneller, ungenau)"
-
-#: src/sid/xs_interface.c:615
-msgid ""
-"This setting can be used to enable libSIDPlay2's \"optimization mode\", "
-"which in downgrades the emulation from cycle-exact to something similar to "
-"frame-exact. The result is lower CPU usage, but worse accuracy."
-msgstr ""
-
-#: src/sid/xs_interface.c:617
-msgid "reSID-emulation"
-msgstr "reSID-Emulation"
-
-#: src/sid/xs_interface.c:621
-msgid ""
-"reSID is the software SID-chip simulator based on SID reverse-engineering, "
-"created by Dag Lem. It is probably the closest thing to real SID available "
-"as software-only emulation."
-msgstr ""
-
-#: src/sid/xs_interface.c:625
-msgid "HardSID"
-msgstr "HardSID"
-
-#: src/sid/xs_interface.c:629
-msgid ""
-"HardSID is a EISA/PCI card for PC-compatibles, which can be fitted with a "
-"real SID-chip. Software can be used to control the HardSID and combined with "
-"software emulation of rest of C64 via libSIDPlay2 HardSID can be used to "
-"achieve \"near 100%\" similarity to real C64. For more information, see "
-"http://www.hardsid.com/"
-msgstr ""
-
-#: src/sid/xs_interface.c:633
-msgid "SIDPlay 2 options:"
-msgstr "SIDPlay 2-Optionen:"
-
-#: src/sid/xs_interface.c:650
-msgid "Fast (nearest neighbour)"
-msgstr "Schnell (am nächsten)"
-
-#: src/sid/xs_interface.c:654
-msgid ""
-"Fastest and also worst sounding sampling method, simply picks nearest "
-"neighbouring sample."
-msgstr ""
-
-#: src/sid/xs_interface.c:658
-msgid "Linear interpolation"
-msgstr "Lineare Interpolation"
-
-#: src/sid/xs_interface.c:662
-msgid ""
-"Uses linear interpolation between samples, yielding higher audio quality "
-"with less sampling noise."
-msgstr ""
-
-#: src/sid/xs_interface.c:673
-msgid "Resampling (FIR)"
-msgstr "Resampling (FIR)"
-
-#: src/sid/xs_interface.c:680
-msgid "reSID sampling options:"
-msgstr "reSID-Sampling-Optionen:"
-
-#: src/sid/xs_interface.c:685
-msgid "Emu#2"
-msgstr "Emu#2"
-
-#: src/sid/xs_interface.c:697
-msgid "Emulate filters"
-msgstr "Filter emulieren"
-
-#: src/sid/xs_interface.c:701
-msgid ""
-"This option enables emulation of SID filter. The filter is an essential part "
-"of SID's sound capacity, but accurate emulation of it may require quite much "
-"CPU power. However, if filter emulation is disabled, tunes won't sound "
-"authentic at all if they utilize the filter."
-msgstr ""
-
-#: src/sid/xs_interface.c:726
-msgid "FS"
-msgstr "FS"
-
-#: src/sid/xs_interface.c:743
-msgid "FM"
-msgstr "FM"
-
-#: src/sid/xs_interface.c:760
-msgid "FT"
-msgstr "FT"
-
-#: src/sid/xs_interface.c:771
-msgid "Reset values"
-msgstr "Werte zurücksetzen"
-
-#: src/sid/xs_interface.c:776
-msgid "SIDPlay1"
-msgstr "SIDPlay1"
-
-#: src/sid/xs_interface.c:817
-msgid "Export"
-msgstr "Exportieren"
-
-#: src/sid/xs_interface.c:825
-msgid "Use"
-msgstr "Nutzen"
-
-#: src/sid/xs_interface.c:833 src/skins/ui_manager.c:447
-msgid "Save"
-msgstr "Speichern"
-
-#: src/sid/xs_interface.c:841 src/skins/ui_manager.c:446
-msgid "Import"
-msgstr "Importieren"
-
-#: src/sid/xs_interface.c:849 src/skins/ui_manager.c:448
-msgid "Delete"
-msgstr "Löschen"
-
-#: src/sid/xs_interface.c:863
-msgid "Filter curve:"
-msgstr "Filterkurve:"
-
-#: src/sid/xs_interface.c:868
-msgid "SIDPlay2"
-msgstr "SIDPlay2"
-
-#: src/sid/xs_interface.c:874
-msgid "Filters"
-msgstr "Filter"
-
-#: src/sid/xs_interface.c:897
-msgid "Play at least for specified time"
-msgstr "Mindestens für die angegebene Zeit spielen"
-
-#: src/sid/xs_interface.c:901
-msgid ""
-"If enabled, the tune is played at least for the specified time, adding "
-"silence to the end if necessary."
-msgstr ""
-"Wenn aktiviert, wird das Stück mindestens für die angegebene Zeit "
-"abgespielt, wobei nötigenfalls Stille zum Ende hinzugefügt wird."
-
-#: src/sid/xs_interface.c:908 src/sid/xs_interface.c:962
-#: src/sid/xs_interface.c:1142
-msgid "Playtime:"
-msgstr "Spielzeit:"
-
-#: src/sid/xs_interface.c:921 src/sid/xs_interface.c:975
-#: src/sid/xs_interface.c:1155
-msgid "seconds"
-msgstr "Sekunden"
-
-#: src/sid/xs_interface.c:928
-msgid "Minimum playtime:"
-msgstr "Minimale Spielzeit:"
-
-#: src/sid/xs_interface.c:945
-msgid "Play for specified time maximum"
-msgstr "Für bestimmte Maximalzeit spielen"
-
-#: src/sid/xs_interface.c:949
-msgid ""
-"If enabled, tune is played until specified duration is reached (aka maximum "
-"playtime)."
-msgstr ""
-"Falls aktiviert, wird der Titel gespielt bis ein bestimmter Wert erreicht "
-"wird (z.B. maximale Spielzeit)."
-
-#: src/sid/xs_interface.c:951
-msgid "Only when song length is unknown"
-msgstr "Nur wenn Titellänge unbekannt"
-
-#: src/sid/xs_interface.c:955
-msgid ""
-"If enabled, the maximum playtime is applied only if song/tune length is not "
-"known."
-msgstr ""
-"Falls aktiviert, wird die maximale Spielzeit nur benutzt, wenn Titellänge "
-"unbekannt ist."
-
-#: src/sid/xs_interface.c:982
-msgid "Maximum playtime:"
-msgstr "Maximale Spielzeit:"
-
-#: src/sid/xs_interface.c:999
-msgid "Use XSIDPLAY-compatible database"
-msgstr "XSIDPLAY-kompatible Datenbank benutzen"
-
-#: src/sid/xs_interface.c:1003
-msgid ""
-"This option enables using of XSIDPLAY compatible song length database. "
-"(Refer to Audacious-SID documentation for more information)"
-msgstr ""
-"Diese Option aktiviert die Nutzung der XSIDPLAY Datenbank (siehe Audacious-"
-"SID-Dokumentation für weitere Informationen)."
-
-#: src/sid/xs_interface.c:1010
-msgid "DB-file:"
-msgstr "DB-Datei:"
-
-#: src/sid/xs_interface.c:1020
-msgid "Database path and filename"
-msgstr "Datenbankpfad und -dateiname"
-
-#: src/sid/xs_interface.c:1027
-msgid "Browse for song length-database file"
-msgstr "Nach Titellänge-Datei in Datenbank suchen"
-
-#: src/sid/xs_interface.c:1049
-msgid "Song length database:"
-msgstr "Titellänge Datenbank:"
-
-#: src/sid/xs_interface.c:1054
-msgid "Songlength"
-msgstr "Titellänge"
-
-#: src/sid/xs_interface.c:1072
-msgid "Override generic Tuplez format string"
-msgstr "Allgemeinen Tuplez-Format-String überschreiben"
-
-#: src/sid/xs_interface.c:1076
-msgid ""
-"By enabling this option you can specify a custom Tuplez formatting string "
-"for SID-files. The SID-plugin specific Tuplez tags are described shortly "
-"below."
-msgstr ""
-"Mit dem Aktivieren dieser Einstellung kann man einen bestimmten Tuplez-"
-"Formatierungs-String für SID-Dateien festlegen. Spezifische Tags sind unten "
-"kurz erklärt."
-
-#: src/sid/xs_interface.c:1087
-msgid "Tuplez format string for SID-files"
-msgstr "Tuplez-Formatierungs-String für SID-Dateien"
-
-#: src/sid/xs_interface.c:1090
-msgid ""
-"SID-specific Tuplez fields:\n"
-"\n"
-"sid-format\t\t- Specific fileformat\n"
-"sid-model\t\t- 6581 or 8580\n"
-"sid-speed\t\t- Timing or speed: PAL/NTSC/etc.\n"
-"\n"
-"Other \"special\" fields set:\n"
-"\n"
-"subsong-num, subsong-id"
-msgstr ""
-
-#: src/sid/xs_interface.c:1098
-msgid "Song title format:"
-msgstr "Titelformat:"
-
-#: src/sid/xs_interface.c:1125
-msgid "Add sub-tunes to playlist"
-msgstr "Sub-Tune zu Wiedergabeliste hinzufügen"
-
-#: src/sid/xs_interface.c:1129
-msgid ""
-"If enabled, sub-tunes of each file will be added to playlist. If disabled, "
-"only the default sub-tune will be added."
-msgstr ""
-"Falls aktiviert, werden Sub-Tunes jeder Datei zur Wiedergabeliste "
-"hinzugefügt. Falls deaktiiviert, werden nur die Standard-Sub-Tunes "
-"hinzugefügt."
-
-#: src/sid/xs_interface.c:1131
-msgid "Only tunes with specified minimum duration"
-msgstr "Nur mit spezifizierter Minimumdauer abstimmen"
-
-#: src/sid/xs_interface.c:1135
-msgid "Only add sub-tunes that have a duration of at least specified time."
-msgstr ""
-"Nur Sub-Tunes hinzufügen, die mindestens eine bestimmte Mindestdauer haben."
-
-#: src/sid/xs_interface.c:1162
-msgid "Sub-tune handling:"
-msgstr "Sub-Tune Umgang:"
-
-#: src/sid/xs_interface.c:1179
-msgid "Use STIL database"
-msgstr "STIL-Datenbank verwenden"
-
-#: src/sid/xs_interface.c:1183
-msgid ""
-"If this option is enabled (and the database & HVSC settings below are "
-"correctly set), Audacious-SID will use and display additional information "
-"from STIL database when HVSC SIDs are played."
-msgstr ""
-"Falls Option aktiviert (und die Datenback & die HVSC Einstellungen unten "
-"richtig gesetzt sind), wird Audacious-SID zusätzliche Informationen aus der "
-"STIL-Datenbank bei passenden Titeln nutzen und anzeigen."
-
-#: src/sid/xs_interface.c:1190
-msgid "STIL file:"
-msgstr "STIL-Datei:"
-
-#: src/sid/xs_interface.c:1206
-msgid ""
-"Path and filename of STIL database file (STIL.txt), usually found from "
-"HVSC's DOCUMENTS-subdirectory."
-msgstr ""
-"Pfad und Dateiname der STIL-Datenbank-Datei (STIL.txt), üblicherweise im "
-"HVSC-DOCUMENTS-Unterverzeichnis."
-
-#: src/sid/xs_interface.c:1219
-msgid "Browse for STIL-database file"
-msgstr "Nach STIL-Datenbank-Datei suchen"
-
-#: src/sid/xs_interface.c:1246
-msgid "HVSC path:"
-msgstr "HVSC-Pfad:"
-
-#: src/sid/xs_interface.c:1262
-msgid ""
-"Path to base-directory of your High Voltage SID Collection (HVSC), for "
-"example /media/C64Music/"
-msgstr ""
-"Pfad zum Basis-Verzeichnis der High Voltage SID Collection (HVSC), zum "
-"Beispiel /media/C64Music/"
-
-#: src/sid/xs_interface.c:1275
-msgid "Browse for HVSC path"
-msgstr "Nach HVSC-Pfad suchen"
-
-#: src/sid/xs_interface.c:1297
-msgid "SID Tune Information List (STIL) database:"
-msgstr "SID Tune Information List (STIL)-Datenbank:"
-
-#: src/sid/xs_interface.c:1321
-msgid "Cancel any changes"
-msgstr "Alle Änderungen verwerfen"
-
-#: src/sid/xs_interface.c:1328
-msgid "Accept and update changes"
-msgstr "Änderungen akzeptieren und aktualisieren"
-
-#: src/sid/xs_interface.c:1628
-msgid "Audacious-SID Fileinfo"
-msgstr "Audacious-SID-Dateiinformation"
-
-#: src/sid/xs_interface.c:1649
-msgid "Filename:"
-msgstr "Dateiname:"
-
-#: src/sid/xs_interface.c:1657
-msgid "Songname:"
-msgstr "Titel:"
-
-#: src/sid/xs_interface.c:1665
-msgid "Composer:"
-msgstr "Komponist:"
-
-#: src/sid/xs_interface.c:1673
-msgid "Copyright:"
-msgstr "Copyright:"
-
-#: src/sid/xs_interface.c:1717
-msgid "Song Information:"
-msgstr "Titel-Information:"
-
-#: src/sid/xs_interface.c:1752
-msgid "Author:"
-msgstr "Autor:"
-
-#: src/sid/xs_interface.c:1786
-msgid "Duration:"
-msgstr "Länge:"
-
-#: src/sid/xs_interface.c:1820
-msgid "Sub-tune Information:"
-msgstr "Sub-Tune Information:"
-
-#: src/sid/xs_interface.c:1881
-msgid "Select HVSC song length database"
-msgstr "HVSC-Titellängendatenbank auswählen"
-
-#: src/sid/xs_interface.c:1922
-msgid "Select STIL-database"
-msgstr "STIL-Datenbank auswählen"
-
-#: src/sid/xs_interface.c:1963
-msgid "Select HVSC location prefix"
-msgstr "HVSC Ort-Präfix auswählen"
-
-#: src/sid/xs_interface.c:2004
-msgid "Select SIDPlay2 filters file for importing"
-msgstr "SIDPlay2-Filterdatei für Importieren auswählen"
-
-#: src/sid/xs_interface.c:2045
-msgid "Select SIDPlay2 filters file for exporting"
-msgstr "SIDPlay2-Filterdatei für Exportieren auswählen"
-
-#: src/sid/xs_interface.c:2093 src/sid/xs_interface.c:2106
-msgid "Confirm selected action"
-msgstr "Gewählte Aktion bestätigen"
-
-#: src/sid/xs_interface.c:2123
-msgid "Yes"
-msgstr "Ja"
-
-#: src/sid/xs_interface.c:2129
-msgid "No"
-msgstr "Nein"
-
-#: src/skins/plugin.c:167
+#: src/skins/plugin.c:165
 msgid "About Skinned GUI"
 msgstr "Über Skinned GUI"
 
-#: src/skins/plugin.c:168
+#: src/skins/plugin.c:166
 msgid ""
 "Copyright (c) 2008, by Tomasz Moń <desowin@gmail.com>\n"
 "\n"
@@ -2780,39 +2519,39 @@
 "Copyright (c) 2008, von Tomasz Moń <desowin@gmail.com>\n"
 "\n"
 
-#: src/skins/skins_cfg.c:254
+#: src/skins/skins_cfg.c:207
 msgid "_Player:"
 msgstr "_Hauptfenster:"
 
-#: src/skins/skins_cfg.c:254
+#: src/skins/skins_cfg.c:208
 msgid "Select main player window font:"
 msgstr "Hauptfenster-Schrift auswählen:"
 
-#: src/skins/skins_cfg.c:255
+#: src/skins/skins_cfg.c:210
 msgid "_Playlist:"
 msgstr "_Wiedergabeliste:"
 
-#: src/skins/skins_cfg.c:255
+#: src/skins/skins_cfg.c:211
 msgid "Select playlist font:"
 msgstr "Playlist-Schrift auswählen:"
 
-#: src/skins/skins_cfg.c:259
+#: src/skins/skins_cfg.c:215
 msgid "_Fonts"
 msgstr "Schriftarten"
 
-#: src/skins/skins_cfg.c:261
+#: src/skins/skins_cfg.c:218
 msgid "Use bitmap fonts (supports ASCII only)"
 msgstr "Benutze Bitmap-Schriftarten (nur ASCII-Unterstützung)"
 
-#: src/skins/skins_cfg.c:263
+#: src/skins/skins_cfg.c:220
 msgid "Scroll song title in both directions"
 msgstr "Titel in beide Richtungen scrollen"
 
-#: src/skins/skins_cfg.c:346
+#: src/skins/skins_cfg.c:298
 msgid "_Skin"
 msgstr "_Skin"
 
-#: src/skins/skins_cfg.c:393
+#: src/skins/skins_cfg.c:345
 msgid "Interface Preferences"
 msgstr "Interface-Einstellungen"
 
@@ -2860,83 +2599,83 @@
 msgid "16 kHz"
 msgstr "16 kHz"
 
-#: src/skins/ui_equalizer.c:378
+#: src/skins/ui_equalizer.c:379
 msgid "Audacious Equalizer"
 msgstr "Audacious Equalizer"
 
-#: src/skins/ui_equalizer.c:884
+#: src/skins/ui_equalizer.c:896
 msgid "Presets"
 msgstr "Standard"
 
-#: src/skins/ui_main.c:444
+#: src/skins/ui_main.c:443
 msgid "kbps"
 msgstr "kbps"
 
-#: src/skins/ui_main.c:452
+#: src/skins/ui_main.c:451
 msgid "kHz"
 msgstr "kHz"
 
-#: src/skins/ui_main.c:459
+#: src/skins/ui_main.c:458
 msgid "surround"
 msgstr "Surround"
 
-#: src/skins/ui_main.c:807
+#: src/skins/ui_main.c:806
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr "Suche nach %d:%-2.2d / %d:%-2.2d"
 
-#: src/skins/ui_main.c:828
+#: src/skins/ui_main.c:827
 #, c-format
 msgid "Volume: %d%%"
 msgstr "Lautstaerke: (%d%%)"
 
-#: src/skins/ui_main.c:851
+#: src/skins/ui_main.c:850
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "Balance: %d%% links"
 
-#: src/skins/ui_main.c:853
+#: src/skins/ui_main.c:852
 msgid "Balance: center"
 msgstr "Balance: Mitte"
 
-#: src/skins/ui_main.c:855
+#: src/skins/ui_main.c:854
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "Balance: %d%% rechts"
 
-#: src/skins/ui_main.c:981
+#: src/skins/ui_main.c:980
 msgid "Options Menu"
 msgstr "Optionen"
 
-#: src/skins/ui_main.c:985
+#: src/skins/ui_main.c:984
 msgid "Disable 'Always On Top'"
 msgstr "'Immer im Vordergrund' aus"
 
-#: src/skins/ui_main.c:987
+#: src/skins/ui_main.c:986
 msgid "Enable 'Always On Top'"
 msgstr "'Immer im Vordergrund' an"
 
-#: src/skins/ui_main.c:990
+#: src/skins/ui_main.c:989
 msgid "File Info Box"
 msgstr "Dateiinformationen"
 
-#: src/skins/ui_main.c:995
+#: src/skins/ui_main.c:994
 msgid "Visualization Menu"
 msgstr "Visualisierungs-Menü"
 
-#: src/skins/ui_main.c:1645
+#: src/skins/ui_main.c:1648
 msgid "Single mode."
 msgstr "Single-Modus."
 
-#: src/skins/ui_main.c:1647
+#: src/skins/ui_main.c:1650
 msgid "Playlist mode."
 msgstr "Wiedergabelistenmodus"
 
-#: src/skins/ui_main.c:1669
+#: src/skins/ui_main.c:1672
 msgid "Stopping after song."
 msgstr "Nach Titel stoppen."
 
-#: src/skins/ui_main.c:1671
+#: src/skins/ui_main.c:1674
 msgid "Not stopping after song."
 msgstr "Nicht nach Titel stoppen."
 
@@ -3162,426 +2901,421 @@
 msgstr "Ausgewählte Wiedergabelisten speichern."
 
 #: src/skins/ui_manager.c:229
-#, fuzzy
-msgid "Save All Playlists"
-msgstr "Neue Wiedergabeliste"
-
-#: src/skins/ui_manager.c:230
-msgid ""
-"Saves all the playlists that are open. Note that this is done automatically "
-"when Audacious quits."
-msgstr ""
-
-#: src/skins/ui_manager.c:234
 msgid "Refresh List"
 msgstr "Liste aktualisieren"
 
-#: src/skins/ui_manager.c:235
+#: src/skins/ui_manager.c:230
 msgid "Refreshes metadata associated with a playlist entry."
 msgstr "Metadaten aktualisieren."
 
-#: src/skins/ui_manager.c:238
-#, fuzzy
-msgid "List Manager"
+#: src/skins/ui_manager.c:233
+msgid "Playlist Manager"
 msgstr "Wiedergabelisten-Manager"
 
-#: src/skins/ui_manager.c:239
-#, fuzzy
-msgid "Opens the playlist manager."
-msgstr "Wiedergabeliste umkehren."
+#: src/skins/ui_manager.c:234
+msgid "Queue Manager"
+msgstr "Warteschlangen-Manager"
 
-#: src/skins/ui_manager.c:243
+#: src/skins/ui_manager.c:237
 msgid "View"
 msgstr "Ansicht"
 
-#: src/skins/ui_manager.c:244
+#: src/skins/ui_manager.c:238
 msgid "Interface"
 msgstr "Interface"
 
-#: src/skins/ui_manager.c:245
+#: src/skins/ui_manager.c:239
 msgid "Interface Preferences ..."
 msgstr "Interface-Einstellungen ..."
 
-#: src/skins/ui_manager.c:249
+#: src/skins/ui_manager.c:243
 msgid "Add Internet Address..."
 msgstr "Internetadresse hinzufügen..."
 
-#: src/skins/ui_manager.c:250
+#: src/skins/ui_manager.c:244
 msgid "Adds a remote track to the playlist."
 msgstr "Entfernter Titel hinzufügen."
 
-#: src/skins/ui_manager.c:253
+#: src/skins/ui_manager.c:247
 msgid "Add Files..."
 msgstr "Dateien hinzufügen..."
 
-#: src/skins/ui_manager.c:254
+#: src/skins/ui_manager.c:248
 msgid "Adds files to the playlist."
 msgstr "Fügt Dateien in Wiedergabeliste ein."
 
-#: src/skins/ui_manager.c:259
+#: src/skins/ui_manager.c:253
 msgid "Search and Select"
 msgstr "Suchen und Auswählen"
 
-#: src/skins/ui_manager.c:260
+#: src/skins/ui_manager.c:254
 msgid ""
 "Searches the playlist and selects playlist entries based on specific "
 "criteria."
 msgstr "Wiedergabeliste nach bestimmte Suchkriterien durchsuchen lassen"
 
-#: src/skins/ui_manager.c:263
+#: src/skins/ui_manager.c:257
 msgid "Invert Selection"
 msgstr "Auswahl invertieren"
 
-#: src/skins/ui_manager.c:264
+#: src/skins/ui_manager.c:258
 msgid "Inverts the selected and unselected entries."
 msgstr "Invertiere alle Einträge."
 
-#: src/skins/ui_manager.c:267
+#: src/skins/ui_manager.c:261
 msgid "Select All"
 msgstr "Alle auswählen"
 
-#: src/skins/ui_manager.c:268
+#: src/skins/ui_manager.c:262
 msgid "Selects all of the playlist entries."
 msgstr "Wähle alle Einträge aus."
 
-#: src/skins/ui_manager.c:271
+#: src/skins/ui_manager.c:265
 msgid "Select None"
 msgstr "Keine auswählen"
 
-#: src/skins/ui_manager.c:272
+#: src/skins/ui_manager.c:266
 msgid "Deselects all of the playlist entries."
 msgstr "Alle ausgewählten Einträge abwählen."
 
-#: src/skins/ui_manager.c:277
+#: src/skins/ui_manager.c:271
 msgid "Remove All"
 msgstr "Alle entfernen"
 
-#: src/skins/ui_manager.c:278
+#: src/skins/ui_manager.c:272
 msgid "Removes all entries from the playlist."
 msgstr "Entfernt alle Warteschlangeneinträge."
 
-#: src/skins/ui_manager.c:281
+#: src/skins/ui_manager.c:275
 msgid "Clear Queue"
 msgstr "Warteschlange löschen"
 
-#: src/skins/ui_manager.c:282
+#: src/skins/ui_manager.c:276
 msgid "Clears the queue associated with this playlist."
 msgstr "Zugehörige Warteschlange der Wiedergabeliste entfernen."
 
-#: src/skins/ui_manager.c:285
+#: src/skins/ui_manager.c:279
 msgid "Remove Unavailable Files"
 msgstr "Nicht verfügbare Dateien entfernen"
 
-#: src/skins/ui_manager.c:286
+#: src/skins/ui_manager.c:280
 msgid "Removes unavailable files from the playlist."
 msgstr "Enfernt alle nicht verfügbaren Dateien aus der Liste."
 
-#: src/skins/ui_manager.c:289
+#: src/skins/ui_manager.c:283
 msgid "Remove Duplicates"
 msgstr "Duplikate entfernen"
 
-#: src/skins/ui_manager.c:291 src/skins/ui_manager.c:323
-#: src/skins/ui_manager.c:353
+#: src/skins/ui_manager.c:285 src/skins/ui_manager.c:317
+#: src/skins/ui_manager.c:347
 msgid "By Title"
 msgstr "Nach Titel"
 
-#: src/skins/ui_manager.c:292
+#: src/skins/ui_manager.c:286
 msgid "Removes duplicate entries from the playlist by title."
 msgstr "Duplikate nach Titel entfernen."
 
-#: src/skins/ui_manager.c:295 src/skins/ui_manager.c:335
-#: src/skins/ui_manager.c:365
+#: src/skins/ui_manager.c:289 src/skins/ui_manager.c:329
+#: src/skins/ui_manager.c:359
 msgid "By Filename"
 msgstr "Nach Dateinamen"
 
-#: src/skins/ui_manager.c:296
+#: src/skins/ui_manager.c:290
 msgid "Removes duplicate entries from the playlist by filename."
 msgstr "Duplikate nach Dateinamen entfernen."
 
-#: src/skins/ui_manager.c:299 src/skins/ui_manager.c:339
-#: src/skins/ui_manager.c:369
+#: src/skins/ui_manager.c:293 src/skins/ui_manager.c:333
+#: src/skins/ui_manager.c:363
 msgid "By Path + Filename"
 msgstr "Nach Pfad + Dateinamen"
 
-#: src/skins/ui_manager.c:300
+#: src/skins/ui_manager.c:294
 msgid "Removes duplicate entries from the playlist by their full path."
 msgstr "Duplikate nach vollem Pfad entfernen."
 
-#: src/skins/ui_manager.c:303
+#: src/skins/ui_manager.c:297
 msgid "Remove Unselected"
 msgstr "Nicht ausgewählte entfernen"
 
-#: src/skins/ui_manager.c:304
+#: src/skins/ui_manager.c:298
 msgid "Remove unselected entries from the playlist."
 msgstr "Entferne nicht ausgewählte Titel."
 
-#: src/skins/ui_manager.c:307
+#: src/skins/ui_manager.c:301
 msgid "Remove Selected"
 msgstr "Auswahl entfernen"
 
-#: src/skins/ui_manager.c:308
+#: src/skins/ui_manager.c:302
 msgid "Remove selected entries from the playlist."
 msgstr "Ausgewählte Wiedergabelisteneinträge entfernen."
 
-#: src/skins/ui_manager.c:313
+#: src/skins/ui_manager.c:307
 msgid "Randomize List"
 msgstr "Liste zufällig anordnen"
 
-#: src/skins/ui_manager.c:314
+#: src/skins/ui_manager.c:308
 msgid "Randomizes the playlist."
 msgstr "Ordne Liste zufällig an."
 
-#: src/skins/ui_manager.c:317
+#: src/skins/ui_manager.c:311
 msgid "Reverse List"
 msgstr "Liste umkehren"
 
-#: src/skins/ui_manager.c:318
+#: src/skins/ui_manager.c:312
 msgid "Reverses the playlist."
 msgstr "Wiedergabeliste umkehren."
 
-#: src/skins/ui_manager.c:321
+#: src/skins/ui_manager.c:315
 msgid "Sort List"
 msgstr "Liste sortieren"
 
-#: src/skins/ui_manager.c:324 src/skins/ui_manager.c:354
+#: src/skins/ui_manager.c:318 src/skins/ui_manager.c:348
 msgid "Sorts the list by title."
 msgstr "Sortiere Liste nach Titel."
 
-#: src/skins/ui_manager.c:327 src/skins/ui_manager.c:357
+#: src/skins/ui_manager.c:321 src/skins/ui_manager.c:351
 msgid "By Album"
 msgstr "Nach Album"
 
-#: src/skins/ui_manager.c:328 src/skins/ui_manager.c:358
+#: src/skins/ui_manager.c:322 src/skins/ui_manager.c:352
 msgid "Sorts the list by album."
 msgstr "Sortiere Liste nach Album."
 
-#: src/skins/ui_manager.c:331 src/skins/ui_manager.c:361
+#: src/skins/ui_manager.c:325 src/skins/ui_manager.c:355
 msgid "By Artist"
 msgstr "Nach Künstler"
 
-#: src/skins/ui_manager.c:332 src/skins/ui_manager.c:362
+#: src/skins/ui_manager.c:326 src/skins/ui_manager.c:356
 msgid "Sorts the list by artist."
 msgstr "Sortiere Liste nach Künstler."
 
-#: src/skins/ui_manager.c:336 src/skins/ui_manager.c:366
+#: src/skins/ui_manager.c:330 src/skins/ui_manager.c:360
 msgid "Sorts the list by filename."
 msgstr "Sortiere Liste nach Dateiname."
 
-#: src/skins/ui_manager.c:340 src/skins/ui_manager.c:370
+#: src/skins/ui_manager.c:334 src/skins/ui_manager.c:364
 msgid "Sorts the list by full pathname."
 msgstr "Sortiere Liste nach Pfadnamen."
 
-#: src/skins/ui_manager.c:343 src/skins/ui_manager.c:373
+#: src/skins/ui_manager.c:337 src/skins/ui_manager.c:367
 msgid "By Date"
 msgstr "Nach Datum"
 
-#: src/skins/ui_manager.c:344 src/skins/ui_manager.c:374
+#: src/skins/ui_manager.c:338 src/skins/ui_manager.c:368
 msgid "Sorts the list by modification time."
 msgstr "Sortiere Liste nach Modifizierungszeitpunkt."
 
-#: src/skins/ui_manager.c:347 src/skins/ui_manager.c:377
+#: src/skins/ui_manager.c:341 src/skins/ui_manager.c:371
 msgid "By Track Number"
 msgstr "Nach Titelnummer"
 
-#: src/skins/ui_manager.c:348 src/skins/ui_manager.c:378
+#: src/skins/ui_manager.c:342 src/skins/ui_manager.c:372
 msgid "Sorts the list by track number."
 msgstr "Sortiere Liste nach Titelnummer."
 
-#: src/skins/ui_manager.c:351
+#: src/skins/ui_manager.c:345
 msgid "Sort Selected"
 msgstr "Ausgewählte Sortieren"
 
-#: src/skins/ui_manager.c:387
+#: src/skins/ui_manager.c:381
 msgid "File"
 msgstr "Datei"
 
-#: src/skins/ui_manager.c:388
-msgid "Help"
-msgstr "Hilfe"
-
-#: src/skins/ui_manager.c:390
+#: src/skins/ui_manager.c:384
 msgid "Plugin Services"
 msgstr "Plugin-Dienste"
 
-#: src/skins/ui_manager.c:392 src/skins/ui_manager.c:395
+#: src/skins/ui_manager.c:386 src/skins/ui_manager.c:389
 msgid "View Track Details"
 msgstr "Zeige Titeldetails"
 
-#: src/skins/ui_manager.c:393 src/skins/ui_manager.c:396
+#: src/skins/ui_manager.c:387 src/skins/ui_manager.c:390
 msgid "View track details"
 msgstr "Zeige Titeldetails"
 
-#: src/skins/ui_manager.c:398 src/skins/ui_manager.c:399
+#: src/skins/ui_manager.c:392 src/skins/ui_manager.c:393
 msgid "About Audacious"
 msgstr "Über Audacious"
 
-#: src/skins/ui_manager.c:401
+#: src/skins/ui_manager.c:395
 msgid "Play File"
 msgstr "Datei abspielen"
 
-#: src/skins/ui_manager.c:402
+#: src/skins/ui_manager.c:396
 msgid "Load and play a file"
 msgstr "Datei laden und abspielen"
 
-#: src/skins/ui_manager.c:404
+#: src/skins/ui_manager.c:398
 msgid "Play Location"
 msgstr "Internetadresse spielen"
 
-#: src/skins/ui_manager.c:405
+#: src/skins/ui_manager.c:399
 msgid "Play media from the selected location"
 msgstr "Medien von bestimmter Adresse abspielen"
 
-#: src/skins/ui_manager.c:407
+#: src/skins/ui_manager.c:401
 msgid "Plugin services"
 msgstr "Plugin-Dienste"
 
-#: src/skins/ui_manager.c:409
+#: src/skins/ui_manager.c:403
 msgid "Preferences"
 msgstr "Einstellungen"
 
-#: src/skins/ui_manager.c:410
+#: src/skins/ui_manager.c:404
 msgid "Open preferences window"
 msgstr "Einstellungen anzeigen"
 
-#: src/skins/ui_manager.c:413
+#: src/skins/ui_manager.c:407
 msgid "Quit Audacious"
 msgstr "Audacious beenden"
 
-#: src/skins/ui_manager.c:415 src/skins/ui_manager.c:416
+#: src/skins/ui_manager.c:409 src/skins/ui_manager.c:410
 msgid "Set A-B"
 msgstr "A-B setzen"
 
-#: src/skins/ui_manager.c:418 src/skins/ui_manager.c:419
+#: src/skins/ui_manager.c:412 src/skins/ui_manager.c:413
 msgid "Clear A-B"
 msgstr "A-B leeren"
 
-#: src/skins/ui_manager.c:421 src/skins/ui_manager.c:422
+#: src/skins/ui_manager.c:415 src/skins/ui_manager.c:416
 msgid "Jump to Playlist Start"
 msgstr "Zum Anfang der Liste springen"
 
-#: src/skins/ui_manager.c:427 src/skins/ui_manager.c:428
+#: src/skins/ui_manager.c:421 src/skins/ui_manager.c:422
 msgid "Jump to Time"
 msgstr "Zu Zeitangabe springen"
 
-#: src/skins/ui_manager.c:430
+#: src/skins/ui_manager.c:424
 msgid "Queue Toggle"
 msgstr "In/Aus Warteschlange"
 
-#: src/skins/ui_manager.c:431
+#: src/skins/ui_manager.c:425
 msgid "Enables/disables the entry in the playlist's queue."
 msgstr "Eintrag in der Wiedergabewarteschleife aktivieren/deaktivieren."
 
-#: src/skins/ui_manager.c:434
+#: src/skins/ui_manager.c:428
 msgid "Copy"
 msgstr "Kopieren"
 
-#: src/skins/ui_manager.c:436
+#: src/skins/ui_manager.c:430
 msgid "Cut"
 msgstr "Ausschneiden"
 
-#: src/skins/ui_manager.c:438
+#: src/skins/ui_manager.c:432
 msgid "Paste"
 msgstr "Einfügen"
 
-#: src/skins/ui_manager.c:445
+#: src/skins/ui_manager.c:439
 msgid "Load"
 msgstr "Laden"
 
-#: src/skins/ui_manager.c:450 src/skins/ui_manager.c:471
-#: src/skins/ui_manager.c:486
+#: src/skins/ui_manager.c:440
+msgid "Import"
+msgstr "Importieren"
+
+#: src/skins/ui_manager.c:441
+msgid "Save"
+msgstr "Speichern"
+
+#: src/skins/ui_manager.c:442
+msgid "Delete"
+msgstr "Löschen"
+
+#: src/skins/ui_manager.c:444 src/skins/ui_manager.c:465
+#: src/skins/ui_manager.c:480
 msgid "Preset"
 msgstr "Voreinstellung"
 
-#: src/skins/ui_manager.c:451
+#: src/skins/ui_manager.c:445
 msgid "Load preset"
 msgstr "Voreinstellungen laden"
 
-#: src/skins/ui_manager.c:453 src/skins/ui_manager.c:474
-#: src/skins/ui_manager.c:489
+#: src/skins/ui_manager.c:447 src/skins/ui_manager.c:468
+#: src/skins/ui_manager.c:483
 msgid "Auto-load preset"
 msgstr "Voreinstellungen automatisch laden"
 
-#: src/skins/ui_manager.c:454
+#: src/skins/ui_manager.c:448
 msgid "Load auto-load preset"
 msgstr "Voreinstellungen laden"
 
-#: src/skins/ui_manager.c:457
+#: src/skins/ui_manager.c:451
 msgid "Load default preset into equalizer"
 msgstr "Standardwerte in Equalizer laden"
 
-#: src/skins/ui_manager.c:459
+#: src/skins/ui_manager.c:453
 msgid "Zero"
 msgstr "Null"
 
-#: src/skins/ui_manager.c:460
+#: src/skins/ui_manager.c:454
 msgid "Set equalizer preset levels to zero"
 msgstr "Equalizer Einstellungen auf Null setzen"
 
-#: src/skins/ui_manager.c:462
+#: src/skins/ui_manager.c:456
 msgid "From file"
 msgstr "Aus Datei"
 
-#: src/skins/ui_manager.c:463
+#: src/skins/ui_manager.c:457
 msgid "Load preset from file"
 msgstr "Standardwerte aus Datei laden"
 
-#: src/skins/ui_manager.c:465
+#: src/skins/ui_manager.c:459
 msgid "From WinAMP EQF file"
 msgstr "Aus einer WinAMP-EQF-Datei"
 
-#: src/skins/ui_manager.c:466
+#: src/skins/ui_manager.c:460
 msgid "Load preset from WinAMP EQF file"
 msgstr "Lade Standard aus WinAMP-EQF-Datei"
 
-#: src/skins/ui_manager.c:468
+#: src/skins/ui_manager.c:462
 msgid "WinAMP Presets"
 msgstr "WinAMP Standard"
 
-#: src/skins/ui_manager.c:469
+#: src/skins/ui_manager.c:463
 msgid "Import WinAMP presets"
 msgstr "Importiere WinAMP Standard"
 
-#: src/skins/ui_manager.c:472
+#: src/skins/ui_manager.c:466
 msgid "Save preset"
 msgstr "Speichere"
 
-#: src/skins/ui_manager.c:475
+#: src/skins/ui_manager.c:469
 msgid "Save auto-load preset"
 msgstr "Speichere"
 
-#: src/skins/ui_manager.c:478
+#: src/skins/ui_manager.c:472
 msgid "Save default preset"
 msgstr "Standardwerte speichern"
 
-#: src/skins/ui_manager.c:480
+#: src/skins/ui_manager.c:474
 msgid "To file"
 msgstr "in Datei"
 
-#: src/skins/ui_manager.c:481
+#: src/skins/ui_manager.c:475
 msgid "Save preset to file"
 msgstr "Speichere in Datei"
 
-#: src/skins/ui_manager.c:483
+#: src/skins/ui_manager.c:477
 msgid "To WinAMP EQF file"
 msgstr "in WinAMP-EQF-Datei"
 
-#: src/skins/ui_manager.c:484
+#: src/skins/ui_manager.c:478
 msgid "Save preset to WinAMP EQF file"
 msgstr "Speichere in WinAMP-EQF-Datei"
 
-#: src/skins/ui_manager.c:487
+#: src/skins/ui_manager.c:481
 msgid "Delete preset"
 msgstr "Lösche Voreinstellungen"
 
-#: src/skins/ui_manager.c:490
+#: src/skins/ui_manager.c:484
 msgid "Delete auto-load preset"
 msgstr "Lösche Voreinstellungen"
 
-#: src/skins/ui_playlist.c:245
+#: src/skins/ui_playlist.c:244
 msgid "Search entries in active playlist"
 msgstr "Suche Einträge in aktiver Playliste"
 
-#: src/skins/ui_playlist.c:253
+#: src/skins/ui_playlist.c:252
 msgid ""
 "Select entries in playlist by filling one or more fields. Fields use regular "
 "expressions syntax, case-insensitive. If you don't know how regular "
@@ -3594,39 +3328,39 @@
 "Ausdrücke funktionieren, geben Sie einfach nur einen Teilbegriff für Ihre "
 "Suche ein."
 
-#: src/skins/ui_playlist.c:261
+#: src/skins/ui_playlist.c:260
 msgid "Title: "
 msgstr "Titel: "
 
-#: src/skins/ui_playlist.c:268
+#: src/skins/ui_playlist.c:267
 msgid "Album: "
 msgstr "Album: "
 
-#: src/skins/ui_playlist.c:275
+#: src/skins/ui_playlist.c:274
 msgid "Artist: "
 msgstr "Künstler: "
 
-#: src/skins/ui_playlist.c:282
+#: src/skins/ui_playlist.c:281
 msgid "Filename: "
 msgstr "Dateiname: "
 
-#: src/skins/ui_playlist.c:290
+#: src/skins/ui_playlist.c:289
 msgid "Clear previous selection before searching"
 msgstr "Vorherige Auswahl vor dem Suchen löschen"
 
-#: src/skins/ui_playlist.c:293
+#: src/skins/ui_playlist.c:292
 msgid "Automatically toggle queue for matching entries"
 msgstr "Automatisch zwischen passenden Einträgen wechseln"
 
-#: src/skins/ui_playlist.c:296
+#: src/skins/ui_playlist.c:295
 msgid "Create a new playlist with matching entries"
 msgstr "Erstelle neue Playlist mit passenden Einträgen"
 
-#: src/skins/ui_playlist.c:763
+#: src/skins/ui_playlist.c:762
 msgid "Audacious Playlist Editor"
 msgstr "Audacious Wiedergabelisten-Editor"
 
-#: src/skins/ui_playlist.c:810
+#: src/skins/ui_playlist.c:809
 #, c-format
 msgid "%s (%d of %d)"
 msgstr "%s (%d von %d)"
@@ -3648,105 +3382,59 @@
 msgid "About sndfile plugin"
 msgstr "Über das Sndfile-Plugin"
 
-#: src/sndfile/plugin.c:455
-msgid ""
-"Adapted for Audacious usage by Tony Vroon <chainsaw@gentoo.org>\n"
-"from the xmms_sndfile plugin which is:\n"
-"Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
-"\n"
-"This program is free software ; you can redistribute it and/or modify \n"
-"it under the terms of the GNU General Public License as published by \n"
-"the Free Software Foundation ; either version 2 of the License, or \n"
-"(at your option) any later version. \n"
-" \n"
-"This program is distributed in the hope that it will be useful, \n"
-"but WITHOUT ANY WARRANTY ; without even the implied warranty of \n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. \n"
-"See the GNU General Public License for more details. \n"
-"\n"
-"You should have received a copy of the GNU General Public \n"
-"License along with this program ; if not, write to \n"
-"the Free Software Foundation, Inc., \n"
-"51 Franklin Street, Fifth Floor, \n"
-"Boston, MA 02110-1301 USA"
-msgstr ""
-"An Audacious angepasst von Tony Vroon <chainsaw@gentoo.org>\n"
-"vom xmms_sndfile-Plugin:\n"
-"Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
-"\n"
-"This program is free software ; you can redistribute it and/or modify \n"
-"it under the terms of the GNU General Public License as published by \n"
-"the Free Software Foundation ; either version 2 of the License, or \n"
-"(at your option) any later version. \n"
-" \n"
-"This program is distributed in the hope that it will be useful, \n"
-"but WITHOUT ANY WARRANTY ; without even the implied warranty of \n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. \n"
-"See the GNU General Public License for more details. \n"
-"\n"
-"You should have received a copy of the GNU General Public \n"
-"License along with this program ; if not, write to \n"
-"the Free Software Foundation, Inc., \n"
-"51 Franklin Street, Fifth Floor, \n"
-"Boston, MA 02110-1301 USA"
-
 #: src/sndstretch/sndstretch_xmms.c:155
 msgid "About SndStretch"
 msgstr "Über SndStretch"
 
-#: src/sndstretch/sndstretch_xmms.c:313
+#: src/sndstretch/sndstretch_xmms.c:308
 msgid "Volume corr."
 msgstr "Lautstärkekorrektur"
 
-#: src/sndstretch/sndstretch_xmms.c:314
+#: src/sndstretch/sndstretch_xmms.c:309
 msgid "Short Overlap"
 msgstr "Kurzes Überlappen"
 
-#: src/sndstretch/sndstretch_xmms.c:360
+#: src/sndstretch/sndstretch_xmms.c:355
 msgid "Speed"
 msgstr "Geschwindigkeit"
 
-#: src/sndstretch/sndstretch_xmms.c:361
+#: src/sndstretch/sndstretch_xmms.c:356
 msgid "Pitch"
 msgstr "Tonhöhe"
 
-#: src/sndstretch/sndstretch_xmms.c:362
+#: src/sndstretch/sndstretch_xmms.c:357
 msgid "Scale"
 msgstr "Skalierung"
 
-#: src/sndstretch/sndstretch_xmms.c:363
-msgid "Options"
-msgstr "Optionen"
-
-#: src/sndstretch/sndstretch_xmms.c:382
+#: src/sndstretch/sndstretch_xmms.c:377
 msgid "SndStretch - Configuration"
 msgstr "SndStretch - Konfiguration"
 
-#: src/song_change/song_change.c:464
+#: src/song_change/song_change.c:447
 msgid "Command to run when Audacious starts a new song."
 msgstr "Auszuführender Befehl, wenn Audacious ein neues Lied startet."
 
-#: src/song_change/song_change.c:465 src/song_change/song_change.c:469
-#: src/song_change/song_change.c:473 src/song_change/song_change.c:477
+#: src/song_change/song_change.c:449 src/song_change/song_change.c:455
+#: src/song_change/song_change.c:461 src/song_change/song_change.c:467
 msgid "Command:"
 msgstr "Befehl:"
 
-#: src/song_change/song_change.c:468
+#: src/song_change/song_change.c:453
 msgid "Command to run toward the end of a song."
 msgstr "Auszuführender Befehl am Ende eines Lieds."
 
-#: src/song_change/song_change.c:472
+#: src/song_change/song_change.c:459
 msgid "Command to run when Audacious reaches the end of the playlist."
 msgstr "Auszuführender Befehl am Ende der Wiedergabeliste."
 
-#: src/song_change/song_change.c:476
+#: src/song_change/song_change.c:465
 msgid ""
 "Command to run when title changes for a song (i.e. network streams titles)."
 msgstr ""
 "Auszuführender Befehl, wenn sich der Titel eines Lieds ändert (z.B. bei "
 "Netzwerk-Streams)."
 
-#: src/song_change/song_change.c:480
+#: src/song_change/song_change.c:471
 msgid ""
 "You can use the following format strings which\n"
 "will be substituted before calling the command\n"
@@ -3781,7 +3469,7 @@
 "%b: Album\n"
 "%T: Titelname"
 
-#: src/song_change/song_change.c:507
+#: src/song_change/song_change.c:498
 msgid ""
 "Parameters passed to the shell should be encapsulated in "
 "quotes. Doing otherwise is a security risk."
@@ -3789,11 +3477,11 @@
 "Parameter sollten zwischen Anführungszeichen stehen, ohne "
 "besteht ein Sicherheitsrisiko."
 
-#: src/song_change/song_change.c:518
+#: src/song_change/song_change.c:509
 msgid "Commands"
 msgstr "Befehle"
 
-#: src/song_change/song_change.c:555
+#: src/song_change/song_change.c:539
 msgid "Song Change"
 msgstr "Songwechsel"
 
@@ -3859,7 +3547,7 @@
 msgid "Close to the notification area (system tray)"
 msgstr "In den Informationsbereich beenden (System-Tray)"
 
-#: src/stereo_plugin/stereo.c:41
+#: src/stereo_plugin/stereo.c:45
 msgid ""
 "Extra Stereo Plugin\n"
 "\n"
@@ -3869,14 +3557,67 @@
 "\n"
 "Von Johan Levin 1999."
 
-#: src/stereo_plugin/stereo.c:65
+#: src/stereo_plugin/stereo.c:64
 msgid "About Extra Stereo Plugin"
 msgstr "Über das Extra Stereo Plugin"
 
-#: src/stereo_plugin/stereo.c:102
+#: src/stereo_plugin/stereo.c:95
 msgid "Configure Extra Stereo"
 msgstr "Extra Stereo konfigurieren"
 
+#: src/streambrowser/gui/streambrowser_win.c:78
+msgid "Search:"
+msgstr "Suchen:"
+
+#: src/streambrowser/gui/streambrowser_win.c:97
+#: src/streambrowser/gui/streambrowser_win.c:372
+msgid "Add Bookmark"
+msgstr "Lesezeichen setzen"
+
+#: src/streambrowser/gui/streambrowser_win.c:324
+msgid "Stream name"
+msgstr "Streamname"
+
+#: src/streambrowser/gui/streambrowser_win.c:331
+msgid "Now playing"
+msgstr "Aktueller Song"
+
+#: src/streambrowser/gui/streambrowser_win.c:369
+msgid "Remove Bookmark"
+msgstr "Lesezeichen entfernen"
+
+#: src/streambrowser/streambrowser.c:330
+msgid "About Stream Browser"
+msgstr "Über Streambrowser"
+
+#: src/streambrowser/streambrowser.c:331
+msgid ""
+"Copyright (c) 2008, by Calin Crisan <ccrisan@gmail.com> and The Audacious "
+"Team.\n"
+"\n"
+"This is a simple stream browser that includes the most popular streaming "
+"directories.\n"
+"Many thanks to the Streamtuner developers <http://www.nongnu.org/"
+"streamtuner>,\n"
+"\tand of course to the whole Audacious community.\n"
+"\n"
+"Also thank you Tony Vroon for mentoring & guiding me, again.\n"
+"\n"
+"This was a Google Summer of Code 2008 project."
+msgstr ""
+"Copyright (c) 2008, von Calin Crisan <ccrisan@gmail.com> und dem Audacious "
+"Team.\n"
+"\n"
+"Dies ist ein simpler Streambrowser, welcher die beliebtesten Streaming-"
+"verzeichnisse beinhaltet.\n"
+"Vielen Dank an die Streamtuner Entwickler <http://www.nongnu.org/"
+"streamtuner>,\n"
+"\tund natürlich an die ganze Audacious Community.\n"
+"\n"
+"Vielen Dank auch nochmal an Tony Vroon für die Beratung und Führung.\n"
+"\n"
+"Dies war ein Google Summer of Code 2008 Projekt."
+
 #: src/tonegen/tonegen.c:48
 msgid "About Tone Generator"
 msgstr "Über Ton-Generator"
@@ -3909,30 +3650,11 @@
 msgid "About File I/O Plugin"
 msgstr "Über File I/O Plugin"
 
-#: src/vorbis/configure.c:31
-#, fuzzy
-msgid "Override generic titles"
-msgstr "Allgemeinen Tuplez-Format-String überschreiben"
-
-#: src/vorbis/configure.c:32
-#, fuzzy
-msgid "Title format:"
-msgstr "Titelinformation"
-
-#: src/vorbis/configure.c:36
-msgid "Ogg Vorbis Tags"
-msgstr ""
-
-#: src/vorbis/configure.c:69
-#, fuzzy
-msgid "Ogg Vorbis Audio Plugin Configuration"
-msgstr "CD-Audio-Plugin-Konfiguration"
-
-#: src/vorbis/vorbis.c:581
+#: src/vorbis/vorbis.c:572
 msgid "About Ogg Vorbis Audio Plugin"
 msgstr "Über Ogg-Vorbis-Audio-Plugin"
 
-#: src/vorbis/vorbis.c:586
+#: src/vorbis/vorbis.c:577
 msgid ""
 "Ogg Vorbis Plugin by the Xiph.org Foundation\n"
 "\n"
@@ -4007,324 +3729,3 @@
 "\n"
 "Ein Teil des Plugin-Codes war von Miles Egan\n"
 "Die Wavpack-Seite befindet sich auf http://www.wavpack.com/\n"
-
-#~ msgid "About XMMS Alarm"
-#~ msgstr "Über XMMS Alarm"
-
-#~ msgid "XMMS Alarm"
-#~ msgstr "XMMS-Alarm"
-
-#~ msgid ""
-#~ "An XMMS plugin which can be used\n"
-#~ "to start playing at a certain time.\n"
-#~ "\n"
-#~ "Send all complaints to:\n"
-#~ "Adam Feakin <adamf@snika.uklinux.net>\n"
-#~ "Daniel Stodden <stodden@in.tum.de>\n"
-#~ "\n"
-#~ "http://www.snika.uklinux.net/xmms-alarm/"
-#~ msgstr ""
-#~ "Ein XMMS-Plugin, das verwendet werden kann,\n"
-#~ "um zu einem bestimmten Zeitpunkt die\n"
-#~ "Wiedergabe zu starten.\n"
-#~ "\n"
-#~ "Alle Beschwerden senden an:\n"
-#~ "Adam Feakin <adamf@snika.uklinux.net>\n"
-#~ "Daniel Stodden <stodden@in.tum.de>\n"
-#~ "\n"
-#~ "http://www.snika.uklinux.net/xmms-alarm/"
-
-#~ msgid "Alarm"
-#~ msgstr "Alarm"
-
-#~ msgid "This is your wakeup call."
-#~ msgstr "Dies ist dein Aufwach-Signal."
-
-#~ msgid "Sorry"
-#~ msgstr "Entschuldigung"
-
-#~ msgid "Warning"
-#~ msgstr "Warnung"
-
-#~ msgid ""
-#~ "For safety reasons the \"quiet\" time must be at least 65 seconds longer "
-#~ "than the fading time, it must also be more than 10 seconds. This "
-#~ "basically means that there is a bug in the code and until I find a way of "
-#~ "really fixing it this message will appear :)\n"
-#~ "\n"
-#~ "Your fading settings have NOT been saved\n"
-#~ "\n"
-#~ "--\n"
-#~ "Adam"
-#~ msgstr ""
-#~ "Aus Sicherheitsgründen muss die \"ruhig\"-Zeitangabe mindestens 65 "
-#~ "Sekunden länger als die Übergangszeitangabe sein, außerdem muss sie "
-#~ "länger als 10 Sekunden sein. Das bedeutet, dass ein Bug im Code vorhanden "
-#~ "ist. Bis ich einen wirklich funktionierenden Fix gefunden habe, wird "
-#~ "diese Meldung erscheinen. :)\n"
-#~ "\n"
-#~ "Deine Einstellungen wurden NICHT gespeichert.\n"
-#~ "\n"
-#~ "--\n"
-#~ "Adam"
-
-#~ msgid "Oh Well"
-#~ msgstr "Jo mei"
-
-#~ msgid "Alarm Settings"
-#~ msgstr "Alarm-Einstellungen"
-
-#~ msgid "Time"
-#~ msgstr "Zeit"
-
-#~ msgid "hours"
-#~ msgstr "Stunden"
-
-#~ msgid "h"
-#~ msgstr "Uhr"
-
-#~ msgid "minutes"
-#~ msgstr "Minuten"
-
-#~ msgid "Quiet after:"
-#~ msgstr "Still nach:"
-
-#~ msgid "Alarm at (default):"
-#~ msgstr "Alarm um (standardmäßig):"
-
-#~ msgid "Choose the days for the alarm to come on"
-#~ msgstr "Tage wählen, an denen der Alarm ausgelöst werden soll"
-
-#~ msgid "Day"
-#~ msgstr "Tag"
-
-#~ msgid "Tuesday"
-#~ msgstr "Dienstag"
-
-#~ msgid "Wednesday"
-#~ msgstr "Mittwoch"
-
-#~ msgid "Thursday"
-#~ msgstr "Donnerstag"
-
-#~ msgid "Friday"
-#~ msgstr "Freitag"
-
-#~ msgid "Saturday"
-#~ msgstr "Samstag"
-
-#~ msgid "Sunday"
-#~ msgstr "Sonntag"
-
-#~ msgid "Monday"
-#~ msgstr "Montag"
-
-#~ msgid "Days"
-#~ msgstr "Tage"
-
-#~ msgid "Fading"
-#~ msgstr "Übergang"
-
-#~ msgid "Volume"
-#~ msgstr "Lautstärke"
-
-#~ msgid "Current"
-#~ msgstr "Momentan"
-
-#~ msgid "Start at"
-#~ msgstr "Beginnen bei"
-
-#~ msgid "%"
-#~ msgstr "%"
-
-#~ msgid "Final"
-#~ msgstr "Schluss"
-
-#~ msgid "Additional Command"
-#~ msgstr "Zusätzlicher Befehl"
-
-#~ msgid "enable"
-#~ msgstr "aktivieren"
-
-#~ msgid "Playlist (optional)"
-#~ msgstr "Wiedergabeliste (optional)"
-
-#~ msgid "Browse..."
-#~ msgstr "Suchen..."
-
-#~ msgid "Reminder"
-#~ msgstr "Erinnern"
-
-#~ msgid "Use reminder"
-#~ msgstr "Erinnerung benutzen"
-
-#~ msgid "What do these options mean?"
-#~ msgstr "Was bedeuten diese Einstellungen?"
-
-#~ msgid ""
-#~ "\n"
-#~ "Time\n"
-#~ " Alarm at: \n"
-#~ " The time for the alarm to come on.\n"
-#~ "\n"
-#~ " Quiet After: \n"
-#~ " Stop alarm after this amount of time.\n"
-#~ " (if the wakeup dialog is not closed)\n"
-#~ "\n"
-#~ "\n"
-#~ "Days\n"
-#~ " Day:\n"
-#~ " Select the days for the alarm to activate.\n"
-#~ "\n"
-#~ " Time:\n"
-#~ " Choose the time for the alarm on each day,\n"
-#~ " or select the toggle button to use the default\n"
-#~ " time.\n"
-#~ "\n"
-#~ "\n"
-#~ "Volume\n"
-#~ " Fading: \n"
-#~ " Fade the volume up to the chosen volume \n"
-#~ " for this amount of time.\n"
-#~ "\n"
-#~ " Start at: \n"
-#~ " Start fading from this volume.\n"
-#~ "\n"
-#~ " Final: \n"
-#~ " The volume to stop fading at. If the fading\n"
-#~ " time is 0 then set volume to this and start\n"
-#~ " playing.\n"
-#~ "\n"
-#~ "\n"
-#~ "Options:\n"
-#~ " Additional Command:\n"
-#~ " Run this command at the alarm time.\n"
-#~ "\n"
-#~ " Playlist: \n"
-#~ " Load this playlist for playing songs from \n"
-#~ " (must have .m3u extension). If no playlist\n"
-#~ " is given then the songs which are currently\n"
-#~ " in the list will be used.\n"
-#~ " The URL of an mp3/ogg stream can also be\n"
-#~ " entered here, but loading of playlists from\n"
-#~ " URLs is not currently supported by xmms.\n"
-#~ "\n"
-#~ " Reminder:\n"
-#~ " Display a reminder when the alarm goes off,\n"
-#~ " type the reminder in the box and turn on the\n"
-#~ " toggle button if you want it to be shown.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Zeit\n"
-#~ " Alarm um: \n"
-#~ " Die Zeit, um die der Alarm ausgelöst wird.\n"
-#~ "\n"
-#~ " Still nach: \n"
-#~ " Der Alarm wird nach dieser Zeit gestoppt.\n"
-#~ " (sofern der Aufweck-Dialog nicht geschlossen wird)\n"
-#~ "\n"
-#~ "\n"
-#~ "Tage\n"
-#~ " Tag:\n"
-#~ " Die Tage wählen, an denen der Alarm aktiviert wird.\n"
-#~ "\n"
-#~ " Zeit:\n"
-#~ " Für jeden Tag einzeln die Zeit für den Alarm wählen,\n"
-#~ " oder den Alarm zur Standard-Zeit aktivieren.\n"
-#~ "\n"
-#~ "\n"
-#~ "Lautstärke\n"
-#~ " Übergang: \n"
-#~ " Passt die Lautstärke an die gewählte Lautstärke\n"
-#~ " in diesem Zeitraum an.\n"
-#~ "\n"
-#~ " Beginnen bei: \n"
-#~ " Starte den Übergang bei dieser Lautstärke.\n"
-#~ "\n"
-#~ " Schluss: \n"
-#~ " Die Lautstärke, bei der der Übergang stoppt.\n"
-#~ " Falls die Übergangszeit 0 beträgt, wird die\n"
-#~ " Wiedergabe schon mit dieser Lautstärke gestartet.\n"
-#~ "\n"
-#~ "\n"
-#~ "Optionen:\n"
-#~ " Zusätzlicher Befehl:\n"
-#~ " Führe diesen Befehl bei Auslösung des Alarms aus.\n"
-#~ "\n"
-#~ " Wiedergabeliste: \n"
-#~ " Lade diese Wiedergabeliste zu Wiedergabe\n"
-#~ " (muss die Erweiterung .m3u haben). Wenn keine Wiedergabeliste\n"
-#~ " gegeben ist, werden die momentan in der\n"
-#~ " Wiedergabeliste befindlichen Stücke verwendet.\n"
-#~ " Die URL eines MP3/OGG-Streams kann auch hier\n"
-#~ " angegeben werden, aber das Laden von Wiedergabelisten\n"
-#~ " von URLs wird momentan noch nicht unterstützt.\n"
-#~ "\n"
-#~ " Erinnerung:\n"
-#~ " Zeige eine Erinnerung an, wenn der Alarm ausgelöst wird.\n"
-
-#~ msgid "Your reminder for today is.."
-#~ msgstr "Die Erinnerung für heute lautet.."
-
-#~ msgid "Thankyou"
-#~ msgstr "Danke"
-
-#~ msgid "_Queue Manager ..."
-#~ msgstr "Warte_schlangen-Manager ..."
-
-#~ msgid "About LADSPA Host"
-#~ msgstr "Über LADSPA Host"
-
-#~ msgid "%s Settings"
-#~ msgstr "%s Einstellungen"
-
-#~ msgid "LADSPA Host Settings"
-#~ msgstr "LADSPA Einstellungen"
-
-#~ msgid "Module path:"
-#~ msgstr "Modulpfad:"
-
-#~ msgid "Available plugins:"
-#~ msgstr "Verfügbare Plugins:"
-
-#~ msgid "Enable"
-#~ msgstr "Aktivieren"
-
-#~ msgid "Enabled plugins:"
-#~ msgstr "Aktive Plugins:"
-
-#~ msgid "Settings"
-#~ msgstr "Einstellungen"
-
-#~ msgid "About Channel Mixer"
-#~ msgstr "Über Channel-Mixer"
-
-#~ msgid "Channel Mixer Settings"
-#~ msgstr "Channel-Mixer-Einstellungen"
-
-#~ msgid "Output channels:"
-#~ msgstr "Ausgabe-Kanäle:"
-
-#~ msgid "Changes take effect at the next song change."
-#~ msgstr "Änderungen werden mit dem nächsten Titelwechsel wirksam"
-
-#~ msgid "Queue Manager"
-#~ msgstr "Warteschlangen-Manager"
-
-#~ msgid "Search:"
-#~ msgstr "Suchen:"
-
-#~ msgid "Add Bookmark"
-#~ msgstr "Lesezeichen setzen"
-
-#~ msgid "Stream name"
-#~ msgstr "Streamname"
-
-#~ msgid "Now playing"
-#~ msgstr "Aktueller Song"
-
-#~ msgid "Remove Bookmark"
-#~ msgstr "Lesezeichen entfernen"
-
-#~ msgid "About Stream Browser"
-#~ msgstr "Über Streambrowser"

audacious-plugins-3.0.3.tar.bz2/po/es.po -> audacious-plugins-3.1.tar.bz2/po/es.po Changed

@@ -1,24 +1,24 @@
-# translation of es.po to
-# Spanish translation for Audacious
-# This file is distributed under the same license as the Audacious package.
-# Cosme Domínguez Díaz <cosme.ddiaz@gmail.com>, 2010
-# Jorge Andrés <winninglero@gmail.com>, 2011
+# Spanish translation for Audacious Plugins
+# Copyright (C) Audacious translators
+# This file is distributed under the same license as the Audacious Plugins package.
 #
+# Translators:
+# Cosme Domínguez Díaz <cosme.ddiaz@gmail.com>, 2010.
+# Jorge Andrés <winninglero@gmail.com>, 2011.
+# <xukosky@yahoo.es>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: Audacious\n"
-"Report-Msgid-Bugs-To: http://jira.atheme.org/\n"
-"POT-Creation-Date: 2011-09-18 14:13-0400\n"
-"PO-Revision-Date: \n"
-"Last-Translator: Jorge Andrés <winninglero@gmail.com>\n"
-"Language-Team: \n"
-"Language: \n"
+"Project-Id-Version: Audacious Plugins\n"
+"Report-Msgid-Bugs-To: http://jira.atheme.org/browse/AUDPLUG\n"
+"POT-Creation-Date: 2011-10-24 16:38-0400\n"
+"PO-Revision-Date: 2011-10-29 22:30+0000\n"
+"Last-Translator: xukosky <xukosky@yahoo.es>\n"
+"Language-Team: Spanish\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Spanish\n"
-"X-Poedit-Country: SPAIN\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: src/aac/libmp4.c:256
 #, c-format
@@ -29,12 +29,345 @@
 msgstr ""
 "Usando libfaad2-%s para decodificar.\n"
 "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decodificador (c) Nero AG, www.nero.com\n"
-"Copyright (c) 2005-2006 Audacious team"
+"Copyright (c) 2005-2006 El equipo de Audacious"
 
 #: src/aac/libmp4.c:261
 msgid "About MP4 AAC decoder plugin"
 msgstr "Acerca del complemento decodificador MP4 AAC"
 
+#: src/alarm/interface.c:34
+msgid "About XMMS Alarm"
+msgstr "Acerca de la alarma XMMS"
+
+#: src/alarm/interface.c:41
+msgid "XMMS Alarm"
+msgstr "Alarma XMMS"
+
+#: src/alarm/interface.c:50
+msgid ""
+"An XMMS plugin which can be used\n"
+"to start playing at a certain time.\n"
+"\n"
+"Send all complaints to:\n"
+"Adam Feakin <adamf@snika.uklinux.net>\n"
+"Daniel Stodden <stodden@in.tum.de>\n"
+"\n"
+"http://www.snika.uklinux.net/xmms-alarm/"
+msgstr ""
+"Un complemento de XMMS que puede ser utilizado\n"
+"para empezar la reproducción en una hora concreta.\n"
+"\n"
+"Envíe todas las quejas a:\n"
+"Adam Feakin <adamf@snika.uklinux.net>\n"
+"Daniel Stodden <stodden@in.tum.de>\n"
+"\n"
+"http://www.snika.uklinux.net/xmms-alarm/"
+
+#: src/alarm/interface.c:65
+msgid "Close"
+msgstr "Cerrar"
+
+#: src/alarm/interface.c:95
+msgid "Alarm"
+msgstr "Alarma"
+
+#: src/alarm/interface.c:102
+msgid "This is your wakeup call."
+msgstr "Esta es su llamada para despertar."
+
+#: src/alarm/interface.c:117 src/alarm/interface.c:1338
+msgid "OK"
+msgstr "Aceptar"
+
+#: src/alarm/interface.c:151
+msgid "Sorry"
+msgstr "Lo sentimos"
+
+#: src/alarm/interface.c:158
+msgid "Warning"
+msgstr "Aviso"
+
+#: src/alarm/interface.c:167
+msgid ""
+"For safety reasons the \"quiet\" time must be at least 65 seconds longer than the fading time, it must also be more than 10 seconds. This basically means that there is a bug in the code and until I find a way of really fixing it this message will appear :)\n"
+"\n"
+"Your fading settings have NOT been saved\n"
+"\n"
+"--\n"
+"Adam"
+msgstr ""
+"Por razones de seguridad el tiempo de silencio debe ser al menos 65 segundos más largo que el tiempo de desvanecimiento, también debe ser al menos 10 segundos. Esto básicamente significa que hay un error en el código y este mensaje aparecerá hasta que encuentre una forma de arreglarlo :)\n"
+"\n"
+"Sus ajustes de desvanecimiento NO se han guardado\n"
+"\n"
+"--\n"
+"Adam"
+
+#: src/alarm/interface.c:183
+msgid "Oh Well"
+msgstr "Ah bueno"
+
+#: src/alarm/interface.c:339
+msgid "Alarm Settings"
+msgstr "Ajustes de alarma"
+
+#: src/alarm/interface.c:354 src/alarm/interface.c:526
+#: src/alarm/interface.c:898
+msgid "Time"
+msgstr "Tiempo"
+
+#: src/alarm/interface.c:395
+msgid "hours"
+msgstr "horas"
+
+#: src/alarm/interface.c:456
+msgid "h"
+msgstr "h"
+
+#: src/alarm/interface.c:486
+msgid "minutes"
+msgstr "minutos"
+
+#: src/alarm/interface.c:504
+msgid "Quiet after:"
+msgstr "Silencio tras:"
+
+#: src/alarm/interface.c:514
+msgid "Alarm at (default):"
+msgstr "Alarma a (predeterminado):"
+
+#: src/alarm/interface.c:534
+msgid "Choose the days for the alarm to come on"
+msgstr "Seleccione los días para que salte la alarma"
+
+#: src/alarm/interface.c:562 src/alarm/interface.c:610
+#: src/alarm/interface.c:658 src/alarm/interface.c:706
+#: src/alarm/interface.c:754 src/alarm/interface.c:802
+#: src/alarm/interface.c:850 src/bs2b/plugin.c:198 src/OSS/configure.c:153
+#: src/skins/ui_manager.c:450 src/skins/ui_manager.c:471
+msgid "Default"
+msgstr "Predeterminado"
+
+#: src/alarm/interface.c:888
+msgid "Day"
+msgstr "Día"
+
+#: src/alarm/interface.c:908
+msgid "Tuesday"
+msgstr "Martes"
+
+#: src/alarm/interface.c:919
+msgid "Wednesday"
+msgstr "Miércoles"
+
+#: src/alarm/interface.c:930
+msgid "Thursday"
+msgstr "Jueves"
+
+#: src/alarm/interface.c:941
+msgid "Friday"
+msgstr "Viernes"
+
+#: src/alarm/interface.c:952
+msgid "Saturday"
+msgstr "Sábado"
+
+#: src/alarm/interface.c:963
+msgid "Sunday"
+msgstr "Domingo"
+
+#: src/alarm/interface.c:973
+msgid "Monday"
+msgstr "Lunes"
+
+#: src/alarm/interface.c:984
+msgid "Days"
+msgstr "Días"
+
+#: src/alarm/interface.c:1000
+msgid "Fading"
+msgstr "Desvanecimiento"
+
+#: src/alarm/interface.c:1037
+msgid "seconds"
+msgstr "segundos"
+
+#: src/alarm/interface.c:1045 src/alarm/interface.c:1160
+msgid "Volume"
+msgstr "Volumen"
+
+#: src/alarm/interface.c:1071
+msgid "Current"
+msgstr "Actual"
+
+#: src/alarm/interface.c:1079
+msgid "Start at"
+msgstr "Iniciar a"
+
+#: src/alarm/interface.c:1107 src/alarm/interface.c:1151
+msgid "%"
+msgstr "%"
+
+#: src/alarm/interface.c:1123
+msgid "Final"
+msgstr "Final"
+
+#: src/alarm/interface.c:1176
+msgid "Additional Command"
+msgstr "Comando adicional"
+
+#: src/alarm/interface.c:1202
+msgid "enable"
+msgstr "activar"
+
+#: src/alarm/interface.c:1210
+msgid "Playlist (optional)"
+msgstr "Lista de reproducción (opcional)"
+
+#: src/alarm/interface.c:1236
+msgid "Browse..."
+msgstr "Examinar..."
+
+#: src/alarm/interface.c:1244 src/alarm/interface.c:1408
+msgid "Reminder"
+msgstr "Recordatorio"
+
+#: src/alarm/interface.c:1261
+msgid "Use reminder"
+msgstr "Utilizar recordatorio"
+
+#: src/alarm/interface.c:1277 src/sndstretch/sndstretch_xmms.c:358
+msgid "Options"
+msgstr "Opciones"
+
+#: src/alarm/interface.c:1285
+msgid "What do these options mean?"
+msgstr "¿Qué significan estas opciones?"
+
+#: src/alarm/interface.c:1313
+msgid ""
+"\n"
+"Time\n"
+" Alarm at: \n"
+" The time for the alarm to come on.\n"
+"\n"
+" Quiet After: \n"
+" Stop alarm after this amount of time.\n"
+" (if the wakeup dialog is not closed)\n"
+"\n"
+"\n"
+"Days\n"
+" Day:\n"
+" Select the days for the alarm to activate.\n"
+"\n"
+" Time:\n"
+" Choose the time for the alarm on each day,\n"
+" or select the toggle button to use the default\n"
+" time.\n"
+"\n"
+"\n"
+"Volume\n"
+" Fading: \n"
+" Fade the volume up to the chosen volume \n"
+" for this amount of time.\n"
+"\n"
+" Start at: \n"
+" Start fading from this volume.\n"
+"\n"
+" Final: \n"
+" The volume to stop fading at. If the fading\n"
+" time is 0 then set volume to this and start\n"
+" playing.\n"
+"\n"
+"\n"
+"Options:\n"
+" Additional Command:\n"
+" Run this command at the alarm time.\n"
+"\n"
+" Playlist: \n"
+" Load this playlist for playing songs from \n"
+" (must have .m3u extension). If no playlist\n"
+" is given then the songs which are currently\n"
+" in the list will be used.\n"
+" The URL of an mp3/ogg stream can also be\n"
+" entered here, but loading of playlists from\n"
+" URLs is not currently supported by xmms.\n"
+"\n"
+" Reminder:\n"
+" Display a reminder when the alarm goes off,\n"
+" type the reminder in the box and turn on the\n"
+" toggle button if you want it to be shown.\n"
+msgstr ""
+"\n"
+"Hora\n"
+" Alarma a: \n"
+" La hora a la que saltará la alarma.\n"
+"\n"
+" Silencio tras: \n"
+" Detener la alarma tras esta cantidad de tiempo.\n"
+" (si el diálogo de despertar no se cierra)\n"
+"\n"
+"\n"
+"Días\n"
+" Día:\n"
+" Seleccione los días para que se active la alarma.\n"
+"\n"
+" Hora:\n"
+" Elija la hora para la alarma en cada día,\n"
+" o seleccione el botón para utilizar la hora\n"
+" predeterminada.\n"
+"\n"
+"\n"
+"Volumen\n"
+" Desvanecimiento: \n"
+" Bajar el volumen hasta el nivel elegido \n"
+" durante este periodo de tiempo.\n"
+"\n"
+" Iniciar a: \n"
+" Empezar a desvanecer desde este volumen.\n"
+"\n"
+" Final: \n"
+" El volumen final del desvanecimiento. Si el tiempo\n"
+" de desvanecimiento es 0 se establece este volumen\n"
+" y empieza la reproducción.\n"
+"\n"
+"\n"
+"Opciones:\n"
+" Comando adicional:\n"
+" Ejecutar este comando a la hora de la alarma.\n"
+"\n"
+" Lista de reproducción: \n"
+" Cargar esta lista de producción para reproducir\n"
+" (debe tener una extensión .m3u). Si no se introduce\n"
+" introduce ninguna lista se utilizarán las canciones\n"
+" en la lista actual.\n"
+" También se puede introducir la URL de un flujo\n"
+" mp3/ogg, pero actualmente xmms no puede cargar\n"
+" listas de reproducción desde URLs.\n"
+"\n"
+" Recordatorio:\n"
+" Mostrar un recordatorio cuando se apaga la alarma,\n"
+" escriba el recordatorio en la caja y seleccione el\n"
+" botón si quiere que se muestre.\n"
+
+#: src/alarm/interface.c:1315 src/skins/ui_manager.c:382
+msgid "Help"
+msgstr "Ayuda"
+
+#: src/alarm/interface.c:1347 src/cdaudio-ng/configure.c:249
+#: src/crystalizer/crystalizer.c:130 src/echo_plugin/gui.c:125
+#: src/jack/configure.c:148 src/null/null.c:108 src/stereo_plugin/stereo.c:125
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: src/alarm/interface.c:1415
+msgid "Your reminder for today is.."
+msgstr "Su recordatorio para hoy es..."
+
+#: src/alarm/interface.c:1440
+msgid "Thankyou"
+msgstr "Gracias"
+
 #: src/alsa/config.c:210
 msgid "Default PCM device"
 msgstr "Dispositivo PCM predeterminado"
@@ -43,25 +376,25 @@
 msgid "Default mixer device"
 msgstr "Dispositivo mezclador predeterminado"
 
-#: src/alsa/config.c:447
+#: src/alsa/config.c:438
 msgid "ALSA Output Plugin Preferences"
 msgstr "Preferencias de complemento de salida ALSA"
 
-#: src/alsa/config.c:454
+#: src/alsa/config.c:445
 msgid "PCM device:"
 msgstr "Dispositivo PCM:"
 
-#: src/alsa/config.c:456 src/OSS/configure.c:246
+#: src/alsa/config.c:447 src/OSS/configure.c:237
 msgid "Mixer device:"
-msgstr "Dispositivo mexclador"
+msgstr "Dispositivo mezclador:"
 
-#: src/alsa/config.c:458
+#: src/alsa/config.c:449
 msgid "Mixer element:"
 msgstr "Elemento mezclador:"
 
-#: src/alsa/config.c:461
+#: src/alsa/config.c:452
 msgid "Work around drain hangup"
-msgstr "Trabajar por la fuga de colgado"
+msgstr "Evitar los cuelgues por falta de recursos"
 
 #: src/alsa/plugin.c:59
 msgid "About ALSA Output Plugin"
@@ -76,24 +409,22 @@
 "You have not selected any sequencer ports for MIDI playback. You can do so "
 "in the MIDI plugin preferences."
 msgstr ""
-"No tiene seleccionado algún puerto secuenciador para reproducción MIDI. "
-"Puede hacerlo en la preferencias del complemento MIDI."
+"No tiene seleccionado ningún puerto secuenciador para la reproducción MIDI."
+" Puede hacerlo en la preferencias del complemento MIDI."
 
 #: src/amidi-plug/backend-alsa/b-alsa.c:35
 msgid "ALSA Backend "
-msgstr "Motor ALSA"
+msgstr "Motor ALSA "
 
 #: src/amidi-plug/backend-alsa/b-alsa.c:37
 msgid ""
-"This backend sends MIDI events to a group of user-chosen ALSA sequencer "
-"ports. The ALSA sequencer interface is very versatile, it can provide ports "
-"for audio cards hardware synthesizers (i.e. emu10k1) but also for software "
-"synths, external devices, etc.\n"
-"This backend does not produce audio, MIDI events are handled directly from "
-"devices/programs behind the ALSA ports; in example, MIDI events sent to the "
-"hardware synth will be directly played.\n"
+"This backend sends MIDI events to a group of user-chosen ALSA sequencer ports. The ALSA sequencer interface is very versatile, it can provide ports for audio cards hardware synthesizers (i.e. emu10k1) but also for software synths, external devices, etc.\n"
+"This backend does not produce audio, MIDI events are handled directly from devices/programs behind the ALSA ports; in example, MIDI events sent to the hardware synth will be directly played.\n"
 "Backend written by Giacomo Lozito."
 msgstr ""
+"Este motor envía eventos MIDI a un grupo de puertos secuenciadores ALSA definidos. El interfaz secuenciador ALSA es muy versátil, puede proporcionar puertos para sintetizadores hardware (p. ej. emu10k1) pero también sintetizadores software, dispositivos externos, etc.\n"
+"Este motor no produce sonido, los eventos MIDI son manejados directamente por los dispositivos/programas tras los puertos ALSA; por ejemplo, los eventos MIDI enviados a un sintetizador hardware serán reproducidos directamente.\n"
+"Motor escrito por Giacomo Lozito."
 
 #: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:38
 msgid "FluidSynth Backend "
@@ -101,13 +432,13 @@
 
 #: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:40
 msgid ""
-"This backend produces audio by sending MIDI events to FluidSynth, a real-"
-"time software synthesizer based on the SoundFont2 specification (www."
-"fluidsynth.org).\n"
-"Produced audio can be manipulated via player effect plugins and is processed "
-"by chosen ouput plugin.\n"
+"This backend produces audio by sending MIDI events to FluidSynth, a real-time software synthesizer based on the SoundFont2 specification (www.fluidsynth.org).\n"
+"Produced audio can be manipulated via player effect plugins and is processed by chosen ouput plugin.\n"
 "Backend written by Giacomo Lozito."
 msgstr ""
+"Este motor produce sonido al enviar eventos MIDI a FluidSynth, un sintetizador software en tiempo real basado en la especificación SoundFont2 (www.fluidsynth.org).\n"
+"El sonido producido se puede manipular mediante complementos de efectos y es procesado por el complemento de salida elegido.\n"
+"Motor escrito por Giacomo Lozito."
 
 #: src/amidi-plug/i_configure-alsa.c:228
 msgid "ALSA BACKEND CONFIGURATION"
@@ -131,15 +462,15 @@
 
 #: src/amidi-plug/i_configure-alsa.c:399
 msgid "Soundcard: "
-msgstr "Tarjeta de sonido:"
+msgstr "Tarjeta de sonido: "
 
 #: src/amidi-plug/i_configure-alsa.c:401
 msgid "Mixer control: "
-msgstr "Control mezclador:"
+msgstr "Control mezclador: "
 
 #: src/amidi-plug/i_configure-alsa.c:413
 msgid "Mixer settings"
-msgstr "Preferencias de mezclador"
+msgstr "Ajustes del mezclador"
 
 #: src/amidi-plug/i_configure-alsa.c:429
 msgid "ALSA Backend not loaded or not available"
@@ -155,11 +486,11 @@
 
 #: src/amidi-plug/i_configure-ap.c:59
 msgid "AMIDI-Plug - backend information"
-msgstr "AMIDI-Plug - información de motor"
+msgstr "Complemento AMIDI - información del motor"
 
 #: src/amidi-plug/i_configure-ap.c:196
 msgid "AMIDI-PLUG PREFERENCES"
-msgstr "AMIDI-PREFERENCIAS DEL PLUG"
+msgstr "PREFERENCIAS DEL COMPLEMENTO AMIDI"
 
 #: src/amidi-plug/i_configure-ap.c:223
 msgid "Backend selection"
@@ -171,51 +502,49 @@
 
 #: src/amidi-plug/i_configure-ap.c:257
 msgid "Playback settings"
-msgstr "Preferencias de reproducción"
+msgstr "Ajustes de reproducción"
 
 #: src/amidi-plug/i_configure-ap.c:262
 msgid "Transpose: "
-msgstr "Transponer"
+msgstr "Transponer: "
 
 #: src/amidi-plug/i_configure-ap.c:271
 msgid "Drum shift: "
-msgstr "Tambor de cambio:"
+msgstr "Cambio de batería: "
 
 #: src/amidi-plug/i_configure-ap.c:289
 msgid "Advanced settings"
-msgstr "Configuración avanzada"
+msgstr "Ajustes avanzados"
 
 #: src/amidi-plug/i_configure-ap.c:293
 msgid "pre-calculate length of MIDI files in playlist"
-msgstr "pre-calcular longitud de archivos MIDI en lista de reproducción"
+msgstr "calcular la longitud de los archivos MIDI en lista de reproducción"
 
 #: src/amidi-plug/i_configure-ap.c:298
 msgid "extract comments from MIDI file (if available)"
-msgstr "extraer comentarios desde archivo MIDI (si está disponible)"
+msgstr "extraer comentarios desde el archivo MIDI (si está disponible)"
 
 #: src/amidi-plug/i_configure-ap.c:303
 msgid "extract lyrics from MIDI file (if available)"
-msgstr "extraer letras desde archivo MIDI (si está disponible)"
+msgstr "extraer letras desde el archivo MIDI (si está disponible)"
 
 #: src/amidi-plug/i_configure-ap.c:333
 msgid ""
 "AMIDI\n"
 "Plug"
-msgstr ""
-"AMIDI\n"
-"Plug"
+msgstr "Complemento AMIDI"
 
 #: src/amidi-plug/i_configure.c:76
 msgid "AMIDI-Plug - select file"
-msgstr "AMIDI-Conector - seleccione archivo"
+msgstr "Complemento AMIDI - seleccione un archivo"
 
 #: src/amidi-plug/i_configure.c:129
 msgid "AMIDI-Plug - configuration"
-msgstr "AMIDI-Conectar - configuración"
+msgstr "Complemento AMIDI - configuración"
 
 #: src/amidi-plug/i_configure-fluidsynth.c:55
 msgid "AMIDI-Plug - select SoundFont file"
-msgstr "AMIDI-Complemento - seleccione archivo Soundfont"
+msgstr "Complemento AMIDI - seleccione un archivo SoundFont"
 
 #: src/amidi-plug/i_configure-fluidsynth.c:270
 msgid "FLUIDSYNTH BACKEND CONFIGURATION"
@@ -223,11 +552,11 @@
 
 #: src/amidi-plug/i_configure-fluidsynth.c:313
 msgid "SoundFont settings"
-msgstr "preferencias SoundFont"
+msgstr "Ajustes de SoundFont"
 
 #: src/amidi-plug/i_configure-fluidsynth.c:345
 msgid "Filename"
-msgstr "Nombre de archivo"
+msgstr "Nombre del archivo"
 
 #: src/amidi-plug/i_configure-fluidsynth.c:349
 msgid "Size (bytes)"
@@ -235,7 +564,7 @@
 
 #: src/amidi-plug/i_configure-fluidsynth.c:398
 msgid "Load SF on player start"
-msgstr "Cargar SF cuando inicie el reproductor"
+msgstr "Cargar SF cuando se inicie el reproductor"
 
 #: src/amidi-plug/i_configure-fluidsynth.c:402
 msgid "Load SF on first midifile play"
@@ -243,11 +572,11 @@
 
 #: src/amidi-plug/i_configure-fluidsynth.c:417
 msgid "Synthesizer settings"
-msgstr "Preferencias de sintetizador"
+msgstr "Preferencias del sintetizador"
 
 #: src/amidi-plug/i_configure-fluidsynth.c:426
 msgid "gain"
-msgstr "Ganancia"
+msgstr "ganancia"
 
 #: src/amidi-plug/i_configure-fluidsynth.c:432
 #: src/amidi-plug/i_configure-fluidsynth.c:460
@@ -267,7 +596,7 @@
 
 #: src/amidi-plug/i_configure-fluidsynth.c:482
 msgid "reverb"
-msgstr "Reverberación"
+msgstr "reverberación"
 
 #: src/amidi-plug/i_configure-fluidsynth.c:491
 #: src/amidi-plug/i_configure-fluidsynth.c:522
@@ -301,7 +630,7 @@
 
 #: src/amidi-plug/i_configure-fluidsynth.c:559
 msgid "custom "
-msgstr "personalizado"
+msgstr "personalizado "
 
 #: src/amidi-plug/i_configure-fluidsynth.c:568
 msgid "Hz "
@@ -316,7 +645,7 @@
 "FluidSynth\n"
 "backend"
 msgstr ""
-"motor\n"
+"Motor\n"
 "FluidSynth"
 
 #: src/amidi-plug/i_configure-timidity.c:39
@@ -335,7 +664,7 @@
 "Motor\n"
 "TiMidity"
 
-#: src/amidi-plug/i_fileinfo.c:169 src/sid/xs_interface.c:1769
+#: src/amidi-plug/i_fileinfo.c:169
 msgid "Name:"
 msgstr "Nombre:"
 
@@ -353,7 +682,7 @@
 
 #: src/amidi-plug/i_fileinfo.c:211
 msgid "Num of Tracks:"
-msgstr "Número de pista:"
+msgstr "Número de pistas:"
 
 #: src/amidi-plug/i_fileinfo.c:216
 msgid "variable"
@@ -369,7 +698,7 @@
 
 #: src/amidi-plug/i_fileinfo.c:226
 msgid "Time Div:"
-msgstr "Tiempo Div:"
+msgstr "Div tiempo:"
 
 #: src/amidi-plug/i_fileinfo.c:237
 msgid " MIDI Comments and Lyrics "
@@ -377,19 +706,19 @@
 
 #: src/amidi-plug/i_fileinfo.c:288
 msgid "* no comments available in this MIDI file *"
-msgstr "* no comentarios disponible en este archivo MIDI *"
+msgstr "* no hay comentarios disponibles en este archivo MIDI *"
 
 #: src/amidi-plug/i_fileinfo.c:301
 msgid "* no lyrics available in this MIDI file *"
-msgstr "* no letras disponible en este archivo MIDI *"
+msgstr "* no hay letras disponibles en este archivo MIDI *"
 
 #: src/amidi-plug/i_fileinfo.c:349
 msgid " (invalid UTF-8)"
-msgstr " (invalido UTF-8)"
+msgstr " (UTF-8 no válido)"
 
 #: src/amidi-plug/i_utils.c:43
 msgid "AMIDI-Plug - about"
-msgstr "AMIDI-Complemento - acerca"
+msgstr "Complemento AMIDI - acerca de"
 
 #: src/amidi-plug/i_utils.c:68
 msgid ""
@@ -397,7 +726,7 @@
 "AMIDI-Plug "
 msgstr ""
 "\n"
-"AMIDI-Complemento "
+"Complemento AMIDI"
 
 #: src/amidi-plug/i_utils.c:69
 msgid ""
@@ -424,25 +753,25 @@
 "\n"
 msgstr ""
 "\n"
-"modular MIDI music player\n"
+"reproductor de música MIDI modular\n"
 "http://www.develia.org/projects.php?p=amidiplug\n"
 "\n"
-"written by Giacomo Lozito\n"
+"escrito por Giacomo Lozito\n"
 "< james@develia.org >\n"
 "\n"
 "\n"
-"special thanks to...\n"
+"agradecimientos especiales a...\n"
 "\n"
-"Clemens Ladisch and Jaroslav Kysela\n"
-"for their cool programs aplaymidi and amixer; those\n"
-"were really useful, along with alsa-lib docs, in order\n"
-"to learn more about the ALSA API\n"
+"Clemens Ladisch y Jaroslav Kysela\n"
+"por sus geniales programas aplaymidi and amixer; que\n"
+"fueron muy útiles, junto con la documentación de alsa-lib,\n"
+"para aprender más acerca de la programación ALSA.\n"
 "\n"
 "Alfredo Spadafina\n"
-"for the nice midi keyboard logo\n"
+"por el bonito logo de teclado midi\n"
 "\n"
 "Tony Vroon\n"
-"for the good help with alpha testing\n"
+"por su buena ayuda con las pruebas\n"
 "\n"
 
 #: src/aosd/aosd_style.c:75
@@ -451,11 +780,11 @@
 
 #: src/aosd/aosd_style.c:79
 msgid "Rounded Rectangle"
-msgstr "Rectángulo Redondeado"
+msgstr "Rectángulo redondeado"
 
 #: src/aosd/aosd_style.c:83
 msgid "Concave Rectangle"
-msgstr "Rectángulo Cóncavo"
+msgstr "Rectángulo cóncavo"
 
 #: src/aosd/aosd_style.c:87
 msgid "None"
@@ -463,16 +792,15 @@
 
 #: src/aosd/aosd_trigger.c:77
 msgid "Playback Start"
-msgstr "Iniciar reproducción"
+msgstr "Reproducción iniciada"
 
 #: src/aosd/aosd_trigger.c:78
 msgid "Triggers OSD when a playlist entry is played."
-msgstr ""
-"Disparador OSD cuando una entrada de lista de reproducción es reproducida."
+msgstr "Avisa cuando se reproduce un elemento de la lista de reproducción."
 
 #: src/aosd/aosd_trigger.c:82
 msgid "Title Change"
-msgstr "Cambiar título"
+msgstr "Cambio de título"
 
 #: src/aosd/aosd_trigger.c:83
 msgid ""
@@ -480,33 +808,33 @@
 "is the same. This is mostly useful to display title changes in internet "
 "streams."
 msgstr ""
-"Disparador OSD cuando, durante la reproducción, el título de la canción "
-"cambie pero el nombre de archivo es el mismo. Esto es sobre todo útil para "
-"mostrar títulos cambiados en flujo de internet."
+"Avisa cuando, durante la reproducción, el título de la canción cambia pero "
+"el nombre de archivo es el mismo. Esto es principalmente útil para mostrar "
+"cambios de título en los flujos de Internet."
 
 #: src/aosd/aosd_trigger.c:89
 msgid "Volume Change"
-msgstr "Cambiar volumen"
+msgstr "Cambio de volumen"
 
 #: src/aosd/aosd_trigger.c:90
 msgid "Triggers OSD when volume is changed."
-msgstr "Disparador OSD cuando volumen es cambiado."
+msgstr "Avisa cuando se cambia el volumen."
 
 #: src/aosd/aosd_trigger.c:94
 msgid "Pause On"
-msgstr "Pausa encendida"
+msgstr "Inicio de pausa"
 
 #: src/aosd/aosd_trigger.c:95
 msgid "Triggers OSD when playback is paused."
-msgstr "Disparador OSD cuando lista de reproducción es pausada."
+msgstr "Avisa cuando la reproducción es pausada."
 
 #: src/aosd/aosd_trigger.c:99
 msgid "Pause Off"
-msgstr "Pausa desactivada"
+msgstr "Fin de pausa"
 
 #: src/aosd/aosd_trigger.c:100
 msgid "Triggers OSD when playback is unpaused."
-msgstr "Disparador OSD cuando lista de reproducción es des-pausada."
+msgstr "Avisa cuando la reproducción se reanuda."
 
 #: src/aosd/aosd_ui.c:180
 msgid "Placement"
@@ -522,15 +850,15 @@
 
 #: src/aosd/aosd_ui.c:237
 msgid "Max OSD width:"
-msgstr "Máximo ancho OSD:"
+msgstr "Ancho máximo:"
 
 #: src/aosd/aosd_ui.c:250
 msgid "Multi-Monitor options"
-msgstr "Opciones Multi-Monitor"
+msgstr "Opciones multi-monitor"
 
 #: src/aosd/aosd_ui.c:254
 msgid "Display OSD using:"
-msgstr "Mostrar OSD usando:"
+msgstr "Mostrar notificaciones utilizando:"
 
 #: src/aosd/aosd_ui.c:265
 msgid "all monitors"
@@ -559,12 +887,12 @@
 
 #: src/aosd/aosd_ui.c:419
 msgid "Fonts"
-msgstr "Fuentes"
+msgstr "Tipografías"
 
 #: src/aosd/aosd_ui.c:427
 #, c-format
 msgid "Font %i:"
-msgstr "Fuente %i:"
+msgstr "Tipografía %i:"
 
 #: src/aosd/aosd_ui.c:444
 msgid "Shadow"
@@ -576,11 +904,11 @@
 
 #: src/aosd/aosd_ui.c:485
 msgid "Disable UTF-8 conversion of text (in aosd)"
-msgstr "Deshabilitar conversión de texto UTF-8 conversión de texto (en aosd)"
+msgstr "Deshabilitar la conversión de texto UTF-8 (en notificaciones)"
 
 #: src/aosd/aosd_ui.c:503
 msgid "Select Skin File"
-msgstr "Seleccione archivo de piel"
+msgstr "Seleccione un archivo de temas"
 
 #: src/aosd/aosd_ui.c:614
 msgid "Render Style"
@@ -597,20 +925,19 @@
 
 #: src/aosd/aosd_ui.c:663
 msgid "Custom Skin"
-msgstr "Piel personalizada"
+msgstr "Tema personalizado"
 
 #: src/aosd/aosd_ui.c:669
 msgid "Skin file:"
-msgstr "Archivo de piel:"
+msgstr "Archivo de temas:"
 
-#: src/aosd/aosd_ui.c:672 src/sid/xs_interface.c:1044
-#: src/sid/xs_interface.c:1236 src/sid/xs_interface.c:1292
+#: src/aosd/aosd_ui.c:672
 msgid "Browse"
 msgstr "Examinar"
 
 #: src/aosd/aosd_ui.c:774
 msgid "Enable trigger"
-msgstr "Habilitar disparador"
+msgstr "Activar disparador"
 
 #: src/aosd/aosd_ui.c:801
 msgid "Event"
@@ -618,21 +945,19 @@
 
 #: src/aosd/aosd_ui.c:829
 msgid "Composite manager detected"
-msgstr "Administrador composite detectado"
+msgstr "Administrador de composición detectado"
 
 #: src/aosd/aosd_ui.c:836
 msgid ""
 "Composite manager not detected;\n"
-"unless you know that you have one running, please activate a composite "
-"manager otherwise the OSD won't work properly"
+"unless you know that you have one running, please activate a composite manager otherwise the OSD won't work properly"
 msgstr ""
-"Administrador composite no detectado;\n"
-"a menos que sepa que tiene uno ejecutándose, por favor active un "
-"administrador composite de otra modo el OSD no trabajará apropiadamente"
+"Administrador de composición no detectado;\n"
+"a menos que sepa que tiene uno ejecutándose, por favor active un administrador de composición o las notificaciones no funcionarán correctamente"
 
 #: src/aosd/aosd_ui.c:844
 msgid "Composite manager not required for fake transparency"
-msgstr "Administrador composite no requerido para transparencia falsa"
+msgstr "Administrador de composición no necesario para transparencia falsa"
 
 #: src/aosd/aosd_ui.c:882
 msgid "Transparency"
@@ -644,24 +969,24 @@
 
 #: src/aosd/aosd_ui.c:890
 msgid "Real transparency (requires X Composite Ext.)"
-msgstr "Transparencia real (requiere extensión Composite X)"
+msgstr "Transparencia real (requiere composición 3D)"
 
 #: src/aosd/aosd_ui.c:932
 msgid "Composite extension not loaded"
-msgstr "Extensión composite no cargada"
+msgstr "Extensión de composición no cargada"
 
 #: src/aosd/aosd_ui.c:940
 msgid "Composite extension not available"
-msgstr "Extensión composite no disponible"
+msgstr "Extensión de composición no disponible"
 
 #: src/aosd/aosd_ui.c:959
 #, c-format
 msgid "Audacious OSD"
-msgstr "OSD de Audacious"
+msgstr "Notificaciones de Audacious"
 
 #: src/aosd/aosd_ui.c:1040
 msgid "Audacious OSD - configuration"
-msgstr "Audacious OSD - configuración"
+msgstr "Notificaciones de Audacious - configuración"
 
 #: src/aosd/aosd_ui.c:1061
 msgid "Test"
@@ -688,13 +1013,12 @@
 msgstr "Disparador"
 
 #: src/aosd/aosd_ui.c:1101 src/cdaudio-ng/configure.c:171
-#: src/sid/xs_interface.c:1302
 msgid "Misc"
-msgstr "Misc"
+msgstr "Varios"
 
 #: src/aosd/aosd_ui.c:1138
 msgid "Audacious OSD - about"
-msgstr "Audacious OSD - acerca de"
+msgstr "Notificaciones de Audacious - acerca de"
 
 #: src/aosd/aosd_ui.c:1168
 msgid ""
@@ -702,7 +1026,7 @@
 "Audacious OSD "
 msgstr ""
 "\n"
-"Audacious OSD "
+"Notificaciones de Audacious"
 
 #: src/aosd/aosd_ui.c:1169
 msgid ""
@@ -721,8 +1045,8 @@
 "escrito por Giacomo Lozito\n"
 "< james@develia.org >\n"
 "\n"
-"On-Screen-Display is based on Ghosd library\n"
-"escrito por Evan Martin\n"
+"Las notificaciones de Audacious se basan en la biblioteca\n"
+"Ghosd escrita por Evan Martin\n"
 "http://neugierig.org/software/ghosd/\n"
 "\n"
 
@@ -730,18 +1054,33 @@
 msgid "Blur Scope: Color selection"
 msgstr "Alcance de desenfoque: Selección de color"
 
-#: src/blur_scope/config.c:83 src/jack/configure.c:111
+#: src/blur_scope/config.c:83 src/jack/configure.c:106
 msgid "Options:"
 msgstr "Opciones:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:264
+#: src/bs2b/plugin.c:157
+msgid "Bauer stereophonic-to-binaural Preferences"
+msgstr "Preferencias del filtro Bauer estereofónico a binaural"
+
+#: src/bs2b/plugin.c:168
+msgid "Feed level:"
+msgstr "Nivel de alimentación:"
+
+#: src/bs2b/plugin.c:182
+msgid "Cut frequency:"
+msgstr "Cortar frecuencia:"
+
+#: src/bs2b/plugin.c:196
+msgid "Presets:"
+msgstr "Predefinidos:"
+
+#: src/cdaudio-ng/cdaudio-ng.c:241
 msgid "About Audio CD Plugin"
-msgstr "Acerca del complemento de CD Audio"
+msgstr "Acerca del complemento de CD de música"
 
-#: src/cdaudio-ng/cdaudio-ng.c:265
+#: src/cdaudio-ng/cdaudio-ng.c:242
 msgid ""
-"Copyright (c) 2007, by Calin Crisan <ccrisan@gmail.com> and The Audacious "
-"Team.\n"
+"Copyright (c) 2007, by Calin Crisan <ccrisan@gmail.com> and The Audacious Team.\n"
 "\n"
 "Many thanks to libcdio developers <http://www.gnu.org/software/libcdio/>\n"
 "\tand to libcddb developers <http://libcddb.sourceforge.net/>.\n"
@@ -752,38 +1091,36 @@
 "\n"
 "Copyright 2009 John Lindgren"
 msgstr ""
-"Copyright (c) 2007, por Calin Crisan <ccrisan@gmail.com> y el Equipo "
-"Audacious.\n"
+"Copyright (c) 2007, por Calin Crisan <ccrisan@gmail.com> y el Equipo Audacious.\n"
 "\n"
-"Muchas gracias a los desarrolladores de libcdio <http://www.gnu.org/software/"
-"libcdio/>\n"
+"Muchas gracias a los desarrolladores de libcdio <http://www.gnu.org/software/libcdio/>\n"
 "\ty de libcddb <http://libcddb.sourceforge.net/>.\n"
 "\n"
-"También gracias a Tony Vroon su tutoría & orientación.\n"
+"También gracias a Tony Vroon su tutoría y orientación.\n"
 "\n"
 "Este fue un proyecto del Google Summer of Code 2007.\n"
 "\n"
 "Copyright 2009 John Lindgren"
 
-#: src/cdaudio-ng/cdaudio-ng.c:558
+#: src/cdaudio-ng/cdaudio-ng.c:550
 msgid "Audio CD"
-msgstr "CD de audio"
+msgstr "CD de música"
 
-#: src/cdaudio-ng/cdaudio-ng.c:913
+#: src/cdaudio-ng/cdaudio-ng.c:922
 msgid "Drive is empty."
-msgstr "Unidad está vacía"
+msgstr "La unidad está vacía."
 
-#: src/cdaudio-ng/cdaudio-ng.c:915
+#: src/cdaudio-ng/cdaudio-ng.c:924
 msgid "Unsupported disk type."
-msgstr "Tipo de disco no soportado"
+msgstr "Tipo de disco no soportado."
 
 #: src/cdaudio-ng/configure.c:148
 msgid "CD Audio Plugin Configuration"
-msgstr "Configuración de Complemento de CD de Audio"
+msgstr "Configuración de complemento de CD de música"
 
 #: src/cdaudio-ng/configure.c:160
 msgid "Digital audio extraction"
-msgstr "Extracción digital de audio"
+msgstr "Extracción digital de sonido"
 
 #: src/cdaudio-ng/configure.c:165
 msgid "Title information"
@@ -795,7 +1132,7 @@
 
 #: src/cdaudio-ng/configure.c:184
 msgid "Use cd-text if available"
-msgstr "Usar cd-texto si está disponible"
+msgstr "Usar texto en CD si está disponible"
 
 #: src/cdaudio-ng/configure.c:191
 msgid "Use CDDB if available"
@@ -803,11 +1140,11 @@
 
 #: src/cdaudio-ng/configure.c:197
 msgid "Server: "
-msgstr "Servidor:"
+msgstr "Servidor: "
 
 #: src/cdaudio-ng/configure.c:201
 msgid "Path: "
-msgstr "Ruta:"
+msgstr "Ruta: "
 
 #: src/cdaudio-ng/configure.c:205
 msgid "Port: "
@@ -815,23 +1152,17 @@
 
 #: src/cdaudio-ng/configure.c:218
 msgid "Use HTTP instead of CDDBP"
-msgstr "Usar HTTP en vez de CDDBP"
+msgstr "Usar HTTP en lugar de CDDBP"
 
 #: src/cdaudio-ng/configure.c:230
 msgid "Override default device: "
-msgstr "Sobreescribir dispositivo predeterminado: "
+msgstr "Sobreescribir el dispositivo predeterminado: "
 
-#: src/cdaudio-ng/configure.c:244 src/crystalizer/crystalizer.c:131
-#: src/echo_plugin/gui.c:123 src/jack/configure.c:146 src/null/null.c:112
-#: src/stereo_plugin/stereo.c:125
+#: src/cdaudio-ng/configure.c:244 src/crystalizer/crystalizer.c:123
+#: src/echo_plugin/gui.c:118 src/jack/configure.c:141 src/null/null.c:107
+#: src/stereo_plugin/stereo.c:118
 msgid "Ok"
-msgstr "Ok"
-
-#: src/cdaudio-ng/configure.c:249 src/crystalizer/crystalizer.c:138
-#: src/echo_plugin/gui.c:130 src/jack/configure.c:153 src/null/null.c:113
-#: src/stereo_plugin/stereo.c:132
-msgid "Cancel"
-msgstr "Cancelar"
+msgstr "Aceptar"
 
 #: src/cd-menu-items/cd-menu-items.c:34
 msgid "Play CD"
@@ -841,90 +1172,90 @@
 msgid "Add CD"
 msgstr "Añadir CD"
 
-#: src/compressor/plugin.c:67
+#: src/compressor/plugin.c:63
 msgid "About Dynamic Range Compression Plugin"
-msgstr "Acerca del complemento de Compresión de Rango Dinámico"
+msgstr "Acerca del complemento de compresión de rango dinámico"
 
-#: src/compressor/plugin.c:99
+#: src/compressor/plugin.c:95
 msgid "Dynamic Range Compressor Preferences"
-msgstr "Preferencias de Compresor de Rango Dinámico"
+msgstr "Preferencias del compresor de rango dinámico"
 
-#: src/compressor/plugin.c:111
+#: src/compressor/plugin.c:107
 msgid "Center volume:"
-msgstr "Volumen central:"
+msgstr "Centrar volumen:"
 
-#: src/compressor/plugin.c:124
+#: src/compressor/plugin.c:120
 msgid "Dynamic range:"
 msgstr "Rango dinámico:"
 
-#: src/console/configure.c:138
+#: src/console/configure.c:136
 msgid "Game Console Music Decoder"
-msgstr "Decodificador Musical de Consola de Juego"
+msgstr "Decodificador musical de videoconsola"
 
-#: src/console/configure.c:155
+#: src/console/configure.c:153
 msgid "General"
 msgstr "General"
 
-#: src/console/configure.c:157 src/skins/ui_manager.c:176
+#: src/console/configure.c:155 src/skins/ui_manager.c:176
 msgid "Playback"
 msgstr "Reproducción"
 
-#: src/console/configure.c:172
+#: src/console/configure.c:170
 msgid "Bass:"
-msgstr "Bajo:"
+msgstr "Graves:"
 
-#: src/console/configure.c:176 src/console/configure.c:187
-#: src/console/configure.c:208
+#: src/console/configure.c:174 src/console/configure.c:185
+#: src/console/configure.c:206
 msgid "secs"
 msgstr "segs"
 
-#: src/console/configure.c:183
+#: src/console/configure.c:181
 msgid "Treble:"
-msgstr "Triple:"
+msgstr "Agudos:"
 
-#: src/console/configure.c:204
+#: src/console/configure.c:202
 msgid "Default song length:"
 msgstr "Longitud de canción predeterminada:"
 
-#: src/console/configure.c:210 src/sid/xs_interface.c:666
+#: src/console/configure.c:208
 msgid "Resampling"
 msgstr "Remuestreo"
 
-#: src/console/configure.c:216
+#: src/console/configure.c:214
 msgid "Enable audio resampling"
-msgstr "Habilitar remuestreo de audio"
+msgstr "Activar el remuestreo de sonido"
 
-#: src/console/configure.c:231
+#: src/console/configure.c:229
 msgid "Resampling rate:"
 msgstr "Tasa de remuestreo:"
 
-#: src/console/configure.c:235 src/sid/xs_interface.c:354
+#: src/console/configure.c:233
 msgid "Hz"
 msgstr "Hz"
 
-#: src/console/configure.c:246
+#: src/console/configure.c:244
 msgid "SPC"
 msgstr "SPC"
 
-#: src/console/configure.c:247
+#: src/console/configure.c:245
 msgid "Ignore length from SPC tags"
 msgstr "Ignorar longitud de etiquetas SPC"
 
-#: src/console/configure.c:248
+#: src/console/configure.c:246
 msgid "Increase reverb"
 msgstr "Aumentar la reverberación"
 
-#: src/console/configure.c:273
+#: src/console/configure.c:271
 msgid ""
-"The default song length, expressed in seconds, is used for songs that do not "
-"provide length information (i.e. looping tracks)."
+"The default song length, expressed in seconds, is used for songs that do not"
+" provide length information (i.e. looping tracks)."
 msgstr ""
 "La longitud de canción predeterminada, expresada en segundos, es usada para "
-"canciones que no preveén información de longitud (es decir pista de bucle)."
+"canciones que no preveén información de longitud (es decir pistas cíclicas)."
 
 #: src/console/plugin.c:33
 msgid "About the Game Console Music Decoder"
-msgstr "Acerca del Decodificador de Música del Juego de Consola"
+msgstr "Acerca del decodificador de música de videoconsola"
 
 #: src/console/plugin.c:34
 msgid ""
@@ -933,64 +1264,57 @@
 "Audacious implementation by: William Pitcock <nenolod@dereferenced.org>, \n"
 " Shay Green <gblargg@gmail.com>\n"
 msgstr ""
-"Console music decoder engine based on Game_Music_Emu 0.5.2.\n"
-"Supported formats: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
-"Audacious implementation by: William Pitcock <nenolod@dereferenced.org>, \n"
+"El motor decodificador de música de videoconsola está basado en Game_Music_Emu 0.5.2.\n"
+"Formatos sopotados: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
+"Implementación de Audacious por: William Pitcock <nenolod@dereferenced.org>, \n"
 " Shay Green <gblargg@gmail.com>\n"
 
-#: src/crossfade/plugin.c:65
+#: src/crossfade/plugin.c:60
 msgid "About Crossfade"
-msgstr "Acerca de Atenuación cruzada"
+msgstr "Acerca de la atenuación cruzada"
 
-#: src/crossfade/plugin.c:97
+#: src/crossfade/plugin.c:92
 msgid "Crossfade Preferences"
-msgstr "Preferencias de Atenuación Cruzada"
+msgstr "Preferencias de la atenuación cruzada"
 
-#: src/crossfade/plugin.c:109
+#: src/crossfade/plugin.c:104
 msgid "Overlap (in seconds):"
 msgstr "Solapamiento (en segundos):"
 
-#: src/crossfade/plugin.c:140 src/crossfade/plugin.c:146
+#: src/crossfade/plugin.c:135 src/crossfade/plugin.c:141
 msgid "Crossfade Error"
-msgstr "Error de Atenuación cruzada"
+msgstr "Error de atenuación cruzada"
 
-#: src/crossfade/plugin.c:140
+#: src/crossfade/plugin.c:135
 msgid ""
 "Crossfading failed because the songs had a different number of channels."
 msgstr ""
-"Atenuación cruzada falló porque las canciones tienen números diferentes de "
-"canales."
+"La atenuación cruzada falló porque las canciones tienen números diferentes "
+"de canales."
 
-#: src/crossfade/plugin.c:148
+#: src/crossfade/plugin.c:143
 msgid ""
 "Crossfading failed because the songs had different sample rates.\n"
 "\n"
-"You can use the Sample Rate Converter effect to resample the songs to the "
-"same rate."
+"You can use the Sample Rate Converter effect to resample the songs to the same rate."
 msgstr ""
-"Atenuación cruzada falló porque las canciones tienen diferentes frecuencias "
-"de muestreo.\n"
+"La tenuación cruzada falló porque las canciones tienen diferentes frecuencias de muestreo.\n"
 "\n"
-"Puede usar el efecto convertidor de frecuencia de muestro para volver a "
-"muestrear las canciones a la misma tasa."
+"Puede usar el efecto convertidor de frecuencia de muestro para volver a muestrear las canciones a la misma tasa."
 
-#: src/crystalizer/crystalizer.c:108
+#: src/crystalizer/crystalizer.c:100
 msgid "Configure Crystalizer"
-msgstr "Configurar cristalizador"
+msgstr "Configurar el cristalizador"
 
-#: src/crystalizer/crystalizer.c:110 src/stereo_plugin/stereo.c:104
+#: src/crystalizer/crystalizer.c:102 src/stereo_plugin/stereo.c:97
 msgid "Effect intensity:"
 msgstr "Intensidad de efectos:"
 
-#: src/crystalizer/crystalizer.c:144 src/echo_plugin/gui.c:136
-#: src/stereo_plugin/stereo.c:138
+#: src/crystalizer/crystalizer.c:136 src/echo_plugin/gui.c:131
+#: src/stereo_plugin/stereo.c:131
 msgid "Apply"
 msgstr "Aplicar"
 
-#: src/daemon/daemon.c:58
-msgid "Daemon Interface (like old headless mode)"
-msgstr ""
-
 #: src/echo_plugin/gui.c:15
 msgid ""
 "Echo Plugin\n"
@@ -998,33 +1322,33 @@
 "\n"
 "Surround echo by Carl van Schaik 1999"
 msgstr ""
-"Echo Plugin\n"
-"By Johan Levin 1999.\n"
+"Complemento de eco\n"
+"por Johan Levin 1999.\n"
 "\n"
-"Surround echo by Carl van Schaik 1999"
+"Eco envolvente por Carl van Schaik 1999"
 
 #: src/echo_plugin/gui.c:27
 msgid "About Echo Plugin"
-msgstr "Acerca del complemento Echo"
+msgstr "Acerca del complemento de eco"
 
-#: src/echo_plugin/gui.c:72
+#: src/echo_plugin/gui.c:67
 msgid "Configure Echo"
-msgstr "Configurar Echo"
+msgstr "Configurar eco"
 
-#: src/echo_plugin/gui.c:88
+#: src/echo_plugin/gui.c:83
 msgid "Delay: (ms)"
 msgstr "Retraso: (ms)"
 
-#: src/echo_plugin/gui.c:93
+#: src/echo_plugin/gui.c:88
 msgid "Feedback: (%)"
-msgstr "Comentarios: (%)"
+msgstr "Retroalimentación: (%)"
 
-#: src/echo_plugin/gui.c:98
+#: src/echo_plugin/gui.c:93
 msgid "Volume: (%)"
 msgstr "Volumen: (%)"
 
-#: src/ffaudio/ffaudio-core.c:789
-#, fuzzy, c-format
+#: src/ffaudio/ffaudio-core.c:795
+#, c-format
 msgid ""
 "Multi-format audio decoding plugin for Audacious based on\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1038,262 +1362,225 @@
 "libavformat %s (%s)\n"
 "libavutil %s (%s)\n"
 msgstr ""
-"Multi-format audio decoding plugin for Audacious based on\n"
-"FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
-"Copyright (c) 2000-2009 Fabrice Bellard, et al.\n"
-"\n"
-"FFmpeg libavformat %d.%d.%d, libavcodec %d.%d.%d\n"
+"Complemento de decodificación de sonido multi-formato para Audacious\n"
+"basado en el marco multimedia FFmpeg (http://www.ffmpeg.org/)\n"
+"Copyright (c) 2000-2009 Fabrice Bellard, y otros.\n"
 "\n"
-"Supported formats: %s\n"
-"\n"
-"Audacious plugin by:\n"
+"Complemento de Audacious por:\n"
 " William Pitcock <nenolod@nenolod.net>,\n"
 " Matti Hämäläinen <ccr@tnsp.org>\n"
+"\n"
+"libavcodec %s (%s)\n"
+"libavformat %s (%s)\n"
+"libavutil %s (%s)\n"
 
-#: src/ffaudio/ffaudio-core.c:803
+#: src/ffaudio/ffaudio-core.c:809
 msgid "About FFaudio Plugin"
 msgstr "Acerca del complemento FFaudio"
 
-#: src/filewriter/filewriter.c:155
+#: src/filewriter/filewriter.c:166
 msgid "About FileWriter-Plugin"
-msgstr "Acerca del Escritor-de-Archivo-Complemento"
+msgstr "Acerca del complemento escritor de archivos"
 
-#: src/filewriter/filewriter.c:156
-msgid ""
-"FileWriter-Plugin\n"
-"\n"
-"This program is free software; you can redistribute it and/or modify\n"
-"it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
-"(at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
-"GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
-msgstr ""
-"FileWriter-Plugin\n"
-"\n"
-"This program is free software; you can redistribute it and/or modify\n"
-"it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
-"(at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
-"GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
-
-#: src/filewriter/filewriter.c:450
+#: src/filewriter/filewriter.c:455
 msgid "File Writer Configuration"
-msgstr "Configuración de Escritor de Archivo"
+msgstr "Configuración del escritor de archivos"
 
-#: src/filewriter/filewriter.c:462
+#: src/filewriter/filewriter.c:467
 msgid "Output file format:"
-msgstr "Formato de archivo de salida:"
+msgstr "Formato del archivo de salida:"
 
-#: src/filewriter/filewriter.c:480
+#: src/filewriter/filewriter.c:485
 msgid "Configure"
 msgstr "Configurar"
 
-#: src/filewriter/filewriter.c:495
+#: src/filewriter/filewriter.c:500
 msgid "Save into original directory"
 msgstr "Guardar dentro del directorio original"
 
-#: src/filewriter/filewriter.c:500
+#: src/filewriter/filewriter.c:505
 msgid "Save into custom directory"
 msgstr "Guardar dentro de directorio personalizado"
 
-#: src/filewriter/filewriter.c:510
+#: src/filewriter/filewriter.c:515
 msgid "Output file folder:"
 msgstr "Carpeta de archivo de salida:"
 
-#: src/filewriter/filewriter.c:514
+#: src/filewriter/filewriter.c:519
 msgid "Pick a folder"
-msgstr "Elige una carpeta"
+msgstr "Elija una carpeta"
 
-#: src/filewriter/filewriter.c:533
+#: src/filewriter/filewriter.c:538
 msgid "Get filename from:"
 msgstr "Obtener nombre de archivo desde:"
 
-#: src/filewriter/filewriter.c:536
+#: src/filewriter/filewriter.c:541
 msgid "original file tags"
-msgstr "Etiquetas de archivo originales"
+msgstr "etiquetas del archivo original"
 
-#: src/filewriter/filewriter.c:542
+#: src/filewriter/filewriter.c:547
 msgid "original filename"
-msgstr "Nombre de archivo original"
+msgstr "nombre del archivo original"
 
-#: src/filewriter/filewriter.c:552
+#: src/filewriter/filewriter.c:557
 msgid "Don't strip file name extension"
-msgstr "No mostar extesión del nombre del archivo"
+msgstr "No quitar la extensión del archivo"
 
-#: src/filewriter/filewriter.c:567
+#: src/filewriter/filewriter.c:572
 msgid "Prepend track number to filename"
 msgstr "Anteponer el número de pista al nombre de archivo"
 
-#: src/filewriter/mp3.c:38 src/filewriter/mp3.c:783
+#: src/filewriter/mp3.c:38 src/filewriter/mp3.c:771
 msgid "Auto"
 msgstr "Auto"
 
 #: src/filewriter/mp3.c:38
-#, fuzzy
 msgid "Joint Stereo"
-msgstr "Unir-estéreo"
+msgstr "Estéreo conjunto"
 
-#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183 src/sid/xs_interface.c:308
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183
 msgid "Stereo"
 msgstr "Estereo"
 
-#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183 src/sid/xs_interface.c:301
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183
 msgid "Mono"
 msgstr "Mono"
 
-#: src/filewriter/mp3.c:724
+#: src/filewriter/mp3.c:712
 msgid "MP3 Configuration"
 msgstr "Configuración MP3"
 
-#: src/filewriter/mp3.c:747
+#: src/filewriter/mp3.c:735
 msgid "Algorithm Quality:"
-msgstr "Calidad de algoritmo:"
+msgstr "Calidad del algoritmo:"
 
-#: src/filewriter/mp3.c:772
+#: src/filewriter/mp3.c:760
 msgid "Output Samplerate:"
 msgstr "Frecuencia de muestreo de salida:"
 
-#: src/filewriter/mp3.c:800
+#: src/filewriter/mp3.c:788
 msgid "(Hz)"
 msgstr "(Hz)"
 
-#: src/filewriter/mp3.c:807
+#: src/filewriter/mp3.c:795
 msgid "Bitrate / Compression ratio:"
-msgstr "Proporción Tasa de bits / Compresión:"
+msgstr "Tasa de bits / Compresión:"
 
-#: src/filewriter/mp3.c:831
+#: src/filewriter/mp3.c:819
 msgid "Bitrate (kbps):"
 msgstr "Tasa de bits (kbps):"
 
-#: src/filewriter/mp3.c:864
+#: src/filewriter/mp3.c:852
 msgid "Compression ratio:"
-msgstr "Proporción de compresión:"
+msgstr "Compresión:"
 
-#: src/filewriter/mp3.c:888
+#: src/filewriter/mp3.c:876
 msgid "Audio Mode:"
-msgstr "Modo de audio:"
+msgstr "Modo de sonido:"
 
-#: src/filewriter/mp3.c:913
+#: src/filewriter/mp3.c:901
 msgid "Misc:"
-msgstr "Miscelanio:"
+msgstr "Varios:"
 
-#: src/filewriter/mp3.c:924
+#: src/filewriter/mp3.c:912
 msgid "Enforce strict ISO complience"
-msgstr "Exigir el cumplimiento estricto de la norma ISO"
+msgstr "Cumplir estrictamente la norma ISO"
 
-#: src/filewriter/mp3.c:935
+#: src/filewriter/mp3.c:923
 msgid "Error protection"
 msgstr "Error de protección"
 
-#: src/filewriter/mp3.c:947 src/filewriter/vorbis.c:245
+#: src/filewriter/mp3.c:935 src/filewriter/vorbis.c:243
 msgid "Quality"
 msgstr "Calidad"
 
-#: src/filewriter/mp3.c:957
+#: src/filewriter/mp3.c:945
 msgid "Enable VBR/ABR"
-msgstr "Habilitar VBR/ABR"
+msgstr "Activar VBR/ABR"
 
-#: src/filewriter/mp3.c:967
+#: src/filewriter/mp3.c:955
 msgid "Type:"
 msgstr "Tipo:"
 
-#: src/filewriter/mp3.c:1000
+#: src/filewriter/mp3.c:988
 msgid "VBR Options:"
 msgstr "Opciones VBR:"
 
-#: src/filewriter/mp3.c:1016
+#: src/filewriter/mp3.c:1004
 msgid "Minimum bitrate (kbps):"
 msgstr "Tasa de bits mínima (kbps):"
 
-#: src/filewriter/mp3.c:1043
+#: src/filewriter/mp3.c:1031
 msgid "Maximum bitrate (kbps):"
 msgstr "Tasa de bits máxima (kbps):"
 
-#: src/filewriter/mp3.c:1066
+#: src/filewriter/mp3.c:1054
 msgid "Strictly enforce minimum bitrate"
 msgstr "Aplicar estrictamente la tasa de bits mínima"
 
-#: src/filewriter/mp3.c:1078
+#: src/filewriter/mp3.c:1066
 msgid "ABR Options:"
 msgstr "Opciones ABR:"
 
-#: src/filewriter/mp3.c:1088
+#: src/filewriter/mp3.c:1076
 msgid "Average bitrate (kbps):"
 msgstr "Tasa de bits promedio (kbps):"
 
-#: src/filewriter/mp3.c:1116
+#: src/filewriter/mp3.c:1104
 msgid "VBR quality level:"
-msgstr "nivel de calidad VBR:"
+msgstr "Nivel de calidad VBR:"
 
-#: src/filewriter/mp3.c:1135
+#: src/filewriter/mp3.c:1123
 msgid "Don't write Xing VBR header"
-msgstr "No escribir cabesal VBR Xing"
+msgstr "No escribir la cabecera VBR Xing"
 
-#: src/filewriter/mp3.c:1149
+#: src/filewriter/mp3.c:1137
 msgid "VBR/ABR"
 msgstr "VBR/ABR"
 
-#: src/filewriter/mp3.c:1159
+#: src/filewriter/mp3.c:1147
 msgid "Frame params:"
 msgstr "Prametros de cuadro:"
 
-#: src/filewriter/mp3.c:1171
+#: src/filewriter/mp3.c:1159
 msgid "Mark as copyright"
 msgstr "Marcar como derechos de autor"
 
-#: src/filewriter/mp3.c:1182
+#: src/filewriter/mp3.c:1170
 msgid "Mark as original"
 msgstr "Marcar como original"
 
-#: src/filewriter/mp3.c:1194
+#: src/filewriter/mp3.c:1182
 msgid "ID3 params:"
 msgstr "Parametros ID3:"
 
-#: src/filewriter/mp3.c:1205
+#: src/filewriter/mp3.c:1193
 msgid "Force addition of version 2 tag"
 msgstr "Forzar adición de etiqueta de la versión 2"
 
-#: src/filewriter/mp3.c:1215
+#: src/filewriter/mp3.c:1203
 msgid "Only add v1 tag"
 msgstr "Solo agregar etiqueta v1"
 
-#: src/filewriter/mp3.c:1222
+#: src/filewriter/mp3.c:1210
 msgid "Only add v2 tag"
 msgstr "Solo agregar etiqueta v2"
 
-#: src/filewriter/mp3.c:1243
+#: src/filewriter/mp3.c:1231
 msgid "Tags"
 msgstr "Etiquetas"
 
-#: src/filewriter/vorbis.c:238
+#: src/filewriter/vorbis.c:236
 msgid "Vorbis Encoder Configuration"
 msgstr "Configuración de codificador Vorbis"
 
-#: src/filewriter/vorbis.c:258
+#: src/filewriter/vorbis.c:256
 msgid "Quality level (0 - 10):"
-msgstr ""
+msgstr "Nivel de calidad (0 - 10):"
 
 #: src/flacng/plugin.c:379
 msgid "About FLAC Audio Plugin"
-msgstr ""
+msgstr "Acerca del complemento de sonido FLAC"
 
 #: src/flacng/plugin.c:380
 msgid ""
@@ -1305,15 +1592,14 @@
 "http://www.skytale.net/projects/bmp-flac2/"
 msgstr ""
 "\n"
-"\n"
-"Original code by\n"
+"Código original por\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
 
 #: src/gnomeshortcuts/gnomeshortcuts.c:303
 msgid "About Gnome Shortcut Plugin"
-msgstr ""
+msgstr "Acerca del complemento de atajos Gnome"
 
 #: src/gnomeshortcuts/gnomeshortcuts.c:304
 msgid ""
@@ -1323,19 +1609,19 @@
 "Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
 "\n"
 msgstr ""
-"Gnome Shortcut Plugin\n"
-"Let's you control the player with Gnome's shortcuts.\n"
+"Complemento de atajos Gnome\n"
+"Le permite controlar el reproductor con atajos de Gnome.\n"
 "\n"
 "Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
 "\n"
 
 #: src/gntui/fileselector.c:75 src/gntui/gntui.c:272
 msgid "Open Files"
-msgstr ""
+msgstr "Abrir archivos"
 
 #: src/gntui/fileselector.c:75 src/gntui/gntui.c:271
 msgid "Add Files"
-msgstr ""
+msgstr "Añadir archivos"
 
 #: src/gntui/gntui.c:270
 msgid "Audacious2"
@@ -1343,405 +1629,372 @@
 
 #: src/gntui/gntui.c:311
 msgid "gnt interface"
-msgstr ""
+msgstr "Interfaz gnt"
 
 #: src/gtkui/columns.c:36
 msgid "Entry number"
-msgstr ""
+msgstr "Número de entrada"
 
-#: src/gtkui/columns.c:36 src/sid/xs_interface.c:1103
+#: src/gtkui/columns.c:36
 msgid "Title"
-msgstr ""
+msgstr "Título"
 
 #: src/gtkui/columns.c:37
-#, fuzzy
 msgid "Artist"
 msgstr "Artista"
 
 #: src/gtkui/columns.c:37
 msgid "Year"
-msgstr ""
+msgstr "Año"
 
 #: src/gtkui/columns.c:37
-#, fuzzy
 msgid "Album"
-msgstr "Por álbum"
+msgstr "Album"
 
 #: src/gtkui/columns.c:37
 msgid "Track"
-msgstr ""
+msgstr "Pista"
 
 #: src/gtkui/columns.c:37
-#, fuzzy
 msgid "Queue position"
-msgstr "Posición"
+msgstr "Posición de la cola"
 
 #: src/gtkui/columns.c:38
-#, fuzzy
 msgid "Length"
-msgstr "Longitud (mseg):"
+msgstr "Longitud"
 
 #: src/gtkui/columns.c:38
-#, fuzzy
 msgid "File path"
-msgstr "Por ruta de archivo"
+msgstr "Ruta del archivo"
 
 #: src/gtkui/columns.c:38
-#, fuzzy
 msgid "File name"
-msgstr "Nombre de archivo"
+msgstr "Nombre del archivo"
 
 #: src/gtkui/columns.c:38
-#, fuzzy
 msgid "Custom title"
-msgstr "Piel personalizada"
+msgstr "Título personalizado"
 
 #: src/gtkui/columns.c:39
-#, fuzzy
 msgid "Bitrate"
-msgstr "Tasa de bits (kbps):"
+msgstr "Tasa de bits"
 
-#: src/gtkui/columns.c:286
+#: src/gtkui/columns.c:278
 msgid "Choose Columns"
-msgstr ""
+msgstr "Seleccionar columnas"
 
-#: src/gtkui/columns.c:300
-#, fuzzy
+#: src/gtkui/columns.c:292
 msgid "Available:"
-msgstr "variable"
+msgstr "Disponible:"
 
-#: src/gtkui/columns.c:334
+#: src/gtkui/columns.c:326
 msgid "Chosen:"
-msgstr ""
+msgstr "Seleccionado:"
 
 #: src/gtkui/layout.c:122
 msgid "Dock at Left"
-msgstr ""
+msgstr "Acoplar a la izquierda"
 
 #: src/gtkui/layout.c:122
 msgid "Dock at Right"
-msgstr ""
+msgstr "Acoplar a la derecha"
 
 #: src/gtkui/layout.c:123
 msgid "Dock at Top"
-msgstr ""
+msgstr "Acoplar arriba"
 
 #: src/gtkui/layout.c:123
 msgid "Dock at Bottom"
-msgstr ""
+msgstr "Acoplar abajo"
 
 #: src/gtkui/layout.c:123
 msgid "Undock"
-msgstr ""
+msgstr "Desacoplar"
 
-#: src/gtkui/layout.c:123
-#, fuzzy
+#: src/gtkui/layout.c:123 src/ladspa/plugin.c:643
 msgid "Disable"
-msgstr "variable"
+msgstr "Deshabilitar"
 
-#: src/gtkui/menus.c:132
+#: src/gtkui/menus.c:130
 msgid "_Open Files ..."
-msgstr ""
+msgstr "_Abrir archivos ..."
 
-#: src/gtkui/menus.c:133
+#: src/gtkui/menus.c:131
 msgid "Open _URL ..."
-msgstr ""
+msgstr "Abrir _URL ..."
 
-#: src/gtkui/menus.c:134
+#: src/gtkui/menus.c:132
 msgid "_Add File ..."
-msgstr ""
+msgstr "Aña_dir archivo ..."
 
-#: src/gtkui/menus.c:135
+#: src/gtkui/menus.c:133
 msgid "Add U_RL ..."
-msgstr ""
+msgstr "Añadir U_RL ..."
 
-#: src/gtkui/menus.c:137
-#, fuzzy
+#: src/gtkui/menus.c:135
 msgid "A_bout ..."
-msgstr "Acerca de"
+msgstr "A_cerca de ..."
 
-#: src/gtkui/menus.c:138
-#, fuzzy
+#: src/gtkui/menus.c:136
 msgid "_Preferences ..."
-msgstr "Preferencias"
+msgstr "_Preferencias"
 
-#: src/gtkui/menus.c:139 src/skins/ui_manager.c:412
+#: src/gtkui/menus.c:137 src/skins/ui_manager.c:406
 msgid "_Quit"
-msgstr "Salir"
+msgstr "_Salir"
 
-#: src/gtkui/menus.c:142
-#, fuzzy
+#: src/gtkui/menus.c:140
 msgid "_Play"
-msgstr "Reproducir"
+msgstr "_Reproducir"
 
-#: src/gtkui/menus.c:143
-#, fuzzy
+#: src/gtkui/menus.c:141
 msgid "Paus_e"
-msgstr "Pausar"
+msgstr "Pa_usar"
 
-#: src/gtkui/menus.c:144
-#, fuzzy
+#: src/gtkui/menus.c:142
 msgid "_Stop"
-msgstr "Detener"
+msgstr "_Detener"
 
-#: src/gtkui/menus.c:145
-#, fuzzy
+#: src/gtkui/menus.c:143
 msgid "Pre_vious"
-msgstr "Anterior"
+msgstr "An_terior"
 
-#: src/gtkui/menus.c:146
-#, fuzzy
+#: src/gtkui/menus.c:144
 msgid "_Next"
-msgstr "Siguiente"
+msgstr "Si_guiente"
 
-#: src/gtkui/menus.c:148
+#: src/gtkui/menus.c:146
 msgid "_Repeat"
-msgstr ""
+msgstr "R_epetir"
 
-#: src/gtkui/menus.c:149
+#: src/gtkui/menus.c:147
 msgid "S_huffle"
-msgstr ""
+msgstr "_Orden aleatorio"
 
-#: src/gtkui/menus.c:150
-#, fuzzy
+#: src/gtkui/menus.c:148
 msgid "N_o Playlist Advance"
-msgstr "Administrador de lista de reproducción"
+msgstr "No avan_zar la lista de reproducción"
 
-#: src/gtkui/menus.c:151
-#, fuzzy
+#: src/gtkui/menus.c:149
 msgid "Stop _After This Song"
-msgstr "Parar después de la canción"
+msgstr "_Detener tras esta canción"
 
-#: src/gtkui/menus.c:153 src/gtkui/menus.c:210
+#: src/gtkui/menus.c:151 src/gtkui/menus.c:209
 msgid "Song _Info ..."
-msgstr ""
+msgstr "_Información de la canción ..."
 
-#: src/gtkui/menus.c:154
+#: src/gtkui/menus.c:152
 msgid "Jump to _Time ..."
-msgstr ""
+msgstr "_Saltar en el tiempo ..."
 
-#: src/gtkui/menus.c:155
+#: src/gtkui/menus.c:153
 msgid "_Jump to Song ..."
-msgstr ""
+msgstr "Saltar a la _canción ..."
 
-#: src/gtkui/menus.c:158
+#: src/gtkui/menus.c:156
 msgid "By Track _Number"
-msgstr ""
+msgstr "Por _número de pista"
 
-#: src/gtkui/menus.c:159
-#, fuzzy
+#: src/gtkui/menus.c:157
 msgid "By _Title"
-msgstr "Por título"
+msgstr "Por _título"
 
-#: src/gtkui/menus.c:160
-#, fuzzy
+#: src/gtkui/menus.c:158
 msgid "By _Artist"
-msgstr "Por artista"
+msgstr "Por _artista"
 
-#: src/gtkui/menus.c:161
-#, fuzzy
+#: src/gtkui/menus.c:159
 msgid "By A_lbum"
-msgstr "Por álbum"
+msgstr "Por a_lbum"
 
-#: src/gtkui/menus.c:162
-#, fuzzy
+#: src/gtkui/menus.c:160
 msgid "By Release _Date"
-msgstr "Por fecha"
+msgstr "Por _fecha de estreno"
 
-#: src/gtkui/menus.c:163
-#, fuzzy
+#: src/gtkui/menus.c:161
 msgid "By _File Path"
-msgstr "Por ruta de archivo"
+msgstr "Por _ruta de archivo"
 
-#: src/gtkui/menus.c:164
-#, fuzzy
+#: src/gtkui/menus.c:162
 msgid "By _Custom Title"
-msgstr "Piel personalizada"
+msgstr "Por título _personalizado"
 
-#: src/gtkui/menus.c:166
+#: src/gtkui/menus.c:164
 msgid "R_everse Order"
-msgstr ""
+msgstr "Orden _inverso"
 
-#: src/gtkui/menus.c:167
+#: src/gtkui/menus.c:165
 msgid "_Random Order"
-msgstr ""
+msgstr "Orden alea_torio"
 
-#: src/gtkui/menus.c:170 src/gtkui/menus.c:212
+#: src/gtkui/menus.c:168 src/gtkui/menus.c:211
 msgid "_Refresh"
-msgstr "_Actualizar"
+msgstr "A_ctualizar"
 
-#: src/gtkui/menus.c:172
-#, fuzzy
+#: src/gtkui/menus.c:170
 msgid "_Sort"
-msgstr "Ordenar"
+msgstr "_Ordenar"
 
-#: src/gtkui/menus.c:174
+#: src/gtkui/menus.c:172
 msgid "_New"
-msgstr ""
+msgstr "_Nuevo"
 
-#: src/gtkui/menus.c:175
+#: src/gtkui/menus.c:173 src/gtkui/menus.c:222
 msgid "_Close"
 msgstr "_Cerrar"
 
-#: src/gtkui/menus.c:177
-#, fuzzy
+#: src/gtkui/menus.c:175
 msgid "_Import ..."
-msgstr "Importar lista de reproducción ..."
+msgstr "_Importar ..."
 
-#: src/gtkui/menus.c:178
-#, fuzzy
+#: src/gtkui/menus.c:176
 msgid "_Export ..."
-msgstr "Exportar lista de reproducción ..."
+msgstr "_Exportar ..."
 
-#: src/gtkui/menus.c:180
-#, fuzzy
+#: src/gtkui/menus.c:178
 msgid "_Playlist Manager ..."
-msgstr "Administrador de lista de reproducción"
+msgstr "_Gestor de listas de reproducción ..."
 
-#: src/gtkui/menus.c:183
-#, fuzzy
+#: src/gtkui/menus.c:179
+msgid "_Queue Manager ..."
+msgstr "Gestor de _colas ..."
+
+#: src/gtkui/menus.c:182
 msgid "Volume _Up"
-msgstr "Volumen"
+msgstr "_Subir volumen"
 
-#: src/gtkui/menus.c:184
-#, fuzzy
+#: src/gtkui/menus.c:183
 msgid "Volume _Down"
-msgstr "Volumen->Bajo_5"
+msgstr "_Bajar volumen"
 
-#: src/gtkui/menus.c:186
-#, fuzzy
+#: src/gtkui/menus.c:185
 msgid "_Equalizer"
-msgstr "Ventana->Ecualizador"
+msgstr "_Ecualizador"
 
-#: src/gtkui/menus.c:188
+#: src/gtkui/menus.c:187
 msgid "E_ffects"
-msgstr ""
+msgstr "E_fectos"
 
-#: src/gtkui/menus.c:191
+#: src/gtkui/menus.c:190
 msgid "_Interface"
-msgstr ""
+msgstr "_Interfaz"
 
-#: src/gtkui/menus.c:193
+#: src/gtkui/menus.c:192
 msgid "Show _Menu Bar"
-msgstr ""
+msgstr "_Mostrar barra de menú"
 
-#: src/gtkui/menus.c:194
+#: src/gtkui/menus.c:193
 msgid "Show I_nfo Bar"
-msgstr ""
+msgstr "Mostrar barra de _información"
 
-#: src/gtkui/menus.c:195
+#: src/gtkui/menus.c:194
 msgid "Show _Status Bar"
-msgstr ""
+msgstr "Mostrar barra de _estado"
 
-#: src/gtkui/menus.c:197
+#: src/gtkui/menus.c:196
 msgid "Show Column _Headers"
-msgstr ""
+msgstr "Mostrar _cabeceras de columna"
 
-#: src/gtkui/menus.c:198
+#: src/gtkui/menus.c:197
 msgid "Choose _Columns ..."
-msgstr ""
+msgstr "_Seleccionar columnas ..."
 
-#: src/gtkui/menus.c:199
+#: src/gtkui/menus.c:198
 msgid "Scrol_l on Song Change"
-msgstr ""
+msgstr "A_vanzar al cambiar de canción"
 
-#: src/gtkui/menus.c:202
-#, fuzzy
+#: src/gtkui/menus.c:201
 msgid "_File"
-msgstr "Archivo"
+msgstr "_Archivo"
 
-#: src/gtkui/menus.c:203
-#, fuzzy
+#: src/gtkui/menus.c:202
 msgid "_Playback"
-msgstr "Reproducción"
+msgstr "_Reproducción"
 
-#: src/gtkui/menus.c:204
-#, fuzzy
+#: src/gtkui/menus.c:203
 msgid "P_laylist"
-msgstr "Lista de reproducción"
+msgstr "_Lista de reproducción"
 
-#: src/gtkui/menus.c:205 src/gtkui/menus.c:219
-#, fuzzy
+#: src/gtkui/menus.c:204 src/gtkui/menus.c:218
 msgid "_Services"
-msgstr "Servicios"
+msgstr "_Servicios"
 
-#: src/gtkui/menus.c:206
+#: src/gtkui/menus.c:205
 msgid "_Output"
-msgstr ""
+msgstr "Sali_da"
 
-#: src/gtkui/menus.c:207
-#, fuzzy
+#: src/gtkui/menus.c:206
 msgid "_View"
-msgstr "Ver"
+msgstr "_Ver"
 
-#: src/gtkui/menus.c:211
+#: src/gtkui/menus.c:210
 msgid "_Queue/Unqueue"
-msgstr ""
+msgstr "_Encolar/desencolar"
 
-#: src/gtkui/menus.c:214
+#: src/gtkui/menus.c:213
 msgid "Cu_t"
-msgstr ""
+msgstr "Cor_tar"
 
-#: src/gtkui/menus.c:215
-#, fuzzy
+#: src/gtkui/menus.c:214
 msgid "_Copy"
-msgstr "Copiar"
+msgstr "_Copiar"
 
-#: src/gtkui/menus.c:216
-#, fuzzy
+#: src/gtkui/menus.c:215
 msgid "_Paste"
-msgstr "Pegar"
+msgstr "_Pegar"
 
-#: src/gtkui/menus.c:217
-#, fuzzy
+#: src/gtkui/menus.c:216
 msgid "Select _All"
-msgstr "Seleccionar todo"
+msgstr "Seleccionar _todo"
 
-#: src/gtkui/menus.c:222
-#, fuzzy
+#: src/gtkui/menus.c:221
 msgid "_Rename"
-msgstr "Nombre de archivo"
+msgstr "_Renombrar"
 
-#: src/gtkui/ui_gtk.c:75
+#: src/gtkui/ui_gtk.c:95
 msgid "GTK Interface"
-msgstr ""
+msgstr "Interfaz GTK"
 
-#: src/gtkui/ui_gtk.c:132 src/skins/ui_main.c:303
+#: src/gtkui/ui_gtk.c:156 src/skins/ui_main.c:302
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.c:138 src/skins/ui_main.c:305 src/skins/ui_main.c:1498
+#: src/gtkui/ui_gtk.c:162
+msgid "Buffering ..."
+msgstr "Gestión de memoria intermedia ..."
+
+#: src/gtkui/ui_gtk.c:165 src/skins/ui_main.c:304 src/skins/ui_main.c:1499
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_gtk.c:177 src/skins/plugin.c:185
+#: src/gtkui/ui_gtk.c:211 src/skins/plugin.c:183
 msgid "Error"
 msgstr "Error"
 
-#: src/gtkui/ui_statusbar.c:102 src/skins/ui_main.c:460
+#: src/gtkui/ui_statusbar.c:102 src/skins/ui_main.c:459
 msgid "mono"
 msgstr "mono"
 
-#: src/gtkui/ui_statusbar.c:104 src/skins/ui_main.c:459
+#: src/gtkui/ui_statusbar.c:104 src/skins/ui_main.c:458
 msgid "stereo"
 msgstr "estéreo"
 
 #: src/gtkui/ui_statusbar.c:106
-#, fuzzy, c-format
+#, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
-msgstr[0] "%d Canales"
-msgstr[1] "%d Canales"
+msgstr[0] "%d canal"
+msgstr[1] "%d canales"
 
 #: src/gtkui/ui_statusbar.c:121
-#, fuzzy, c-format
+#, c-format
 msgid "%d kbps"
-msgstr "kbps"
+msgstr "%d kbps"
 
 #: src/hotkey/gui.c:71
 msgid "Previous Track"
-msgstr ""
+msgstr "Pista anterior"
 
 #: src/hotkey/gui.c:72 src/skins/ui_manager.c:178 src/skins/ui_manager.c:179
 msgid "Play"
@@ -1749,7 +2002,7 @@
 
 #: src/hotkey/gui.c:73
 msgid "Pause/Resume"
-msgstr ""
+msgstr "Pausa/continuar"
 
 #: src/hotkey/gui.c:74 src/skins/ui_manager.c:184 src/skins/ui_manager.c:185
 msgid "Stop"
@@ -1757,89 +2010,93 @@
 
 #: src/hotkey/gui.c:75
 msgid "Next Track"
-msgstr ""
+msgstr "Siguiente pista"
 
 #: src/hotkey/gui.c:76
 msgid "Forward 5 Seconds"
-msgstr ""
+msgstr "Avanzar 5 segundos"
 
 #: src/hotkey/gui.c:77
 msgid "Rewind 5 Seconds"
-msgstr ""
+msgstr "Retroceder 5 segundos"
 
 #: src/hotkey/gui.c:78
 msgid "Mute"
-msgstr ""
+msgstr "Silenciar"
 
 #: src/hotkey/gui.c:79
 msgid "Volume Up"
-msgstr ""
+msgstr "Subir volumen"
 
 #: src/hotkey/gui.c:80
 msgid "Volume Down"
-msgstr ""
+msgstr "Bajar volumen"
 
-#: src/hotkey/gui.c:81 src/skins/ui_manager.c:424 src/skins/ui_manager.c:425
+#: src/hotkey/gui.c:81 src/skins/ui_manager.c:418 src/skins/ui_manager.c:419
 msgid "Jump to File"
-msgstr ""
+msgstr "Ir al archivo"
 
 #: src/hotkey/gui.c:82
 msgid "Toggle Player Windows"
-msgstr ""
+msgstr "Cambiar ventanas del reproductor"
 
 #: src/hotkey/gui.c:83
 msgid "Show On-Screen-Display"
-msgstr ""
+msgstr "Mostrar notificaciones"
 
 #: src/hotkey/gui.c:84
 msgid "Toggle Repeat"
-msgstr ""
+msgstr "Conmutar el modo repetir"
 
 #: src/hotkey/gui.c:85
 msgid "Toggle Shuffle"
-msgstr ""
+msgstr "Conmutar orden aleatorio"
 
 #: src/hotkey/gui.c:95
 msgid "(none)"
-msgstr ""
+msgstr "(ninguno)"
 
 #: src/hotkey/gui.c:232
 msgid ""
-"It is not recommended to bind the primary mouse buttons without "
-"modificators.\n"
+"It is not recommended to bind the primary mouse buttons without modificators.\n"
 "\n"
 "Do you want to continue?"
 msgstr ""
+"No se recomienda asociar los botones principales del ratón sin modificadores.\n"
+"\n"
+"¿Quiere continuar?"
 
 #: src/hotkey/gui.c:234
 msgid "Binding mouse buttons"
-msgstr ""
+msgstr "Asociar botones del ratón"
 
 #: src/hotkey/gui.c:384
 msgid "Global Hotkey Plugin Configuration"
-msgstr ""
+msgstr "Configuración de atajos de teclado"
 
 #: src/hotkey/gui.c:400
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
 msgstr ""
+"Pulse una combinación de teclas dentro del campo de texto.\n"
+"También puede asociar botones del ratón."
 
 #: src/hotkey/gui.c:405
 msgid "Hotkeys:"
-msgstr ""
+msgstr "Atajos de teclado:"
 
 #: src/hotkey/gui.c:424
 msgid "Action:"
-msgstr ""
+msgstr "Acción:"
 
 #: src/hotkey/gui.c:432
 msgid "Key Binding:"
-msgstr ""
+msgstr "Teclas asociadas:"
 
 #: src/hotkey/gui.c:663
 msgid "About Global Hotkey Plugin"
-msgstr ""
+msgstr "Acerca del complemento de atajos de teclado"
 
 #: src/hotkey/gui.c:664
 msgid ""
@@ -1856,12 +2113,12 @@
 "\t\t\tJeremy Tan <nsx@nsx.homeip.net>\n"
 "\n"
 msgstr ""
-"Global Hotkey Plugin\n"
-"Control the player with global key combinations or multimedia keys.\n"
+"Complemento de atajos de teclado\n"
+"Controla el reproductor con combinaciones de teclas o teclas multimedia.\n"
 "\n"
 "Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
 "\n"
-"Contributers include:\n"
+"Con la participación de:\n"
 "Copyright (C) 2006-2007 Vladimir Paskov <vlado.paskov@gmail.com>\n"
 "Copyright (C) 2000-2002 Ville Syrjälä <syrjala@sci.fi>\n"
 "\t\t\tBryn Davies <curious@ihug.com.au>\n"
@@ -1869,31 +2126,31 @@
 "\t\t\tJeremy Tan <nsx@nsx.homeip.net>\n"
 "\n"
 
-#: src/jack/configure.c:71
+#: src/jack/configure.c:66
 msgid "Connect to all available jack ports"
-msgstr ""
+msgstr "Conectar a todos los puertos jack disponibles"
 
-#: src/jack/configure.c:78
+#: src/jack/configure.c:73
 msgid "Connect only the output ports"
-msgstr ""
+msgstr "Conectar solo los puertos de salida"
 
-#: src/jack/configure.c:85
+#: src/jack/configure.c:80
 msgid "Connect to no ports"
-msgstr ""
+msgstr "No conectar puertos"
 
-#: src/jack/configure.c:103
+#: src/jack/configure.c:98
 msgid "jack Plugin configuration"
-msgstr ""
+msgstr "Configuración del complemento jack"
 
-#: src/jack/configure.c:121
+#: src/jack/configure.c:116
 msgid "Connection mode:"
-msgstr ""
+msgstr "Modo de conexión:"
 
-#: src/jack/configure.c:133
+#: src/jack/configure.c:128
 msgid "Enable debug printing"
-msgstr ""
+msgstr "Activar mensajes de depuración"
 
-#: src/jack/jack.c:438
+#: src/jack/jack.c:422
 msgid ""
 "XMMS jack Driver 0.17\n"
 "\n"
@@ -1903,39 +2160,88 @@
 "Audacious port by\n"
 "Giacomo Lozito from develia.org"
 msgstr ""
-"XMMS jack Driver 0.17\n"
+"Complemento jack para XMMS 0.17\n"
 "\n"
 "xmms-jack.sf.net\n"
 "Chris Morgan<cmorgan@alum.wpi.edu>\n"
 "\n"
-"Audacious port by\n"
-"Giacomo Lozito from develia.org"
+"Portado a Audacious por\n"
+"Giacomo Lozito de develia.org"
 
-#: src/jack/jack.c:443
+#: src/jack/jack.c:427
 msgid "About JACK Output Plugin 0.17"
+msgstr "Acerca del complemento de salida JACK 0.17"
+
+#: src/ladspa/plugin.c:414
+msgid "About LADSPA Host"
+msgstr "Acerca del servidor LADSPA"
+
+#: src/ladspa/plugin.c:515
+#, c-format
+msgid "%s Settings"
+msgstr "Ajustes %s"
+
+#: src/ladspa/plugin.c:583
+msgid "LADSPA Host Settings"
+msgstr "Ajustes del servidor LADSPA"
+
+#: src/ladspa/plugin.c:592
+msgid "Module paths:"
+msgstr "Rutas de complementos:"
+
+#: src/ladspa/plugin.c:597
+msgid ""
+"Separate multiple paths with a colon.\n"
+"These paths are searched in addition to LADSPA_PATH.\n"
+"After adding new paths, press Enter to scan for new plugins."
 msgstr ""
+"Separe múltiples rutas por dos puntos.\n"
+"Estas rutas se utilizan además de LADSPA_PATH.\n"
+"Tras añadir nuevas rutas, pulse Intro para buscar complementos nuevos."
+
+#: src/ladspa/plugin.c:613
+msgid "Available plugins:"
+msgstr "Complementos disponibles:"
 
-#: src/lyricwiki/lyricwiki.c:226
+#: src/ladspa/plugin.c:625
+msgid "Enable"
+msgstr "Activar"
+
+#: src/ladspa/plugin.c:631
+msgid "Enabled plugins:"
+msgstr "Complementos activos:"
+
+#: src/ladspa/plugin.c:646
+msgid "Settings"
+msgstr "Ajustes"
+
+#: src/lyricwiki/lyricwiki.c:227
 msgid ""
 "\n"
 "Looking for lyrics..."
 msgstr ""
+"\n"
+"Buscando letras ..."
 
-#: src/lyricwiki/lyricwiki.c:249
+#: src/lyricwiki/lyricwiki.c:250
 msgid ""
 "\n"
 "Connecting to lyrics.wikia.com..."
 msgstr ""
+"\n"
+"Conectando a lyrics.wikia.com..."
 
-#: src/lyricwiki/lyricwiki.c:337
+#: src/lyricwiki/lyricwiki.c:338
 msgid ""
 "\n"
 "No lyrics were found."
 msgstr ""
+"\n"
+"No se encontraron letras."
 
 #: src/metronom/metronom.c:85
 msgid "About Metronom"
-msgstr ""
+msgstr "Acerca del metrónomo"
 
 #: src/metronom/metronom.c:86
 msgid ""
@@ -1945,984 +2251,294 @@
 "e.g. tact://77 to play 77 beats per minute\n"
 "or tact://60*3/4 to play 60 bpm in 3/4 tacts"
 msgstr ""
-"A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
+"Un generador de tacto por Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
-"To use it, add a URL: tact://beats*num/den\n"
-"e.g. tact://77 to play 77 beats per minute\n"
-"or tact://60*3/4 to play 60 bpm in 3/4 tacts"
+"Para utilizarlo, añada una URL: tact://pulsos*num/den\n"
+"p. ej. tact://77 para reproducir 77 pulsos por minuto\n"
+"o tact://60*3/4 para reproducir 60 ppm en 3/4 tactos"
 
 #: src/metronom/metronom.c:143
 #, c-format
 msgid "Tact generator: %d bpm"
-msgstr ""
+msgstr "Generador de tacto: %d ppm"
 
 #: src/metronom/metronom.c:145
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
-msgstr ""
+msgstr "Generador de tacto: %d ppm %d/%d"
+
+#: src/mixer/plugin.c:64
+msgid "About Channel Mixer"
+msgstr "Acerca del mezclador de canales"
+
+#: src/mixer/plugin.c:93
+msgid "Channel Mixer Settings"
+msgstr "Ajustes del mezclador de canales"
+
+#: src/mixer/plugin.c:102
+msgid "Output channels:"
+msgstr "Canales de salida:"
+
+#: src/mixer/plugin.c:112
+msgid "Changes take effect at the next song change."
+msgstr "Los cambios se aplicarán en el siguiente cambio de canción."
 
 #: src/mpg123/mpg123.c:183
 msgid "Surround"
-msgstr ""
+msgstr "Envolvente"
 
 #: src/mtp_up/mtp.c:298
 msgid "Upload in progress..."
-msgstr ""
+msgstr "Carga en progreso..."
 
 #: src/mtp_up/mtp.c:310
 msgid "Upload to MTP Device"
-msgstr ""
+msgstr "Cargar a un dispositivo MTP"
 
 #: src/mtp_up/mtp.c:311
 msgid "Disconnect MTP Device"
-msgstr ""
+msgstr "Desconectar dispositivo MTP"
 
 #: src/notify/libnotify-aosd_event.c:47
-#, fuzzy
 msgid "Stopped"
-msgstr "Detener"
+msgstr "Detenido"
 
 #: src/notify/libnotify-aosd_event.c:47
-#, fuzzy
 msgid "Audacious is not playing."
-msgstr "Audacious - advertencia de visualización"
+msgstr "Audacious no está reproduciendo."
 
 #: src/null/null.c:64
 msgid "Null output plugin "
-msgstr ""
+msgstr "Complemento de salida nula "
 
 #: src/null/null.c:65
 msgid ""
 " by Christian Birchinger <joker@netswarm.net>\n"
 "based on the XMMS plugin by Håvard Kvål <havardk@xmms.org>"
 msgstr ""
-" by Christian Birchinger <joker@netswarm.net>\n"
-"based on the XMMS plugin by Håvard Kvål <havardk@xmms.org>"
+" por Christian Birchinger <joker@netswarm.net>\n"
+"basado en el complemento de XMMS por Håvard Kvål <havardk@xmms.org>"
 
 #: src/null/null.c:68
 msgid "About Null Output"
-msgstr ""
+msgstr "Acerca del complemento de salida nula"
 
-#: src/null/null.c:94
+#: src/null/null.c:89
 msgid "Null output preferences"
-msgstr ""
+msgstr "Preferencias de la salida nula"
 
-#: src/null/null.c:105
+#: src/null/null.c:100
 msgid "Run in real time"
-msgstr ""
+msgstr "Ejecutar en tiempo real"
 
-#: src/oss4/configure.c:89
+#: src/oss4/configure.c:76
 msgid "1. Default device"
-msgstr ""
+msgstr "1. Dispositivo predeterminado"
 
-#: src/oss4/configure.c:151
+#: src/oss4/configure.c:132
 msgid "OSS4 Output Plugin Preferences"
-msgstr ""
+msgstr "Preferencias del complemento de salida OSS4"
 
-#: src/oss4/configure.c:163 src/OSS/configure.c:203
+#: src/oss4/configure.c:144 src/OSS/configure.c:194
 msgid "Audio device:"
-msgstr ""
+msgstr "Dispositivo de sonido:"
 
-#: src/oss4/configure.c:189 src/OSS/configure.c:226 src/OSS/configure.c:269
+#: src/oss4/configure.c:172 src/OSS/configure.c:217 src/OSS/configure.c:260
 msgid "Use alternate device:"
-msgstr ""
+msgstr "Utilizar dispositivo alternativo:"
 
-#: src/oss4/configure.c:202
+#: src/oss4/configure.c:187
 msgid "Save volume between sessions"
-msgstr ""
+msgstr "Guardar volumen entre sesiones"
 
-#: src/oss4/configure.c:206
+#: src/oss4/configure.c:191
 msgid "Enable format conversions made by the OSS software."
-msgstr ""
+msgstr "Activar conversiones de formato realizadas por el software OSS."
 
 #: src/oss4/plugin.c:51
 msgid "About OSS4 Plugin"
-msgstr ""
-
-#: src/oss4/plugin.c:52
-msgid ""
-"OSS4 Output Plugin for Audacious\n"
-"Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
-"\n"
-"I would like to thank people on #audacious, especially Tony Vroon and John "
-"Lindgren and of course the authors of the previous OSS plugin.\n"
-"\n"
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with "
-"this program. If not, see <http://www.gnu.org/licenses/>.\n"
-msgstr ""
-"OSS4 Output Plugin for Audacious\n"
-"Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
-"\n"
-"I would like to thank people on #audacious, especially Tony Vroon and John "
-"Lindgren and of course the authors of the previous OSS plugin.\n"
-"\n"
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with "
-"this program. If not, see <http://www.gnu.org/licenses/>.\n"
+msgstr "Acerca del complemento OSS4"
 
-#: src/oss4/utils.c:204
+#: src/oss4/utils.c:211
 msgid "OSS4 error"
-msgstr ""
+msgstr "Error OSS4"
 
-#: src/OSS/configure.c:146
+#: src/OSS/configure.c:137
 #, c-format
 msgid "Default (%s)"
-msgstr ""
+msgstr "Predeterminado (%s)"
 
-#: src/OSS/configure.c:162 src/skins/ui_manager.c:456
-#: src/skins/ui_manager.c:477
-msgid "Default"
-msgstr "Predeterminado"
-
-#: src/OSS/configure.c:187
+#: src/OSS/configure.c:178
 msgid "OSS Driver configuration"
-msgstr ""
+msgstr "Configuración del complemento OSS"
 
-#: src/OSS/configure.c:290
+#: src/OSS/configure.c:281
 msgid "Devices"
-msgstr ""
+msgstr "Dispositivos"
 
-#: src/OSS/configure.c:292
+#: src/OSS/configure.c:283
 msgid "Buffering:"
-msgstr ""
+msgstr "Gestión de memoria intermedia:"
 
-#: src/OSS/configure.c:305
+#: src/OSS/configure.c:296
 msgid "Pre-buffer (percent):"
-msgstr ""
+msgstr "Información inicial (porcentaje):"
 
-#: src/OSS/configure.c:316
+#: src/OSS/configure.c:307
 msgid "Buffering"
-msgstr ""
+msgstr "Gestión de memoria intermedia"
 
-#: src/OSS/configure.c:317
+#: src/OSS/configure.c:308
 msgid "Mixer Settings:"
-msgstr ""
+msgstr "Ajustes del mezclador:"
 
-#: src/OSS/configure.c:323
+#: src/OSS/configure.c:314
 msgid "Volume controls Master not PCM"
-msgstr ""
+msgstr "El volumen controla el maestro no PCM"
 
-#: src/OSS/configure.c:329
+#: src/OSS/configure.c:320
 msgid "Mixer"
-msgstr ""
+msgstr "Mezclador"
 
 #: src/OSS/OSS.c:40
 msgid "About OSS Driver"
-msgstr ""
-
-#: src/OSS/OSS.c:41
-msgid ""
-"Audacious OSS Driver\n"
-"\n"
-" This program is free software; you can redistribute it and/or modify\n"
-"it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
-"(at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
-"GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
-msgstr ""
-"Audacious OSS Driver\n"
-"\n"
-" This program is free software; you can redistribute it and/or modify\n"
-"it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
-"(at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
-"GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
+msgstr "Acerca del complemento OSS"
 
 #: src/pulse_audio/pulse_audio.c:687
 msgid "About Audacious PulseAudio Output Plugin"
-msgstr ""
-
-#: src/pulse_audio/pulse_audio.c:688
-msgid ""
-"Audacious PulseAudio Output Plugin\n"
-"\n"
-" This program is free software; you can redistribute it and/or modify\n"
-"it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
-"(at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
-"GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
-msgstr ""
-"Audacious PulseAudio Output Plugin\n"
-"\n"
-" This program is free software; you can redistribute it and/or modify\n"
-"it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
-"(at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
-"GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
+msgstr "Acerca del complemento de salida PulseAudio"
 
-#: src/resample/plugin.c:91
+#: src/resample/plugin.c:89
 msgid "About Sample Rate Converter Plugin"
-msgstr ""
+msgstr "Acerca del módulo de conversión de frecuencia de muestreo"
 
-#: src/resample/plugin.c:146
+#: src/resample/plugin.c:144
 msgid "Sample Rate Converter Preferences"
-msgstr ""
+msgstr "Preferencias del conversor de frecuencia de muestreo"
 
-#: src/resample/plugin.c:158
+#: src/resample/plugin.c:156
 msgid "Rate mappings:"
-msgstr ""
+msgstr "Mapas de frecuencia:"
 
-#: src/resample/plugin.c:181
+#: src/resample/plugin.c:179
 msgid "All others:"
-msgstr ""
+msgstr "Todos los demás:"
 
-#: src/resample/plugin.c:193
+#: src/resample/plugin.c:191
 msgid "Method:"
-msgstr ""
+msgstr "Método:"
 
-#: src/scrobbler/configure.c:128 src/scrobbler/configure.c:204
+#: src/scrobbler/configure.c:122 src/scrobbler/configure.c:197
 msgid "Change password"
-msgstr ""
+msgstr "Cambiar la contraseña"
 
-#: src/scrobbler/configure.c:150
+#: src/scrobbler/configure.c:143
 msgid "Services"
 msgstr "Servicios"
 
-#: src/scrobbler/configure.c:172
+#: src/scrobbler/configure.c:165
 msgid "Username:"
 msgstr "Nombre de usuario:"
 
-#: src/scrobbler/configure.c:178
+#: src/scrobbler/configure.c:171
 msgid "Password:"
 msgstr "Contraseña:"
 
-#: src/scrobbler/configure.c:186
+#: src/scrobbler/configure.c:179
 msgid "Scrobbler URL:"
-msgstr ""
+msgstr "URL del Scrobbler:"
 
-#: src/scrobbler/configure.c:218
+#: src/scrobbler/configure.c:211
 msgid "Last.FM"
-msgstr ""
+msgstr "Last.FM"
 
-#: src/scrobbler/configure.c:262
+#: src/scrobbler/configure.c:238
 msgid "Scrobbler"
-msgstr ""
+msgstr "Scrobbler"
 
-#: src/scrobbler/plugin.c:213
+#: src/scrobbler/plugin.c:194
 msgid ""
 "Audacious AudioScrobbler Plugin\n"
 "\n"
-"Originally created by Audun Hove <audun@nlc.no> and Pipian <pipian@pipian."
-"com>\n"
+"Originally created by Audun Hove <audun@nlc.no> and Pipian <pipian@pipian.com>\n"
 msgstr ""
-"Audacious AudioScrobbler Plugin\n"
+"Módulo de AudioScrobbler para Audacious\n"
 "\n"
-"Originally created by Audun Hove <audun@nlc.no> and Pipian <pipian@pipian."
-"com>\n"
+"Creado originalmente por Audun Hove <audun@nlc.no> y Pipian <pipian@pipian.com>\n"
 
-#: src/scrobbler/plugin.c:215
+#: src/scrobbler/plugin.c:196
 msgid "About Scrobbler Plugin"
-msgstr ""
+msgstr "Acerca del complemento Scrobbler"
 
 #: src/sdlout/plugin.c:58
-#, fuzzy
 msgid "About SDL Output Plugin"
-msgstr "Acerca del complemento de salida ALSA"
+msgstr "Acerca del complemento de salida SDL"
 
 #: src/sdlout/plugin.c:78
-#, fuzzy
 msgid "SDL error"
-msgstr "Error de ALSA"
-
-#: src/sid/xs_about.c:84
-#, c-format
-msgid "About %s"
-msgstr "Acerca de %s"
-
-#: src/sid/xs_about.c:214 src/sid/xs_interface.c:1825
-msgid "Close"
-msgstr "Cerrar"
-
-#: src/sid/xs_config.c:326
-msgid " Error"
-msgstr ""
-
-#: src/sid/xs_config.c:326
-msgid "OK"
-msgstr "OK"
-
-#: src/sid/xs_fileinfo.c:151
-msgid "General info"
-msgstr ""
-
-#: src/sid/xs_fileinfo.c:164
-#, c-format
-msgid "Tune #%i: "
-msgstr ""
-
-#: src/sid/xs_glade.c:90 src/sid/xs_glade.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr ""
-
-#: src/sid/xs_interface.c:234
-msgid "Audacious-SID configuration"
-msgstr ""
-
-#: src/sid/xs_interface.c:270
-msgid "8-bit"
-msgstr "8-bit"
-
-#: src/sid/xs_interface.c:277
-msgid "16-bit"
-msgstr "16-bit"
-
-#: src/sid/xs_interface.c:284
-msgid "Resolution:"
-msgstr ""
-
-#: src/sid/xs_interface.c:315
-msgid "Autopanning"
-msgstr ""
-
-#: src/sid/xs_interface.c:322
-msgid "Channels:"
-msgstr ""
-
-#: src/sid/xs_interface.c:366
-msgid "Samplerate:"
-msgstr ""
-
-#: src/sid/xs_interface.c:383
-msgid "Use oversampling"
-msgstr ""
-
-#: src/sid/xs_interface.c:394
-msgid "Factor:"
-msgstr ""
-
-#: src/sid/xs_interface.c:406
-msgid "Large factors require more CPU-power"
-msgstr ""
-
-#: src/sid/xs_interface.c:412
-msgid "Oversampling:"
-msgstr ""
-
-#: src/sid/xs_interface.c:417
-msgid "Audio"
-msgstr "Audio"
-
-#: src/sid/xs_interface.c:445
-msgid "Force speed"
-msgstr ""
-
-#: src/sid/xs_interface.c:449
-msgid ""
-"If enabled, this option \"forces\" the emulation engine to use the selected "
-"clock speed/frequency. Otherwise the speed is determined from played file "
-"itself."
-msgstr ""
-
-#: src/sid/xs_interface.c:451
-msgid "PAL (50 Hz)"
-msgstr "PAL (50 Hz)"
-
-#: src/sid/xs_interface.c:455
-msgid ""
-"PAL is the european TV standard, which uses 50Hz vertical refresh frequency. "
-"Most of SID-tunes have been made for PAL computers."
-msgstr ""
-
-#: src/sid/xs_interface.c:459
-msgid "NTSC (60 Hz)"
-msgstr "NTSC (60 Hz)"
-
-#: src/sid/xs_interface.c:463
-msgid ""
-"NTSC is the TV standard with 60Hz vertical refresh rate (and other features "
-"that differ from PAL). It is mainly used in United States, Japan and certain "
-"other countries."
-msgstr ""
-
-#: src/sid/xs_interface.c:467
-msgid "Clock speed:"
-msgstr ""
-
-#: src/sid/xs_interface.c:484
-msgid "Force model"
-msgstr ""
-
-#: src/sid/xs_interface.c:488
-msgid ""
-"If enabled, this option \"forces\" the emulation engine to use the selected "
-"SID-chip model. Otherwise the preferred SID model is determined from the "
-"file (if PSIDv2NG type) or if not available, this setting is used."
-msgstr ""
-
-#: src/sid/xs_interface.c:490
-msgid "MOS 6581"
-msgstr "MOS 6581"
-
-#: src/sid/xs_interface.c:494
-msgid ""
-"MOS/CSG 6581 is the earlier major version of SID chip. It differs from 8580 "
-"in few ways, having much fuller filter (which, due to design error, is never "
-"same between two different SID-chips) and has the \"volume adjustment bug\", "
-"which enables playing of digital samples."
-msgstr ""
-
-#: src/sid/xs_interface.c:498
-msgid "MOS 8580"
-msgstr "MOS 8580"
-
-#: src/sid/xs_interface.c:505
-msgid "SID model:"
-msgstr ""
-
-#: src/sid/xs_interface.c:522
-msgid "SIDPlay 1 (frame-based)"
-msgstr ""
-
-#: src/sid/xs_interface.c:526
-msgid ""
-"Use libSIDPlay 1.x emulation, faster but not so accurate. Good in most "
-"cases, though."
-msgstr ""
-
-#: src/sid/xs_interface.c:530
-msgid "SIDPlay 2 (cycle-based)"
-msgstr ""
-
-#: src/sid/xs_interface.c:534
-msgid ""
-"Use libSIDPlay 2.x emulation, which requires powerful CPU due to more exact "
-"emulation."
-msgstr ""
-
-#: src/sid/xs_interface.c:538
-msgid "Emulation library selection:"
-msgstr ""
-
-#: src/sid/xs_interface.c:555
-msgid "Real C64 (SIDPlay 2 only)"
-msgstr ""
-
-#: src/sid/xs_interface.c:562
-msgid "Bank switching"
-msgstr ""
+msgstr "Error SDL"
 
-#: src/sid/xs_interface.c:569
-msgid "Transparent ROM"
-msgstr ""
-
-#: src/sid/xs_interface.c:576
-msgid "PlaySID environment"
-msgstr ""
-
-#: src/sid/xs_interface.c:583
-msgid "Memory mode:"
-msgstr ""
-
-#: src/sid/xs_interface.c:588
-msgid "Emu#1"
-msgstr ""
-
-#: src/sid/xs_interface.c:611
-msgid "Optimization mode (faster, inaccurate)"
-msgstr ""
-
-#: src/sid/xs_interface.c:615
-msgid ""
-"This setting can be used to enable libSIDPlay2's \"optimization mode\", "
-"which in downgrades the emulation from cycle-exact to something similar to "
-"frame-exact. The result is lower CPU usage, but worse accuracy."
-msgstr ""
-
-#: src/sid/xs_interface.c:617
-msgid "reSID-emulation"
-msgstr ""
-
-#: src/sid/xs_interface.c:621
-msgid ""
-"reSID is the software SID-chip simulator based on SID reverse-engineering, "
-"created by Dag Lem. It is probably the closest thing to real SID available "
-"as software-only emulation."
-msgstr ""
-
-#: src/sid/xs_interface.c:625
-msgid "HardSID"
-msgstr ""
-
-#: src/sid/xs_interface.c:629
-msgid ""
-"HardSID is a EISA/PCI card for PC-compatibles, which can be fitted with a "
-"real SID-chip. Software can be used to control the HardSID and combined with "
-"software emulation of rest of C64 via libSIDPlay2 HardSID can be used to "
-"achieve \"near 100%\" similarity to real C64. For more information, see "
-"http://www.hardsid.com/"
-msgstr ""
-
-#: src/sid/xs_interface.c:633
-msgid "SIDPlay 2 options:"
-msgstr ""
-
-#: src/sid/xs_interface.c:650
-msgid "Fast (nearest neighbour)"
-msgstr ""
-
-#: src/sid/xs_interface.c:654
-msgid ""
-"Fastest and also worst sounding sampling method, simply picks nearest "
-"neighbouring sample."
-msgstr ""
-
-#: src/sid/xs_interface.c:658
-msgid "Linear interpolation"
-msgstr ""
-
-#: src/sid/xs_interface.c:662
-msgid ""
-"Uses linear interpolation between samples, yielding higher audio quality "
-"with less sampling noise."
-msgstr ""
-
-#: src/sid/xs_interface.c:673
-msgid "Resampling (FIR)"
-msgstr ""
-
-#: src/sid/xs_interface.c:680
-msgid "reSID sampling options:"
-msgstr ""
-
-#: src/sid/xs_interface.c:685
-msgid "Emu#2"
-msgstr ""
-
-#: src/sid/xs_interface.c:697
-msgid "Emulate filters"
-msgstr ""
-
-#: src/sid/xs_interface.c:701
-msgid ""
-"This option enables emulation of SID filter. The filter is an essential part "
-"of SID's sound capacity, but accurate emulation of it may require quite much "
-"CPU power. However, if filter emulation is disabled, tunes won't sound "
-"authentic at all if they utilize the filter."
-msgstr ""
-
-#: src/sid/xs_interface.c:726
-msgid "FS"
-msgstr "FS"
-
-#: src/sid/xs_interface.c:743
-msgid "FM"
-msgstr "FM"
-
-#: src/sid/xs_interface.c:760
-msgid "FT"
-msgstr "FT"
-
-#: src/sid/xs_interface.c:771
-msgid "Reset values"
-msgstr ""
-
-#: src/sid/xs_interface.c:776
-msgid "SIDPlay1"
-msgstr ""
-
-#: src/sid/xs_interface.c:817
-msgid "Export"
-msgstr ""
-
-#: src/sid/xs_interface.c:825
-msgid "Use"
-msgstr ""
-
-#: src/sid/xs_interface.c:833 src/skins/ui_manager.c:447
-msgid "Save"
-msgstr ""
-
-#: src/sid/xs_interface.c:841 src/skins/ui_manager.c:446
-msgid "Import"
-msgstr ""
-
-#: src/sid/xs_interface.c:849 src/skins/ui_manager.c:448
-msgid "Delete"
-msgstr ""
-
-#: src/sid/xs_interface.c:863
-msgid "Filter curve:"
-msgstr ""
-
-#: src/sid/xs_interface.c:868
-msgid "SIDPlay2"
-msgstr ""
-
-#: src/sid/xs_interface.c:874
-msgid "Filters"
-msgstr ""
-
-#: src/sid/xs_interface.c:897
-msgid "Play at least for specified time"
-msgstr ""
-
-#: src/sid/xs_interface.c:901
-msgid ""
-"If enabled, the tune is played at least for the specified time, adding "
-"silence to the end if necessary."
-msgstr ""
-
-#: src/sid/xs_interface.c:908 src/sid/xs_interface.c:962
-#: src/sid/xs_interface.c:1142
-msgid "Playtime:"
-msgstr ""
-
-#: src/sid/xs_interface.c:921 src/sid/xs_interface.c:975
-#: src/sid/xs_interface.c:1155
-msgid "seconds"
-msgstr "segundos"
-
-#: src/sid/xs_interface.c:928
-msgid "Minimum playtime:"
-msgstr ""
-
-#: src/sid/xs_interface.c:945
-msgid "Play for specified time maximum"
-msgstr ""
-
-#: src/sid/xs_interface.c:949
-msgid ""
-"If enabled, tune is played until specified duration is reached (aka maximum "
-"playtime)."
-msgstr ""
-
-#: src/sid/xs_interface.c:951
-msgid "Only when song length is unknown"
-msgstr ""
-
-#: src/sid/xs_interface.c:955
-msgid ""
-"If enabled, the maximum playtime is applied only if song/tune length is not "
-"known."
-msgstr ""
-
-#: src/sid/xs_interface.c:982
-msgid "Maximum playtime:"
-msgstr ""
-
-#: src/sid/xs_interface.c:999
-msgid "Use XSIDPLAY-compatible database"
-msgstr ""
-
-#: src/sid/xs_interface.c:1003
-msgid ""
-"This option enables using of XSIDPLAY compatible song length database. "
-"(Refer to Audacious-SID documentation for more information)"
-msgstr ""
-
-#: src/sid/xs_interface.c:1010
-msgid "DB-file:"
-msgstr ""
-
-#: src/sid/xs_interface.c:1020
-msgid "Database path and filename"
-msgstr ""
-
-#: src/sid/xs_interface.c:1027
-msgid "Browse for song length-database file"
-msgstr ""
-
-#: src/sid/xs_interface.c:1049
-msgid "Song length database:"
-msgstr ""
-
-#: src/sid/xs_interface.c:1054
-msgid "Songlength"
-msgstr ""
-
-#: src/sid/xs_interface.c:1072
-msgid "Override generic Tuplez format string"
-msgstr ""
-
-#: src/sid/xs_interface.c:1076
-msgid ""
-"By enabling this option you can specify a custom Tuplez formatting string "
-"for SID-files. The SID-plugin specific Tuplez tags are described shortly "
-"below."
-msgstr ""
-
-#: src/sid/xs_interface.c:1087
-msgid "Tuplez format string for SID-files"
-msgstr ""
-
-#: src/sid/xs_interface.c:1090
-msgid ""
-"SID-specific Tuplez fields:\n"
-"\n"
-"sid-format\t\t- Specific fileformat\n"
-"sid-model\t\t- 6581 or 8580\n"
-"sid-speed\t\t- Timing or speed: PAL/NTSC/etc.\n"
-"\n"
-"Other \"special\" fields set:\n"
-"\n"
-"subsong-num, subsong-id"
-msgstr ""
-
-#: src/sid/xs_interface.c:1098
-msgid "Song title format:"
-msgstr ""
-
-#: src/sid/xs_interface.c:1125
-msgid "Add sub-tunes to playlist"
-msgstr ""
-
-#: src/sid/xs_interface.c:1129
-msgid ""
-"If enabled, sub-tunes of each file will be added to playlist. If disabled, "
-"only the default sub-tune will be added."
-msgstr ""
-
-#: src/sid/xs_interface.c:1131
-msgid "Only tunes with specified minimum duration"
-msgstr ""
-
-#: src/sid/xs_interface.c:1135
-msgid "Only add sub-tunes that have a duration of at least specified time."
-msgstr ""
-
-#: src/sid/xs_interface.c:1162
-msgid "Sub-tune handling:"
-msgstr ""
-
-#: src/sid/xs_interface.c:1179
-msgid "Use STIL database"
-msgstr ""
-
-#: src/sid/xs_interface.c:1183
-msgid ""
-"If this option is enabled (and the database & HVSC settings below are "
-"correctly set), Audacious-SID will use and display additional information "
-"from STIL database when HVSC SIDs are played."
-msgstr ""
-
-#: src/sid/xs_interface.c:1190
-msgid "STIL file:"
-msgstr ""
-
-#: src/sid/xs_interface.c:1206
-msgid ""
-"Path and filename of STIL database file (STIL.txt), usually found from "
-"HVSC's DOCUMENTS-subdirectory."
-msgstr ""
-
-#: src/sid/xs_interface.c:1219
-msgid "Browse for STIL-database file"
-msgstr ""
-
-#: src/sid/xs_interface.c:1246
-msgid "HVSC path:"
-msgstr ""
-
-#: src/sid/xs_interface.c:1262
-msgid ""
-"Path to base-directory of your High Voltage SID Collection (HVSC), for "
-"example /media/C64Music/"
-msgstr ""
-
-#: src/sid/xs_interface.c:1275
-msgid "Browse for HVSC path"
-msgstr ""
-
-#: src/sid/xs_interface.c:1297
-msgid "SID Tune Information List (STIL) database:"
-msgstr ""
-
-#: src/sid/xs_interface.c:1321
-msgid "Cancel any changes"
-msgstr ""
-
-#: src/sid/xs_interface.c:1328
-msgid "Accept and update changes"
-msgstr ""
-
-#: src/sid/xs_interface.c:1628
-msgid "Audacious-SID Fileinfo"
-msgstr ""
-
-#: src/sid/xs_interface.c:1649
-msgid "Filename:"
-msgstr ""
-
-#: src/sid/xs_interface.c:1657
-msgid "Songname:"
-msgstr ""
-
-#: src/sid/xs_interface.c:1665
-msgid "Composer:"
-msgstr ""
-
-#: src/sid/xs_interface.c:1673
-msgid "Copyright:"
-msgstr ""
-
-#: src/sid/xs_interface.c:1717
-msgid "Song Information:"
-msgstr ""
-
-#: src/sid/xs_interface.c:1752
-msgid "Author:"
-msgstr ""
-
-#: src/sid/xs_interface.c:1786
-msgid "Duration:"
-msgstr ""
-
-#: src/sid/xs_interface.c:1820
-msgid "Sub-tune Information:"
-msgstr ""
-
-#: src/sid/xs_interface.c:1881
-msgid "Select HVSC song length database"
-msgstr ""
-
-#: src/sid/xs_interface.c:1922
-msgid "Select STIL-database"
-msgstr ""
-
-#: src/sid/xs_interface.c:1963
-msgid "Select HVSC location prefix"
-msgstr ""
-
-#: src/sid/xs_interface.c:2004
-msgid "Select SIDPlay2 filters file for importing"
-msgstr ""
-
-#: src/sid/xs_interface.c:2045
-msgid "Select SIDPlay2 filters file for exporting"
-msgstr ""
-
-#: src/sid/xs_interface.c:2093 src/sid/xs_interface.c:2106
-msgid "Confirm selected action"
-msgstr ""
-
-#: src/sid/xs_interface.c:2123
-msgid "Yes"
-msgstr "Si"
-
-#: src/sid/xs_interface.c:2129
-msgid "No"
-msgstr "No"
-
-#: src/skins/plugin.c:167
+#: src/skins/plugin.c:165
 msgid "About Skinned GUI"
-msgstr ""
+msgstr "Acerca del interfaz con soporte de temas"
 
-#: src/skins/plugin.c:168
+#: src/skins/plugin.c:166
 msgid ""
 "Copyright (c) 2008, by Tomasz Moń <desowin@gmail.com>\n"
 "\n"
-msgstr ""
-"Copyright (c) 2008, por Tomasz Moń <desowin@gmail.com>\n"
-"\n"
+msgstr "Copyright (c) 2008, por Tomasz Moń <desowin@gmail.com>\n"
 
-#: src/skins/skins_cfg.c:254
+#: src/skins/skins_cfg.c:207
 msgid "_Player:"
-msgstr ""
+msgstr "_Reproductor:"
 
-#: src/skins/skins_cfg.c:254
+#: src/skins/skins_cfg.c:208
 msgid "Select main player window font:"
-msgstr ""
+msgstr "Seleccione la tipografía para la ventana principal:"
 
-#: src/skins/skins_cfg.c:255
+#: src/skins/skins_cfg.c:210
 msgid "_Playlist:"
 msgstr "Lista de reproducción:"
 
-#: src/skins/skins_cfg.c:255
+#: src/skins/skins_cfg.c:211
 msgid "Select playlist font:"
-msgstr ""
+msgstr "Seleccione la tipografía de la lista de reproducción:"
 
-#: src/skins/skins_cfg.c:259
+#: src/skins/skins_cfg.c:215
 msgid "_Fonts"
-msgstr ""
+msgstr "_Tipografías"
 
-#: src/skins/skins_cfg.c:261
+#: src/skins/skins_cfg.c:218
 msgid "Use bitmap fonts (supports ASCII only)"
-msgstr ""
+msgstr "Usar tipografías de mapa de bits (solo soporta ASCII)"
 
-#: src/skins/skins_cfg.c:263
+#: src/skins/skins_cfg.c:220
 msgid "Scroll song title in both directions"
-msgstr ""
+msgstr "Desplazar el título de la canción en ambas direcciones"
 
-#: src/skins/skins_cfg.c:346
+#: src/skins/skins_cfg.c:298
 msgid "_Skin"
-msgstr "Piel"
+msgstr "_Tema"
 
-#: src/skins/skins_cfg.c:393
-#, fuzzy
+#: src/skins/skins_cfg.c:345
 msgid "Interface Preferences"
-msgstr "Preferencias de Atenuación Cruzada"
+msgstr "Preferencias del interfaz"
 
 #: src/skins/ui_equalizer.c:330
 msgid "Preamp"
-msgstr ""
+msgstr "Preamplificador"
 
 #: src/skins/ui_equalizer.c:334
 msgid "31 Hz"
-msgstr ""
+msgstr "31 Hz"
 
 #: src/skins/ui_equalizer.c:335
 msgid "63 Hz"
-msgstr ""
+msgstr "63 Hz"
 
 #: src/skins/ui_equalizer.c:335
 msgid "125 Hz"
-msgstr ""
+msgstr "125 Hz"
 
 #: src/skins/ui_equalizer.c:335
 msgid "250 Hz"
@@ -2952,121 +2568,121 @@
 msgid "16 kHz"
 msgstr "16 kHz"
 
-#: src/skins/ui_equalizer.c:378
+#: src/skins/ui_equalizer.c:379
 msgid "Audacious Equalizer"
-msgstr "Ecualizador audacious"
+msgstr "Ecualizador de Audacious"
 
-#: src/skins/ui_equalizer.c:884
+#: src/skins/ui_equalizer.c:896
 msgid "Presets"
-msgstr ""
+msgstr "Predefinidos"
 
-#: src/skins/ui_main.c:444
+#: src/skins/ui_main.c:443
 msgid "kbps"
 msgstr "kbps"
 
-#: src/skins/ui_main.c:452
+#: src/skins/ui_main.c:451
 msgid "kHz"
 msgstr "kHz"
 
-#: src/skins/ui_main.c:459
+#: src/skins/ui_main.c:458
 msgid "surround"
-msgstr "surround"
+msgstr "envolvente"
 
-#: src/skins/ui_main.c:807
+#: src/skins/ui_main.c:806
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
-msgstr ""
+msgstr "Ir a la posición %d:%-2.2d / %d:%-2.2d"
 
-#: src/skins/ui_main.c:828
+#: src/skins/ui_main.c:827
 #, c-format
 msgid "Volume: %d%%"
 msgstr "Volumen: %d%%"
 
-#: src/skins/ui_main.c:851
+#: src/skins/ui_main.c:850
 #, c-format
 msgid "Balance: %d%% left"
-msgstr ""
+msgstr "Balance: %d%% izquierda"
 
-#: src/skins/ui_main.c:853
+#: src/skins/ui_main.c:852
 msgid "Balance: center"
-msgstr ""
+msgstr "Balance: centrado"
 
-#: src/skins/ui_main.c:855
+#: src/skins/ui_main.c:854
 #, c-format
 msgid "Balance: %d%% right"
-msgstr ""
+msgstr "Balance: %d%% derecha"
 
-#: src/skins/ui_main.c:981
+#: src/skins/ui_main.c:980
 msgid "Options Menu"
 msgstr "Menú de opciones"
 
-#: src/skins/ui_main.c:985
+#: src/skins/ui_main.c:984
 msgid "Disable 'Always On Top'"
-msgstr "Deshabilitar 'Siempre encima'"
+msgstr "Desactivar 'Siempre encima'"
 
-#: src/skins/ui_main.c:987
+#: src/skins/ui_main.c:986
 msgid "Enable 'Always On Top'"
-msgstr "Habilitar 'Siempre encima'"
+msgstr "Activar 'Siempre encima'"
 
-#: src/skins/ui_main.c:990
+#: src/skins/ui_main.c:989
 msgid "File Info Box"
-msgstr ""
+msgstr "Caja de información de archivo"
 
-#: src/skins/ui_main.c:995
+#: src/skins/ui_main.c:994
 msgid "Visualization Menu"
 msgstr "Menú de visualización"
 
-#: src/skins/ui_main.c:1645
+#: src/skins/ui_main.c:1648
 msgid "Single mode."
-msgstr ""
+msgstr "Modo único."
 
-#: src/skins/ui_main.c:1647
+#: src/skins/ui_main.c:1650
 msgid "Playlist mode."
 msgstr "Modo de lista de reproducción."
 
-#: src/skins/ui_main.c:1669
+#: src/skins/ui_main.c:1672
 msgid "Stopping after song."
-msgstr "Parar después de la canción"
+msgstr "Parar después de la canción."
 
-#: src/skins/ui_main.c:1671
+#: src/skins/ui_main.c:1674
 msgid "Not stopping after song."
-msgstr "No parar después de la canción"
+msgstr "No parar después de la canción."
 
 #: src/skins/ui_manager.c:67 src/skins/ui_manager.c:68
 msgid "Autoscroll Songname"
-msgstr ""
+msgstr "Desplazar el nombre de la canción"
 
 #: src/skins/ui_manager.c:70 src/skins/ui_manager.c:71
 msgid "Stop after Current Song"
-msgstr ""
+msgstr "Parar tras la canción actual"
 
 #: src/skins/ui_manager.c:73 src/skins/ui_manager.c:74
 msgid "Peaks"
-msgstr ""
+msgstr "Picos"
 
 #: src/skins/ui_manager.c:76 src/skins/ui_manager.c:77
 msgid "Repeat"
-msgstr ""
+msgstr "Repetir"
 
 #: src/skins/ui_manager.c:79 src/skins/ui_manager.c:80
 msgid "Shuffle"
-msgstr ""
+msgstr "Orden aleatorio"
 
 #: src/skins/ui_manager.c:82 src/skins/ui_manager.c:83
 msgid "No Playlist Advance"
-msgstr ""
+msgstr "No avanzar la lista de reproducción"
 
 #: src/skins/ui_manager.c:85 src/skins/ui_manager.c:86
 msgid "Show Player"
-msgstr ""
+msgstr "Mostrar reproductor"
 
 #: src/skins/ui_manager.c:88 src/skins/ui_manager.c:89
 msgid "Show Playlist Editor"
-msgstr ""
+msgstr "Mostrar el editor de listas de reproducción"
 
 #: src/skins/ui_manager.c:91 src/skins/ui_manager.c:92
 msgid "Show Equalizer"
-msgstr ""
+msgstr "Mostrar el ecualizador"
 
 #: src/skins/ui_manager.c:94 src/skins/ui_manager.c:95
 msgid "Always on Top"
@@ -3074,76 +2690,76 @@
 
 #: src/skins/ui_manager.c:97 src/skins/ui_manager.c:98
 msgid "Put on All Workspaces"
-msgstr ""
+msgstr "Poner en todos los espacios de trabajo"
 
 #: src/skins/ui_manager.c:100 src/skins/ui_manager.c:101
 msgid "Roll up Player"
-msgstr ""
+msgstr "Enrollar el reproductor"
 
 #: src/skins/ui_manager.c:103 src/skins/ui_manager.c:104
 msgid "Roll up Playlist Editor"
-msgstr ""
+msgstr "Enrollar el editor de listas de reproducción"
 
 #: src/skins/ui_manager.c:106 src/skins/ui_manager.c:107
 msgid "Roll up Equalizer"
-msgstr ""
+msgstr "Enrollar el ecualizador"
 
 #: src/skins/ui_manager.c:115
 msgid "Analyzer"
-msgstr ""
+msgstr "Analizador"
 
 #: src/skins/ui_manager.c:116
 msgid "Scope"
-msgstr ""
+msgstr "Campo"
 
 #: src/skins/ui_manager.c:117
 msgid "Voiceprint"
-msgstr ""
+msgstr "Marca de voz"
 
 #: src/skins/ui_manager.c:118
 msgid "Off"
-msgstr "Off"
+msgstr "Apagado"
 
 #: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
 #: src/skins/ui_manager.c:145
 msgid "Normal"
-msgstr ""
+msgstr "Normal"
 
 #: src/skins/ui_manager.c:123 src/skins/ui_manager.c:140
 msgid "Fire"
-msgstr ""
+msgstr "Fuego"
 
 #: src/skins/ui_manager.c:124
 msgid "Vertical Lines"
-msgstr ""
+msgstr "Líneas verticales"
 
 #: src/skins/ui_manager.c:128
 msgid "Lines"
-msgstr ""
+msgstr "Líneas"
 
 #: src/skins/ui_manager.c:129
 msgid "Bars"
-msgstr ""
+msgstr "Barras"
 
 #: src/skins/ui_manager.c:133
 msgid "Dot Scope"
-msgstr ""
+msgstr "Campo de puntos"
 
 #: src/skins/ui_manager.c:134
 msgid "Line Scope"
-msgstr ""
+msgstr "Campo de líneas"
 
 #: src/skins/ui_manager.c:135
 msgid "Solid Scope"
-msgstr ""
+msgstr "Campo sólido"
 
 #: src/skins/ui_manager.c:141
 msgid "Ice"
-msgstr ""
+msgstr "Hielo"
 
 #: src/skins/ui_manager.c:146
 msgid "Smooth"
-msgstr ""
+msgstr "Suave"
 
 #: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
 msgid "Slowest"
@@ -3167,11 +2783,11 @@
 
 #: src/skins/ui_manager.c:166
 msgid "Time Elapsed"
-msgstr ""
+msgstr "Tiempo transcurrido"
 
 #: src/skins/ui_manager.c:167
 msgid "Time Remaining"
-msgstr ""
+msgstr "Tiempo restante"
 
 #: src/skins/ui_manager.c:181 src/skins/ui_manager.c:182
 msgid "Pause"
@@ -3191,31 +2807,31 @@
 
 #: src/skins/ui_manager.c:197
 msgid "Visualization Mode"
-msgstr ""
+msgstr "Modo de visualización"
 
 #: src/skins/ui_manager.c:198
 msgid "Analyzer Mode"
-msgstr ""
+msgstr "Modo analizador"
 
 #: src/skins/ui_manager.c:199
 msgid "Scope Mode"
-msgstr ""
+msgstr "Modo de campo"
 
 #: src/skins/ui_manager.c:200
 msgid "Voiceprint Mode"
-msgstr ""
+msgstr "Modo marca de voz"
 
 #: src/skins/ui_manager.c:201
 msgid "WindowShade VU Mode"
-msgstr ""
+msgstr "Modo WindowShade VU"
 
 #: src/skins/ui_manager.c:202
 msgid "Analyzer Falloff"
-msgstr ""
+msgstr "Caída del analizador"
 
 #: src/skins/ui_manager.c:203
 msgid "Peaks Falloff"
-msgstr ""
+msgstr "Caída de los picos"
 
 #: src/skins/ui_manager.c:208
 msgid "Playlist"
@@ -3227,609 +2843,576 @@
 
 #: src/skins/ui_manager.c:213 src/skins/ui_manager.c:214
 msgid "Select Next Playlist"
-msgstr ""
+msgstr "Lista de reproducción siguiente"
 
 #: src/skins/ui_manager.c:216 src/skins/ui_manager.c:217
 msgid "Select Previous Playlist"
-msgstr ""
+msgstr "Lista de reproducción anterior"
 
 #: src/skins/ui_manager.c:219 src/skins/ui_manager.c:220
 msgid "Delete Playlist"
-msgstr "Eliminar lista de reproducción"
+msgstr "Eliminar la lista de reproducción"
 
 #: src/skins/ui_manager.c:222
 msgid "Import Playlist"
-msgstr ""
+msgstr "Importar lista de reproducción"
 
 #: src/skins/ui_manager.c:223
 msgid "Loads a playlist file into the selected playlist."
-msgstr "Cargar lista de reproducción en la lista seleccionada"
+msgstr "Carga un archivo de listas en la lista de reproducción seleccionada."
 
 #: src/skins/ui_manager.c:226
 msgid "Export Playlist"
-msgstr ""
+msgstr "Exportar lista de reproducción"
 
 #: src/skins/ui_manager.c:227
 msgid "Saves the selected playlist."
-msgstr "Guardar la lista de reproducción seleccionada"
+msgstr "Guarda la lista de reproducción seleccionada."
 
 #: src/skins/ui_manager.c:229
-msgid "Save All Playlists"
-msgstr "Guardar todas las listas de reproducción"
-
-#: src/skins/ui_manager.c:230
-msgid ""
-"Saves all the playlists that are open. Note that this is done automatically "
-"when Audacious quits."
-msgstr ""
-
-#: src/skins/ui_manager.c:234
 msgid "Refresh List"
-msgstr ""
+msgstr "Actualizar lista"
 
-#: src/skins/ui_manager.c:235
+#: src/skins/ui_manager.c:230
 msgid "Refreshes metadata associated with a playlist entry."
 msgstr ""
+"Actualiza los metadatos asociados con una entrada de la lista de "
+"reproducción."
 
-#: src/skins/ui_manager.c:238
-msgid "List Manager"
-msgstr ""
+#: src/skins/ui_manager.c:233
+msgid "Playlist Manager"
+msgstr "Gestor de listas de reproducción"
 
-#: src/skins/ui_manager.c:239
-msgid "Opens the playlist manager."
-msgstr ""
+#: src/skins/ui_manager.c:234
+msgid "Queue Manager"
+msgstr "Gestor de colas"
 
-#: src/skins/ui_manager.c:243
+#: src/skins/ui_manager.c:237
 msgid "View"
 msgstr "Ver"
 
-#: src/skins/ui_manager.c:244
+#: src/skins/ui_manager.c:238
 msgid "Interface"
-msgstr ""
+msgstr "Interfaz"
 
-#: src/skins/ui_manager.c:245
-#, fuzzy
+#: src/skins/ui_manager.c:239
 msgid "Interface Preferences ..."
-msgstr "Preferencias de Atenuación Cruzada"
+msgstr "Preferencias del interfaz ..."
 
-#: src/skins/ui_manager.c:249
+#: src/skins/ui_manager.c:243
 msgid "Add Internet Address..."
-msgstr ""
+msgstr "Añadir dirección de Internet..."
 
-#: src/skins/ui_manager.c:250
+#: src/skins/ui_manager.c:244
 msgid "Adds a remote track to the playlist."
-msgstr ""
+msgstr "Añade una pista remota a la lista de reproducción."
 
-#: src/skins/ui_manager.c:253
+#: src/skins/ui_manager.c:247
 msgid "Add Files..."
-msgstr ""
+msgstr "Añadir archivos..."
 
-#: src/skins/ui_manager.c:254
+#: src/skins/ui_manager.c:248
 msgid "Adds files to the playlist."
-msgstr ""
+msgstr "Añadir archivos a la lista de reproducción."
 
-#: src/skins/ui_manager.c:259
+#: src/skins/ui_manager.c:253
 msgid "Search and Select"
-msgstr ""
+msgstr "Buscar y seleccionar"
 
-#: src/skins/ui_manager.c:260
+#: src/skins/ui_manager.c:254
 msgid ""
 "Searches the playlist and selects playlist entries based on specific "
 "criteria."
 msgstr ""
+"Busca en la lista de reproducción y selecciona las entradas que cumplen un "
+"criterio específico."
 
-#: src/skins/ui_manager.c:263
+#: src/skins/ui_manager.c:257
 msgid "Invert Selection"
-msgstr ""
+msgstr "Invertir la selección"
 
-#: src/skins/ui_manager.c:264
+#: src/skins/ui_manager.c:258
 msgid "Inverts the selected and unselected entries."
-msgstr ""
+msgstr "Invierte las entradas seleccionadas y no seleccionadas."
 
-#: src/skins/ui_manager.c:267
+#: src/skins/ui_manager.c:261
 msgid "Select All"
 msgstr "Seleccionar todo"
 
-#: src/skins/ui_manager.c:268
+#: src/skins/ui_manager.c:262
 msgid "Selects all of the playlist entries."
-msgstr ""
+msgstr "Selecciona todos los elementos de la lista de reproducción."
 
-#: src/skins/ui_manager.c:271
+#: src/skins/ui_manager.c:265
 msgid "Select None"
-msgstr ""
+msgstr "No seleccionar nada"
 
-#: src/skins/ui_manager.c:272
+#: src/skins/ui_manager.c:266
 msgid "Deselects all of the playlist entries."
-msgstr ""
+msgstr "Quita la selección de todos los elementos de la lista."
 
-#: src/skins/ui_manager.c:277
+#: src/skins/ui_manager.c:271
 msgid "Remove All"
-msgstr ""
+msgstr "Eliminar todo"
 
-#: src/skins/ui_manager.c:278
+#: src/skins/ui_manager.c:272
 msgid "Removes all entries from the playlist."
-msgstr ""
+msgstr "Elimina todas las entradas de la lista de reproducción."
 
-#: src/skins/ui_manager.c:281
+#: src/skins/ui_manager.c:275
 msgid "Clear Queue"
-msgstr "Limpiar lista"
+msgstr "Limpiar la cola"
 
-#: src/skins/ui_manager.c:282
+#: src/skins/ui_manager.c:276
 msgid "Clears the queue associated with this playlist."
-msgstr "Limpiar la lista asociada con esta lista de reproducción"
+msgstr "Limpia la cola asociada con esta lista de reproducción."
 
-#: src/skins/ui_manager.c:285
+#: src/skins/ui_manager.c:279
 msgid "Remove Unavailable Files"
-msgstr "Eliminar archivos no disponibles"
+msgstr "Eliminar los archivos no disponibles"
 
-#: src/skins/ui_manager.c:286
+#: src/skins/ui_manager.c:280
 msgid "Removes unavailable files from the playlist."
-msgstr "Eliminar archivos no disponibles de la lista de reproducción"
+msgstr "Elimina los archivos no disponibles de la lista de reproducción."
 
-#: src/skins/ui_manager.c:289
+#: src/skins/ui_manager.c:283
 msgid "Remove Duplicates"
 msgstr "Eliminar duplicados"
 
-#: src/skins/ui_manager.c:291 src/skins/ui_manager.c:323
-#: src/skins/ui_manager.c:353
+#: src/skins/ui_manager.c:285 src/skins/ui_manager.c:317
+#: src/skins/ui_manager.c:347
 msgid "By Title"
 msgstr "Por título"
 
-#: src/skins/ui_manager.c:292
+#: src/skins/ui_manager.c:286
 msgid "Removes duplicate entries from the playlist by title."
-msgstr ""
+msgstr "Elimina las entradas duplicadas de la lista por título."
 
-#: src/skins/ui_manager.c:295 src/skins/ui_manager.c:335
-#: src/skins/ui_manager.c:365
+#: src/skins/ui_manager.c:289 src/skins/ui_manager.c:329
+#: src/skins/ui_manager.c:359
 msgid "By Filename"
 msgstr "Por nombre de archivo"
 
-#: src/skins/ui_manager.c:296
+#: src/skins/ui_manager.c:290
 msgid "Removes duplicate entries from the playlist by filename."
 msgstr ""
+"Elimina las entradas duplicadas de la lista de reproducción por nombre de "
+"archivo."
 
-#: src/skins/ui_manager.c:299 src/skins/ui_manager.c:339
-#: src/skins/ui_manager.c:369
+#: src/skins/ui_manager.c:293 src/skins/ui_manager.c:333
+#: src/skins/ui_manager.c:363
 msgid "By Path + Filename"
 msgstr "Por ruta y nombre de archivo"
 
-#: src/skins/ui_manager.c:300
+#: src/skins/ui_manager.c:294
 msgid "Removes duplicate entries from the playlist by their full path."
 msgstr ""
+"Elimina las entradas duplicadas de la lista de reproducción por su ruta "
+"completa."
 
-#: src/skins/ui_manager.c:303
+#: src/skins/ui_manager.c:297
 msgid "Remove Unselected"
-msgstr ""
+msgstr "Eliminar los no seleccionados"
 
-#: src/skins/ui_manager.c:304
+#: src/skins/ui_manager.c:298
 msgid "Remove unselected entries from the playlist."
-msgstr ""
+msgstr "Elimina las entradas no seleccionadas de la lista de reproducción."
 
-#: src/skins/ui_manager.c:307
+#: src/skins/ui_manager.c:301
 msgid "Remove Selected"
-msgstr ""
+msgstr "Eliminar los seleccionados"
 
-#: src/skins/ui_manager.c:308
+#: src/skins/ui_manager.c:302
 msgid "Remove selected entries from the playlist."
-msgstr ""
+msgstr "Elimina las entradas seleccionadas de la lista de reproducción."
 
-#: src/skins/ui_manager.c:313
+#: src/skins/ui_manager.c:307
 msgid "Randomize List"
-msgstr ""
+msgstr "Ordenar aleatoriamente"
 
-#: src/skins/ui_manager.c:314
+#: src/skins/ui_manager.c:308
 msgid "Randomizes the playlist."
-msgstr "Lista de reproducción aleatoria."
+msgstr "Ordena la lista de reproducción de forma aleatoria."
 
-#: src/skins/ui_manager.c:317
+#: src/skins/ui_manager.c:311
 msgid "Reverse List"
-msgstr ""
+msgstr "Invertir la lista"
 
-#: src/skins/ui_manager.c:318
+#: src/skins/ui_manager.c:312
 msgid "Reverses the playlist."
-msgstr ""
+msgstr "Invierte la lista de reproducción."
 
-#: src/skins/ui_manager.c:321
+#: src/skins/ui_manager.c:315
 msgid "Sort List"
 msgstr "Ordenar lista"
 
-#: src/skins/ui_manager.c:324 src/skins/ui_manager.c:354
+#: src/skins/ui_manager.c:318 src/skins/ui_manager.c:348
 msgid "Sorts the list by title."
-msgstr ""
+msgstr "Ordena la lista por título."
 
-#: src/skins/ui_manager.c:327 src/skins/ui_manager.c:357
+#: src/skins/ui_manager.c:321 src/skins/ui_manager.c:351
 msgid "By Album"
 msgstr "Por álbum"
 
-#: src/skins/ui_manager.c:328 src/skins/ui_manager.c:358
+#: src/skins/ui_manager.c:322 src/skins/ui_manager.c:352
 msgid "Sorts the list by album."
-msgstr ""
+msgstr "Ordena la lista por álbum."
 
-#: src/skins/ui_manager.c:331 src/skins/ui_manager.c:361
+#: src/skins/ui_manager.c:325 src/skins/ui_manager.c:355
 msgid "By Artist"
 msgstr "Por artista"
 
-#: src/skins/ui_manager.c:332 src/skins/ui_manager.c:362
+#: src/skins/ui_manager.c:326 src/skins/ui_manager.c:356
 msgid "Sorts the list by artist."
-msgstr ""
+msgstr "Ordena la lista por artista."
 
-#: src/skins/ui_manager.c:336 src/skins/ui_manager.c:366
+#: src/skins/ui_manager.c:330 src/skins/ui_manager.c:360
 msgid "Sorts the list by filename."
-msgstr ""
+msgstr "Ordena la lista por nombre de archivo."
 
-#: src/skins/ui_manager.c:340 src/skins/ui_manager.c:370
+#: src/skins/ui_manager.c:334 src/skins/ui_manager.c:364
 msgid "Sorts the list by full pathname."
-msgstr ""
+msgstr "Ordena la lista por ruta de archivo completa."
 
-#: src/skins/ui_manager.c:343 src/skins/ui_manager.c:373
+#: src/skins/ui_manager.c:337 src/skins/ui_manager.c:367
 msgid "By Date"
 msgstr "Por fecha"
 
-#: src/skins/ui_manager.c:344 src/skins/ui_manager.c:374
+#: src/skins/ui_manager.c:338 src/skins/ui_manager.c:368
 msgid "Sorts the list by modification time."
-msgstr ""
+msgstr "Ordena la lista por fecha de modificación."
 
-#: src/skins/ui_manager.c:347 src/skins/ui_manager.c:377
+#: src/skins/ui_manager.c:341 src/skins/ui_manager.c:371
 msgid "By Track Number"
-msgstr ""
+msgstr "Por número de pista"
 
-#: src/skins/ui_manager.c:348 src/skins/ui_manager.c:378
+#: src/skins/ui_manager.c:342 src/skins/ui_manager.c:372
 msgid "Sorts the list by track number."
-msgstr ""
+msgstr "Ordena la lista por número de pista."
 
-#: src/skins/ui_manager.c:351
+#: src/skins/ui_manager.c:345
 msgid "Sort Selected"
-msgstr ""
+msgstr "Ordenar los seleccionados"
 
-#: src/skins/ui_manager.c:387
+#: src/skins/ui_manager.c:381
 msgid "File"
 msgstr "Archivo"
 
-#: src/skins/ui_manager.c:388
-msgid "Help"
-msgstr "Ayuda"
-
-#: src/skins/ui_manager.c:390
+#: src/skins/ui_manager.c:384
 msgid "Plugin Services"
-msgstr ""
+msgstr "Servicios de complementos"
 
-#: src/skins/ui_manager.c:392 src/skins/ui_manager.c:395
+#: src/skins/ui_manager.c:386 src/skins/ui_manager.c:389
 msgid "View Track Details"
-msgstr ""
+msgstr "Ver detalles de la pista"
 
-#: src/skins/ui_manager.c:393 src/skins/ui_manager.c:396
+#: src/skins/ui_manager.c:387 src/skins/ui_manager.c:390
 msgid "View track details"
-msgstr ""
+msgstr "Ver detalles de la pista"
 
-#: src/skins/ui_manager.c:398 src/skins/ui_manager.c:399
+#: src/skins/ui_manager.c:392 src/skins/ui_manager.c:393
 msgid "About Audacious"
 msgstr "Acerca de Audacious"
 
-#: src/skins/ui_manager.c:401
+#: src/skins/ui_manager.c:395
 msgid "Play File"
 msgstr "Reproducir archivo"
 
-#: src/skins/ui_manager.c:402
+#: src/skins/ui_manager.c:396
 msgid "Load and play a file"
-msgstr ""
+msgstr "Carga y reproduce un archivo."
 
-#: src/skins/ui_manager.c:404
+#: src/skins/ui_manager.c:398
 msgid "Play Location"
-msgstr "Reproducir lugar"
+msgstr "Reproducir localización"
 
-#: src/skins/ui_manager.c:405
+#: src/skins/ui_manager.c:399
 msgid "Play media from the selected location"
-msgstr ""
+msgstr "Reproduce los medios desde la localización seleccionada."
 
-#: src/skins/ui_manager.c:407
+#: src/skins/ui_manager.c:401
 msgid "Plugin services"
-msgstr "Servicios de plugins"
+msgstr "Servicios de complementos"
 
-#: src/skins/ui_manager.c:409
+#: src/skins/ui_manager.c:403
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: src/skins/ui_manager.c:410
+#: src/skins/ui_manager.c:404
 msgid "Open preferences window"
-msgstr ""
+msgstr "Abrir la ventana de preferencias"
 
-#: src/skins/ui_manager.c:413
+#: src/skins/ui_manager.c:407
 msgid "Quit Audacious"
-msgstr "Cerrar Audacious"
+msgstr "Salir de Audacious"
 
-#: src/skins/ui_manager.c:415 src/skins/ui_manager.c:416
+#: src/skins/ui_manager.c:409 src/skins/ui_manager.c:410
 msgid "Set A-B"
-msgstr ""
+msgstr "Poner A-B"
 
-#: src/skins/ui_manager.c:418 src/skins/ui_manager.c:419
+#: src/skins/ui_manager.c:412 src/skins/ui_manager.c:413
 msgid "Clear A-B"
-msgstr ""
+msgstr "Quitar A-B"
 
-#: src/skins/ui_manager.c:421 src/skins/ui_manager.c:422
+#: src/skins/ui_manager.c:415 src/skins/ui_manager.c:416
 msgid "Jump to Playlist Start"
-msgstr ""
+msgstr "Saltar al inicio de la lista"
 
-#: src/skins/ui_manager.c:427 src/skins/ui_manager.c:428
+#: src/skins/ui_manager.c:421 src/skins/ui_manager.c:422
 msgid "Jump to Time"
-msgstr ""
+msgstr "Saltar en el tiempo"
 
-#: src/skins/ui_manager.c:430
+#: src/skins/ui_manager.c:424
 msgid "Queue Toggle"
-msgstr ""
+msgstr "Conmutar cola"
 
-#: src/skins/ui_manager.c:431
+#: src/skins/ui_manager.c:425
 msgid "Enables/disables the entry in the playlist's queue."
-msgstr ""
+msgstr "Activa/desactiva las entradas en la lista de reproducción."
 
-#: src/skins/ui_manager.c:434
+#: src/skins/ui_manager.c:428
 msgid "Copy"
 msgstr "Copiar"
 
-#: src/skins/ui_manager.c:436
+#: src/skins/ui_manager.c:430
 msgid "Cut"
 msgstr "Cortar"
 
-#: src/skins/ui_manager.c:438
+#: src/skins/ui_manager.c:432
 msgid "Paste"
 msgstr "Pegar"
 
-#: src/skins/ui_manager.c:445
+#: src/skins/ui_manager.c:439
 msgid "Load"
-msgstr ""
+msgstr "Cargar"
 
-#: src/skins/ui_manager.c:450 src/skins/ui_manager.c:471
-#: src/skins/ui_manager.c:486
+#: src/skins/ui_manager.c:440
+msgid "Import"
+msgstr "Importar"
+
+#: src/skins/ui_manager.c:441
+msgid "Save"
+msgstr "Guardar"
+
+#: src/skins/ui_manager.c:442
+msgid "Delete"
+msgstr "Borrar"
+
+#: src/skins/ui_manager.c:444 src/skins/ui_manager.c:465
+#: src/skins/ui_manager.c:480
 msgid "Preset"
-msgstr ""
+msgstr "Predefinido"
 
-#: src/skins/ui_manager.c:451
+#: src/skins/ui_manager.c:445
 msgid "Load preset"
-msgstr ""
+msgstr "Cargar predefinido"
 
-#: src/skins/ui_manager.c:453 src/skins/ui_manager.c:474
-#: src/skins/ui_manager.c:489
+#: src/skins/ui_manager.c:447 src/skins/ui_manager.c:468
+#: src/skins/ui_manager.c:483
 msgid "Auto-load preset"
-msgstr ""
+msgstr "Auto-cargar predefinido"
 
-#: src/skins/ui_manager.c:454
+#: src/skins/ui_manager.c:448
 msgid "Load auto-load preset"
-msgstr ""
+msgstr "Cargar auto-cargar predefinido"
 
-#: src/skins/ui_manager.c:457
+#: src/skins/ui_manager.c:451
 msgid "Load default preset into equalizer"
-msgstr ""
+msgstr "Cargar el predefinido predeterminado en el ecualizador"
 
-#: src/skins/ui_manager.c:459
+#: src/skins/ui_manager.c:453
 msgid "Zero"
-msgstr ""
+msgstr "Cero"
 
-#: src/skins/ui_manager.c:460
+#: src/skins/ui_manager.c:454
 msgid "Set equalizer preset levels to zero"
-msgstr ""
+msgstr "Pone los niveles predefinidos del ecualizador a cero"
 
-#: src/skins/ui_manager.c:462
+#: src/skins/ui_manager.c:456
 msgid "From file"
-msgstr ""
+msgstr "Desde archivo"
 
-#: src/skins/ui_manager.c:463
+#: src/skins/ui_manager.c:457
 msgid "Load preset from file"
-msgstr ""
+msgstr "Cargar el predefinido desde un archivo"
 
-#: src/skins/ui_manager.c:465
+#: src/skins/ui_manager.c:459
 msgid "From WinAMP EQF file"
-msgstr ""
+msgstr "Desde archivo"
 
-#: src/skins/ui_manager.c:466
+#: src/skins/ui_manager.c:460
 msgid "Load preset from WinAMP EQF file"
-msgstr ""
+msgstr "Carga el predefinido desde un archivo EQF de WinAMP"
 
-#: src/skins/ui_manager.c:468
+#: src/skins/ui_manager.c:462
 msgid "WinAMP Presets"
-msgstr ""
+msgstr "Predefinidos de WinAMP"
 
-#: src/skins/ui_manager.c:469
+#: src/skins/ui_manager.c:463
 msgid "Import WinAMP presets"
-msgstr ""
+msgstr "Importar los predefindos de WinAMP"
 
-#: src/skins/ui_manager.c:472
+#: src/skins/ui_manager.c:466
 msgid "Save preset"
-msgstr ""
+msgstr "Guardar predefinido"
 
-#: src/skins/ui_manager.c:475
+#: src/skins/ui_manager.c:469
 msgid "Save auto-load preset"
-msgstr ""
+msgstr "Guardar auto-cargar predefinido"
 
-#: src/skins/ui_manager.c:478
+#: src/skins/ui_manager.c:472
 msgid "Save default preset"
-msgstr ""
+msgstr "Guardar predefinido predeterminado"
 
-#: src/skins/ui_manager.c:480
+#: src/skins/ui_manager.c:474
 msgid "To file"
-msgstr ""
+msgstr "A un archivo"
 
-#: src/skins/ui_manager.c:481
+#: src/skins/ui_manager.c:475
 msgid "Save preset to file"
-msgstr ""
+msgstr "Guarda el predefinido en un archivo"
 
-#: src/skins/ui_manager.c:483
+#: src/skins/ui_manager.c:477
 msgid "To WinAMP EQF file"
-msgstr ""
+msgstr "A un archivo EQF de WinAMP"
 
-#: src/skins/ui_manager.c:484
+#: src/skins/ui_manager.c:478
 msgid "Save preset to WinAMP EQF file"
-msgstr ""
+msgstr "Guarda el predefinido en un archivo EQF de WinAMP"
 
-#: src/skins/ui_manager.c:487
+#: src/skins/ui_manager.c:481
 msgid "Delete preset"
-msgstr ""
+msgstr "Borrar predefinido"
 
-#: src/skins/ui_manager.c:490
+#: src/skins/ui_manager.c:484
 msgid "Delete auto-load preset"
-msgstr ""
+msgstr "Borrar auto-cargar predefinido"
 
-#: src/skins/ui_playlist.c:245
+#: src/skins/ui_playlist.c:244
 msgid "Search entries in active playlist"
-msgstr ""
+msgstr "Buscar entradas en la lista de reproducción activa"
 
-#: src/skins/ui_playlist.c:253
+#: src/skins/ui_playlist.c:252
 msgid ""
-"Select entries in playlist by filling one or more fields. Fields use regular "
-"expressions syntax, case-insensitive. If you don't know how regular "
+"Select entries in playlist by filling one or more fields. Fields use regular"
+" expressions syntax, case-insensitive. If you don't know how regular "
 "expressions work, simply insert a literal portion of what you're searching "
 "for."
 msgstr ""
+"Seleccione entradas en la lista de reproducción indicando uno o más campos. "
+"Los campos utilizan sintaxis de expresiones regulares, sin distinguir "
+"mayúsculas de minúsculas. Si no sabe como funcionan las expresiones "
+"regulares, tan solo escriba la parte del literal que quiere buscar."
 
-#: src/skins/ui_playlist.c:261
+#: src/skins/ui_playlist.c:260
 msgid "Title: "
 msgstr "Título: "
 
-#: src/skins/ui_playlist.c:268
+#: src/skins/ui_playlist.c:267
 msgid "Album: "
-msgstr ""
+msgstr "Álbum: "
 
-#: src/skins/ui_playlist.c:275
+#: src/skins/ui_playlist.c:274
 msgid "Artist: "
-msgstr "Artista"
+msgstr "Artista: "
 
-#: src/skins/ui_playlist.c:282
+#: src/skins/ui_playlist.c:281
 msgid "Filename: "
-msgstr "Nombre del archivo"
+msgstr "Nombre del archivo: "
 
-#: src/skins/ui_playlist.c:290
+#: src/skins/ui_playlist.c:289
 msgid "Clear previous selection before searching"
-msgstr ""
+msgstr "Limpiar la selección previa antes de buscar"
 
-#: src/skins/ui_playlist.c:293
+#: src/skins/ui_playlist.c:292
 msgid "Automatically toggle queue for matching entries"
-msgstr ""
+msgstr "Conmutar automáticamente la cola para las entradas coincidentes"
 
-#: src/skins/ui_playlist.c:296
+#: src/skins/ui_playlist.c:295
 msgid "Create a new playlist with matching entries"
-msgstr ""
+msgstr "Crear una nueva lista de reproducción con las entradas coincidentes"
 
-#: src/skins/ui_playlist.c:763
+#: src/skins/ui_playlist.c:762
 msgid "Audacious Playlist Editor"
-msgstr ""
+msgstr "Editor de listas de reproducción de Audacious"
 
-#: src/skins/ui_playlist.c:810
+#: src/skins/ui_playlist.c:809
 #, c-format
 msgid "%s (%d of %d)"
 msgstr "%s (%d de %d)"
 
 #: src/skins/ui_skinselector.c:162
 msgid "Archived Winamp 2.x skin"
-msgstr ""
+msgstr "Tema para Winamp 2.x archivado"
 
 #: src/skins/ui_skinselector.c:167
 msgid "Unarchived Winamp 2.x skin"
-msgstr ""
+msgstr "Tema para Winamp 2.x no archivado"
 
 #: src/skins/util.c:773
 #, c-format
 msgid "Could not create directory (%s): %s\n"
-msgstr ""
+msgstr "No se pudo crear el directorio (%s): %s\n"
 
 #: src/sndfile/plugin.c:454
 msgid "About sndfile plugin"
-msgstr ""
-
-#: src/sndfile/plugin.c:455
-msgid ""
-"Adapted for Audacious usage by Tony Vroon <chainsaw@gentoo.org>\n"
-"from the xmms_sndfile plugin which is:\n"
-"Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
-"\n"
-"This program is free software ; you can redistribute it and/or modify \n"
-"it under the terms of the GNU General Public License as published by \n"
-"the Free Software Foundation ; either version 2 of the License, or \n"
-"(at your option) any later version. \n"
-" \n"
-"This program is distributed in the hope that it will be useful, \n"
-"but WITHOUT ANY WARRANTY ; without even the implied warranty of \n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. \n"
-"See the GNU General Public License for more details. \n"
-"\n"
-"You should have received a copy of the GNU General Public \n"
-"License along with this program ; if not, write to \n"
-"the Free Software Foundation, Inc., \n"
-"51 Franklin Street, Fifth Floor, \n"
-"Boston, MA 02110-1301 USA"
-msgstr ""
-"Adapted for Audacious usage by Tony Vroon <chainsaw@gentoo.org>\n"
-"from the xmms_sndfile plugin which is:\n"
-"Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
-"\n"
-"This program is free software ; you can redistribute it and/or modify \n"
-"it under the terms of the GNU General Public License as published by \n"
-"the Free Software Foundation ; either version 2 of the License, or \n"
-"(at your option) any later version. \n"
-" \n"
-"This program is distributed in the hope that it will be useful, \n"
-"but WITHOUT ANY WARRANTY ; without even the implied warranty of \n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. \n"
-"See the GNU General Public License for more details. \n"
-"\n"
-"You should have received a copy of the GNU General Public \n"
-"License along with this program ; if not, write to \n"
-"the Free Software Foundation, Inc., \n"
-"51 Franklin Street, Fifth Floor, \n"
-"Boston, MA 02110-1301 USA"
+msgstr "Acerca del complemento de archivos de sonido"
 
 #: src/sndstretch/sndstretch_xmms.c:155
 msgid "About SndStretch"
-msgstr ""
+msgstr "Acerca del extensor de sonido"
 
-#: src/sndstretch/sndstretch_xmms.c:313
+#: src/sndstretch/sndstretch_xmms.c:308
 msgid "Volume corr."
-msgstr ""
+msgstr "Corr. volumen"
 
-#: src/sndstretch/sndstretch_xmms.c:314
+#: src/sndstretch/sndstretch_xmms.c:309
 msgid "Short Overlap"
 msgstr "Solapamiento corto"
 
-#: src/sndstretch/sndstretch_xmms.c:360
+#: src/sndstretch/sndstretch_xmms.c:355
 msgid "Speed"
-msgstr ""
+msgstr "Velocidad"
 
-#: src/sndstretch/sndstretch_xmms.c:361
+#: src/sndstretch/sndstretch_xmms.c:356
 msgid "Pitch"
-msgstr ""
+msgstr "Tono"
 
-#: src/sndstretch/sndstretch_xmms.c:362
+#: src/sndstretch/sndstretch_xmms.c:357
 msgid "Scale"
-msgstr ""
+msgstr "Escala"
 
-#: src/sndstretch/sndstretch_xmms.c:363
-msgid "Options"
-msgstr "Opciones"
-
-#: src/sndstretch/sndstretch_xmms.c:382
+#: src/sndstretch/sndstretch_xmms.c:377
 msgid "SndStretch - Configuration"
-msgstr ""
+msgstr "Extensor de sonido - Configuración"
 
-#: src/song_change/song_change.c:464
+#: src/song_change/song_change.c:447
 msgid "Command to run when Audacious starts a new song."
-msgstr ""
+msgstr "Comando a ejecutar cuando Audacious reproduce una canción nueva."
 
-#: src/song_change/song_change.c:465 src/song_change/song_change.c:469
-#: src/song_change/song_change.c:473 src/song_change/song_change.c:477
+#: src/song_change/song_change.c:449 src/song_change/song_change.c:455
+#: src/song_change/song_change.c:461 src/song_change/song_change.c:467
 msgid "Command:"
-msgstr ""
+msgstr "Comando:"
 
-#: src/song_change/song_change.c:468
+#: src/song_change/song_change.c:453
 msgid "Command to run toward the end of a song."
-msgstr ""
+msgstr "Comando para ejecutar al final de una canción."
 
-#: src/song_change/song_change.c:472
+#: src/song_change/song_change.c:459
 msgid "Command to run when Audacious reaches the end of the playlist."
 msgstr ""
+"Comando para ejecutar cuando Audacious llega al final de una lista de "
+"reproducción."
 
-#: src/song_change/song_change.c:476
+#: src/song_change/song_change.c:465
 msgid ""
 "Command to run when title changes for a song (i.e. network streams titles)."
 msgstr ""
+"Comando para ejecutar cuando el título cambia para una canción (es decir, "
+"títulos de flujos en red)"
 
-#: src/song_change/song_change.c:480
+#: src/song_change/song_change.c:471
 msgid ""
 "You can use the following format strings which\n"
 "will be substituted before calling the command\n"
@@ -3847,24 +3430,41 @@
 "%b: Album\n"
 "%T: Track title"
 msgstr ""
+"Puede utilizar los siguientes formatos de cadena que\n"
+"se reemplazarán antes de ejecutar el comando (no\n"
+"todos son útiles para el final del comando de fin de lista).\n"
+"\n"
+"%F: Frecuencia (en hercios)\n"
+"%c: Número de canales\n"
+"%f: Nombre de archivo (ruta completa)\n"
+"%l: Longitud (en milisegundos)\n"
+"%n o %s: Nombre de la canción\n"
+"%r: Tasa (en bits por segundo)\n"
+"%t: Posición de la lista de reproducción (%02d)\n"
+"%p: Reproduciendo actualmente (1 o 0)\n"
+"%a: Artista\n"
+"%b: Álbum\n"
+"%T: Título de la pista"
 
-#: src/song_change/song_change.c:507
+#: src/song_change/song_change.c:498
 msgid ""
 "Parameters passed to the shell should be encapsulated in "
 "quotes. Doing otherwise is a security risk."
 msgstr ""
+"Los parámetros enviados a la consola se deberían "
+"encapsular con comillas. De otra forma existe un riesgo de seguridad."
 
-#: src/song_change/song_change.c:518
+#: src/song_change/song_change.c:509
 msgid "Commands"
-msgstr ""
+msgstr "Comandos"
 
-#: src/song_change/song_change.c:555
+#: src/song_change/song_change.c:539
 msgid "Song Change"
-msgstr ""
+msgstr "Cambio de canción"
 
 #: src/statusicon/statusicon.c:378
 msgid "About Status Icon Plugin"
-msgstr "Acerca del plugin Status Icon"
+msgstr "Acerca del complemento de icono de estado"
 
 #: src/statusicon/statusicon.c:379
 msgid ""
@@ -3876,21 +3476,21 @@
 "This plugin provides a status icon, placed in\n"
 "the system tray area of the window manager.\n"
 msgstr ""
-"Status Icon Plugin\n"
+"Complemento de icono de estado\n"
 "\n"
 "Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
 "Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
 "\n"
-"This plugin provides a status icon, placed in\n"
-"the system tray area of the window manager.\n"
+"Este complemento proporciona un icono de estado, situado\n"
+"en la bandeja de sistema del gestor de ventanas.\n"
 
 #: src/statusicon/statusicon.c:447
 msgid "Status Icon Plugin - Preferences"
-msgstr "Plugin Status Icon - Preferencias"
+msgstr "Complemento de icono de estado - Preferencias"
 
 #: src/statusicon/statusicon.c:457
 msgid "Right-Click Menu"
-msgstr ""
+msgstr "Menú con click derecho"
 
 #: src/statusicon/statusicon.c:462
 msgid "Small playback menu #1"
@@ -3902,49 +3502,97 @@
 
 #: src/statusicon/statusicon.c:481
 msgid "Mouse Scroll Action"
-msgstr ""
+msgstr "Acción de la rueda del ratón"
 
 #: src/statusicon/statusicon.c:485
 msgid "Change volume"
-msgstr ""
+msgstr "Cambiar el volumen"
 
 #: src/statusicon/statusicon.c:487
 msgid "Change playing song"
-msgstr ""
+msgstr "Cambiar la canción en reproducción"
 
 #: src/statusicon/statusicon.c:500
 msgid "Other settings"
-msgstr "Otras configuraciones"
+msgstr "Otros ajustes"
 
 #: src/statusicon/statusicon.c:505
 msgid "Disable the popup window"
-msgstr ""
+msgstr "Desactivar la ventana emergente"
 
 #: src/statusicon/statusicon.c:512
 msgid "Close to the notification area (system tray)"
-msgstr ""
+msgstr "Cerrar al área de notificación (bandeja de sistema)"
 
-#: src/stereo_plugin/stereo.c:41
+#: src/stereo_plugin/stereo.c:45
 msgid ""
 "Extra Stereo Plugin\n"
 "\n"
 "By Johan Levin 1999."
 msgstr ""
-"Extra Stereo Plugin\n"
+"Complemento de estéreo extra\n"
 "\n"
-"By Johan Levin 1999."
+"Por Johan Levin 1999."
 
-#: src/stereo_plugin/stereo.c:65
+#: src/stereo_plugin/stereo.c:64
 msgid "About Extra Stereo Plugin"
-msgstr ""
+msgstr "Acerca del complemento de estéreo extra"
 
-#: src/stereo_plugin/stereo.c:102
+#: src/stereo_plugin/stereo.c:95
 msgid "Configure Extra Stereo"
+msgstr "Configurar estéreo extra"
+
+#: src/streambrowser/gui/streambrowser_win.c:78
+msgid "Search:"
+msgstr "Buscar:"
+
+#: src/streambrowser/gui/streambrowser_win.c:97
+#: src/streambrowser/gui/streambrowser_win.c:372
+msgid "Add Bookmark"
+msgstr "Añadir marcador"
+
+#: src/streambrowser/gui/streambrowser_win.c:324
+msgid "Stream name"
+msgstr "Nombre del flujo"
+
+#: src/streambrowser/gui/streambrowser_win.c:331
+msgid "Now playing"
+msgstr "Reproduciendo"
+
+#: src/streambrowser/gui/streambrowser_win.c:369
+msgid "Remove Bookmark"
+msgstr "Eliminar marcador"
+
+#: src/streambrowser/streambrowser.c:330
+msgid "About Stream Browser"
+msgstr "Acerca del navegador de flujos"
+
+#: src/streambrowser/streambrowser.c:331
+msgid ""
+"Copyright (c) 2008, by Calin Crisan <ccrisan@gmail.com> and The Audacious Team.\n"
+"\n"
+"This is a simple stream browser that includes the most popular streaming directories.\n"
+"Many thanks to the Streamtuner developers <http://www.nongnu.org/streamtuner>,\n"
+"\tand of course to the whole Audacious community.\n"
+"\n"
+"Also thank you Tony Vroon for mentoring & guiding me, again.\n"
+"\n"
+"This was a Google Summer of Code 2008 project."
 msgstr ""
+"Copyright (c) 2008, por Calin Crisan <ccrisan@gmail.com> y el equipo de Audacious.\n"
+"\n"
+"Este es un navegador de flujos simple que incluye los directorios de flujos más populares.\n"
+"Muchas gracias a los desarrolladores de Streamtuner\n"
+"<http://www.nongnu.org/streamtuner>,\n"
+"»y por supuesto a toda la comunidad de Audacious.\n"
+"\n"
+"También gracias a ti Tony Vroon por ser mi tutor y guía, otra vez.\n"
+"\n"
+"Este fue un proyecto del Google Summer of Code 2008."
 
 #: src/tonegen/tonegen.c:48
 msgid "About Tone Generator"
-msgstr ""
+msgstr "Acerca del generador de tonos"
 
 #: src/tonegen/tonegen.c:50
 msgid ""
@@ -3954,11 +3602,11 @@
 "To use it, add a URL: tone://frequency1;frequency2;frequency3;...\n"
 "e.g. tone://2000;2005 to play a 2000Hz tone and a 2005Hz tone"
 msgstr ""
-"Sinus tone generator by Haavard Kvaalen <havardk@xmms.org>\n"
-"Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
+"Generador de tonos por Haavard Kvaalen <havardk@xmms.org>\n"
+"Modificado por Daniel J. Peng <danielpeng@bigfoot.com>\n"
 "\n"
-"To use it, add a URL: tone://frequency1;frequency2;frequency3;...\n"
-"e.g. tone://2000;2005 to play a 2000Hz tone and a 2005Hz tone"
+"Para utilizarlo, añada una URL: tone://frequencia1;frequencia2;frequencia3;...\n"
+"p. ej. tone://2000;2005 para reproducir un tono de 2000Hz y otro de 2005Hz"
 
 #: src/tonegen/tonegen.c:100
 #, c-format
@@ -3967,34 +3615,17 @@
 
 #: src/tonegen/tonegen.c:100
 msgid "Tone Generator: "
-msgstr ""
+msgstr "Generador de tonos: "
 
 #: src/unix-io/gtk.c:34
-#, fuzzy
 msgid "About File I/O Plugin"
-msgstr "Acerca del complemento FFaudio"
-
-#: src/vorbis/configure.c:31
-msgid "Override generic titles"
-msgstr ""
-
-#: src/vorbis/configure.c:32
-msgid "Title format:"
-msgstr "Formato del título:"
-
-#: src/vorbis/configure.c:36
-msgid "Ogg Vorbis Tags"
-msgstr "Ogg Vorbis Tags"
+msgstr "Acerca del complemento de archivos de E/S"
 
-#: src/vorbis/configure.c:69
-msgid "Ogg Vorbis Audio Plugin Configuration"
-msgstr "Configuración del plugin de audio Ogg Vorbis"
-
-#: src/vorbis/vorbis.c:581
+#: src/vorbis/vorbis.c:572
 msgid "About Ogg Vorbis Audio Plugin"
-msgstr "Acerca del plugin de audio Ogg Vorbis"
+msgstr "Acerca del complemento de sonido Ogg Vorbis"
 
-#: src/vorbis/vorbis.c:586
+#: src/vorbis/vorbis.c:577
 msgid ""
 "Ogg Vorbis Plugin by the Xiph.org Foundation\n"
 "\n"
@@ -4012,11 +3643,11 @@
 "\n"
 "Visit the Xiph.org Foundation at http://www.xiph.org/\n"
 msgstr ""
-"Ogg Vorbis Plugin by the Xiph.org Foundation\n"
+"Complemento Ogg Vorbis por la fundación Xiph.org\n"
 "\n"
-"Original code by\n"
+"Código original de\n"
 "Tony Arcieri <bascule@inferno.tusculum.edu>\n"
-"Contributions from\n"
+"Contribuciones de\n"
 "Chris Montgomery <monty@xiph.org>\n"
 "Peter Alm <peter@xmms.org>\n"
 "Michael Smith <msmith@labyrinth.edu.au>\n"
@@ -4026,7 +3657,7 @@
 "Gian-Carlo Pascutto <gcp@sjeng.org>\n"
 "Eugene Zagidullin <e.asphyx@gmail.com>\n"
 "\n"
-"Visit the Xiph.org Foundation at http://www.xiph.org/\n"
+"Visite la fundación Xiph.org en http://www.xiph.org/\n"
 
 #: src/vtx/about.c:14
 msgid "About Vortex Player"
@@ -4035,27 +3666,25 @@
 #: src/vtx/about.c:15
 msgid ""
 "Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
-"Founded on original source in_vtx.dll by Roman Sherbakov <v_soft@microfor."
-"ru>\n"
+"Founded on original source in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
 "\n"
 "Music in vtx format can be found at http://vtx.microfor.ru/music.htm\n"
 "and other AY/YM music sites.\n"
 "\n"
 "Audacious implementation by Pavel Vymetalek <pvymetalek@seznam.cz>"
 msgstr ""
-"Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
-"Founded on original source in_vtx.dll by Roman Sherbakov <v_soft@microfor."
-"ru>\n"
+"Reproductor de archivos con formato Vortex por Sashnov Alexander <sashnov@ngs.ru>\n"
+"Basado en el código original in_vtx.dll de Roman Sherbakov <v_soft@microfor.ru>\n"
 "\n"
-"Music in vtx format can be found at http://vtx.microfor.ru/music.htm\n"
-"and other AY/YM music sites.\n"
+"Se puede encontrar música en formato vtx en http://vtx.microfor.ru/music.htm\n"
+"y otros portales de música AY/YM.\n"
 "\n"
-"Audacious implementation by Pavel Vymetalek <pvymetalek@seznam.cz>"
+"Implementación de Audacious por Pavel Vymetalek <pvymetalek@seznam.cz>"
 
 #: src/wavpack/wavpack.c:353
 #, c-format
 msgid "Wavpack Decoder Plugin %s"
-msgstr "Plugin decodificador Wavpack %s"
+msgstr "Complemento decodificador Wavpack %s"
 
 #: src/wavpack/wavpack.c:354
 msgid ""
@@ -4064,826 +3693,9 @@
 "Some of the plugin code was by Miles Egan\n"
 "Visit the Wavpack site at http://www.wavpack.com/\n"
 msgstr ""
-"Copyright (c) 2006 William Pitcock <nenolod -at- nenolod.net>\n"
+"Copyright (c) 2006 William Pitcock <nenolod -en- nenolod.net>\n"
 "\n"
-"Some of the plugin code was by Miles Egan\n"
-"Visit the Wavpack site at http://www.wavpack.com/\n"
-
-#~ msgid "About "
-#~ msgstr "Acerca de"
-
-#~ msgid ""
-#~ "\n"
-#~ "Copyright (C) 2002, 2003 Simon Peter <dn.tlp@gmx.net>\n"
-#~ "\n"
-#~ "This plugin is released under the terms and conditions of the GNU LGPL.\n"
-#~ "See http://www.gnu.org/licenses/lgpl.html for details.\n"
-#~ "\n"
-#~ "This plugin uses the AdPlug library, which is copyright (C) Simon Peter, "
-#~ "et al.\n"
-#~ "Linked AdPlug library version: "
-#~ msgstr ""
-#~ "\n"
-#~ "Copyright (C) 2002, 2003 Simon Peter <dn.tlp@gmx.net>\n"
-#~ "\n"
-#~ "Este plugin está publicado bajo los términos y condiciones de la GNU "
-#~ "LGPL.\n"
-#~ "Ver http://www.gnu.org/licenses/lgpl.html para más información.\n"
-#~ "\n"
-#~ "Este plugin usa la librería AdPlug, la cual es copyright (C) Simon Peter, "
-#~ "et al.\n"
-#~ "Linked AdPlug library version: "
-
-#~ msgid "AdPlug :: Configuration"
-#~ msgstr "AdPlug :: Configuración"
-
-#~ msgid "Sound quality"
-#~ msgstr "Calidad de sonido"
-
-#~ msgid "Resolution"
-#~ msgstr "Resolución"
-
-#~ msgid "8bit"
-#~ msgstr "8bit"
-
-#~ msgid "16bit"
-#~ msgstr "16bit"
-
-#~ msgid "Channels"
-#~ msgstr "Canales"
-
-#~ msgid ""
-#~ "Setting stereo is not recommended, unless you need to. This won't add any "
-#~ "stereo effects to the sound - OPL2 is just mono - but eats up more CPU "
-#~ "power!"
-#~ msgstr "No se recomienda usar el estéreo a menos que lo necesites."
-
-#~ msgid "Frequency"
-#~ msgstr "Frecuencia"
-
-#~ msgid "Detect songend"
-#~ msgstr "Detectar canción final"
-
-#~ msgid "Formats"
-#~ msgstr "Formatos"
-
-#~ msgid "Format selection"
-#~ msgstr "Selección de formatos"
-
-#~ msgid "Format"
-#~ msgstr "Formato"
-
-#~ msgid "Extension"
-#~ msgstr "Extensión"
-
-#~ msgid "AdPlug :: File Info"
-#~ msgstr "AdPlug :: Información del archivo"
-
-#~ msgid "Author: "
-#~ msgstr "Autor:"
-
-#~ msgid "File Type: "
-#~ msgstr "Tipo de archivo: "
-
-#~ msgid "Subsongs: "
-#~ msgstr "Subcanciones:"
-
-#~ msgid "Instruments: "
-#~ msgstr "Instrumentos: "
-
-#~ msgid "Orders: "
-#~ msgstr "Órdenes:"
-
-#~ msgid "Patterns: "
-#~ msgstr "Patrones: "
-
-#~ msgid "Song"
-#~ msgstr "Canción"
-
-#~ msgid "Instrument name"
-#~ msgstr "Nombre del instrumento"
-
-#~ msgid "Song message"
-#~ msgstr "Mensaje de canción"
-
-#~ msgid "Subsong selection"
-#~ msgstr "Selección de subcanción"
-
-#~ msgid "Order: "
-#~ msgstr "Orden:"
-
-#~ msgid "Pattern: "
-#~ msgstr "Patrón:"
-
-#~ msgid "Row: "
-#~ msgstr "Fila:"
-
-#~ msgid "Speed: "
-#~ msgstr "Velocidad:"
-
-#~ msgid "Timer: "
-#~ msgstr "Temporizador:"
-
-#~ msgid "About XMMS Alarm"
-#~ msgstr "Acerca de Alarma XMMS"
-
-#~ msgid "XMMS Alarm"
-#~ msgstr "Alarma XMMS"
-
-#~ msgid ""
-#~ "An XMMS plugin which can be used\n"
-#~ "to start playing at a certain time.\n"
-#~ "\n"
-#~ "Send all complaints to:\n"
-#~ "Adam Feakin <adamf@snika.uklinux.net>\n"
-#~ "Daniel Stodden <stodden@in.tum.de>\n"
-#~ "\n"
-#~ "http://www.snika.uklinux.net/xmms-alarm/"
-#~ msgstr ""
-#~ "An XMMS plugin which can be used\n"
-#~ "to start playing at a certain time.\n"
-#~ "\n"
-#~ "Send all complaints to:\n"
-#~ "Adam Feakin <adamf@snika.uklinux.net>\n"
-#~ "Daniel Stodden <stodden@in.tum.de>\n"
-#~ "\n"
-#~ "http://www.snika.uklinux.net/xmms-alarm/"
-
-#~ msgid "Alarm"
-#~ msgstr "Alarma"
-
-#~ msgid "This is your wakeup call."
-#~ msgstr "Este es su llamada para despertar."
-
-#~ msgid "Select Playlist"
-#~ msgstr "Seleccione Lista de Reproducción"
-
-#~ msgid "Sorry"
-#~ msgstr "Lo siento"
-
-#~ msgid "Warning"
-#~ msgstr "Advertencia"
-
-#~ msgid "Oh Well"
-#~ msgstr "Oh Bien"
-
-#~ msgid "Alarm Settings"
-#~ msgstr "Opciones de la alarma"
-
-#~ msgid "Time"
-#~ msgstr "Tiempo"
-
-#~ msgid "hours"
-#~ msgstr "horas"
-
-#~ msgid "h"
-#~ msgstr "h"
-
-#~ msgid "minutes"
-#~ msgstr "minutos"
-
-#~ msgid "Quiet after:"
-#~ msgstr "Silencio después de:"
-
-#~ msgid "Alarm at (default):"
-#~ msgstr "Alarma a las (predeterminado):"
-
-#~ msgid "Choose the days for the alarm to come on"
-#~ msgstr "Escoge los días para iniciarse la alarma"
-
-#~ msgid "Day"
-#~ msgstr "Día"
-
-#~ msgid "Tuesday"
-#~ msgstr "Martes"
-
-#~ msgid "Wednesday"
-#~ msgstr "Miércoles"
-
-#~ msgid "Thursday"
-#~ msgstr "Jueves"
-
-#~ msgid "Friday"
-#~ msgstr "Viernes"
-
-#~ msgid "Saturday"
-#~ msgstr "Sábado"
-
-#~ msgid "Sunday"
-#~ msgstr "Domingo"
-
-#~ msgid "Monday"
-#~ msgstr "Lunes"
-
-#~ msgid "Days"
-#~ msgstr "Días"
-
-#~ msgid "Fading"
-#~ msgstr "Desvanecimiento"
-
-#~ msgid "Volume"
-#~ msgstr "Volumen"
-
-#~ msgid "Current"
-#~ msgstr "Actual"
-
-#~ msgid "reset to current output volume"
-#~ msgstr "reiniciar a volumen de salida actual"
-
-#~ msgid "Start at"
-#~ msgstr "Iniciar a las"
-
-#~ msgid "%"
-#~ msgstr "%"
-
-#~ msgid "Final"
-#~ msgstr "Final"
-
-#~ msgid "Additional Command"
-#~ msgstr "Comandos Adicionales"
-
-#~ msgid "enable"
-#~ msgstr "habilitar"
-
-#~ msgid "Playlist (optional)"
-#~ msgstr "Lista de reproducción (opcional)"
-
-#~ msgid "Browse..."
-#~ msgstr "Examinar..."
-
-#~ msgid "Reminder"
-#~ msgstr "Recordatorio"
-
-#~ msgid "Use reminder"
-#~ msgstr "Usar recordatorio"
-
-#~ msgid "What do these options mean?"
-#~ msgstr "¿Que significan estas opciones?"
-
-#~ msgid "Your reminder for today is.."
-#~ msgstr "Su recordatorio para hoy es..."
-
-#~ msgid "Thankyou"
-#~ msgstr "Gracias"
-
-#~ msgid "Pairing request for '%s'"
-#~ msgstr "Solicitud de emparejamiento para '%s'"
-
-#~ msgid "Authorization request for %s"
-#~ msgstr "Autorización requerida para %s"
-
-#~ msgid "Created bonding with %s"
-#~ msgstr "Crear vinculación con %s"
-
-#~ msgid "Removed bonding with %s"
-#~ msgstr "Quitar vinculación con %s"
-
-#~ msgid "Device has been switched off"
-#~ msgstr "Dispositivo ha sido apagado"
-
-#~ msgid "Device has been made non-discoverable"
-#~ msgstr "Dispositivo ha sido hecho con capacidad no-detectable"
-
-#~ msgid "Device has been made connectable"
-#~ msgstr "Dispositivo ha sido hecho con capacidad conectable"
-
-#~ msgid "Device has been made discoverable"
-#~ msgstr "Dispositivo ha sido hecho con capacidad detectable"
-
-#~ msgid "Device has been made limited discoverable"
-#~ msgstr "Dispositivo ha sido hecho con capacidad limitada de detectabilidad"
-
-#~ msgid "Device has been switched into pairing mode"
-#~ msgstr "Dispositivo ha sido cambiado en modo de emparejamiento"
-
-#~ msgid "Bluetooth headset support plugin"
-#~ msgstr "Soporte de complementeno de auriculares Bluetooth"
-
-#~ msgid ""
-#~ "Bluetooth headset support\n"
-#~ "Copyright (c) 2008 Paula Stanciu paula.stanciu@gmail.com\n"
-#~ "This was a GSoC 2008 Project - Many thanks to my mentor Tony Vroon and "
-#~ "the Audacious team\n"
-#~ " \n"
-#~ "In order to use the AVRCP you need the uinput module loaded into the "
-#~ "kernel\n"
-#~ "The headset keys will be recognized as normal mutimedia keys and \n"
-#~ "can be configured using the Audacious Global Hotkey plugin or ohter "
-#~ "tools \n"
-#~ "provided by your window manager\n"
-#~ msgstr ""
-#~ "Bluetooth headset support\n"
-#~ "Copyright (c) 2008 Paula Stanciu paula.stanciu@gmail.com\n"
-#~ "This was a GSoC 2008 Project - Many thanks to my mentor Tony Vroon and "
-#~ "the Audacious team\n"
-#~ " \n"
-#~ "In order to use the AVRCP you need the uinput module loaded into the "
-#~ "kernel\n"
-#~ "The headset keys will be recognized as normal mutimedia keys and \n"
-#~ "can be configured using the Audacious Global Hotkey plugin or ohter "
-#~ "tools \n"
-#~ "provided by your window manager\n"
-
-#~ msgid "Producer"
-#~ msgstr "Productor"
-
-#~ msgid "Available Headsets"
-#~ msgstr "Auriculares disponibles"
-
-#~ msgid "Current Headset"
-#~ msgstr "Auricular actual"
-
-#~ msgid "_Connect"
-#~ msgstr "_Conectar"
-
-#~ msgid "Class"
-#~ msgstr "Clase"
-
-#~ msgid "Address:"
-#~ msgstr "Dirección:"
-
-#~ msgid "Bonding finish!"
-#~ msgstr "¡Termino de vinculación?"
-
-#~ msgid "No devices found!"
-#~ msgstr "¡No dispositivo encontrado!"
-
-#~ msgid "Scanning..."
-#~ msgstr "Escaneando..."
-
-#~ msgid "Pairing..."
-#~ msgstr "Emparejando..."
-
-#~ msgid "Rescan"
-#~ msgstr "Re-escanear"
-
-#~ msgid "Playback->Play"
-#~ msgstr "Reproducción->Reproducir"
-
-#~ msgid "Playback->Stop"
-#~ msgstr "Reproducción->Detener"
-
-#~ msgid "Playback->Pause"
-#~ msgstr "Reproducción->Pausa"
-
-#~ msgid "Playback->Prev"
-#~ msgstr "Reproducción->Previo"
-
-#~ msgid "Playback->Next"
-#~ msgstr "Reproducción->Siguiente"
-
-#~ msgid "Playback->Eject"
-#~ msgstr "Reproducción->Expulsar"
-
-#~ msgid "Playlist->Repeat"
-#~ msgstr "Lista de reproducción->Repetir"
-
-#~ msgid "Playlist->Shuffle"
-#~ msgstr "Lista de reproducción->Aleatorio"
-
-#~ msgid "Volume->Up_5"
-#~ msgstr "Volumen->Sobre_5"
-
-#~ msgid "Volume->Down_5"
-#~ msgstr "Volumen->Bajo_5"
-
-#~ msgid "Volume->Up_10"
-#~ msgstr "Volumen->Sobre_10"
-
-#~ msgid "Volume->Down_10"
-#~ msgstr "Volumen->Bajo_10"
-
-#~ msgid "Volume->Mute"
-#~ msgstr "Volumen->Silenciar"
-
-#~ msgid "Window->Main"
-#~ msgstr "Ventana->Principal"
-
-#~ msgid "Window->Playlist"
-#~ msgstr "Ventana->Lista de reproducción"
-
-#~ msgid "Window->Equalizer"
-#~ msgstr "Ventana->Ecualizador"
-
-#~ msgid "Window->JumpToFile"
-#~ msgstr "Ventana->IrAlArchivo"
-
-#~ msgid "Detected"
-#~ msgstr "Detectado"
-
-#~ msgid "Custom"
-#~ msgstr "Personalizado"
-
-#~ msgid "Not Detected"
-#~ msgstr "No detectado"
-
-#~ msgid "Information"
-#~ msgstr "Información"
-
-#~ msgid ""
-#~ "Cannot open bindings window for a not-detected device.\n"
-#~ "Ensure that the device has been correctly plugged in."
-#~ msgstr ""
-#~ "No se puede abrir ventanas bindings para un dispositivo no-detectado.\n"
-#~ "Asegurece que el dispositivo ha sido correctamente conectado."
-
-#~ msgid ""
-#~ "Unable to open selected device.\n"
-#~ "Please check read permissions on device file."
-#~ msgstr ""
-#~ "Inzapaz de abrir dispositivo selecionado.\n"
-#~ "Por favor compruebe permisos de lectura en el archivo de dispositivo."
-
-#~ msgid "Device name:"
-#~ msgstr "Nombre del dispositivo:"
-
-#~ msgid "Device file:"
-#~ msgstr "Archivo del dispositivo:"
-
-#~ msgid "(custom)"
-#~ msgstr "(personalizado)"
-
-#~ msgid ""
-#~ "Please specify both name and filename.\n"
-#~ "Filename must be specified with absolute path."
-#~ msgstr ""
-#~ "Por favor especifique tanto nombre como nombre de archivo.\n"
-#~ "Nombre de archivo debe ser especificado con ruta absoluta."
-
-#~ msgid ""
-#~ "Do you want to remove the existing configuration for selected device?\n"
-#~ msgstr ""
-#~ "¿Quiere quitar la configuración existente para el dispositivo "
-#~ "seleccionado?\n"
-
-#~ msgid "Do you want to remove the selected custom device?\n"
-#~ msgstr "¿Quiere quitar el dispositivo personalizado seleccionado?\n"
-
-#~ msgid "EvDev-Plug - Configuration"
-#~ msgstr "EvDev-Complemento - Configuración"
-
-#~ msgid "Active"
-#~ msgstr "Activo"
-
-#~ msgid "Status"
-#~ msgstr "Estado"
-
-#~ msgid "Device Name"
-#~ msgstr "Nombre de dispositivo"
-
-#~ msgid "Device File"
-#~ msgstr "Archivo de dispositivo"
-
-#~ msgid "Device Address"
-#~ msgstr "Dirección de dispositivo"
-
-#~ msgid "_Bindings"
-#~ msgstr "_Bindings"
-
-#~ msgid ""
-#~ "Press a key of your device to bind it;\n"
-#~ "if no key is pressed in five seconds, this window\n"
-#~ "will close without binding changes."
-#~ msgstr ""
-#~ "Presione una tecla de su dispositivo para enlazarlo;\n"
-#~ "si ninguna tecla es presionada en cinco segundos, esta ventana\n"
-#~ "se cerrará sin cambios de binding."
-
-#~ msgid ""
-#~ "This input event has been already assigned.\n"
-#~ "\n"
-#~ "It's not possible to assign multiple actions to the same input event "
-#~ "(although it's possible to assign the same action to multiple events)."
-#~ msgstr ""
-#~ "Est aentrada de evento ya ha sido asignado.\n"
-#~ "\n"
-#~ "Imposible asignar multiples acciones a la misma entrada de evento (aunque "
-#~ "es posible asignar la misma acción a multiples eventos):"
-
-#~ msgid "EvDev-Plug - Bindings Configuration"
-#~ msgstr "EvDev-Complemento - Configuración Bindings"
-
-#~ msgid "Name: "
-#~ msgstr "Nombre: "
-
-#~ msgid "Filename: "
-#~ msgstr "Nombre de archivo: "
-
-#~ msgid "Phys.Address: "
-#~ msgstr "Dirección física: "
-
-#~ msgid "EvDev-Plug - about"
-#~ msgstr "EvDev-Complemento - acerca"
-
-#~ msgid ""
-#~ "\n"
-#~ "player remote control via event devices\n"
-#~ "http://www.develia.org/projects.php?p=audacious#evdevplug\n"
-#~ "\n"
-#~ "written by Giacomo Lozito\n"
-#~ msgstr ""
-#~ "\n"
-#~ "player remote control via event devices\n"
-#~ "http://www.develia.org/projects.php?p=audacious#evdevplug\n"
-#~ "\n"
-#~ "written by Giacomo Lozito\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "A simple plugin that lets you control\n"
-#~ "Audacious using the LIRC remote control daemon\n"
-#~ "\n"
-#~ "Adapted for Audacious usage by Tony Vroon <chainsaw@gentoo.org>\n"
-#~ "from the XMMS LIRC plugin by:\n"
-#~ "Carl van Schaik <carl@leg.uct.ac.za>\n"
-#~ "Christoph Bartelmus <xmms@bartelmus.de>\n"
-#~ "Andrew O. Shadoura <bugzilla@tut.by>\n"
-#~ "You can get LIRC information at:\n"
-#~ "http://lirc.org"
-#~ msgstr ""
-#~ "\n"
-#~ "A simple plugin that lets you control\n"
-#~ "Audacious using the LIRC remote control daemon\n"
-#~ "\n"
-#~ "Adapted for Audacious usage by Tony Vroon <chainsaw@gentoo.org>\n"
-#~ "from the XMMS LIRC plugin by:\n"
-#~ "Carl van Schaik <carl@leg.uct.ac.za>\n"
-#~ "Christoph Bartelmus <xmms@bartelmus.de>\n"
-#~ "Andrew O. Shadoura <bugzilla@tut.by>\n"
-#~ "You can get LIRC information at:\n"
-#~ "http://lirc.org"
-
-#~ msgid "16 bit"
-#~ msgstr "16 bit"
-
-#~ msgid "8 bit"
-#~ msgstr "8 bit"
-
-#~ msgid "96 kHz"
-#~ msgstr "96 kHz"
-
-#~ msgid "48 kHz"
-#~ msgstr "48 kHz"
-
-#~ msgid "44 kHz"
-#~ msgstr "44 kHz"
-
-#~ msgid "22 kHz"
-#~ msgstr "22 kHz"
-
-#~ msgid ""
-#~ "---\n"
-#~ "---\n"
-#~ "---\n"
-#~ "---\n"
-#~ "---\n"
-#~ "---\n"
-#~ "---\n"
-#~ "---\n"
-#~ "---\n"
-#~ "---"
-#~ msgstr ""
-#~ "---\n"
-#~ "---\n"
-#~ "---\n"
-#~ "---\n"
-#~ "---\n"
-#~ "---\n"
-#~ "---\n"
-#~ "---\n"
-#~ "---\n"
-#~ "---"
-
-#~ msgid ""
-#~ "\n"
-#~ "Modplug sound engine written by Olivier Lapicque.\n"
-#~ "XMMS interface for Modplug by Kenton Varda.\n"
-#~ "(c)2000 Olivier Lapicque and Kenton Varda.\n"
-#~ "Updates and maintenance by Konstanty Bialkowski.\n"
-#~ "Ported to BMP by Theofilos Intzoglou."
-#~ msgstr ""
-#~ "\n"
-#~ "Modplug sound engine written by Olivier Lapicque.\n"
-#~ "XMMS interface for Modplug by Kenton Varda.\n"
-#~ "(c)2000 Olivier Lapicque and Kenton Varda.\n"
-#~ "Updates and maintenance by Konstanty Bialkowski.\n"
-#~ "Ported to BMP by Theofilos Intzoglou."
-
-#~ msgid "Color Adjustment"
-#~ msgstr "Ajuste de color"
-
-#~ msgid ""
-#~ "Audacious allows you to alter the color balance of the skinned UI. The "
-#~ "sliders below will allow you to do this."
-#~ msgstr ""
-#~ "Audacious te permite alterar el balance de color de la interfaz del "
-#~ "programa. Las barras inferiores te permiten hacer esto."
-
-#~ msgid "Blue"
-#~ msgstr "Azul"
-
-#~ msgid "Green"
-#~ msgstr "Verde"
-
-#~ msgid "Red"
-#~ msgstr "Rojo"
-
-#~ msgid "Color adjustment ..."
-#~ msgstr "Ajuste de color ..."
-
-#~ msgid "Disable 'GUI Scaling'"
-#~ msgstr "Deshabilitar 'Escalado de la interfaz'"
-
-#~ msgid "Enable 'GUI Scaling'"
-#~ msgstr "Habilitar 'Escalado de la interfaz'"
-
-#~ msgid ""
-#~ "Copyright (c) 2008, by Calin Crisan <ccrisan@gmail.com> and The Audacious "
-#~ "Team.\n"
-#~ "\n"
-#~ "This is a simple stream browser that includes the most popular streaming "
-#~ "directories.\n"
-#~ "Many thanks to the Streamtuner developers <http://www.nongnu.org/"
-#~ "streamtuner>,\n"
-#~ "\tand of course to the whole Audacious community.\n"
-#~ "\n"
-#~ "Also thank you Tony Vroon for mentoring & guiding me, again.\n"
-#~ "\n"
-#~ "This was a Google Summer of Code 2008 project."
-#~ msgstr ""
-#~ "Copyright (c) 2008, by Calin Crisan <ccrisan@gmail.com> and The Audacious "
-#~ "Team.\n"
-#~ "\n"
-#~ "This is a simple stream browser that includes the most popular streaming "
-#~ "directories.\n"
-#~ "Many thanks to the Streamtuner developers <http://www.nongnu.org/"
-#~ "streamtuner>,\n"
-#~ "\tand of course to the whole Audacious community.\n"
-#~ "\n"
-#~ "Also thank you Tony Vroon for mentoring & guiding me, again.\n"
-#~ "\n"
-#~ "This was a Google Summer of Code 2008 project."
-
-#~ msgid "%s already exist. Continue?"
-#~ msgstr "%s ya existe. ¿Desea continuar?"
-
-#, fuzzy
-#~ msgid "Edit the playlist title."
-#~ msgstr "Lista de reproducción aleatoria."
-
-#~ msgid "By Formatted Title"
-#~ msgstr "Por título formateado"
-
-#~ msgid "Show main player window"
-#~ msgstr "Mostrar ventana principal del reproductor"
-
-#~ msgid "Ignore"
-#~ msgstr "Ignorar"
-
-#~ msgid ""
-#~ "Audacious has been started with all of its windows hidden.\n"
-#~ "You may want to show the player window again to control Audacious; "
-#~ "otherwise, you'll have to control it remotely via audtool or enabled "
-#~ "plugins (such as the statusicon plugin)."
-#~ msgstr ""
-#~ "Audacious se ha ejecutado con todas sus ventanas ocultas.\n"
-#~ "Quizás quieras mostrar la ventana del reproductor otra vez para controlar "
-#~ "audacious; de otra forma, tendrás el control remoto via audtool o con "
-#~ "algunos plugins (como el plugin statusicon)."
-
-#~ msgid "Always ignore, show/hide is controlled remotely"
-#~ msgstr "Ignorar siempre"
-
-#~ msgid "Audacious - broken GTK engine usage warning"
-#~ msgstr "Audacious - advertencia de uso de un motor GTK roto"
-
-#~ msgid ""
-#~ "<big>Broken GTK engine in use</big>\n"
-#~ "\n"
-#~ "Audacious has detected that you are using a broken GTK engine.\n"
-#~ "\n"
-#~ "The theme engine you are using, %s, is incompatible with some of "
-#~ "the features used by modern skins. The incompatible features have been "
-#~ "disabled for this session.\n"
-#~ "\n"
-#~ "To use these features, please consider using a different GTK theme engine."
-#~ msgstr ""
-#~ "<big>Motor GTK roto en uso</big>\n"
-#~ "\n"
-#~ "Audacious ha detectado que estas usando un motor GTK roto.\n"
-#~ "\n"
-#~ "El motor de temas que estas usando, %s, es incompatible con "
-#~ "algunas características presentes en pieles modernas. Las características "
-#~ "incompatibles han sido deshabilitadas para esta sesión.\n"
-#~ "\n"
-#~ "Para usar estas características, por favor considera utilizar otro motor "
-#~ "de temas GTK diferente."
-
-#~ msgid "Do not display this warning again"
-#~ msgstr "No mostrar esta advertencia otra vez"
-
-#~ msgid "Load Playlist"
-#~ msgstr "Cargar lista de reproducción"
-
-#~ msgid "Save Playlist"
-#~ msgstr "Guardar lista de reproducción"
-
-#~ msgid ""
-#~ "* Synthesizer samplerate *\n"
-#~ "The sample rate of the audio generated by the synthesizer. You can also "
-#~ "specify a custom value in the interval 22050Hz-96000Hz."
-#~ msgstr ""
-#~ "* Sintetizador de Frecuencia de muestreo *\n"
-#~ "La frecuencia de muestreo del audio generado por el sintetizador. Puede "
-#~ "también especificar un valor personalizado en el intervalo "
-#~ "22050Hz-96000Hz."
-
-#~ msgid ""
-#~ "If enabled, the extension from the original filename will not be stripped "
-#~ "before adding the new file extension to the end."
-#~ msgstr ""
-#~ "SI está disponible, la extensión del nombre del archivo original no será "
-#~ "mostrado antes de agregar la nueva extensión de archivo al final."
-
-#~ msgid ""
-#~ "best/slowest:0;\n"
-#~ "worst/fastest:9;\n"
-#~ "recommended:2;\n"
-#~ "default:5;"
-#~ msgstr ""
-#~ "mejor/lento:0;\n"
-#~ "peor/rápido:9;\n"
-#~ "recomendado:2;\n"
-#~ "predeterminado:5;"
-
-#~ msgid "Adds 16 bit checksum to every frame"
-#~ msgstr "Agregar suma de comprobación de 16 bits a cada fotograna"
-
-#~ msgid "Variable bitrate"
-#~ msgstr "Tasa de bits variable"
-
-#~ msgid "Average bitrate"
-#~ msgstr "Tasa de bits promedio"
-
-#~ msgid ""
-#~ "For use with players that do not support low bitrate mp3 (Apex AD600-A "
-#~ "DVD/mp3 player)"
-#~ msgstr ""
-#~ "Para usar con reproductores que no soporten tasa de bits mp3 bajo (Apex "
-#~ "AD600-A DVD/reproductor mp3)"
-
-#~ msgid ""
-#~ "highest:0;\n"
-#~ "lowest:9;\n"
-#~ "default:4;"
-#~ msgstr ""
-#~ "más alto:0;\n"
-#~ "más bajo:9;\n"
-#~ "predeterminado:4;"
-
-#~ msgid ""
-#~ "XMMS BSD Sun Driver\n"
-#~ "\n"
-#~ "Copyright (c) 2001 CubeSoft Communications, Inc.\n"
-#~ "Maintainer: <vedge at csoft.org>.\n"
-#~ msgstr ""
-#~ "XMMS BSD Sun Driver\n"
-#~ "\n"
-#~ "Copyright (c) 2001 CubeSoft Communications, Inc.\n"
-#~ "Maintainer: <vedge at csoft.org>.\n"
-
-#~ msgid "PREAMP"
-#~ msgstr "PREAMP"
-
-#~ msgid "60HZ"
-#~ msgstr "60HZ"
-
-#~ msgid "170HZ"
-#~ msgstr "170HZ"
-
-#~ msgid "310HZ"
-#~ msgstr "310HZ"
-
-#~ msgid "600HZ"
-#~ msgstr "600HZ"
-
-#~ msgid "1KHZ"
-#~ msgstr "1KHZ"
-
-#~ msgid "3KHZ"
-#~ msgstr "3KHZ"
-
-#~ msgid "6KHZ"
-#~ msgstr "6KHZ"
-
-#~ msgid "12KHZ"
-#~ msgstr "12KHZ"
-
-#~ msgid "14KHZ"
-#~ msgstr "14KHZ"
+"Parte del código del complemento es de Miles Egan\n"
+"Visite el portal de Wavpack en http://www.wavpack.com/\n"
 
-#~ msgid "16KHZ"
-#~ msgstr "16KHZ"
 
-#~ msgid "Audacious standard menu"
-#~ msgstr "Menú estándar Audacious"

audacious-plugins-3.0.3.tar.bz2/po/et.po -> audacious-plugins-3.1.tar.bz2/po/et.po Changed

@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: audacious-plugins 1.4.2\n"
 "Report-Msgid-Bugs-To: http://jira.atheme.org/\n"
-"POT-Creation-Date: 2011-09-18 14:13-0400\n"
+"POT-Creation-Date: 2011-07-17 18:49-0400\n"
 "PO-Revision-Date: 2007-12-30 17:49+0200\n"
 "Last-Translator: Ivar Smolin <okul@linux.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -971,7 +971,7 @@
 msgid "Volume: (%)"
 msgstr "Valjus: (%)"
 
-#: src/ffaudio/ffaudio-core.c:789
+#: src/ffaudio/ffaudio-core.c:763
 #, c-format
 msgid ""
 "Multi-format audio decoding plugin for Audacious based on\n"
@@ -987,7 +987,7 @@
 "libavutil %s (%s)\n"
 msgstr ""
 
-#: src/ffaudio/ffaudio-core.c:803
+#: src/ffaudio/ffaudio-core.c:777
 #, fuzzy
 msgid "About FFaudio Plugin"
 msgstr "FLAC audiopluginast lähemalt"
@@ -3647,11 +3647,11 @@
 msgid "Delete auto-load preset"
 msgstr ""
 
-#: src/skins/ui_playlist.c:245
+#: src/skins/ui_playlist.c:244
 msgid "Search entries in active playlist"
 msgstr ""
 
-#: src/skins/ui_playlist.c:253
+#: src/skins/ui_playlist.c:252
 msgid ""
 "Select entries in playlist by filling one or more fields. Fields use regular "
 "expressions syntax, case-insensitive. If you don't know how regular "
@@ -3659,43 +3659,43 @@
 "for."
 msgstr ""
 
-#: src/skins/ui_playlist.c:261
+#: src/skins/ui_playlist.c:260
 msgid "Title: "
 msgstr "Pealkiri: "
 
-#: src/skins/ui_playlist.c:268
+#: src/skins/ui_playlist.c:267
 #, fuzzy
 msgid "Album: "
 msgstr "Album:"
 
-#: src/skins/ui_playlist.c:275
+#: src/skins/ui_playlist.c:274
 #, fuzzy
 msgid "Artist: "
 msgstr "Esitaja:"
 
-#: src/skins/ui_playlist.c:282
+#: src/skins/ui_playlist.c:281
 #, fuzzy
 msgid "Filename: "
 msgstr "Failinimi:"
 
-#: src/skins/ui_playlist.c:290
+#: src/skins/ui_playlist.c:289
 msgid "Clear previous selection before searching"
 msgstr ""
 
-#: src/skins/ui_playlist.c:293
+#: src/skins/ui_playlist.c:292
 msgid "Automatically toggle queue for matching entries"
 msgstr ""
 
-#: src/skins/ui_playlist.c:296
+#: src/skins/ui_playlist.c:295
 msgid "Create a new playlist with matching entries"
 msgstr ""
 
-#: src/skins/ui_playlist.c:763
+#: src/skins/ui_playlist.c:762
 #, fuzzy
 msgid "Audacious Playlist Editor"
 msgstr "Esitusnimekirja andmed kiiresti"
 
-#: src/skins/ui_playlist.c:810
+#: src/skins/ui_playlist.c:809
 #, c-format
 msgid "%s (%d of %d)"
 msgstr ""
@@ -3713,12 +3713,12 @@
 msgid "Could not create directory (%s): %s\n"
 msgstr ""
 
-#: src/sndfile/plugin.c:454
+#: src/sndfile/plugin.c:438
 #, fuzzy
 msgid "About sndfile plugin"
 msgstr "ESounD'i pluginast lähemalt"
 
-#: src/sndfile/plugin.c:455
+#: src/sndfile/plugin.c:439
 msgid ""
 "Adapted for Audacious usage by Tony Vroon <chainsaw@gentoo.org>\n"
 "from the xmms_sndfile plugin which is:\n"

audacious-plugins-3.0.3.tar.bz2/po/eu.po -> audacious-plugins-3.1.tar.bz2/po/eu.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: audacious-plugins_eu\n"
 "Report-Msgid-Bugs-To: http://jira.atheme.org/\n"
-"POT-Creation-Date: 2011-09-18 14:13-0400\n"
+"POT-Creation-Date: 2011-07-17 18:49-0400\n"
 "PO-Revision-Date: 2009-04-23 18:56+0200\n"
 "Last-Translator: Iñaki Larrañaga Murgoitio <dooteo@euskalgnu.org>\n"
 "Language-Team: Basque <itzulpena@euskalgnu.org>\n"
@@ -1047,7 +1047,7 @@
 msgid "Volume: (%)"
 msgstr "Bolumena (%):"
 
-#: src/ffaudio/ffaudio-core.c:789
+#: src/ffaudio/ffaudio-core.c:763
 #, c-format
 msgid ""
 "Multi-format audio decoding plugin for Audacious based on\n"
@@ -1063,7 +1063,7 @@
 "libavutil %s (%s)\n"
 msgstr ""
 
-#: src/ffaudio/ffaudio-core.c:803
+#: src/ffaudio/ffaudio-core.c:777
 #, fuzzy
 msgid "About FFaudio Plugin"
 msgstr "FLAC audioaren pluginari buruz"
@@ -3825,11 +3825,11 @@
 msgid "Delete auto-load preset"
 msgstr "Ezabatu autokargaren aurrezarpenak"
 
-#: src/skins/ui_playlist.c:245
+#: src/skins/ui_playlist.c:244
 msgid "Search entries in active playlist"
 msgstr "Bilatu sarrerak erreprodukzio-zerrenda aktiboan"
 
-#: src/skins/ui_playlist.c:253
+#: src/skins/ui_playlist.c:252
 msgid ""
 "Select entries in playlist by filling one or more fields. Fields use regular "
 "expressions syntax, case-insensitive. If you don't know how regular "
@@ -3841,39 +3841,39 @@
 "minuskulak ez bereiztuz. Ez badakizu adierazpen erregularrak nola ibiltzen "
 "diren, sartu bilatzea nahi duzunaren zati literal bat."
 
-#: src/skins/ui_playlist.c:261
+#: src/skins/ui_playlist.c:260
 msgid "Title: "
 msgstr "Izenburua: "
 
-#: src/skins/ui_playlist.c:268
+#: src/skins/ui_playlist.c:267
 msgid "Album: "
 msgstr "Albuma: "
 
-#: src/skins/ui_playlist.c:275
+#: src/skins/ui_playlist.c:274
 msgid "Artist: "
 msgstr "Artista: "
 
-#: src/skins/ui_playlist.c:282
+#: src/skins/ui_playlist.c:281
 msgid "Filename: "
 msgstr "Fitxategi-izena: "
 
-#: src/skins/ui_playlist.c:290
+#: src/skins/ui_playlist.c:289
 msgid "Clear previous selection before searching"
 msgstr "Garbitu aurreko hautapena bilatu aurretik"
 
-#: src/skins/ui_playlist.c:293
+#: src/skins/ui_playlist.c:292
 msgid "Automatically toggle queue for matching entries"
 msgstr "Txandakatu automatikoki ilara bat datozen sarrerentzako"
 
-#: src/skins/ui_playlist.c:296
+#: src/skins/ui_playlist.c:295
 msgid "Create a new playlist with matching entries"
 msgstr "Sortu erreprodukzio-zerrenda berria bat datozen sarrerekin"
 
-#: src/skins/ui_playlist.c:763
+#: src/skins/ui_playlist.c:762
 msgid "Audacious Playlist Editor"
 msgstr "Audacious erreprodukzio-zerrendaren editorea"
 
-#: src/skins/ui_playlist.c:810
+#: src/skins/ui_playlist.c:809
 #, c-format
 msgid "%s (%d of %d)"
 msgstr ""
@@ -3891,11 +3891,11 @@
 msgid "Could not create directory (%s): %s\n"
 msgstr "Ezin izan da direktorioa (%s) sortu: %s\n"
 
-#: src/sndfile/plugin.c:454
+#: src/sndfile/plugin.c:438
 msgid "About sndfile plugin"
 msgstr "sndfile pluginari buruz"
 
-#: src/sndfile/plugin.c:455
+#: src/sndfile/plugin.c:439
 msgid ""
 "Adapted for Audacious usage by Tony Vroon <chainsaw@gentoo.org>\n"
 "from the xmms_sndfile plugin which is:\n"

audacious-plugins-3.0.3.tar.bz2/po/fr.po -> audacious-plugins-3.1.tar.bz2/po/fr.po Changed

@@ -1,27 +1,22 @@
-# /* _\|/_
-# (o o)
-# +----oOO-{_}-OOo----+
-# | |
-# | audacious-plugins |
-# | |
-# +------------------*/
-# Jean-Alexandre Anglès d'Auriac <jagw40k@free.fr>, 2011.
+# French translation for Audacious Plugins
+# Copyright (C) 2011 Audacious Translators
+# This file is distributed under the same license as the Audacious Plugins package.
 #
+# Translators:
+# Jean-Alexandre Anglès d'Auriac <jagw40k@free.fr>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: Audacious-plugins 2.4\n"
-"Report-Msgid-Bugs-To: http://jira.atheme.org/\n"
-"POT-Creation-Date: 2011-09-18 14:13-0400\n"
-"PO-Revision-Date: 2011-04-18 19:16+0200\n"
+"Project-Id-Version: Audacious Plugins\n"
+"Report-Msgid-Bugs-To: http://jira.atheme.org/browse/AUDPLUG\n"
+"POT-Creation-Date: 2011-10-19 21:37-0400\n"
+"PO-Revision-Date: 2011-10-20 01:39+0000\n"
 "Last-Translator: Jean-Alexandre Anglès d'Auriac <jagw40k@free.fr>\n"
-"Language-Team: français <>\n"
-"Language: \n"
+"Language-Team: French\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: utf-8\n"
-"X-Poedit-Language: French\n"
-"X-Poedit-Country: BELGIUM\n"
-"Plural-Forms: nplurals=2; plural=n>1;\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
 #: src/aac/libmp4.c:256
 #, c-format
@@ -40,6 +35,274 @@
 msgid "About MP4 AAC decoder plugin"
 msgstr "À propos du décodeur « MP4 AAC »"
 
+#: src/alarm/interface.c:34
+msgid "About XMMS Alarm"
+msgstr ""
+
+#: src/alarm/interface.c:41
+msgid "XMMS Alarm"
+msgstr ""
+
+#: src/alarm/interface.c:50
+msgid ""
+"An XMMS plugin which can be used\n"
+"to start playing at a certain time.\n"
+"\n"
+"Send all complaints to:\n"
+"Adam Feakin <adamf@snika.uklinux.net>\n"
+"Daniel Stodden <stodden@in.tum.de>\n"
+"\n"
+"http://www.snika.uklinux.net/xmms-alarm/"
+msgstr ""
+
+#: src/alarm/interface.c:65
+msgid "Close"
+msgstr "Fermer"
+
+#: src/alarm/interface.c:95
+msgid "Alarm"
+msgstr ""
+
+#: src/alarm/interface.c:102
+msgid "This is your wakeup call."
+msgstr ""
+
+#: src/alarm/interface.c:117 src/alarm/interface.c:1338
+msgid "OK"
+msgstr "OK"
+
+#: src/alarm/interface.c:151
+msgid "Sorry"
+msgstr ""
+
+#: src/alarm/interface.c:158
+msgid "Warning"
+msgstr ""
+
+#: src/alarm/interface.c:167
+msgid ""
+"For safety reasons the \"quiet\" time must be at least 65 seconds longer than the fading time, it must also be more than 10 seconds. This basically means that there is a bug in the code and until I find a way of really fixing it this message will appear :)\n"
+"\n"
+"Your fading settings have NOT been saved\n"
+"\n"
+"--\n"
+"Adam"
+msgstr ""
+
+#: src/alarm/interface.c:183
+msgid "Oh Well"
+msgstr ""
+
+#: src/alarm/interface.c:339
+msgid "Alarm Settings"
+msgstr ""
+
+#: src/alarm/interface.c:354 src/alarm/interface.c:526
+#: src/alarm/interface.c:898
+msgid "Time"
+msgstr ""
+
+#: src/alarm/interface.c:395
+msgid "hours"
+msgstr ""
+
+#: src/alarm/interface.c:456
+msgid "h"
+msgstr ""
+
+#: src/alarm/interface.c:486
+msgid "minutes"
+msgstr ""
+
+#: src/alarm/interface.c:504
+msgid "Quiet after:"
+msgstr ""
+
+#: src/alarm/interface.c:514
+msgid "Alarm at (default):"
+msgstr ""
+
+#: src/alarm/interface.c:534
+msgid "Choose the days for the alarm to come on"
+msgstr ""
+
+#: src/alarm/interface.c:562 src/alarm/interface.c:610
+#: src/alarm/interface.c:658 src/alarm/interface.c:706
+#: src/alarm/interface.c:754 src/alarm/interface.c:802
+#: src/alarm/interface.c:850 src/OSS/configure.c:153
+#: src/skins/ui_manager.c:450 src/skins/ui_manager.c:471
+msgid "Default"
+msgstr "Défaut"
+
+#: src/alarm/interface.c:888
+msgid "Day"
+msgstr ""
+
+#: src/alarm/interface.c:908
+msgid "Tuesday"
+msgstr "Mardi"
+
+#: src/alarm/interface.c:919
+msgid "Wednesday"
+msgstr "Mercredi"
+
+#: src/alarm/interface.c:930
+msgid "Thursday"
+msgstr "Jeudi"
+
+#: src/alarm/interface.c:941
+msgid "Friday"
+msgstr "Vendredi"
+
+#: src/alarm/interface.c:952
+msgid "Saturday"
+msgstr "Samedi"
+
+#: src/alarm/interface.c:963
+msgid "Sunday"
+msgstr "Dimanche"
+
+#: src/alarm/interface.c:973
+msgid "Monday"
+msgstr "Lundi"
+
+#: src/alarm/interface.c:984
+msgid "Days"
+msgstr ""
+
+#: src/alarm/interface.c:1000
+msgid "Fading"
+msgstr ""
+
+#: src/alarm/interface.c:1037
+msgid "seconds"
+msgstr "secondes"
+
+#: src/alarm/interface.c:1045 src/alarm/interface.c:1160
+msgid "Volume"
+msgstr ""
+
+#: src/alarm/interface.c:1071
+msgid "Current"
+msgstr ""
+
+#: src/alarm/interface.c:1079
+msgid "Start at"
+msgstr ""
+
+#: src/alarm/interface.c:1107 src/alarm/interface.c:1151
+msgid "%"
+msgstr "%"
+
+#: src/alarm/interface.c:1123
+msgid "Final"
+msgstr ""
+
+#: src/alarm/interface.c:1176
+msgid "Additional Command"
+msgstr ""
+
+#: src/alarm/interface.c:1202
+msgid "enable"
+msgstr ""
+
+#: src/alarm/interface.c:1210
+msgid "Playlist (optional)"
+msgstr ""
+
+#: src/alarm/interface.c:1236
+msgid "Browse..."
+msgstr ""
+
+#: src/alarm/interface.c:1244 src/alarm/interface.c:1408
+msgid "Reminder"
+msgstr ""
+
+#: src/alarm/interface.c:1261
+msgid "Use reminder"
+msgstr ""
+
+#: src/alarm/interface.c:1277 src/sndstretch/sndstretch_xmms.c:358
+msgid "Options"
+msgstr "Options"
+
+#: src/alarm/interface.c:1285
+msgid "What do these options mean?"
+msgstr ""
+
+#: src/alarm/interface.c:1313
+msgid ""
+"\n"
+"Time\n"
+" Alarm at: \n"
+" The time for the alarm to come on.\n"
+"\n"
+" Quiet After: \n"
+" Stop alarm after this amount of time.\n"
+" (if the wakeup dialog is not closed)\n"
+"\n"
+"\n"
+"Days\n"
+" Day:\n"
+" Select the days for the alarm to activate.\n"
+"\n"
+" Time:\n"
+" Choose the time for the alarm on each day,\n"
+" or select the toggle button to use the default\n"
+" time.\n"
+"\n"
+"\n"
+"Volume\n"
+" Fading: \n"
+" Fade the volume up to the chosen volume \n"
+" for this amount of time.\n"
+"\n"
+" Start at: \n"
+" Start fading from this volume.\n"
+"\n"
+" Final: \n"
+" The volume to stop fading at. If the fading\n"
+" time is 0 then set volume to this and start\n"
+" playing.\n"
+"\n"
+"\n"
+"Options:\n"
+" Additional Command:\n"
+" Run this command at the alarm time.\n"
+"\n"
+" Playlist: \n"
+" Load this playlist for playing songs from \n"
+" (must have .m3u extension). If no playlist\n"
+" is given then the songs which are currently\n"
+" in the list will be used.\n"
+" The URL of an mp3/ogg stream can also be\n"
+" entered here, but loading of playlists from\n"
+" URLs is not currently supported by xmms.\n"
+"\n"
+" Reminder:\n"
+" Display a reminder when the alarm goes off,\n"
+" type the reminder in the box and turn on the\n"
+" toggle button if you want it to be shown.\n"
+msgstr ""
+
+#: src/alarm/interface.c:1315 src/skins/ui_manager.c:382
+msgid "Help"
+msgstr "Aide"
+
+#: src/alarm/interface.c:1347 src/cdaudio-ng/configure.c:249
+#: src/crystalizer/crystalizer.c:130 src/echo_plugin/gui.c:125
+#: src/jack/configure.c:148 src/null/null.c:108 src/stereo_plugin/stereo.c:125
+msgid "Cancel"
+msgstr "Annuler"
+
+#: src/alarm/interface.c:1415
+msgid "Your reminder for today is.."
+msgstr ""
+
+#: src/alarm/interface.c:1440
+msgid "Thankyou"
+msgstr ""
+
 #: src/alsa/config.c:210
 msgid "Default PCM device"
 msgstr "Périphérique PCM par défaut"
@@ -48,23 +311,23 @@
 msgid "Default mixer device"
 msgstr "Mélangeur audio par défaut"
 
-#: src/alsa/config.c:447
+#: src/alsa/config.c:438
 msgid "ALSA Output Plugin Preferences"
 msgstr "Préférences du module de sortie « ALSA »"
 
-#: src/alsa/config.c:454
+#: src/alsa/config.c:445
 msgid "PCM device:"
 msgstr "Périphérique PCM :"
 
-#: src/alsa/config.c:456 src/OSS/configure.c:246
+#: src/alsa/config.c:447 src/OSS/configure.c:237
 msgid "Mixer device:"
 msgstr "Canal de mélange audio :"
 
-#: src/alsa/config.c:458
+#: src/alsa/config.c:449
 msgid "Mixer element:"
 msgstr "Mélangeur :"
 
-#: src/alsa/config.c:461
+#: src/alsa/config.c:452
 msgid "Work around drain hangup"
 msgstr "Contourner le problème d'interruption du flux ( « drain hang-up » )"
 
@@ -90,24 +353,12 @@
 
 #: src/amidi-plug/backend-alsa/b-alsa.c:37
 msgid ""
-"This backend sends MIDI events to a group of user-chosen ALSA sequencer "
-"ports. The ALSA sequencer interface is very versatile, it can provide ports "
-"for audio cards hardware synthesizers (i.e. emu10k1) but also for software "
-"synths, external devices, etc.\n"
-"This backend does not produce audio, MIDI events are handled directly from "
-"devices/programs behind the ALSA ports; in example, MIDI events sent to the "
-"hardware synth will be directly played.\n"
+"This backend sends MIDI events to a group of user-chosen ALSA sequencer ports. The ALSA sequencer interface is very versatile, it can provide ports for audio cards hardware synthesizers (i.e. emu10k1) but also for software synths, external devices, etc.\n"
+"This backend does not produce audio, MIDI events are handled directly from devices/programs behind the ALSA ports; in example, MIDI events sent to the hardware synth will be directly played.\n"
 "Backend written by Giacomo Lozito."
 msgstr ""
-"Ce système envoie les événements MIDI à l'ensemble des ports du séquenceur « "
-"ALSA » que l'utilisateur a spécifié. L'interface du séquenceur « ALSA » "
-"offre des possibilités variées : elle peut fournir des ports aux "
-"synthétiseurs matériels des cartes sons (« emu10k1 », par exemple), mais "
-"aussi aux synthétiseurs logiciels, aux périphériques externes, etc.\n"
-"Ce système de sortie ne produit pas de flux audio : les événements MIDI sont "
-"gérés directement par les périphériques et les applications associés aux "
-"ports « ALSA ». Par exemple, les événements MIDI envoyés au synthétiseur "
-"matériel seront directement interprétés.\n"
+"Ce système envoie les événements MIDI à l'ensemble des ports du séquenceur « ALSA » que l'utilisateur a spécifié. L'interface du séquenceur « ALSA » offre des possibilités variées : elle peut fournir des ports aux synthétiseurs matériels des cartes sons (« emu10k1 », par exemple), mais aussi aux synthétiseurs logiciels, aux périphériques externes, etc.\n"
+"Ce système de sortie ne produit pas de flux audio : les événements MIDI sont gérés directement par les périphériques et les applications associés aux ports « ALSA ». Par exemple, les événements MIDI envoyés au synthétiseur matériel seront directement interprétés.\n"
 "\n"
 "Auteur : Giacomo Lozito."
 
@@ -117,18 +368,12 @@
 
 #: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:40
 msgid ""
-"This backend produces audio by sending MIDI events to FluidSynth, a real-"
-"time software synthesizer based on the SoundFont2 specification (www."
-"fluidsynth.org).\n"
-"Produced audio can be manipulated via player effect plugins and is processed "
-"by chosen ouput plugin.\n"
+"This backend produces audio by sending MIDI events to FluidSynth, a real-time software synthesizer based on the SoundFont2 specification (www.fluidsynth.org).\n"
+"Produced audio can be manipulated via player effect plugins and is processed by chosen ouput plugin.\n"
 "Backend written by Giacomo Lozito."
 msgstr ""
-"Ce système de sortie produit des flux audio en envoyant les événements MIDI "
-"à « FluidSynth », un synthétiseur logiciel en temps réel conçu à partir des "
-"principes de « SoundFont2 » (www.fluidsynth.org).\n"
-"Les flux générés peuvent être manipulés grâce aux modules d'effets du "
-"lecteur et sont traités par le module de sortie sélectionné.\n"
+"Ce système de sortie produit des flux audio en envoyant les événements MIDI à « FluidSynth », un synthétiseur logiciel en temps réel conçu à partir des principes de « SoundFont2 » (www.fluidsynth.org).\n"
+"Les flux générés peuvent être manipulés grâce aux modules d'effets du lecteur et sont traités par le module de sortie sélectionné.\n"
 "\n"
 "Auteur : Giacomo Lozito."
 
@@ -166,7 +411,8 @@
 
 #: src/amidi-plug/i_configure-alsa.c:429
 msgid "ALSA Backend not loaded or not available"
-msgstr "Le système de sortie « ALSA » n'est pas chargé ou n'est pas disponible"
+msgstr ""
+"Le système de sortie « ALSA » n'est pas chargé ou n'est pas disponible"
 
 #: src/amidi-plug/i_configure-alsa.c:448
 msgid ""
@@ -360,7 +606,7 @@
 "Sortie\n"
 "'TiMidity'"
 
-#: src/amidi-plug/i_fileinfo.c:169 src/sid/xs_interface.c:1769
+#: src/amidi-plug/i_fileinfo.c:169
 msgid "Name:"
 msgstr "Nom :"
 
@@ -398,8 +644,7 @@
 
 #: src/amidi-plug/i_fileinfo.c:237
 msgid " MIDI Comments and Lyrics "
-msgstr ""
-" Commentaires et paroles du fichier MIDI "
+msgstr " Commentaires et paroles du fichier MIDI "
 
 #: src/amidi-plug/i_fileinfo.c:288
 msgid "* no comments available in this MIDI file *"
@@ -636,8 +881,7 @@
 msgid "Skin file:"
 msgstr "Fichier du thème"
 
-#: src/aosd/aosd_ui.c:672 src/sid/xs_interface.c:1044
-#: src/sid/xs_interface.c:1236 src/sid/xs_interface.c:1292
+#: src/aosd/aosd_ui.c:672
 msgid "Browse"
 msgstr "Parcourir"
 
@@ -656,13 +900,10 @@
 #: src/aosd/aosd_ui.c:836
 msgid ""
 "Composite manager not detected;\n"
-"unless you know that you have one running, please activate a composite "
-"manager otherwise the OSD won't work properly"
+"unless you know that you have one running, please activate a composite manager otherwise the OSD won't work properly"
 msgstr ""
-"Aucun gestionnaire composite n'a été détecté. À moins que vous ne soyez "
-"certain d'utiliser un tel gestionnaire,\n"
-"veuillez activer un gestionnaire composite approprié. Sinon, l'affichage « "
-"OSD » ne fonctionnera pas correctement."
+"Aucun gestionnaire composite n'a été détecté. À moins que vous ne soyez certain d'utiliser un tel gestionnaire,\n"
+"veuillez activer un gestionnaire composite approprié. Sinon, l'affichage « OSD » ne fonctionnera pas correctement."
 
 #: src/aosd/aosd_ui.c:844
 msgid "Composite manager not required for fake transparency"
@@ -722,7 +963,6 @@
 msgstr "Déclenchement"
 
 #: src/aosd/aosd_ui.c:1101 src/cdaudio-ng/configure.c:171
-#: src/sid/xs_interface.c:1302
 msgid "Misc"
 msgstr "Options diverses"
 
@@ -764,18 +1004,17 @@
 msgid "Blur Scope: Color selection"
 msgstr "Module « Blur Scope » : sélection de la couleur"
 
-#: src/blur_scope/config.c:83 src/jack/configure.c:111
+#: src/blur_scope/config.c:83 src/jack/configure.c:106
 msgid "Options:"
 msgstr "Options :"
 
-#: src/cdaudio-ng/cdaudio-ng.c:264
+#: src/cdaudio-ng/cdaudio-ng.c:241
 msgid "About Audio CD Plugin"
 msgstr "À propos du module « CD Audio »"
 
-#: src/cdaudio-ng/cdaudio-ng.c:265
+#: src/cdaudio-ng/cdaudio-ng.c:242
 msgid ""
-"Copyright (c) 2007, by Calin Crisan <ccrisan@gmail.com> and The Audacious "
-"Team.\n"
+"Copyright (c) 2007, by Calin Crisan <ccrisan@gmail.com> and The Audacious Team.\n"
 "\n"
 "Many thanks to libcdio developers <http://www.gnu.org/software/libcdio/>\n"
 "\tand to libcddb developers <http://libcddb.sourceforge.net/>.\n"
@@ -802,15 +1041,15 @@
 "\n"
 "Droits d'utilisation (2009) : John Lindgren"
 
-#: src/cdaudio-ng/cdaudio-ng.c:558
+#: src/cdaudio-ng/cdaudio-ng.c:550
 msgid "Audio CD"
 msgstr "CD audio"
 
-#: src/cdaudio-ng/cdaudio-ng.c:913
+#: src/cdaudio-ng/cdaudio-ng.c:922
 msgid "Drive is empty."
 msgstr "Le lecteur est vide"
 
-#: src/cdaudio-ng/cdaudio-ng.c:915
+#: src/cdaudio-ng/cdaudio-ng.c:924
 msgid "Unsupported disk type."
 msgstr "Type de disque non supporté"
 
@@ -858,18 +1097,12 @@
 msgid "Override default device: "
 msgstr "Remplacer le périphérique par défaut : "
 
-#: src/cdaudio-ng/configure.c:244 src/crystalizer/crystalizer.c:131
-#: src/echo_plugin/gui.c:123 src/jack/configure.c:146 src/null/null.c:112
-#: src/stereo_plugin/stereo.c:125
+#: src/cdaudio-ng/configure.c:244 src/crystalizer/crystalizer.c:123
+#: src/echo_plugin/gui.c:118 src/jack/configure.c:141 src/null/null.c:107
+#: src/stereo_plugin/stereo.c:118
 msgid "Ok"
 msgstr "OK"
 
-#: src/cdaudio-ng/configure.c:249 src/crystalizer/crystalizer.c:138
-#: src/echo_plugin/gui.c:130 src/jack/configure.c:153 src/null/null.c:113
-#: src/stereo_plugin/stereo.c:132
-msgid "Cancel"
-msgstr "Annuler"
-
 #: src/cd-menu-items/cd-menu-items.c:34
 msgid "Play CD"
 msgstr "Lire les pistes du CD"
@@ -878,88 +1111,86 @@
 msgid "Add CD"
 msgstr "Ajouter les pistes du CD"
 
-#: src/compressor/plugin.c:67
+#: src/compressor/plugin.c:63
 msgid "About Dynamic Range Compression Plugin"
 msgstr "À propos du module « Dynamic Range Compression »"
 
-#: src/compressor/plugin.c:99
+#: src/compressor/plugin.c:95
 msgid "Dynamic Range Compressor Preferences"
 msgstr "Préférences du module « Dynamic Range Compressor »"
 
-#: src/compressor/plugin.c:111
+#: src/compressor/plugin.c:107
 msgid "Center volume:"
 msgstr ""
 
-#: src/compressor/plugin.c:124
+#: src/compressor/plugin.c:120
 msgid "Dynamic range:"
 msgstr ""
 
-#: src/console/configure.c:138
+#: src/console/configure.c:136
 msgid "Game Console Music Decoder"
 msgstr "Décodeur « Game Console Music »"
 
-#: src/console/configure.c:155
+#: src/console/configure.c:153
 msgid "General"
 msgstr "Général"
 
-#: src/console/configure.c:157 src/skins/ui_manager.c:176
+#: src/console/configure.c:155 src/skins/ui_manager.c:176
 msgid "Playback"
 msgstr "Lecture"
 
-#: src/console/configure.c:172
+#: src/console/configure.c:170
 msgid "Bass:"
 msgstr "Basses :"
 
-#: src/console/configure.c:176 src/console/configure.c:187
-#: src/console/configure.c:208
+#: src/console/configure.c:174 src/console/configure.c:185
+#: src/console/configure.c:206
 msgid "secs"
 msgstr "secondes"
 
-#: src/console/configure.c:183
+#: src/console/configure.c:181
 msgid "Treble:"
 msgstr "Aiguës :"
 
-#: src/console/configure.c:204
+#: src/console/configure.c:202
 msgid "Default song length:"
 msgstr "Durée par défaut :"
 
-#: src/console/configure.c:210 src/sid/xs_interface.c:666
+#: src/console/configure.c:208
 msgid "Resampling"
 msgstr "Rééchantillonnage"
 
-#: src/console/configure.c:216
+#: src/console/configure.c:214
 msgid "Enable audio resampling"
 msgstr "Activer le rééchantillonnage"
 
-#: src/console/configure.c:231
+#: src/console/configure.c:229
 msgid "Resampling rate:"
 msgstr "Fréquence de rééchantillonnage"
 
-#: src/console/configure.c:235 src/sid/xs_interface.c:354
+#: src/console/configure.c:233
 msgid "Hz"
 msgstr "Hz"
 
-#: src/console/configure.c:246
+#: src/console/configure.c:244
 msgid "SPC"
 msgstr "SPC"
 
-#: src/console/configure.c:247
+#: src/console/configure.c:245
 msgid "Ignore length from SPC tags"
 msgstr "Ignorer les métadonnées SPC relatives à la durée"
 
-#: src/console/configure.c:248
+#: src/console/configure.c:246
 msgid "Increase reverb"
 msgstr "Augmenter la réverbération"
 
-#: src/console/configure.c:273
+#: src/console/configure.c:271
 msgid ""
-"The default song length, expressed in seconds, is used for songs that do not "
-"provide length information (i.e. looping tracks)."
+"The default song length, expressed in seconds, is used for songs that do not"
+" provide length information (i.e. looping tracks)."
 msgstr ""
 "* Durée par défaut *\n"
-"La durée par défaut, exprimée en secondes, est utilisée pour les morceaux "
-"qui ne disposent pas d'informations quant à leur durée (les pistes en "
-"boucle, par exemple)."
+"La durée par défaut, exprimée en secondes, est utilisée pour les morceaux qui ne disposent pas d'informations quant à leur durée (les pistes en boucle, par exemple)."
 
 #: src/console/plugin.c:33
 msgid "About the Game Console Music Decoder"
@@ -972,8 +1203,7 @@
 "Audacious implementation by: William Pitcock <nenolod@dereferenced.org>, \n"
 " Shay Green <gblargg@gmail.com>\n"
 msgstr ""
-"Le moteur de « Console Music Decoder » a été conçu à partir de « "
-"Game_Music_Emu 0.5.2 ».\n"
+"Le moteur de « Console Music Decoder » a été conçu à partir de « Game_Music_Emu 0.5.2 ».\n"
 "\n"
 "Formats supportés : AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
 "\n"
@@ -982,57 +1212,50 @@
 "William Pitcock <nenolod@dereferenced.org>\n"
 "Shay Green <gblargg@gmail.com>\n"
 
-#: src/crossfade/plugin.c:65
+#: src/crossfade/plugin.c:60
 msgid "About Crossfade"
 msgstr "À propos du module « Crossfade »"
 
-#: src/crossfade/plugin.c:97
+#: src/crossfade/plugin.c:92
 msgid "Crossfade Preferences"
 msgstr "Préférences du module « Crossfade »"
 
-#: src/crossfade/plugin.c:109
+#: src/crossfade/plugin.c:104
 msgid "Overlap (in seconds):"
 msgstr "Chevauchement (en secondes) :"
 
-#: src/crossfade/plugin.c:140 src/crossfade/plugin.c:146
+#: src/crossfade/plugin.c:135 src/crossfade/plugin.c:141
 msgid "Crossfade Error"
 msgstr "Erreur du module « Crossfade »"
 
-#: src/crossfade/plugin.c:140
+#: src/crossfade/plugin.c:135
 msgid ""
 "Crossfading failed because the songs had a different number of channels."
 msgstr ""
 "Le fondu a échoué, parce que les morceaux ont un nombre de voies différent."
 
-#: src/crossfade/plugin.c:148
+#: src/crossfade/plugin.c:143
 msgid ""
 "Crossfading failed because the songs had different sample rates.\n"
 "\n"
-"You can use the Sample Rate Converter effect to resample the songs to the "
-"same rate."
+"You can use the Sample Rate Converter effect to resample the songs to the same rate."
 msgstr ""
-"Le fondu enchaîné a échoué, parce que les morceaux ont une fréquence "
-"d'échantillonnage différente.\n"
-"Vous pouvez utiliser l'effet « Sample Rate Converter » pour rééchantillonner "
-"les titres à la même fréquence."
+"Le fondu enchaîné a échoué, parce que les morceaux ont une fréquence d'échantillonnage différente.\n"
+"Vous pouvez utiliser l'effet « Sample Rate Converter » pour rééchantillonner les titres à la même fréquence."
 
-#: src/crystalizer/crystalizer.c:108
+#: src/crystalizer/crystalizer.c:100
 msgid "Configure Crystalizer"
 msgstr "Configuration de « Crystalizer »"
 
-#: src/crystalizer/crystalizer.c:110 src/stereo_plugin/stereo.c:104
+#: src/crystalizer/crystalizer.c:102 src/stereo_plugin/stereo.c:97
 msgid "Effect intensity:"
 msgstr "Intensité de l'effet :"
 
-#: src/crystalizer/crystalizer.c:144 src/echo_plugin/gui.c:136
-#: src/stereo_plugin/stereo.c:138
+#: src/crystalizer/crystalizer.c:136 src/echo_plugin/gui.c:131
+#: src/stereo_plugin/stereo.c:131
 msgid "Apply"
 msgstr "Appliquer"
 
-#: src/daemon/daemon.c:58
-msgid "Daemon Interface (like old headless mode)"
-msgstr ""
-
 #: src/echo_plugin/gui.c:15
 msgid ""
 "Echo Plugin\n"
@@ -1050,24 +1273,24 @@
 msgid "About Echo Plugin"
 msgstr "À propos du module « Écho »"
 
-#: src/echo_plugin/gui.c:72
+#: src/echo_plugin/gui.c:67
 msgid "Configure Echo"
 msgstr "Configuration du module « Écho »"
 
-#: src/echo_plugin/gui.c:88
+#: src/echo_plugin/gui.c:83
 msgid "Delay: (ms)"
 msgstr "Délai : (ms)"
 
-#: src/echo_plugin/gui.c:93
+#: src/echo_plugin/gui.c:88
 msgid "Feedback: (%)"
 msgstr "Retour : (%)"
 
-#: src/echo_plugin/gui.c:98
+#: src/echo_plugin/gui.c:93
 msgid "Volume: (%)"
 msgstr "Volume : (%)"
 
-#: src/ffaudio/ffaudio-core.c:789
-#, fuzzy, c-format
+#: src/ffaudio/ffaudio-core.c:795
+#, c-format
 msgid ""
 "Multi-format audio decoding plugin for Audacious based on\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1081,267 +1304,208 @@
 "libavformat %s (%s)\n"
 "libavutil %s (%s)\n"
 msgstr ""
-"Module de décodage audio multi-format pour Audacious,\n"
-"conçu à partir de l'ensemble des bibliothèques multimédia du projet\n"
-"« FFmpeg » (http://www.ffmpeg.org/)\n"
-"Droits d'utilisation (2000-2009) : Fabrice Bellard, et al.\n"
-"\n"
-"Version de la bibliothèque « libavformat » de « FFmpeg » : %d.%d.%d\n"
-"Version de la bibliothèque « libavcodec » de « FFmpeg » : %d.%d.%d\n"
-"\n"
-"Module pour Audacious écrit par :\n"
-"\n"
-"William Pitcock <nenolod@nenolod.net>\n"
-"Matti Hämäläinen <ccr@tnsp.org>\n"
 
-#: src/ffaudio/ffaudio-core.c:803
+#: src/ffaudio/ffaudio-core.c:809
 msgid "About FFaudio Plugin"
 msgstr "À propos du module « FFaudio »"
 
-#: src/filewriter/filewriter.c:155
+#: src/filewriter/filewriter.c:166
 msgid "About FileWriter-Plugin"
 msgstr "À propos du module « FileWriter »"
 
-#: src/filewriter/filewriter.c:156
-msgid ""
-"FileWriter-Plugin\n"
-"\n"
-"This program is free software; you can redistribute it and/or modify\n"
-"it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
-"(at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
-"GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
-msgstr ""
-"Module « FileWriter »\n"
-"\n"
-"Ceci est une traduction non officielle de la « GNU General Public License »\n"
-"en français. Elle n'a pas été publiée par la « Free Software Foundation »,\n"
-"et ne détermine pas les termes de distribution pour les logiciels qui\n"
-"utilisent la « GNU GPL » -- seul le texte anglais original de la « GNU GPL "
-"»\n"
-"en a le droit. Cependant, nous espérons que cette traduction aidera les\n"
-"francophones à mieux comprendre la « GNU GPL ».\n"
-"\n"
-"Ce programme est un logiciel libre : vous pouvez le redistribuer et/ou le\n"
-"modifier selon les termes de la « Licence Publique Générale GNU » (GNU "
-"GPL),\n"
-"telle que publiée par la « Free Software Foundation », soit la version 2 de\n"
-"la Licence, soit (à votre convenance) toute version postérieure.\n"
-"\n"
-"Ce programme est distribué dans l'espoir qu'il sera utile, mais SANS AUCUNE\n"
-"GARANTIE, sans même la garantie implicite d'une possible VALEUR MARCHANDE\n"
-"ou de l'ADÉQUATION Á UN BESOIN PARTICULIER. Consultez la « Licence Publique\n"
-"Générale GNU » (GNU GPL) pour plus de détails.\n"
-"\n"
-"Vous devriez avoir reçu une copie de la « Licence Publique Générale GNU »\n"
-"(GNU GPL) avec ce programme. Dans le cas contraire, vous pouvez consulter\n"
-"la Licence sur la page <http://www.gnu.org/licenses/> ou écrire à la\n"
-"Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,\n"
-"MA 02110-1301, USA."
-
-#: src/filewriter/filewriter.c:450
+#: src/filewriter/filewriter.c:455
 msgid "File Writer Configuration"
 msgstr "Configuration du module « File Writer »"
 
-#: src/filewriter/filewriter.c:462
+#: src/filewriter/filewriter.c:467
 msgid "Output file format:"
 msgstr "Format du fichier de sortie :"
 
-#: src/filewriter/filewriter.c:480
+#: src/filewriter/filewriter.c:485
 msgid "Configure"
 msgstr "Configurer"
 
-#: src/filewriter/filewriter.c:495
+#: src/filewriter/filewriter.c:500
 msgid "Save into original directory"
 msgstr "Enregistrer dans le répertoire d'origine"
 
-#: src/filewriter/filewriter.c:500
+#: src/filewriter/filewriter.c:505
 msgid "Save into custom directory"
 msgstr "Enregistrer dans un répertoire personnel"
 
-#: src/filewriter/filewriter.c:510
+#: src/filewriter/filewriter.c:515
 msgid "Output file folder:"
 msgstr "Dossier de destination :"
 
-#: src/filewriter/filewriter.c:514
+#: src/filewriter/filewriter.c:519
 msgid "Pick a folder"
 msgstr "Choix d'un répertoire"
 
-#: src/filewriter/filewriter.c:533
+#: src/filewriter/filewriter.c:538
 msgid "Get filename from:"
 msgstr "Déterminer le nom du fichier à partir :"
 
-#: src/filewriter/filewriter.c:536
+#: src/filewriter/filewriter.c:541
 msgid "original file tags"
 msgstr "des métadonnées du fichier d'origine"
 
-#: src/filewriter/filewriter.c:542
+#: src/filewriter/filewriter.c:547
 msgid "original filename"
 msgstr "du nom du fichier d'origine"
 
-#: src/filewriter/filewriter.c:552
+#: src/filewriter/filewriter.c:557
 msgid "Don't strip file name extension"
 msgstr "Conserver l'extension du nom de fichier"
 
-#: src/filewriter/filewriter.c:567
+#: src/filewriter/filewriter.c:572
 msgid "Prepend track number to filename"
 msgstr "Ajouter le numéro de la piste au début du nom du fichier"
 
-#: src/filewriter/mp3.c:38 src/filewriter/mp3.c:783
+#: src/filewriter/mp3.c:38 src/filewriter/mp3.c:771
 msgid "Auto"
 msgstr "Auto"
 
 #: src/filewriter/mp3.c:38
-#, fuzzy
 msgid "Joint Stereo"
-msgstr "Stéréo jointe"
+msgstr ""
 
-#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183 src/sid/xs_interface.c:308
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183
 msgid "Stereo"
 msgstr "Stéréo"
 
-#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183 src/sid/xs_interface.c:301
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183
 msgid "Mono"
 msgstr "Mono"
 
-#: src/filewriter/mp3.c:724
+#: src/filewriter/mp3.c:712
 msgid "MP3 Configuration"
 msgstr "Configuration de l'encodeur « MP3 »"
 
-#: src/filewriter/mp3.c:747
+#: src/filewriter/mp3.c:735
 msgid "Algorithm Quality:"
 msgstr "Qualité de l'algorithme :"
 
-#: src/filewriter/mp3.c:772
+#: src/filewriter/mp3.c:760
 msgid "Output Samplerate:"
 msgstr "Fréquence d'échantillonnage de sortie :"
 
-#: src/filewriter/mp3.c:800
+#: src/filewriter/mp3.c:788
 msgid "(Hz)"
 msgstr "(Hz)"
 
-#: src/filewriter/mp3.c:807
+#: src/filewriter/mp3.c:795
 msgid "Bitrate / Compression ratio:"
 msgstr "Débit binaire / Taux de compression :"
 
-#: src/filewriter/mp3.c:831
+#: src/filewriter/mp3.c:819
 msgid "Bitrate (kbps):"
 msgstr "Débit binaire (kbps)"
 
-#: src/filewriter/mp3.c:864
+#: src/filewriter/mp3.c:852
 msgid "Compression ratio:"
 msgstr "Taux de compression :"
 
-#: src/filewriter/mp3.c:888
+#: src/filewriter/mp3.c:876
 msgid "Audio Mode:"
 msgstr "Mode audio :"
 
-#: src/filewriter/mp3.c:913
+#: src/filewriter/mp3.c:901
 msgid "Misc:"
 msgstr "Options diverses :"
 
-#: src/filewriter/mp3.c:924
+#: src/filewriter/mp3.c:912
 msgid "Enforce strict ISO complience"
 msgstr "Forcer le respect strict des normes ISO"
 
-#: src/filewriter/mp3.c:935
+#: src/filewriter/mp3.c:923
 msgid "Error protection"
 msgstr "Protection contre les erreurs"
 
-#: src/filewriter/mp3.c:947 src/filewriter/vorbis.c:245
+#: src/filewriter/mp3.c:935 src/filewriter/vorbis.c:243
 msgid "Quality"
 msgstr "Qualité"
 
-#: src/filewriter/mp3.c:957
+#: src/filewriter/mp3.c:945
 msgid "Enable VBR/ABR"
 msgstr "Activer VBR/ABR"
 
-#: src/filewriter/mp3.c:967
+#: src/filewriter/mp3.c:955
 msgid "Type:"
 msgstr "Type :"
 
-#: src/filewriter/mp3.c:1000
+#: src/filewriter/mp3.c:988
 msgid "VBR Options:"
 msgstr "Options VBR :"
 
-#: src/filewriter/mp3.c:1016
+#: src/filewriter/mp3.c:1004
 msgid "Minimum bitrate (kbps):"
 msgstr "Débit binaire minimal (kbps) :"
 
-#: src/filewriter/mp3.c:1043
+#: src/filewriter/mp3.c:1031
 msgid "Maximum bitrate (kbps):"
 msgstr "Débit binaire maximal (kbps) :"
 
-#: src/filewriter/mp3.c:1066
+#: src/filewriter/mp3.c:1054
 msgid "Strictly enforce minimum bitrate"
 msgstr "Forcer de manière stricte le débit binaire minimal"
 
-#: src/filewriter/mp3.c:1078
+#: src/filewriter/mp3.c:1066
 msgid "ABR Options:"
 msgstr "Options ABR :"
 
-#: src/filewriter/mp3.c:1088
+#: src/filewriter/mp3.c:1076
 msgid "Average bitrate (kbps):"
 msgstr "Débit binaire moyen (kbps) :"
 
-#: src/filewriter/mp3.c:1116
+#: src/filewriter/mp3.c:1104
 msgid "VBR quality level:"
 msgstr "Niveau de qualité VBR :"
 
-#: src/filewriter/mp3.c:1135
+#: src/filewriter/mp3.c:1123
 msgid "Don't write Xing VBR header"
 msgstr "Ne pas écrire l'en-tête VBR « Xing »"
 
-#: src/filewriter/mp3.c:1149
+#: src/filewriter/mp3.c:1137
 msgid "VBR/ABR"
 msgstr "VBR/ABR"
 
-#: src/filewriter/mp3.c:1159
+#: src/filewriter/mp3.c:1147
 msgid "Frame params:"
 msgstr "Paramètres des trames :"
 
-#: src/filewriter/mp3.c:1171
+#: src/filewriter/mp3.c:1159
 msgid "Mark as copyright"
 msgstr "Marquer comme soumises aux droits d'utilisation"
 
-#: src/filewriter/mp3.c:1182
+#: src/filewriter/mp3.c:1170
 msgid "Mark as original"
 msgstr "Marquer comme originales"
 
-#: src/filewriter/mp3.c:1194
+#: src/filewriter/mp3.c:1182
 msgid "ID3 params:"
 msgstr "Paramètres ID3 :"
 
-#: src/filewriter/mp3.c:1205
+#: src/filewriter/mp3.c:1193
 msgid "Force addition of version 2 tag"
 msgstr "Forcer l'ajout de la version 2 des métadonnées"
 
-#: src/filewriter/mp3.c:1215
+#: src/filewriter/mp3.c:1203
 msgid "Only add v1 tag"
 msgstr "Ajouter uniquement la version 1 des métadonnées"
 
-#: src/filewriter/mp3.c:1222
+#: src/filewriter/mp3.c:1210
 msgid "Only add v2 tag"
 msgstr "Ajouter uniquement la version 2 des métadonnées"
 
-#: src/filewriter/mp3.c:1243
+#: src/filewriter/mp3.c:1231
 msgid "Tags"
 msgstr "Métadonnées"
 
-#: src/filewriter/vorbis.c:238
+#: src/filewriter/vorbis.c:236
 msgid "Vorbis Encoder Configuration"
 msgstr "Confogiration de l'encodeur « Vorbis »"
 
-#: src/filewriter/vorbis.c:258
+#: src/filewriter/vorbis.c:256
 msgid "Quality level (0 - 10):"
 msgstr "Niveau de qualité (0 - 10) :"
 
@@ -1405,7 +1569,7 @@
 msgid "Entry number"
 msgstr "Place dans la liste"
 
-#: src/gtkui/columns.c:36 src/sid/xs_interface.c:1103
+#: src/gtkui/columns.c:36
 msgid "Title"
 msgstr "Titre"
 
@@ -1449,15 +1613,15 @@
 msgid "Bitrate"
 msgstr "Débit binaire (kbps)"
 
-#: src/gtkui/columns.c:286
+#: src/gtkui/columns.c:278
 msgid "Choose Columns"
 msgstr "Choisir les colonnes"
 
-#: src/gtkui/columns.c:300
+#: src/gtkui/columns.c:292
 msgid "Available:"
 msgstr "Disponibles :"
 
-#: src/gtkui/columns.c:334
+#: src/gtkui/columns.c:326
 msgid "Chosen:"
 msgstr "Sélectionnées :"
 
@@ -1481,327 +1645,286 @@
 msgid "Undock"
 msgstr "Séparer"
 
-#: src/gtkui/layout.c:123
+#: src/gtkui/layout.c:123 src/ladspa/plugin.c:643
 msgid "Disable"
 msgstr "Désactiver"
 
-#: src/gtkui/menus.c:132
-#, fuzzy
+#: src/gtkui/menus.c:130
 msgid "_Open Files ..."
-msgstr "Ouvrir des fichiers ..."
+msgstr "Ouvrir des fichiers"
 
-#: src/gtkui/menus.c:133
-#, fuzzy
+#: src/gtkui/menus.c:131
 msgid "Open _URL ..."
-msgstr "Ouvrir l'adresse d'un flux ..."
+msgstr "Ouvrir un adresse"
 
-#: src/gtkui/menus.c:134
-#, fuzzy
+#: src/gtkui/menus.c:132
 msgid "_Add File ..."
-msgstr "Ajouter des fichiers ..."
+msgstr "Ajouter des fichiers"
 
-#: src/gtkui/menus.c:135
-#, fuzzy
+#: src/gtkui/menus.c:133
 msgid "Add U_RL ..."
-msgstr "Ajouter l'adresse d'un flux ..."
+msgstr "Ajouter une adresse"
 
-#: src/gtkui/menus.c:137
-#, fuzzy
+#: src/gtkui/menus.c:135
 msgid "A_bout ..."
-msgstr "À propos du module "
+msgstr "À propos"
 
-#: src/gtkui/menus.c:138
-#, fuzzy
+#: src/gtkui/menus.c:136
 msgid "_Preferences ..."
-msgstr "Préférences..."
+msgstr "_Préférences"
 
-#: src/gtkui/menus.c:139 src/skins/ui_manager.c:412
+#: src/gtkui/menus.c:137 src/skins/ui_manager.c:406
 msgid "_Quit"
 msgstr "_Quitter"
 
-#: src/gtkui/menus.c:142
-#, fuzzy
+#: src/gtkui/menus.c:140
 msgid "_Play"
 msgstr "Lecture"
 
-#: src/gtkui/menus.c:143
-#, fuzzy
+#: src/gtkui/menus.c:141
 msgid "Paus_e"
 msgstr "Pause"
 
-#: src/gtkui/menus.c:144
-#, fuzzy
+#: src/gtkui/menus.c:142
 msgid "_Stop"
-msgstr "Arrêt"
+msgstr "Stop"
 
-#: src/gtkui/menus.c:145
-#, fuzzy
+#: src/gtkui/menus.c:143
 msgid "Pre_vious"
 msgstr "Précédent"
 
-#: src/gtkui/menus.c:146
-#, fuzzy
+#: src/gtkui/menus.c:144
 msgid "_Next"
 msgstr "Suivant"
 
-#: src/gtkui/menus.c:148
-#, fuzzy
+#: src/gtkui/menus.c:146
 msgid "_Repeat"
 msgstr "Mode « répétition »"
 
-#: src/gtkui/menus.c:149
-#, fuzzy
+#: src/gtkui/menus.c:147
 msgid "S_huffle"
 msgstr "Mode « lecture aléatoire »"
 
-#: src/gtkui/menus.c:150
-#, fuzzy
+#: src/gtkui/menus.c:148
 msgid "N_o Playlist Advance"
 msgstr "Ne pas avancer dans la liste de lecture"
 
-#: src/gtkui/menus.c:151
-#, fuzzy
+#: src/gtkui/menus.c:149
 msgid "Stop _After This Song"
 msgstr "Arrêter après le titre en cours de lecture."
 
-#: src/gtkui/menus.c:153 src/gtkui/menus.c:210
+#: src/gtkui/menus.c:151 src/gtkui/menus.c:209
 msgid "Song _Info ..."
-msgstr ""
+msgstr "Informations sur le morceau"
 
-#: src/gtkui/menus.c:154
-#, fuzzy
+#: src/gtkui/menus.c:152
 msgid "Jump to _Time ..."
-msgstr "Aller au temps..."
+msgstr "Sauter au temps…"
 
-#: src/gtkui/menus.c:155
+#: src/gtkui/menus.c:153
 msgid "_Jump to Song ..."
-msgstr ""
+msgstr "Sauter à la chanson"
 
-#: src/gtkui/menus.c:158
-#, fuzzy
+#: src/gtkui/menus.c:156
 msgid "By Track _Number"
 msgstr "Par numéro de piste"
 
-#: src/gtkui/menus.c:159
-#, fuzzy
+#: src/gtkui/menus.c:157
 msgid "By _Title"
 msgstr "Par titre"
 
-#: src/gtkui/menus.c:160
-#, fuzzy
+#: src/gtkui/menus.c:158
 msgid "By _Artist"
 msgstr "Par artiste"
 
-#: src/gtkui/menus.c:161
-#, fuzzy
+#: src/gtkui/menus.c:159
 msgid "By A_lbum"
 msgstr "Par album"
 
-#: src/gtkui/menus.c:162
-#, fuzzy
+#: src/gtkui/menus.c:160
 msgid "By Release _Date"
-msgstr "Par date"
+msgstr "Par date de parution"
 
-#: src/gtkui/menus.c:163
-#, fuzzy
+#: src/gtkui/menus.c:161
 msgid "By _File Path"
 msgstr "Par emplacement de fichier"
 
-#: src/gtkui/menus.c:164
-#, fuzzy
+#: src/gtkui/menus.c:162
 msgid "By _Custom Title"
-msgstr "Titre formaté"
+msgstr "Par titre formaté"
 
-#: src/gtkui/menus.c:166
-#, fuzzy
+#: src/gtkui/menus.c:164
 msgid "R_everse Order"
 msgstr "Inverser l'ordre"
 
-#: src/gtkui/menus.c:167
-#, fuzzy
+#: src/gtkui/menus.c:165
 msgid "_Random Order"
-msgstr "Mélanger aléatoirement"
+msgstr "Mélanger aléatoirement"
 
-#: src/gtkui/menus.c:170 src/gtkui/menus.c:212
+#: src/gtkui/menus.c:168 src/gtkui/menus.c:211
 msgid "_Refresh"
 msgstr "_Réactualiser"
 
-#: src/gtkui/menus.c:172
-#, fuzzy
+#: src/gtkui/menus.c:170
 msgid "_Sort"
 msgstr "Trier"
 
-#: src/gtkui/menus.c:174
+#: src/gtkui/menus.c:172
 msgid "_New"
-msgstr ""
+msgstr "_Nouvelle liste de lecture"
 
-#: src/gtkui/menus.c:175
+#: src/gtkui/menus.c:173 src/gtkui/menus.c:222
 msgid "_Close"
 msgstr "_Fermer"
 
-#: src/gtkui/menus.c:177
-#, fuzzy
+#: src/gtkui/menus.c:175
 msgid "_Import ..."
-msgstr "Importer"
+msgstr "_Importer"
 
-#: src/gtkui/menus.c:178
-#, fuzzy
+#: src/gtkui/menus.c:176
 msgid "_Export ..."
-msgstr "Exporter"
+msgstr "_Exporter"
 
-#: src/gtkui/menus.c:180
-#, fuzzy
+#: src/gtkui/menus.c:178
 msgid "_Playlist Manager ..."
 msgstr "Gestionnaire de listes de lecture"
 
-#: src/gtkui/menus.c:183
-#, fuzzy
+#: src/gtkui/menus.c:179
+msgid "_Queue Manager ..."
+msgstr "Gestionnaire de files d'attentes"
+
+#: src/gtkui/menus.c:182
 msgid "Volume _Up"
 msgstr "Augmenter le volume"
 
-#: src/gtkui/menus.c:184
-#, fuzzy
+#: src/gtkui/menus.c:183
 msgid "Volume _Down"
 msgstr "Réduire le volume"
 
-#: src/gtkui/menus.c:186
-#, fuzzy
+#: src/gtkui/menus.c:185
 msgid "_Equalizer"
 msgstr "Égaliseur"
 
-#: src/gtkui/menus.c:188
-#, fuzzy
+#: src/gtkui/menus.c:187
 msgid "E_ffects"
-msgstr "Effets audio"
+msgstr "E_ffets audio"
 
-#: src/gtkui/menus.c:191
-#, fuzzy
+#: src/gtkui/menus.c:190
 msgid "_Interface"
-msgstr "Interface"
+msgstr "_Interface"
 
-#: src/gtkui/menus.c:193
+#: src/gtkui/menus.c:192
 msgid "Show _Menu Bar"
-msgstr ""
+msgstr "Afficher la barre de menu"
 
-#: src/gtkui/menus.c:194
-#, fuzzy
+#: src/gtkui/menus.c:193
 msgid "Show I_nfo Bar"
 msgstr "Afficher l'espace informatif"
 
-#: src/gtkui/menus.c:195
-#, fuzzy
+#: src/gtkui/menus.c:194
 msgid "Show _Status Bar"
 msgstr "Afficher la barre d'état"
 
-#: src/gtkui/menus.c:197
-#, fuzzy
+#: src/gtkui/menus.c:196
 msgid "Show Column _Headers"
 msgstr "Afficher le titre des colonnes"
 
-#: src/gtkui/menus.c:198
-#, fuzzy
+#: src/gtkui/menus.c:197
 msgid "Choose _Columns ..."
 msgstr "Choisir les colonnes à afficher"
 
-#: src/gtkui/menus.c:199
-#, fuzzy
+#: src/gtkui/menus.c:198
 msgid "Scrol_l on Song Change"
 msgstr "Afficher le morceau courant au changement de pistes"
 
-#: src/gtkui/menus.c:202
-#, fuzzy
+#: src/gtkui/menus.c:201
 msgid "_File"
-msgstr "Fichier"
+msgstr "_Fichier"
 
-#: src/gtkui/menus.c:203
-#, fuzzy
+#: src/gtkui/menus.c:202
 msgid "_Playback"
 msgstr "Lecture"
 
-#: src/gtkui/menus.c:204
-#, fuzzy
+#: src/gtkui/menus.c:203
 msgid "P_laylist"
 msgstr "Liste de lecture"
 
-#: src/gtkui/menus.c:205 src/gtkui/menus.c:219
-#, fuzzy
+#: src/gtkui/menus.c:204 src/gtkui/menus.c:218
 msgid "_Services"
 msgstr "Périphériques"
 
-#: src/gtkui/menus.c:206
-#, fuzzy
+#: src/gtkui/menus.c:205
 msgid "_Output"
 msgstr "Sortie"
 
-#: src/gtkui/menus.c:207
-#, fuzzy
+#: src/gtkui/menus.c:206
 msgid "_View"
 msgstr "Affichage"
 
-#: src/gtkui/menus.c:211
+#: src/gtkui/menus.c:210
 msgid "_Queue/Unqueue"
-msgstr ""
+msgstr "Mettre/enlever dans la file"
 
-#: src/gtkui/menus.c:214
+#: src/gtkui/menus.c:213
 msgid "Cu_t"
-msgstr ""
+msgstr "Couper"
 
-#: src/gtkui/menus.c:215
-#, fuzzy
+#: src/gtkui/menus.c:214
 msgid "_Copy"
 msgstr "Copier"
 
-#: src/gtkui/menus.c:216
-#, fuzzy
+#: src/gtkui/menus.c:215
 msgid "_Paste"
 msgstr "Coller"
 
-#: src/gtkui/menus.c:217
-#, fuzzy
+#: src/gtkui/menus.c:216
 msgid "Select _All"
-msgstr "Tout sélectionner"
+msgstr "Sélectionner tout"
 
-#: src/gtkui/menus.c:222
-#, fuzzy
+#: src/gtkui/menus.c:221
 msgid "_Rename"
-msgstr "Nom du fichier"
+msgstr "_Renommer"
 
-#: src/gtkui/ui_gtk.c:75
+#: src/gtkui/ui_gtk.c:95
 msgid "GTK Interface"
 msgstr "Interface GTK"
 
-#: src/gtkui/ui_gtk.c:132 src/skins/ui_main.c:303
+#: src/gtkui/ui_gtk.c:156 src/skins/ui_main.c:302
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.c:138 src/skins/ui_main.c:305 src/skins/ui_main.c:1498
+#: src/gtkui/ui_gtk.c:162
+msgid "Buffering ..."
+msgstr ""
+
+#: src/gtkui/ui_gtk.c:165 src/skins/ui_main.c:304 src/skins/ui_main.c:1499
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_gtk.c:177 src/skins/plugin.c:185
+#: src/gtkui/ui_gtk.c:211 src/skins/plugin.c:183
 msgid "Error"
 msgstr "Erreur"
 
-#: src/gtkui/ui_statusbar.c:102 src/skins/ui_main.c:460
+#: src/gtkui/ui_statusbar.c:102 src/skins/ui_main.c:459
 msgid "mono"
 msgstr "mono"
 
-#: src/gtkui/ui_statusbar.c:104 src/skins/ui_main.c:459
+#: src/gtkui/ui_statusbar.c:104 src/skins/ui_main.c:458
 msgid "stereo"
 msgstr "stereo"
 
 #: src/gtkui/ui_statusbar.c:106
-#, fuzzy, c-format
+#, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
-msgstr[0] "%d voies"
-msgstr[1] "%d voies"
+msgstr[0] "%d canal"
+msgstr[1] "%d canaux"
 
 #: src/gtkui/ui_statusbar.c:121
-#, fuzzy, c-format
+#, c-format
 msgid "%d kbps"
-msgstr "kbps"
+msgstr "%d kbps"
 
 #: src/hotkey/gui.c:71
 msgid "Previous Track"
@@ -1843,7 +1966,7 @@
 msgid "Volume Down"
 msgstr "Réduire le volume"
 
-#: src/hotkey/gui.c:81 src/skins/ui_manager.c:424 src/skins/ui_manager.c:425
+#: src/hotkey/gui.c:81 src/skins/ui_manager.c:418 src/skins/ui_manager.c:419
 msgid "Jump to File"
 msgstr "Aller au fichier..."
 
@@ -1856,14 +1979,12 @@
 msgstr "Activer l'affichage à l'écran (« OSD »)"
 
 #: src/hotkey/gui.c:84
-#, fuzzy
 msgid "Toggle Repeat"
-msgstr "Mode « répétition »"
+msgstr "Bascule le mode « répétition »"
 
 #: src/hotkey/gui.c:85
-#, fuzzy
 msgid "Toggle Shuffle"
-msgstr "Mode « lecture aléatoire »"
+msgstr "Bascule le mode « lecture aléatoire »"
 
 #: src/hotkey/gui.c:95
 msgid "(none)"
@@ -1871,8 +1992,7 @@
 
 #: src/hotkey/gui.c:232
 msgid ""
-"It is not recommended to bind the primary mouse buttons without "
-"modificators.\n"
+"It is not recommended to bind the primary mouse buttons without modificators.\n"
 "\n"
 "Do you want to continue?"
 msgstr ""
@@ -1936,46 +2056,43 @@
 "Permet de contrôler le lecteur à l'aide de combinaisons de touches\n"
 "ou des fonctions multimédia du clavier.\n"
 "\n"
-"Droits d'utilisation (2007-2008) : Sascha Hlusiak <contact@saschahlusiak."
-"de>\n"
+"Droits d'utilisation (2007-2008) : Sascha Hlusiak <contact@saschahlusiak.de>\n"
 "\n"
 "\n"
 "Ont contribué :\n"
 "\n"
-"Vladimir Paskov <vlado.paskov@gmail.com> (Droits d'utilisation "
-"2006-2007)\n"
-"Ville Syrjälä <syrjala@sci.fi> (Droits "
-"d'utilisation 2000-2002)\n"
+"Vladimir Paskov <vlado.paskov@gmail.com> (Droits d'utilisation 2006-2007)\n"
+"Ville Syrjälä <syrjala@sci.fi> (Droits d'utilisation 2000-2002)\n"
 "Bryn Davies <curious@ihug.com.au>\n"
 "Jonathan A. Davis <davis@jdhouse.org>\n"
 "Jeremy Tan <nsx@nsx.homeip.net>\n"
 "\n"
 
-#: src/jack/configure.c:71
+#: src/jack/configure.c:66
 msgid "Connect to all available jack ports"
 msgstr "Connexion à tous les ports « Jack » disponibles"
 
-#: src/jack/configure.c:78
+#: src/jack/configure.c:73
 msgid "Connect only the output ports"
 msgstr "Connexion aux ports de sortie uniquement"
 
-#: src/jack/configure.c:85
+#: src/jack/configure.c:80
 msgid "Connect to no ports"
 msgstr "Aucune connexion"
 
-#: src/jack/configure.c:103
+#: src/jack/configure.c:98
 msgid "jack Plugin configuration"
 msgstr "Configuration du module « Jack »"
 
-#: src/jack/configure.c:121
+#: src/jack/configure.c:116
 msgid "Connection mode:"
 msgstr "Mode de connexion :"
 
-#: src/jack/configure.c:133
+#: src/jack/configure.c:128
 msgid "Enable debug printing"
 msgstr "Activer le mode de débogage"
 
-#: src/jack/jack.c:438
+#: src/jack/jack.c:422
 msgid ""
 "XMMS jack Driver 0.17\n"
 "\n"
@@ -1994,23 +2111,67 @@
 "Rétroportage pour Audacious effectué par :\n"
 "Giacomo Lozito from develia.org"
 
-#: src/jack/jack.c:443
+#: src/jack/jack.c:427
 msgid "About JACK Output Plugin 0.17"
 msgstr "À propos du module « JACK » 0.17"
 
-#: src/lyricwiki/lyricwiki.c:226
+#: src/ladspa/plugin.c:414
+msgid "About LADSPA Host"
+msgstr ""
+
+#: src/ladspa/plugin.c:515
+#, c-format
+msgid "%s Settings"
+msgstr ""
+
+#: src/ladspa/plugin.c:583
+msgid "LADSPA Host Settings"
+msgstr ""
+
+#: src/ladspa/plugin.c:592
+msgid "Module paths:"
+msgstr ""
+
+#: src/ladspa/plugin.c:597
+msgid ""
+"Separate multiple paths with a colon.\n"
+"These paths are searched in addition to LADSPA_PATH.\n"
+"After adding new paths, press Enter to scan for new plugins."
+msgstr ""
+
+#: src/ladspa/plugin.c:613
+msgid "Available plugins:"
+msgstr "Greffons disponibles"
+
+#: src/ladspa/plugin.c:625
+msgid "Enable"
+msgstr "Activer"
+
+#: src/ladspa/plugin.c:631
+msgid "Enabled plugins:"
+msgstr ""
+
+#: src/ladspa/plugin.c:646
+msgid "Settings"
+msgstr ""
+
+#: src/lyricwiki/lyricwiki.c:227
 msgid ""
 "\n"
 "Looking for lyrics..."
 msgstr ""
+"\n"
+"Recherche les paroles"
 
-#: src/lyricwiki/lyricwiki.c:249
+#: src/lyricwiki/lyricwiki.c:250
 msgid ""
 "\n"
 "Connecting to lyrics.wikia.com..."
 msgstr ""
+"\n"
+"Se connecte à lyrics.wikia.com..."
 
-#: src/lyricwiki/lyricwiki.c:337
+#: src/lyricwiki/lyricwiki.c:338
 msgid ""
 "\n"
 "No lyrics were found."
@@ -2051,6 +2212,22 @@
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Métronome : %d bpm %d/%d"
 
+#: src/mixer/plugin.c:64
+msgid "About Channel Mixer"
+msgstr ""
+
+#: src/mixer/plugin.c:93
+msgid "Channel Mixer Settings"
+msgstr ""
+
+#: src/mixer/plugin.c:102
+msgid "Output channels:"
+msgstr ""
+
+#: src/mixer/plugin.c:112
+msgid "Changes take effect at the next song change."
+msgstr ""
+
 #: src/mpg123/mpg123.c:183
 msgid "Surround"
 msgstr "Son d'ambiance"
@@ -2061,22 +2238,19 @@
 
 #: src/mtp_up/mtp.c:310
 msgid "Upload to MTP Device"
-msgstr ""
+msgstr "Envoyer vers le périphérique MTP"
 
 #: src/mtp_up/mtp.c:311
-#, fuzzy
 msgid "Disconnect MTP Device"
-msgstr "Déconnecter le périphérique"
+msgstr "Déconnecter le périphérique MTP"
 
 #: src/notify/libnotify-aosd_event.c:47
-#, fuzzy
 msgid "Stopped"
-msgstr "Arrêt"
+msgstr "Arreté"
 
 #: src/notify/libnotify-aosd_event.c:47
-#, fuzzy
 msgid "Audacious is not playing."
-msgstr "Audacious - avertissement concernant l'affichage"
+msgstr "Audacious n'est pas en train de lire de la musique."
 
 #: src/null/null.c:64
 msgid "Null output plugin "
@@ -2096,35 +2270,35 @@
 msgid "About Null Output"
 msgstr "À propos du module de sortie « Null »"
 
-#: src/null/null.c:94
+#: src/null/null.c:89
 msgid "Null output preferences"
 msgstr "Préférences du module de sortie « Null »"
 
-#: src/null/null.c:105
+#: src/null/null.c:100
 msgid "Run in real time"
 msgstr "Utiliser en temps réel"
 
-#: src/oss4/configure.c:89
+#: src/oss4/configure.c:76
 msgid "1. Default device"
 msgstr "1. Périphérique par défaut"
 
-#: src/oss4/configure.c:151
+#: src/oss4/configure.c:132
 msgid "OSS4 Output Plugin Preferences"
 msgstr "Préférences du module de sortie « OSS4 »"
 
-#: src/oss4/configure.c:163 src/OSS/configure.c:203
+#: src/oss4/configure.c:144 src/OSS/configure.c:194
 msgid "Audio device:"
 msgstr "Périphérique audio :"
 
-#: src/oss4/configure.c:189 src/OSS/configure.c:226 src/OSS/configure.c:269
+#: src/oss4/configure.c:172 src/OSS/configure.c:217 src/OSS/configure.c:260
 msgid "Use alternate device:"
 msgstr "Utiliser un autre périphérique :"
 
-#: src/oss4/configure.c:202
+#: src/oss4/configure.c:187
 msgid "Save volume between sessions"
 msgstr "Conserver le volume, d'une session à l'autre"
 
-#: src/oss4/configure.c:206
+#: src/oss4/configure.c:191
 msgid "Enable format conversions made by the OSS software."
 msgstr "Activer les conversions de format logicielles de « OSS »."
 
@@ -2132,99 +2306,44 @@
 msgid "About OSS4 Plugin"
 msgstr "À propos du module « OSS4 »"
 
-#: src/oss4/plugin.c:52
-msgid ""
-"OSS4 Output Plugin for Audacious\n"
-"Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
-"\n"
-"I would like to thank people on #audacious, especially Tony Vroon and John "
-"Lindgren and of course the authors of the previous OSS plugin.\n"
-"\n"
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with "
-"this program. If not, see <http://www.gnu.org/licenses/>.\n"
-msgstr ""
-"Module de sortie « OSS4 » pour Audacious\n"
-"Droits d'utilisation (2010) : Michał Lipski <tallica@o2.pl>\n"
-"\n"
-"Je voudrais remercier les personnes de #audacious -Tony Vroon et John "
-"Lindgren en particulier- et, bien entendu, les auteurs du module « OSS » "
-"précédent.\n"
-"\n"
-"\n"
-"Ceci est une traduction non officielle de la « GNU General Public License » "
-"en français. Elle n'a pas été publiée par la « Free Software Foundation » et "
-"ne détermine pas les termes de distribution pour les logiciels qui utilisent "
-"la « GNU GPL » -- seul le texte anglais original de la « GNU GPL » en a le "
-"droit. Cependant, nous espérons que cette traduction aidera les francophones "
-"à mieux comprendre la « GNU GPL ».\n"
-"\n"
-"Ce programme est un logiciel libre : vous pouvez le redistribuer et/ou le\n"
-" modifier selon les termes de la « Licence Publique Générale GNU » (GNU "
-"GPL), telle que publiée par la « Free Software Foundation », soit la version "
-"2 de la Licence, soit (à votre convenance) toute version postérieure.\n"
-"\n"
-"\"Ce programme est distribué dans l'espoir qu'il sera utile, mais SANS "
-"AUCUNE GARANTIE, sans même la garantie implicite d'une possible VALEUR "
-"MARCHANDE ou de l'ADÉQUATION Á UN BESOIN PARTICULIER. Consultez la « Licence "
-"Publique Générale GNU » (GNU GPL) pour plus de détails.\n"
-"\n"
-"Vous devriez avoir reçu une copie de la « Licence Publique Générale GNU "
-"» (GNU GPL) avec ce programme. Dans le cas contraire, vous pouvez consulter "
-"la Licence sur la page <http://www.gnu.org/licenses/>\n"
-
-#: src/oss4/utils.c:204
+#: src/oss4/utils.c:211
 msgid "OSS4 error"
 msgstr "Erreur OSS4"
 
-#: src/OSS/configure.c:146
+#: src/OSS/configure.c:137
 #, c-format
 msgid "Default (%s)"
 msgstr "Défaut (%s)"
 
-#: src/OSS/configure.c:162 src/skins/ui_manager.c:456
-#: src/skins/ui_manager.c:477
-msgid "Default"
-msgstr "Défaut"
-
-#: src/OSS/configure.c:187
+#: src/OSS/configure.c:178
 msgid "OSS Driver configuration"
 msgstr "Configuration du pilote « OSS »"
 
-#: src/OSS/configure.c:290
+#: src/OSS/configure.c:281
 msgid "Devices"
 msgstr "Périphériques"
 
-#: src/OSS/configure.c:292
+#: src/OSS/configure.c:283
 msgid "Buffering:"
 msgstr "Tampon"
 
-#: src/OSS/configure.c:305
+#: src/OSS/configure.c:296
 msgid "Pre-buffer (percent):"
 msgstr "Pré-tampon (pourcents) :"
 
-#: src/OSS/configure.c:316
+#: src/OSS/configure.c:307
 msgid "Buffering"
 msgstr "Tampon"
 
-#: src/OSS/configure.c:317
+#: src/OSS/configure.c:308
 msgid "Mixer Settings:"
 msgstr "Paramètres du mélangeur :"
 
-#: src/OSS/configure.c:323
+#: src/OSS/configure.c:314
 msgid "Volume controls Master not PCM"
 msgstr "Contrôle du volume via le canal « maître » au lieu du canal « PCM »"
 
-#: src/OSS/configure.c:329
+#: src/OSS/configure.c:320
 msgid "Mixer"
 msgstr "Mélangeur audio"
 
@@ -2232,163 +2351,69 @@
 msgid "About OSS Driver"
 msgstr "À propos du pilote « OSS »"
 
-#: src/OSS/OSS.c:41
-msgid ""
-"Audacious OSS Driver\n"
-"\n"
-" This program is free software; you can redistribute it and/or modify\n"
-"it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
-"(at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
-"GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
-msgstr ""
-"Pilote « OSS » pour Audacious\n"
-"\n"
-"Ceci est une traduction non officielle de la « GNU General Public License »\n"
-"en français. Elle n'a pas été publiée par la « Free Software Foundation »,\n"
-"et ne détermine pas les termes de distribution pour les logiciels qui\n"
-"utilisent la « GNU GPL » -- seul le texte anglais original de la « GNU GPL "
-"»\n"
-"en a le droit. Cependant, nous espérons que cette traduction aidera les\n"
-"francophones à mieux comprendre la « GNU GPL ».\n"
-"\n"
-"Ce programme est un logiciel libre : vous pouvez le redistribuer et/ou le\n"
-"modifier selon les termes de la « Licence Publique Générale GNU » (GNU "
-"GPL),\n"
-"telle que publiée par la « Free Software Foundation », soit la version 2 de\n"
-"la Licence, soit (à votre convenance) toute version postérieure.\n"
-"\n"
-"Ce programme est distribué dans l'espoir qu'il sera utile, mais SANS AUCUNE\n"
-"GARANTIE, sans même la garantie implicite d'une possible VALEUR MARCHANDE\n"
-"ou de l'ADÉQUATION Á UN BESOIN PARTICULIER. Consultez la « Licence Publique\n"
-"Générale GNU » (GNU GPL) pour plus de détails.\n"
-"\n"
-"Vous devriez avoir reçu une copie de la « Licence Publique Générale GNU »\n"
-"(GNU GPL) avec ce programme. Dans le cas contraire, vous pouvez consulter\n"
-"la Licence sur la page <http://www.gnu.org/licenses/> ou écrire à la\n"
-"Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,\n"
-"MA 02110-1301, USA."
-
 #: src/pulse_audio/pulse_audio.c:687
 msgid "About Audacious PulseAudio Output Plugin"
 msgstr "À propos du module de sortie « PulseAudio » pour Audacious"
 
-#: src/pulse_audio/pulse_audio.c:688
-msgid ""
-"Audacious PulseAudio Output Plugin\n"
-"\n"
-" This program is free software; you can redistribute it and/or modify\n"
-"it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
-"(at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
-"GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
-msgstr ""
-"Module de sortie « PulseAudio » pour Audacious\n"
-"\n"
-"Ceci est une traduction non officielle de la « GNU General Public License »\n"
-"en français. Elle n'a pas été publiée par la « Free Software Foundation »,\n"
-"et ne détermine pas les termes de distribution pour les logiciels qui\n"
-"utilisent la « GNU GPL » -- seul le texte anglais original de la « GNU GPL "
-"»\n"
-"en a le droit. Cependant, nous espérons que cette traduction aidera les\n"
-"francophones à mieux comprendre la « GNU GPL ».\n"
-"\n"
-"Ce programme est un logiciel libre : vous pouvez le redistribuer et/ou le\n"
-"modifier selon les termes de la « Licence Publique Générale GNU » (GNU "
-"GPL),\n"
-"telle que publiée par la « Free Software Foundation », soit la version 2 de\n"
-"la Licence, soit (à votre convenance) toute version postérieure.\n"
-"\n"
-"Ce programme est distribué dans l'espoir qu'il sera utile, mais SANS AUCUNE\n"
-"GARANTIE, sans même la garantie implicite d'une possible VALEUR MARCHANDE\n"
-"ou de l'ADÉQUATION Á UN BESOIN PARTICULIER. Consultez la « Licence Publique\n"
-"Générale GNU » (GNU GPL) pour plus de détails.\n"
-"\n"
-"Vous devriez avoir reçu une copie de la « Licence Publique Générale GNU »\n"
-"(GNU GPL) avec ce programme. Dans le cas contraire, vous pouvez consulter\n"
-"la Licence sur la page <http://www.gnu.org/licenses/> ou écrire à la\n"
-"Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,\n"
-"MA 02110-1301, USA."
-
-#: src/resample/plugin.c:91
+#: src/resample/plugin.c:89
 msgid "About Sample Rate Converter Plugin"
 msgstr "À propos du module « Sample Rate Converter »"
 
-#: src/resample/plugin.c:146
+#: src/resample/plugin.c:144
 msgid "Sample Rate Converter Preferences"
 msgstr "Préférence du module « Sample Rate Converter »"
 
-#: src/resample/plugin.c:158
+#: src/resample/plugin.c:156
 msgid "Rate mappings:"
 msgstr "Correspondances des fréquences :"
 
-#: src/resample/plugin.c:181
+#: src/resample/plugin.c:179
 msgid "All others:"
 msgstr "Toutes les autres :"
 
-#: src/resample/plugin.c:193
+#: src/resample/plugin.c:191
 msgid "Method:"
 msgstr "Méthode :"
 
-#: src/scrobbler/configure.c:128 src/scrobbler/configure.c:204
+#: src/scrobbler/configure.c:122 src/scrobbler/configure.c:197
 msgid "Change password"
 msgstr "Modifier le mot de passe"
 
-#: src/scrobbler/configure.c:150
+#: src/scrobbler/configure.c:143
 msgid "Services"
 msgstr "Services"
 
-#: src/scrobbler/configure.c:172
+#: src/scrobbler/configure.c:165
 msgid "Username:"
 msgstr "Nom d'utilisateur :"
 
-#: src/scrobbler/configure.c:178
+#: src/scrobbler/configure.c:171
 msgid "Password:"
 msgstr "Mot de passe :"
 
-#: src/scrobbler/configure.c:186
+#: src/scrobbler/configure.c:179
 msgid "Scrobbler URL:"
 msgstr "Adresse Scrobbler :"
 
-#: src/scrobbler/configure.c:218
+#: src/scrobbler/configure.c:211
 msgid "Last.FM"
 msgstr "Last.FM"
 
-#: src/scrobbler/configure.c:262
+#: src/scrobbler/configure.c:238
 msgid "Scrobbler"
 msgstr "Scrobbler"
 
-#: src/scrobbler/plugin.c:213
+#: src/scrobbler/plugin.c:194
 msgid ""
 "Audacious AudioScrobbler Plugin\n"
 "\n"
-"Originally created by Audun Hove <audun@nlc.no> and Pipian <pipian@pipian."
-"com>\n"
+"Originally created by Audun Hove <audun@nlc.no> and Pipian <pipian@pipian.com>\n"
 msgstr ""
 "Module « AudioScrobbler » pour Audacious\n"
 "\n"
-"Initialement créé par Audun Hove <audun@nlc.no> et Pipian <pipian@pipian."
-"com>\n"
+"Initialement créé par Audun Hove <audun@nlc.no> et Pipian <pipian@pipian.com>\n"
 
-#: src/scrobbler/plugin.c:215
+#: src/scrobbler/plugin.c:196
 msgid "About Scrobbler Plugin"
 msgstr "À propos du module « Scrobbler »"
 
@@ -2400,682 +2425,11 @@
 msgid "SDL error"
 msgstr "Erreur SDL"
 
-#: src/sid/xs_about.c:84
-#, c-format
-msgid "About %s"
-msgstr "À propos du module « %s »"
-
-#: src/sid/xs_about.c:214 src/sid/xs_interface.c:1825
-msgid "Close"
-msgstr "Fermer"
-
-#: src/sid/xs_config.c:326
-msgid " Error"
-msgstr "Erreur"
-
-#: src/sid/xs_config.c:326
-msgid "OK"
-msgstr "OK"
-
-#: src/sid/xs_fileinfo.c:151
-msgid "General info"
-msgstr "Général"
-
-#: src/sid/xs_fileinfo.c:164
-#, c-format
-msgid "Tune #%i: "
-msgstr "Module #%i : "
-
-#: src/sid/xs_glade.c:90 src/sid/xs_glade.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "Impossible d'ouvrir l'image : %s"
-
-#: src/sid/xs_interface.c:234
-msgid "Audacious-SID configuration"
-msgstr "Configuration du module « Audacious-SID »"
-
-#: src/sid/xs_interface.c:270
-msgid "8-bit"
-msgstr "8 bits"
-
-#: src/sid/xs_interface.c:277
-msgid "16-bit"
-msgstr "16 bits"
-
-#: src/sid/xs_interface.c:284
-msgid "Resolution:"
-msgstr "Résolution :"
-
-#: src/sid/xs_interface.c:315
-msgid "Autopanning"
-msgstr "Son panoramique"
-
-#: src/sid/xs_interface.c:322
-msgid "Channels:"
-msgstr "Sortie :"
-
-#: src/sid/xs_interface.c:366
-msgid "Samplerate:"
-msgstr "Fréquence d'échantillonnage :"
-
-#: src/sid/xs_interface.c:383
-msgid "Use oversampling"
-msgstr "Utiliser le suréchantillonnage"
-
-#: src/sid/xs_interface.c:394
-msgid "Factor:"
-msgstr "Facteur :"
-
-#: src/sid/xs_interface.c:406
-msgid "Large factors require more CPU-power"
-msgstr "Les facteurs élevés nécessitent plus de ressources du processeur"
-
-#: src/sid/xs_interface.c:412
-msgid "Oversampling:"
-msgstr "Suréchantillonnage :"
-
-#: src/sid/xs_interface.c:417
-msgid "Audio"
-msgstr "Audio"
-
-#: src/sid/xs_interface.c:445
-msgid "Force speed"
-msgstr "Forcer la vitesse"
-
-#: src/sid/xs_interface.c:449
-msgid ""
-"If enabled, this option \"forces\" the emulation engine to use the selected "
-"clock speed/frequency. Otherwise the speed is determined from played file "
-"itself."
-msgstr ""
-"Activée, cette option « force » le moteur de l'émulation à utiliser la "
-"vitesse/fréquence de l'horloge sélectionnée. Dans le cas contraire, la "
-"vitesse est déterminée par le fichier lui-même."
-
-#: src/sid/xs_interface.c:451
-msgid "PAL (50 Hz)"
-msgstr "PAL (50 Hz)"
-
-#: src/sid/xs_interface.c:455
-msgid ""
-"PAL is the european TV standard, which uses 50Hz vertical refresh frequency. "
-"Most of SID-tunes have been made for PAL computers."
-msgstr ""
-"'PAL' est le standard télévisuel européen ; il utilise une fréquence de "
-"rafraîchissement vertical de 50 hz. La plupart des compositions « SID » ont "
-"été réalisées pour les ordinateurs « PAL »."
-
-#: src/sid/xs_interface.c:459
-msgid "NTSC (60 Hz)"
-msgstr "NTSC (60 Hz)"
-
-#: src/sid/xs_interface.c:463
-msgid ""
-"NTSC is the TV standard with 60Hz vertical refresh rate (and other features "
-"that differ from PAL). It is mainly used in United States, Japan and certain "
-"other countries."
-msgstr ""
-"'NTSC' est le standard télévisuel qui utilise un taux de rafraîchissement "
-"vertical de 60 Hz (et d'autres caractéristiques qui diffèrent du standard « "
-"PAL »). Il est principalement utilisé aux États-Unis, au Japon et dans "
-"d'autres pays."
-
-#: src/sid/xs_interface.c:467
-msgid "Clock speed:"
-msgstr "Vitesse d'horloge :"
-
-#: src/sid/xs_interface.c:484
-msgid "Force model"
-msgstr "Forcer le modèle"
-
-#: src/sid/xs_interface.c:488
-msgid ""
-"If enabled, this option \"forces\" the emulation engine to use the selected "
-"SID-chip model. Otherwise the preferred SID model is determined from the "
-"file (if PSIDv2NG type) or if not available, this setting is used."
-msgstr ""
-"Activée, cette option « force » le moteur de l'émulation à utiliser le "
-"modèle de puce « SID » sélectionné. Dans le cas contraire, le modèle « SID » "
-"adéquat est déterminé à partir du fichier (s'il est du type « PSIDv2NG »). "
-"Si l'information concernant le modèle n'est pas disponible, c'est le réglage "
-"choisi via cette option qui sera utilisé."
-
-#: src/sid/xs_interface.c:490
-msgid "MOS 6581"
-msgstr "MOS 6581"
-
-#: src/sid/xs_interface.c:494
-msgid ""
-"MOS/CSG 6581 is the earlier major version of SID chip. It differs from 8580 "
-"in few ways, having much fuller filter (which, due to design error, is never "
-"same between two different SID-chips) and has the \"volume adjustment bug\", "
-"which enables playing of digital samples."
-msgstr ""
-"'MOS/CSG 6581 est la toute première version majeure de la puce « SID ». Elle "
-"diffère du modèle '8580' de plusieurs manières : elle dispose d'un filtre "
-"plus complet (qui, à cause d'une erreur de conception, n'est jamais le même, "
-"d'un modèle de puce « SID » à l'autre) et présente le « problème "
-"d'ajustement du volume » qui permet la lecture des échantillons digitaux."
-
-#: src/sid/xs_interface.c:498
-msgid "MOS 8580"
-msgstr "MOS 8580"
-
-#: src/sid/xs_interface.c:505
-msgid "SID model:"
-msgstr "Modèle « SID » :"
-
-#: src/sid/xs_interface.c:522
-msgid "SIDPlay 1 (frame-based)"
-msgstr "SIDPlay 1 (synchronisation de la trame)"
-
-#: src/sid/xs_interface.c:526
-msgid ""
-"Use libSIDPlay 1.x emulation, faster but not so accurate. Good in most "
-"cases, though."
-msgstr ""
-"Utilise la bibliothèque « libSIDPlay 1.x ». L'émulation est plus rapide, "
-"mais moins précise (toutefois, elle offre une bonne restitution, dans la "
-"plupart des cas)."
-
-#: src/sid/xs_interface.c:530
-msgid "SIDPlay 2 (cycle-based)"
-msgstr "SIDPlay 2 (synchronisation du cycle)"
-
-#: src/sid/xs_interface.c:534
-msgid ""
-"Use libSIDPlay 2.x emulation, which requires powerful CPU due to more exact "
-"emulation."
-msgstr ""
-"Utilise la bibliothèque « libSIDPlay 2.x ». L'émulation nécessite un "
-"processeur puissant, mais est plus précise."
-
-#: src/sid/xs_interface.c:538
-msgid "Emulation library selection:"
-msgstr "Choix de la bibliothèque d'émulation :"
-
-#: src/sid/xs_interface.c:555
-msgid "Real C64 (SIDPlay 2 only)"
-msgstr "C64 réel (SIDPlay 2 uniquement)"
-
-#: src/sid/xs_interface.c:562
-msgid "Bank switching"
-msgstr "Pagination"
-
-#: src/sid/xs_interface.c:569
-msgid "Transparent ROM"
-msgstr "ROM transparente"
-
-#: src/sid/xs_interface.c:576
-msgid "PlaySID environment"
-msgstr "Environnement « PlaySID »"
-
-#: src/sid/xs_interface.c:583
-msgid "Memory mode:"
-msgstr "Gestion de la mémoire :"
-
-#: src/sid/xs_interface.c:588
-msgid "Emu#1"
-msgstr "Émulation #1"
-
-#: src/sid/xs_interface.c:611
-msgid "Optimization mode (faster, inaccurate)"
-msgstr "Mode « optimisation » (plus rapide, mais imprécis)"
-
-#: src/sid/xs_interface.c:615
-msgid ""
-"This setting can be used to enable libSIDPlay2's \"optimization mode\", "
-"which in downgrades the emulation from cycle-exact to something similar to "
-"frame-exact. The result is lower CPU usage, but worse accuracy."
-msgstr ""
-"Ce réglage peut être utilisé pour activer le « mode d'optimisation » de la "
-"bibliothèque « libSIDPlay2 ». Ce mode réduit l'émulation de « "
-"synchronisation du cycle » à quelque chose équivalant à « synchronisation de "
-"la trame »."
-
-#: src/sid/xs_interface.c:617
-msgid "reSID-emulation"
-msgstr "Émulation « reSID »"
-
-#: src/sid/xs_interface.c:621
-msgid ""
-"reSID is the software SID-chip simulator based on SID reverse-engineering, "
-"created by Dag Lem. It is probably the closest thing to real SID available "
-"as software-only emulation."
-msgstr ""
-"« reSID » est le simulateur logiciel de puces « SID » créé par Dag Lem par "
-"ingénierie inverse. Il constitue probablement l'émulation logicielle la plus "
-"proche des véritables puces « SID »."
-
-#: src/sid/xs_interface.c:625
-msgid "HardSID"
-msgstr "HardSID"
-
-#: src/sid/xs_interface.c:629
-msgid ""
-"HardSID is a EISA/PCI card for PC-compatibles, which can be fitted with a "
-"real SID-chip. Software can be used to control the HardSID and combined with "
-"software emulation of rest of C64 via libSIDPlay2 HardSID can be used to "
-"achieve \"near 100%\" similarity to real C64. For more information, see "
-"http://www.hardsid.com/"
-msgstr ""
-"'HardSID' est une carte EISA/PCI destinée aux systèmes compatibles PC, dans "
-"laquelle peut être insérée une véritable puce « SID ». La carte « HardSID » "
-"peut être contrôlée par un logiciel, mais, combinée à l'émulation d'un "
-"système C64 fournie par la bibliothèque « libSIDPlay2 », elle permet "
-"d'obtenir un rendu sonore « presque » similaire à celui d'un véritable C64. "
-"Pour de plus amples informations, vous pouvez consulter le site suivant : "
-"http://www.hardsid.com/"
-
-#: src/sid/xs_interface.c:633
-msgid "SIDPlay 2 options:"
-msgstr "Options de « SIDPlay 2 » :"
-
-#: src/sid/xs_interface.c:650
-msgid "Fast (nearest neighbour)"
-msgstr "Rapide (méthode du « plus proche voisin »)"
-
-#: src/sid/xs_interface.c:654
-msgid ""
-"Fastest and also worst sounding sampling method, simply picks nearest "
-"neighbouring sample."
-msgstr ""
-"La plus rapide, mais aussi la pire méthode de restitution sonore : les "
-"échantillons sont choisis selon la méthode du « plus proche voisin »."
-
-#: src/sid/xs_interface.c:658
-msgid "Linear interpolation"
-msgstr "Interpolation linéaire"
-
-#: src/sid/xs_interface.c:662
-msgid ""
-"Uses linear interpolation between samples, yielding higher audio quality "
-"with less sampling noise."
-msgstr ""
-"Utilise l'interpolation linéaire entre les échantillons. Le flux audio est "
-"alors de plus grande qualité et est moins affecté par le bruit. "
-
-#: src/sid/xs_interface.c:673
-msgid "Resampling (FIR)"
-msgstr "Filtre à réponse impulsionnelle finie ('FIR')"
-
-#: src/sid/xs_interface.c:680
-msgid "reSID sampling options:"
-msgstr "Options d'échantillonnage de « reSID » :"
-
-#: src/sid/xs_interface.c:685
-msgid "Emu#2"
-msgstr "Émulation #2"
-
-#: src/sid/xs_interface.c:697
-msgid "Emulate filters"
-msgstr "Émuler les filtres"
-
-#: src/sid/xs_interface.c:701
-msgid ""
-"This option enables emulation of SID filter. The filter is an essential part "
-"of SID's sound capacity, but accurate emulation of it may require quite much "
-"CPU power. However, if filter emulation is disabled, tunes won't sound "
-"authentic at all if they utilize the filter."
-msgstr ""
-"Cette option active l'émulation des filtres « SID ». Le filtre constitue "
-"l'élément' essentiel de la qualité du son « SID », mais une émulation "
-"précise peut utiliser beaucoup de ressources du processeur. Cependant, si "
-"l'émulation est désactivée, alors qu'un module audio a été composé avec les "
-"fonctions d'un filtre, le son ne sera pas restitué de manière authentique."
-
-#: src/sid/xs_interface.c:726
-msgid "FS"
-msgstr "FS"
-
-#: src/sid/xs_interface.c:743
-msgid "FM"
-msgstr "FM"
-
-#: src/sid/xs_interface.c:760
-msgid "FT"
-msgstr "FT"
-
-#: src/sid/xs_interface.c:771
-msgid "Reset values"
-msgstr "Réinitialiser"
-
-#: src/sid/xs_interface.c:776
-msgid "SIDPlay1"
-msgstr "SIDPlay 1"
-
-#: src/sid/xs_interface.c:817
-msgid "Export"
-msgstr "Exporter"
-
-#: src/sid/xs_interface.c:825
-msgid "Use"
-msgstr "Utiliser"
-
-#: src/sid/xs_interface.c:833 src/skins/ui_manager.c:447
-msgid "Save"
-msgstr "Enregistrer"
-
-#: src/sid/xs_interface.c:841 src/skins/ui_manager.c:446
-msgid "Import"
-msgstr "Importer"
-
-#: src/sid/xs_interface.c:849 src/skins/ui_manager.c:448
-msgid "Delete"
-msgstr "Supprimer"
-
-#: src/sid/xs_interface.c:863
-msgid "Filter curve:"
-msgstr "Courbe du filtre :"
-
-#: src/sid/xs_interface.c:868
-msgid "SIDPlay2"
-msgstr "SIDPlay 2"
-
-#: src/sid/xs_interface.c:874
-msgid "Filters"
-msgstr "Filtres"
-
-#: src/sid/xs_interface.c:897
-msgid "Play at least for specified time"
-msgstr "Lire au moins pendant la durée indiquée"
-
-#: src/sid/xs_interface.c:901
-msgid ""
-"If enabled, the tune is played at least for the specified time, adding "
-"silence to the end if necessary."
-msgstr ""
-"Si cette option est activée, le module audio sera lu au moins pendant la "
-"durée indiquée. Si cela s'avère nécessaire, un silence sera ajouté à la fin "
-"du morceau."
-
-#: src/sid/xs_interface.c:908 src/sid/xs_interface.c:962
-#: src/sid/xs_interface.c:1142
-msgid "Playtime:"
-msgstr "Durée :"
-
-#: src/sid/xs_interface.c:921 src/sid/xs_interface.c:975
-#: src/sid/xs_interface.c:1155
-msgid "seconds"
-msgstr "secondes"
-
-#: src/sid/xs_interface.c:928
-msgid "Minimum playtime:"
-msgstr "Durée de lecture minimale :"
-
-#: src/sid/xs_interface.c:945
-msgid "Play for specified time maximum"
-msgstr "Lire au maximum pendant la durée indiquée"
-
-#: src/sid/xs_interface.c:949
-msgid ""
-"If enabled, tune is played until specified duration is reached (aka maximum "
-"playtime)."
-msgstr ""
-"Si cette option est activée, le module audio sera lu jusqu'à ce que soit "
-"atteinte la durée indiquée (la durée de lecture maximale, en d'autres "
-"termes)."
-
-#: src/sid/xs_interface.c:951
-msgid "Only when song length is unknown"
-msgstr "Uniquement si la durée du module audio est inconnue"
-
-#: src/sid/xs_interface.c:955
-msgid ""
-"If enabled, the maximum playtime is applied only if song/tune length is not "
-"known."
-msgstr ""
-"Si cette option est activée, la durée de lecture maximale ne sera appliquée "
-"que si la durée du module audio ne peut pas être déterminée."
-
-#: src/sid/xs_interface.c:982
-msgid "Maximum playtime:"
-msgstr "Durée de lecture maximale :"
-
-#: src/sid/xs_interface.c:999
-msgid "Use XSIDPLAY-compatible database"
-msgstr "Utiliser une base de données compatible avec « XSIDPLAY »"
-
-#: src/sid/xs_interface.c:1003
-msgid ""
-"This option enables using of XSIDPLAY compatible song length database. "
-"(Refer to Audacious-SID documentation for more information)"
-msgstr ""
-"Cette option active l'utilisation d'une base de données compatible avec « "
-"XSIDPLAY », relative à la durée des modules audio. Pour de plus amples "
-"informations, vous pouvez consulter la documentation de « Audacious-SID »."
-
-#: src/sid/xs_interface.c:1010
-msgid "DB-file:"
-msgstr "Fichier :"
-
-#: src/sid/xs_interface.c:1020
-msgid "Database path and filename"
-msgstr "Emplacement et nom du fichier de la base de données"
-
-#: src/sid/xs_interface.c:1027
-msgid "Browse for song length-database file"
-msgstr ""
-"Permet de parcourir l'arborescence pour sélectionner le fichier de la base "
-"de données"
-
-#: src/sid/xs_interface.c:1049
-msgid "Song length database:"
-msgstr "Base de données relative à la durée des modules audio :"
-
-#: src/sid/xs_interface.c:1054
-msgid "Songlength"
-msgstr "Durée"
-
-#: src/sid/xs_interface.c:1072
-msgid "Override generic Tuplez format string"
-msgstr "Remplacer les titres génériques"
-
-#: src/sid/xs_interface.c:1076
-msgid ""
-"By enabling this option you can specify a custom Tuplez formatting string "
-"for SID-files. The SID-plugin specific Tuplez tags are described shortly "
-"below."
-msgstr ""
-"Si vous cochez cette option, vous pourrez indiquer un format de titre "
-"personnalisé pour les fichiers « SID ». Les métadonnées propres au module "
-"d'extension « SID » sont brièvement expliquées ci-dessous."
-
-#: src/sid/xs_interface.c:1087
-msgid "Tuplez format string for SID-files"
-msgstr "Format du titre des modules audio « SID »"
-
-#: src/sid/xs_interface.c:1090
-msgid ""
-"SID-specific Tuplez fields:\n"
-"\n"
-"sid-format\t\t- Specific fileformat\n"
-"sid-model\t\t- 6581 or 8580\n"
-"sid-speed\t\t- Timing or speed: PAL/NTSC/etc.\n"
-"\n"
-"Other \"special\" fields set:\n"
-"\n"
-"subsong-num, subsong-id"
-msgstr ""
-"Champs des métadonnées propres à « SID » :\n"
-"\n"
-"sid-format\t\t- Format de fichier spécifique\n"
-"sid-model\t\t- 6581 ou 8580\n"
-"sid-speed\t\t- Fréquence ou vitesse : « PAL » / « NTSC » / etc.\n"
-"\n"
-"Autres champs « spéciaux » :\n"
-"\n"
-"subsong-num, subsong-id"
-
-#: src/sid/xs_interface.c:1098
-msgid "Song title format:"
-msgstr "Format du titre :"
-
-#: src/sid/xs_interface.c:1125
-msgid "Add sub-tunes to playlist"
-msgstr "Ajouter les sous-modules à la liste de lecture"
-
-#: src/sid/xs_interface.c:1129
-msgid ""
-"If enabled, sub-tunes of each file will be added to playlist. If disabled, "
-"only the default sub-tune will be added."
-msgstr ""
-"Si cette option est activée, les sous-modules de chaque fichier seront "
-"ajoutés à la liste de lecture. Dans le cas contraire, seul le sous-module "
-"par défaut sera ajouté."
-
-#: src/sid/xs_interface.c:1131
-msgid "Only tunes with specified minimum duration"
-msgstr "Uniquement les morceaux dont la durée minimale est la suivante :"
-
-#: src/sid/xs_interface.c:1135
-msgid "Only add sub-tunes that have a duration of at least specified time."
-msgstr ""
-"Ajoute uniquement les sous-modules dont la durée est au moins égale au temps "
-"spécifié."
-
-#: src/sid/xs_interface.c:1162
-msgid "Sub-tune handling:"
-msgstr "Gestion des sous-modules :"
-
-#: src/sid/xs_interface.c:1179
-msgid "Use STIL database"
-msgstr "Utiliser une base de données « STIL »"
-
-#: src/sid/xs_interface.c:1183
-msgid ""
-"If this option is enabled (and the database & HVSC settings below are "
-"correctly set), Audacious-SID will use and display additional information "
-"from STIL database when HVSC SIDs are played."
-msgstr ""
-"Si cette option est activée (et que la base de données ainsi que les "
-"paramètres « HVSC » ci-dessous sont correctement configurés), « Audacious-"
-"SID » utilisera et affichera des informations supplémentaires, à partir de "
-"la base de données « STIL », lorsque des modules audio « SID » de la "
-"collection « HVSC » seront lus."
-
-#: src/sid/xs_interface.c:1190
-msgid "STIL file:"
-msgstr "Fichier « STIL » :"
-
-#: src/sid/xs_interface.c:1206
-msgid ""
-"Path and filename of STIL database file (STIL.txt), usually found from "
-"HVSC's DOCUMENTS-subdirectory."
-msgstr ""
-"Emplacement et nom du fichier de la base de données « STIL » (le fichier "
-"\"STIL.txt\" est habituellement situé dans le sous-répertoire \"DOCUMENTS\" "
-"du dossier \"HVSC\")."
-
-#: src/sid/xs_interface.c:1219
-msgid "Browse for STIL-database file"
-msgstr ""
-"Permet de parcourir l'arborescence pour sélectionner le fichier de la base "
-"de données « STIL »"
-
-#: src/sid/xs_interface.c:1246
-msgid "HVSC path:"
-msgstr "Emplacement de « HVSC » :"
-
-#: src/sid/xs_interface.c:1262
-msgid ""
-"Path to base-directory of your High Voltage SID Collection (HVSC), for "
-"example /media/C64Music/"
-msgstr ""
-"Emplacement du dossier de base de « High Voltage SID Collection » (HVSC) (\"/"
-"media/C64Music/\", par exemple)"
-
-#: src/sid/xs_interface.c:1275
-msgid "Browse for HVSC path"
-msgstr ""
-"Permet de parcourir l'arborescence pour sélectionner le dossier \"HVSC\""
-
-#: src/sid/xs_interface.c:1297
-msgid "SID Tune Information List (STIL) database:"
-msgstr "Base de données « STIL » (SID Tune Information List) :"
-
-#: src/sid/xs_interface.c:1321
-msgid "Cancel any changes"
-msgstr "Annule tous les changements"
-
-#: src/sid/xs_interface.c:1328
-msgid "Accept and update changes"
-msgstr "Valide et applique les changements"
-
-#: src/sid/xs_interface.c:1628
-msgid "Audacious-SID Fileinfo"
-msgstr "Infomations sur le fichier « Audacious-SID »"
-
-#: src/sid/xs_interface.c:1649
-msgid "Filename:"
-msgstr "Nom du fichier :"
-
-#: src/sid/xs_interface.c:1657
-msgid "Songname:"
-msgstr "Nom du morceau :"
-
-#: src/sid/xs_interface.c:1665
-msgid "Composer:"
-msgstr "Compositeur :"
-
-#: src/sid/xs_interface.c:1673
-msgid "Copyright:"
-msgstr "Droits :"
-
-#: src/sid/xs_interface.c:1717
-msgid "Song Information:"
-msgstr "Informations sur le module :"
-
-#: src/sid/xs_interface.c:1752
-msgid "Author:"
-msgstr "Auteur :"
-
-#: src/sid/xs_interface.c:1786
-msgid "Duration:"
-msgstr "Durée :"
-
-#: src/sid/xs_interface.c:1820
-msgid "Sub-tune Information:"
-msgstr "Informations sur les sous-modules :"
-
-#: src/sid/xs_interface.c:1881
-msgid "Select HVSC song length database"
-msgstr "Choix de la base de données « HVSC »"
-
-#: src/sid/xs_interface.c:1922
-msgid "Select STIL-database"
-msgstr "Choix de la base de données « STIL »"
-
-#: src/sid/xs_interface.c:1963
-msgid "Select HVSC location prefix"
-msgstr "Emplacement de « HVSC »"
-
-#: src/sid/xs_interface.c:2004
-msgid "Select SIDPlay2 filters file for importing"
-msgstr "Fichier de filtres « SIDPlay2 » à importer :"
-
-#: src/sid/xs_interface.c:2045
-msgid "Select SIDPlay2 filters file for exporting"
-msgstr "Fichier de filtres « SIDPlay2 » à exporter :"
-
-#: src/sid/xs_interface.c:2093 src/sid/xs_interface.c:2106
-msgid "Confirm selected action"
-msgstr "Confirmer l'action choisie"
-
-#: src/sid/xs_interface.c:2123
-msgid "Yes"
-msgstr "Oui"
-
-#: src/sid/xs_interface.c:2129
-msgid "No"
-msgstr "Aucun"
-
-#: src/skins/plugin.c:167
+#: src/skins/plugin.c:165
 msgid "About Skinned GUI"
 msgstr "À propos de l'interface à thème"
 
-#: src/skins/plugin.c:168
+#: src/skins/plugin.c:166
 msgid ""
 "Copyright (c) 2008, by Tomasz Moń <desowin@gmail.com>\n"
 "\n"
@@ -3083,42 +2437,41 @@
 "Droits d'utilisation : Tomasz Moń <desowin@gmail.com> (2008)\n"
 "\n"
 
-#: src/skins/skins_cfg.c:254
+#: src/skins/skins_cfg.c:207
 msgid "_Player:"
 msgstr "F_enêtre principale"
 
-#: src/skins/skins_cfg.c:254
+#: src/skins/skins_cfg.c:208
 msgid "Select main player window font:"
 msgstr "Police de la fenêtre principale du lecteur"
 
-#: src/skins/skins_cfg.c:255
+#: src/skins/skins_cfg.c:210
 msgid "_Playlist:"
 msgstr "_Liste de lecture"
 
-#: src/skins/skins_cfg.c:255
+#: src/skins/skins_cfg.c:211
 msgid "Select playlist font:"
 msgstr "Police de la liste de lecture"
 
-#: src/skins/skins_cfg.c:259
+#: src/skins/skins_cfg.c:215
 msgid "_Fonts"
 msgstr "_Polices"
 
-#: src/skins/skins_cfg.c:261
+#: src/skins/skins_cfg.c:218
 msgid "Use bitmap fonts (supports ASCII only)"
-msgstr ""
+msgstr "Utiliser des polices bitmap (supporte seulement les caractères ASCII)"
 
-#: src/skins/skins_cfg.c:263
+#: src/skins/skins_cfg.c:220
 msgid "Scroll song title in both directions"
-msgstr ""
+msgstr "Faire défiler le titre dans les deux sens"
 
-#: src/skins/skins_cfg.c:346
+#: src/skins/skins_cfg.c:298
 msgid "_Skin"
 msgstr "_Thème"
 
-#: src/skins/skins_cfg.c:393
-#, fuzzy
+#: src/skins/skins_cfg.c:345
 msgid "Interface Preferences"
-msgstr "Préférences du module « Crossfade »"
+msgstr "Préférences de l'interface"
 
 #: src/skins/ui_equalizer.c:330
 msgid "Preamp"
@@ -3164,83 +2517,83 @@
 msgid "16 kHz"
 msgstr "16 kHz"
 
-#: src/skins/ui_equalizer.c:378
+#: src/skins/ui_equalizer.c:379
 msgid "Audacious Equalizer"
 msgstr "Égaliseur d'Audacious"
 
-#: src/skins/ui_equalizer.c:884
+#: src/skins/ui_equalizer.c:896
 msgid "Presets"
 msgstr "Préréglages"
 
-#: src/skins/ui_main.c:444
+#: src/skins/ui_main.c:443
 msgid "kbps"
 msgstr "kbps"
 
-#: src/skins/ui_main.c:452
+#: src/skins/ui_main.c:451
 msgid "kHz"
 msgstr "kHz"
 
-#: src/skins/ui_main.c:459
+#: src/skins/ui_main.c:458
 msgid "surround"
 msgstr "son d'ambiance"
 
-#: src/skins/ui_main.c:807
-#, fuzzy, c-format
+#: src/skins/ui_main.c:806
+#, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
-msgstr "Position : %d:%-2.2d/%d:%-2.2d (%d%%)"
+msgstr "Aller à %d:%-2.2d/%d:%-2.2d"
 
-#: src/skins/ui_main.c:828
+#: src/skins/ui_main.c:827
 #, c-format
 msgid "Volume: %d%%"
 msgstr "Volume : %d%%"
 
-#: src/skins/ui_main.c:851
+#: src/skins/ui_main.c:850
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "Balance : %d%% gauche"
 
-#: src/skins/ui_main.c:853
+#: src/skins/ui_main.c:852
 msgid "Balance: center"
 msgstr "Balance : centre"
 
-#: src/skins/ui_main.c:855
+#: src/skins/ui_main.c:854
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "Balance : %d%% droite"
 
-#: src/skins/ui_main.c:981
+#: src/skins/ui_main.c:980
 msgid "Options Menu"
 msgstr "Menu des options"
 
-#: src/skins/ui_main.c:985
+#: src/skins/ui_main.c:984
 msgid "Disable 'Always On Top'"
 msgstr "Annuler « Toujours au premier plan »"
 
-#: src/skins/ui_main.c:987
+#: src/skins/ui_main.c:986
 msgid "Enable 'Always On Top'"
 msgstr "Activer « Toujours au premier plan »"
 
-#: src/skins/ui_main.c:990
+#: src/skins/ui_main.c:989
 msgid "File Info Box"
 msgstr "Informations sur le fichier"
 
-#: src/skins/ui_main.c:995
+#: src/skins/ui_main.c:994
 msgid "Visualization Menu"
 msgstr "Menu des effets visuels"
 
-#: src/skins/ui_main.c:1645
+#: src/skins/ui_main.c:1648
 msgid "Single mode."
 msgstr "Mode « Fichier unique »."
 
-#: src/skins/ui_main.c:1647
+#: src/skins/ui_main.c:1650
 msgid "Playlist mode."
 msgstr "Mode « Liste de lecture »."
 
-#: src/skins/ui_main.c:1669
+#: src/skins/ui_main.c:1672
 msgid "Stopping after song."
 msgstr "Arrêter après le titre en cours de lecture."
 
-#: src/skins/ui_main.c:1671
+#: src/skins/ui_main.c:1674
 msgid "Not stopping after song."
 msgstr "Ne pas arrêter après le titre en cours de lecture."
 
@@ -3466,67 +2819,54 @@
 msgstr "Enregistre la liste de lecture active."
 
 #: src/skins/ui_manager.c:229
-msgid "Save All Playlists"
-msgstr "Enregistrer toutes les listes"
-
-#: src/skins/ui_manager.c:230
-msgid ""
-"Saves all the playlists that are open. Note that this is done automatically "
-"when Audacious quits."
-msgstr ""
-"Enregistre toutes les listes de lecture qui sont ouvertes. Veuillez noter "
-"que cette opération est effectuée automatiquement à la fermeture d'Audacious."
-
-#: src/skins/ui_manager.c:234
 msgid "Refresh List"
 msgstr "Actualiser la liste"
 
-#: src/skins/ui_manager.c:235
+#: src/skins/ui_manager.c:230
 msgid "Refreshes metadata associated with a playlist entry."
 msgstr "Actualise les métadonnées associées à une entrée de la liste."
 
-#: src/skins/ui_manager.c:238
-msgid "List Manager"
-msgstr "Gestionnaire de listes"
+#: src/skins/ui_manager.c:233
+msgid "Playlist Manager"
+msgstr "Gestionnaire de listes de lecture"
 
-#: src/skins/ui_manager.c:239
-msgid "Opens the playlist manager."
-msgstr "Ouvre le gestionnaire de listes de lecture."
+#: src/skins/ui_manager.c:234
+msgid "Queue Manager"
+msgstr "Gestionnaire de files d'attente"
 
-#: src/skins/ui_manager.c:243
+#: src/skins/ui_manager.c:237
 msgid "View"
 msgstr "Affichage"
 
-#: src/skins/ui_manager.c:244
+#: src/skins/ui_manager.c:238
 msgid "Interface"
 msgstr "Interface"
 
-#: src/skins/ui_manager.c:245
-#, fuzzy
+#: src/skins/ui_manager.c:239
 msgid "Interface Preferences ..."
-msgstr "Préférences du module « Crossfade »"
+msgstr "Préférences de l'interface"
 
-#: src/skins/ui_manager.c:249
+#: src/skins/ui_manager.c:243
 msgid "Add Internet Address..."
 msgstr "Ajouter un flux Internet..."
 
-#: src/skins/ui_manager.c:250
+#: src/skins/ui_manager.c:244
 msgid "Adds a remote track to the playlist."
 msgstr "Ajoute un flux distant à la liste de lecture."
 
-#: src/skins/ui_manager.c:253
+#: src/skins/ui_manager.c:247
 msgid "Add Files..."
 msgstr "Ajouter des fichiers..."
 
-#: src/skins/ui_manager.c:254
+#: src/skins/ui_manager.c:248
 msgid "Adds files to the playlist."
 msgstr "Ajoute des fichiers à la liste de lecture."
 
-#: src/skins/ui_manager.c:259
+#: src/skins/ui_manager.c:253
 msgid "Search and Select"
 msgstr "Chercher et sélectionner"
 
-#: src/skins/ui_manager.c:260
+#: src/skins/ui_manager.c:254
 msgid ""
 "Searches the playlist and selects playlist entries based on specific "
 "criteria."
@@ -3534,409 +2874,414 @@
 "Effectue une recherche dans la liste de lecture et sélectionne des entrées "
 "en fonction de critères définis."
 
-#: src/skins/ui_manager.c:263
+#: src/skins/ui_manager.c:257
 msgid "Invert Selection"
 msgstr "Inverser la sélection"
 
-#: src/skins/ui_manager.c:264
+#: src/skins/ui_manager.c:258
 msgid "Inverts the selected and unselected entries."
 msgstr "Inverse les entrées sélectionnées et les entrées non sélectionnées."
 
-#: src/skins/ui_manager.c:267
+#: src/skins/ui_manager.c:261
 msgid "Select All"
 msgstr "Tout sélectionner"
 
-#: src/skins/ui_manager.c:268
+#: src/skins/ui_manager.c:262
 msgid "Selects all of the playlist entries."
 msgstr "Sélectionne toutes les entrées de la liste."
 
-#: src/skins/ui_manager.c:271
+#: src/skins/ui_manager.c:265
 msgid "Select None"
 msgstr "Ne rien sélectionner"
 
-#: src/skins/ui_manager.c:272
+#: src/skins/ui_manager.c:266
 msgid "Deselects all of the playlist entries."
 msgstr "Annule la sélection de toutes les entrées de la liste."
 
-#: src/skins/ui_manager.c:277
+#: src/skins/ui_manager.c:271
 msgid "Remove All"
 msgstr "Effacer toutes les entrées"
 
-#: src/skins/ui_manager.c:278
+#: src/skins/ui_manager.c:272
 msgid "Removes all entries from the playlist."
 msgstr "Efface toutes les entrées de la liste de lecture."
 
-#: src/skins/ui_manager.c:281
+#: src/skins/ui_manager.c:275
 msgid "Clear Queue"
 msgstr "Vider la file d'attente"
 
-#: src/skins/ui_manager.c:282
+#: src/skins/ui_manager.c:276
 msgid "Clears the queue associated with this playlist."
 msgstr "Vide la file d'attente associée à la liste de lecture active."
 
-#: src/skins/ui_manager.c:285
+#: src/skins/ui_manager.c:279
 msgid "Remove Unavailable Files"
 msgstr "Effacer les fichiers inexistants"
 
-#: src/skins/ui_manager.c:286
+#: src/skins/ui_manager.c:280
 msgid "Removes unavailable files from the playlist."
 msgstr ""
 "Efface de la liste de lecture les fichiers qui ne sont plus disponibles."
 
-#: src/skins/ui_manager.c:289
+#: src/skins/ui_manager.c:283
 msgid "Remove Duplicates"
 msgstr "Effacer les éléments redondants"
 
-#: src/skins/ui_manager.c:291 src/skins/ui_manager.c:323
-#: src/skins/ui_manager.c:353
+#: src/skins/ui_manager.c:285 src/skins/ui_manager.c:317
+#: src/skins/ui_manager.c:347
 msgid "By Title"
 msgstr "Par titre"
 
-#: src/skins/ui_manager.c:292
+#: src/skins/ui_manager.c:286
 msgid "Removes duplicate entries from the playlist by title."
 msgstr "Efface les entrées redondantes, en fonction de leur titre."
 
-#: src/skins/ui_manager.c:295 src/skins/ui_manager.c:335
-#: src/skins/ui_manager.c:365
+#: src/skins/ui_manager.c:289 src/skins/ui_manager.c:329
+#: src/skins/ui_manager.c:359
 msgid "By Filename"
 msgstr "Par nom de fichier"
 
-#: src/skins/ui_manager.c:296
+#: src/skins/ui_manager.c:290
 msgid "Removes duplicate entries from the playlist by filename."
 msgstr "Efface les entrées redondantes, en fonction de leur nom de fichier."
 
-#: src/skins/ui_manager.c:299 src/skins/ui_manager.c:339
-#: src/skins/ui_manager.c:369
+#: src/skins/ui_manager.c:293 src/skins/ui_manager.c:333
+#: src/skins/ui_manager.c:363
 msgid "By Path + Filename"
 msgstr "Par chemin et nom de fichier"
 
-#: src/skins/ui_manager.c:300
+#: src/skins/ui_manager.c:294
 msgid "Removes duplicate entries from the playlist by their full path."
 msgstr "Efface les entrées redondantes, en fonction de leur chemin complet."
 
-#: src/skins/ui_manager.c:303
+#: src/skins/ui_manager.c:297
 msgid "Remove Unselected"
 msgstr "Ne garder que la sélection"
 
-#: src/skins/ui_manager.c:304
+#: src/skins/ui_manager.c:298
 msgid "Remove unselected entries from the playlist."
 msgstr "Efface les entrées non sélectionnées de la liste de lecture."
 
-#: src/skins/ui_manager.c:307
+#: src/skins/ui_manager.c:301
 msgid "Remove Selected"
 msgstr "Effacer la sélection"
 
-#: src/skins/ui_manager.c:308
+#: src/skins/ui_manager.c:302
 msgid "Remove selected entries from the playlist."
 msgstr "Efface les entrées sélectionnées de la liste de lecture."
 
-#: src/skins/ui_manager.c:313
+#: src/skins/ui_manager.c:307
 msgid "Randomize List"
 msgstr "Mélanger aléatoirement la liste"
 
-#: src/skins/ui_manager.c:314
+#: src/skins/ui_manager.c:308
 msgid "Randomizes the playlist."
 msgstr "Mélange aléatoirement la liste de lecture."
 
-#: src/skins/ui_manager.c:317
+#: src/skins/ui_manager.c:311
 msgid "Reverse List"
 msgstr "Inverser la liste"
 
-#: src/skins/ui_manager.c:318
+#: src/skins/ui_manager.c:312
 msgid "Reverses the playlist."
 msgstr "Inverse l'ordre de la liste de lecture."
 
-#: src/skins/ui_manager.c:321
+#: src/skins/ui_manager.c:315
 msgid "Sort List"
 msgstr "Trier la liste"
 
-#: src/skins/ui_manager.c:324 src/skins/ui_manager.c:354
+#: src/skins/ui_manager.c:318 src/skins/ui_manager.c:348
 msgid "Sorts the list by title."
 msgstr "Trie la liste, en fonction du titre des entrées."
 
-#: src/skins/ui_manager.c:327 src/skins/ui_manager.c:357
+#: src/skins/ui_manager.c:321 src/skins/ui_manager.c:351
 msgid "By Album"
 msgstr "Par album"
 
-#: src/skins/ui_manager.c:328 src/skins/ui_manager.c:358
+#: src/skins/ui_manager.c:322 src/skins/ui_manager.c:352
 msgid "Sorts the list by album."
 msgstr "Trie la liste, en fonction du nom de l'album."
 
-#: src/skins/ui_manager.c:331 src/skins/ui_manager.c:361
+#: src/skins/ui_manager.c:325 src/skins/ui_manager.c:355
 msgid "By Artist"
 msgstr "Par artiste"
 
-#: src/skins/ui_manager.c:332 src/skins/ui_manager.c:362
+#: src/skins/ui_manager.c:326 src/skins/ui_manager.c:356
 msgid "Sorts the list by artist."
 msgstr "Trie la liste, en fonction de l'artiste."
 
-#: src/skins/ui_manager.c:336 src/skins/ui_manager.c:366
+#: src/skins/ui_manager.c:330 src/skins/ui_manager.c:360
 msgid "Sorts the list by filename."
 msgstr "Trie la liste, en fonction du nom de fichier des entrées."
 
-#: src/skins/ui_manager.c:340 src/skins/ui_manager.c:370
+#: src/skins/ui_manager.c:334 src/skins/ui_manager.c:364
 msgid "Sorts the list by full pathname."
 msgstr "Trie la liste, en fonction du chemin complet des entrées."
 
-#: src/skins/ui_manager.c:343 src/skins/ui_manager.c:373
+#: src/skins/ui_manager.c:337 src/skins/ui_manager.c:367
 msgid "By Date"
 msgstr "Par date"
 
-#: src/skins/ui_manager.c:344 src/skins/ui_manager.c:374
+#: src/skins/ui_manager.c:338 src/skins/ui_manager.c:368
 msgid "Sorts the list by modification time."
 msgstr "Trie la liste, en fonction de la date de modification des entrées."
 
-#: src/skins/ui_manager.c:347 src/skins/ui_manager.c:377
+#: src/skins/ui_manager.c:341 src/skins/ui_manager.c:371
 msgid "By Track Number"
 msgstr "Par numéro de piste"
 
-#: src/skins/ui_manager.c:348 src/skins/ui_manager.c:378
+#: src/skins/ui_manager.c:342 src/skins/ui_manager.c:372
 msgid "Sorts the list by track number."
 msgstr "Trie la liste, en fonction du numéro des pistes."
 
-#: src/skins/ui_manager.c:351
+#: src/skins/ui_manager.c:345
 msgid "Sort Selected"
 msgstr "Trier la sélection"
 
-#: src/skins/ui_manager.c:387
+#: src/skins/ui_manager.c:381
 msgid "File"
 msgstr "Fichier"
 
-#: src/skins/ui_manager.c:388
-msgid "Help"
-msgstr "Aide"
-
-#: src/skins/ui_manager.c:390
+#: src/skins/ui_manager.c:384
 msgid "Plugin Services"
 msgstr "Services des modules"
 
-#: src/skins/ui_manager.c:392 src/skins/ui_manager.c:395
+#: src/skins/ui_manager.c:386 src/skins/ui_manager.c:389
 msgid "View Track Details"
 msgstr "Afficher les détails"
 
-#: src/skins/ui_manager.c:393 src/skins/ui_manager.c:396
+#: src/skins/ui_manager.c:387 src/skins/ui_manager.c:390
 msgid "View track details"
 msgstr "Affiche les informations relatives au morceau."
 
-#: src/skins/ui_manager.c:398 src/skins/ui_manager.c:399
+#: src/skins/ui_manager.c:392 src/skins/ui_manager.c:393
 msgid "About Audacious"
 msgstr "À propos d'Audacious"
 
-#: src/skins/ui_manager.c:401
+#: src/skins/ui_manager.c:395
 msgid "Play File"
 msgstr "Lire un fichier..."
 
-#: src/skins/ui_manager.c:402
+#: src/skins/ui_manager.c:396
 msgid "Load and play a file"
 msgstr "Charge et lit un fichier."
 
-#: src/skins/ui_manager.c:404
+#: src/skins/ui_manager.c:398
 msgid "Play Location"
 msgstr "Lire un emplacement..."
 
-#: src/skins/ui_manager.c:405
+#: src/skins/ui_manager.c:399
 msgid "Play media from the selected location"
 msgstr "Lit les média de l'emplacement sélectionné."
 
-#: src/skins/ui_manager.c:407
+#: src/skins/ui_manager.c:401
 msgid "Plugin services"
 msgstr "Affiche le menu propre à certains modules."
 
-#: src/skins/ui_manager.c:409
+#: src/skins/ui_manager.c:403
 msgid "Preferences"
 msgstr "Préférences..."
 
-#: src/skins/ui_manager.c:410
+#: src/skins/ui_manager.c:404
 msgid "Open preferences window"
 msgstr "Ouvre la fenêtre des préférences."
 
-#: src/skins/ui_manager.c:413
+#: src/skins/ui_manager.c:407
 msgid "Quit Audacious"
 msgstr "Ferme Audacious."
 
-#: src/skins/ui_manager.c:415 src/skins/ui_manager.c:416
+#: src/skins/ui_manager.c:409 src/skins/ui_manager.c:410
 msgid "Set A-B"
 msgstr "Marquer une boucle A-B"
 
-#: src/skins/ui_manager.c:418 src/skins/ui_manager.c:419
+#: src/skins/ui_manager.c:412 src/skins/ui_manager.c:413
 msgid "Clear A-B"
 msgstr "Effacer la boucle A-B"
 
-#: src/skins/ui_manager.c:421 src/skins/ui_manager.c:422
+#: src/skins/ui_manager.c:415 src/skins/ui_manager.c:416
 msgid "Jump to Playlist Start"
 msgstr "Aller au début de la liste"
 
-#: src/skins/ui_manager.c:427 src/skins/ui_manager.c:428
+#: src/skins/ui_manager.c:421 src/skins/ui_manager.c:422
 msgid "Jump to Time"
 msgstr "Aller au temps..."
 
-#: src/skins/ui_manager.c:430
+#: src/skins/ui_manager.c:424
 msgid "Queue Toggle"
 msgstr "Mettre dans la file d'attente"
 
-#: src/skins/ui_manager.c:431
+#: src/skins/ui_manager.c:425
 msgid "Enables/disables the entry in the playlist's queue."
 msgstr "Active/désactive l'entrée dans la file d'attente de la liste."
 
-#: src/skins/ui_manager.c:434
+#: src/skins/ui_manager.c:428
 msgid "Copy"
 msgstr "Copier"
 
-#: src/skins/ui_manager.c:436
+#: src/skins/ui_manager.c:430
 msgid "Cut"
 msgstr "Couper"
 
-#: src/skins/ui_manager.c:438
+#: src/skins/ui_manager.c:432
 msgid "Paste"
 msgstr "Coller"
 
-#: src/skins/ui_manager.c:445
+#: src/skins/ui_manager.c:439
 msgid "Load"
 msgstr "Charger"
 
-#: src/skins/ui_manager.c:450 src/skins/ui_manager.c:471
-#: src/skins/ui_manager.c:486
+#: src/skins/ui_manager.c:440
+msgid "Import"
+msgstr "Importer"
+
+#: src/skins/ui_manager.c:441
+msgid "Save"
+msgstr "Enregistrer"
+
+#: src/skins/ui_manager.c:442
+msgid "Delete"
+msgstr "Supprimer"
+
+#: src/skins/ui_manager.c:444 src/skins/ui_manager.c:465
+#: src/skins/ui_manager.c:480
 msgid "Preset"
 msgstr "Préréglage général"
 
-#: src/skins/ui_manager.c:451
+#: src/skins/ui_manager.c:445
 msgid "Load preset"
 msgstr "Charge un préréglage général."
 
-#: src/skins/ui_manager.c:453 src/skins/ui_manager.c:474
-#: src/skins/ui_manager.c:489
+#: src/skins/ui_manager.c:447 src/skins/ui_manager.c:468
+#: src/skins/ui_manager.c:483
 msgid "Auto-load preset"
 msgstr "Préréglage spécifique"
 
-#: src/skins/ui_manager.c:454
+#: src/skins/ui_manager.c:448
 msgid "Load auto-load preset"
 msgstr "Charge un préréglage spécifique."
 
-#: src/skins/ui_manager.c:457
+#: src/skins/ui_manager.c:451
 msgid "Load default preset into equalizer"
 msgstr "Charge le préréglage par défaut dans l'égaliseur."
 
-#: src/skins/ui_manager.c:459
+#: src/skins/ui_manager.c:453
 msgid "Zero"
 msgstr "Remise à zéro"
 
-#: src/skins/ui_manager.c:460
+#: src/skins/ui_manager.c:454
 msgid "Set equalizer preset levels to zero"
 msgstr "Réinitialise les niveaux de l'égaliseur."
 
-#: src/skins/ui_manager.c:462
+#: src/skins/ui_manager.c:456
 msgid "From file"
 msgstr "À partir d'un fichier"
 
-#: src/skins/ui_manager.c:463
+#: src/skins/ui_manager.c:457
 msgid "Load preset from file"
 msgstr "Charge un préréglage à partir d'un fichier."
 
-#: src/skins/ui_manager.c:465
+#: src/skins/ui_manager.c:459
 msgid "From WinAMP EQF file"
 msgstr "À partir d'un fichier « EQF » de « WinAMP »"
 
-#: src/skins/ui_manager.c:466
+#: src/skins/ui_manager.c:460
 msgid "Load preset from WinAMP EQF file"
 msgstr "Charge un préréglage à partir d'un fichier « EQF » de « WinAMP »."
 
-#: src/skins/ui_manager.c:468
+#: src/skins/ui_manager.c:462
 msgid "WinAMP Presets"
 msgstr "Préréglages de « WinAMP »"
 
-#: src/skins/ui_manager.c:469
+#: src/skins/ui_manager.c:463
 msgid "Import WinAMP presets"
 msgstr "Importe les préréglages de « WinAMP »."
 
-#: src/skins/ui_manager.c:472
+#: src/skins/ui_manager.c:466
 msgid "Save preset"
 msgstr "Enregistre comme préréglage général."
 
-#: src/skins/ui_manager.c:475
+#: src/skins/ui_manager.c:469
 msgid "Save auto-load preset"
 msgstr "Enregistre comme préréglage spécifique."
 
-#: src/skins/ui_manager.c:478
+#: src/skins/ui_manager.c:472
 msgid "Save default preset"
 msgstr "Enregistre comme préréglage par défaut."
 
-#: src/skins/ui_manager.c:480
+#: src/skins/ui_manager.c:474
 msgid "To file"
 msgstr "Dans un fichier"
 
-#: src/skins/ui_manager.c:481
+#: src/skins/ui_manager.c:475
 msgid "Save preset to file"
 msgstr "Enregistre le préréglage dans un fichier."
 
-#: src/skins/ui_manager.c:483
+#: src/skins/ui_manager.c:477
 msgid "To WinAMP EQF file"
 msgstr "Dans un fichier « EQF » pour « WinAMP »"
 
-#: src/skins/ui_manager.c:484
+#: src/skins/ui_manager.c:478
 msgid "Save preset to WinAMP EQF file"
 msgstr "Enregistre le préréglage dans un fichier « EQF » pour « WinAMP »."
 
-#: src/skins/ui_manager.c:487
+#: src/skins/ui_manager.c:481
 msgid "Delete preset"
 msgstr "Efface un préréglage."
 
-#: src/skins/ui_manager.c:490
+#: src/skins/ui_manager.c:484
 msgid "Delete auto-load preset"
 msgstr "Efface un préréglage spécifique."
 
-#: src/skins/ui_playlist.c:245
+#: src/skins/ui_playlist.c:244
 msgid "Search entries in active playlist"
 msgstr "Chercher des entrées dans la liste active"
 
-#: src/skins/ui_playlist.c:253
+#: src/skins/ui_playlist.c:252
 msgid ""
-"Select entries in playlist by filling one or more fields. Fields use regular "
-"expressions syntax, case-insensitive. If you don't know how regular "
+"Select entries in playlist by filling one or more fields. Fields use regular"
+" expressions syntax, case-insensitive. If you don't know how regular "
 "expressions work, simply insert a literal portion of what you're searching "
 "for."
 msgstr ""
-"Le choix des entrées de la liste de lecture s'effectue au moyen des champs "
-"ci-dessous.\n"
+"Le choix des entrées de la liste de lecture s'effectue au moyen des champs ci-dessous.\n"
 "\n"
-"La syntaxe utilisée est celle des expressions rationnelles et est sensible à "
-"la casse.\n"
+"La syntaxe utilisée est celle des expressions rationnelles et est sensible à la casse.\n"
 "\n"
-"Si vous ne savez pas comment fonctionnent les expressions rationnelles, vous "
-"pouvez simplement indiquer une expression littérale de ce que vous cherchez."
+"Si vous ne savez pas comment fonctionnent les expressions rationnelles, vous pouvez simplement indiquer une expression littérale de ce que vous cherchez."
 
-#: src/skins/ui_playlist.c:261
+#: src/skins/ui_playlist.c:260
 msgid "Title: "
 msgstr "Titre : "
 
-#: src/skins/ui_playlist.c:268
+#: src/skins/ui_playlist.c:267
 msgid "Album: "
 msgstr "Titre de l'album : "
 
-#: src/skins/ui_playlist.c:275
+#: src/skins/ui_playlist.c:274
 msgid "Artist: "
 msgstr "Nom de l'artiste : "
 
-#: src/skins/ui_playlist.c:282
+#: src/skins/ui_playlist.c:281
 msgid "Filename: "
 msgstr "Nom du fichier : "
 
-#: src/skins/ui_playlist.c:290
+#: src/skins/ui_playlist.c:289
 msgid "Clear previous selection before searching"
 msgstr "Effacer la sélection précédente avant d'effectuer la recherche"
 
-#: src/skins/ui_playlist.c:293
+#: src/skins/ui_playlist.c:292
 msgid "Automatically toggle queue for matching entries"
 msgstr "Mettre automatiquement dans la file d'attente les entrées trouvées"
 
-#: src/skins/ui_playlist.c:296
+#: src/skins/ui_playlist.c:295
 msgid "Create a new playlist with matching entries"
 msgstr "Créer une nouvelle liste comportant les entrées trouvées"
 
-#: src/skins/ui_playlist.c:763
+#: src/skins/ui_playlist.c:762
 msgid "Audacious Playlist Editor"
 msgstr "Éditeur de la liste de lecture d'Audacious"
 
-#: src/skins/ui_playlist.c:810
+#: src/skins/ui_playlist.c:809
 #, c-format
 msgid "%s (%d of %d)"
 msgstr "%s (%d sur %d)"
@@ -3958,116 +3303,60 @@
 msgid "About sndfile plugin"
 msgstr "À propos du module « sndfile »"
 
-#: src/sndfile/plugin.c:455
-msgid ""
-"Adapted for Audacious usage by Tony Vroon <chainsaw@gentoo.org>\n"
-"from the xmms_sndfile plugin which is:\n"
-"Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
-"\n"
-"This program is free software ; you can redistribute it and/or modify \n"
-"it under the terms of the GNU General Public License as published by \n"
-"the Free Software Foundation ; either version 2 of the License, or \n"
-"(at your option) any later version. \n"
-" \n"
-"This program is distributed in the hope that it will be useful, \n"
-"but WITHOUT ANY WARRANTY ; without even the implied warranty of \n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. \n"
-"See the GNU General Public License for more details. \n"
-"\n"
-"You should have received a copy of the GNU General Public \n"
-"License along with this program ; if not, write to \n"
-"the Free Software Foundation, Inc., \n"
-"51 Franklin Street, Fifth Floor, \n"
-"Boston, MA 02110-1301 USA"
-msgstr ""
-"Adapté pour Audacious par Tony Vroon <chainsaw@gentoo.org>\n"
-"à partir du module « xmms_sndfile » de Erik de Castro Lopo\n"
-"(Droits d'utilisation 2000, 2002)\n"
-"\n"
-"\n"
-"Ceci est une traduction non officielle de la « GNU General Public License »\n"
-"en français. Elle n'a pas été publiée par la « Free Software Foundation »,\n"
-"et ne détermine pas les termes de distribution pour les logiciels qui\n"
-"utilisent la « GNU GPL » -- seul le texte anglais original de la « GNU GPL "
-"»\n"
-"en a le droit. Cependant, nous espérons que cette traduction aidera les\n"
-"francophones à mieux comprendre la « GNU GPL ».\n"
-"\n"
-"Ce programme est un logiciel libre : vous pouvez le redistribuer et/ou le\n"
-"modifier selon les termes de la « Licence Publique Générale GNU » (GNU "
-"GPL),\n"
-"telle que publiée par la « Free Software Foundation », soit la version 2 de\n"
-"la Licence, soit (à votre convenance) toute version postérieure.\n"
-"\n"
-"Ce programme est distribué dans l'espoir qu'il sera utile, mais SANS AUCUNE\n"
-"GARANTIE, sans même la garantie implicite d'une possible VALEUR MARCHANDE\n"
-"ou de l'ADÉQUATION Á UN BESOIN PARTICULIER. Consultez la « Licence Publique\n"
-"Générale GNU » (GNU GPL) pour plus de détails.\n"
-"\n"
-"Vous devriez avoir reçu une copie de la « Licence Publique Générale GNU »\n"
-"(GNU GPL) avec ce programme. Dans le cas contraire, vous pouvez consulter\n"
-"la Licence sur la page <http://www.gnu.org/licenses/> ou écrire à la\n"
-"Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,\n"
-"MA 02110-1301, USA."
-
 #: src/sndstretch/sndstretch_xmms.c:155
 msgid "About SndStretch"
 msgstr "À propos de « SndStretch »"
 
-#: src/sndstretch/sndstretch_xmms.c:313
+#: src/sndstretch/sndstretch_xmms.c:308
 msgid "Volume corr."
 msgstr "Correction du volume"
 
-#: src/sndstretch/sndstretch_xmms.c:314
+#: src/sndstretch/sndstretch_xmms.c:309
 msgid "Short Overlap"
 msgstr "Chevauchement léger"
 
-#: src/sndstretch/sndstretch_xmms.c:360
+#: src/sndstretch/sndstretch_xmms.c:355
 msgid "Speed"
 msgstr "Vitesse"
 
-#: src/sndstretch/sndstretch_xmms.c:361
+#: src/sndstretch/sndstretch_xmms.c:356
 msgid "Pitch"
 msgstr "Hauteur"
 
-#: src/sndstretch/sndstretch_xmms.c:362
+#: src/sndstretch/sndstretch_xmms.c:357
 msgid "Scale"
 msgstr "Échelle"
 
-#: src/sndstretch/sndstretch_xmms.c:363
-msgid "Options"
-msgstr "Options"
-
-#: src/sndstretch/sndstretch_xmms.c:382
+#: src/sndstretch/sndstretch_xmms.c:377
 msgid "SndStretch - Configuration"
 msgstr "Configuration de « SndStretch »"
 
-#: src/song_change/song_change.c:464
+#: src/song_change/song_change.c:447
 msgid "Command to run when Audacious starts a new song."
 msgstr "Commande à exécuter lorsqu'un nouveau morceau commence :"
 
-#: src/song_change/song_change.c:465 src/song_change/song_change.c:469
-#: src/song_change/song_change.c:473 src/song_change/song_change.c:477
+#: src/song_change/song_change.c:449 src/song_change/song_change.c:455
+#: src/song_change/song_change.c:461 src/song_change/song_change.c:467
 msgid "Command:"
 msgstr "Commande :"
 
-#: src/song_change/song_change.c:468
+#: src/song_change/song_change.c:453
 msgid "Command to run toward the end of a song."
 msgstr "Commande à exécuter lorsque la lecture d'un morceau se termine :"
 
-#: src/song_change/song_change.c:472
+#: src/song_change/song_change.c:459
 msgid "Command to run when Audacious reaches the end of the playlist."
 msgstr ""
 "Commande à exécuter lorsque la fin de la liste de lecture est atteinte :"
 
-#: src/song_change/song_change.c:476
+#: src/song_change/song_change.c:465
 msgid ""
 "Command to run when title changes for a song (i.e. network streams titles)."
 msgstr ""
-"Commande à exécuter lorsque le titre d'un morceau change (le titre d'un flux "
-"distant, par exemple) :"
+"Commande à exécuter lorsque le titre d'un morceau change (le titre d'un flux"
+" distant, par exemple) :"
 
-#: src/song_change/song_change.c:480
+#: src/song_change/song_change.c:471
 msgid ""
 "You can use the following format strings which\n"
 "will be substituted before calling the command\n"
@@ -4087,8 +3376,7 @@
 msgstr ""
 "Vous pouvez utiliser les variables de la liste ci-dessous.\n"
 "\n"
-"Elles seront remplacées avant l'appel de la commande à exécuter (toutes ne "
-"sont pas utiles pour la fonction « fin de liste ») :\n"
+"Elles seront remplacées avant l'appel de la commande à exécuter (toutes ne sont pas utiles pour la fonction « fin de liste ») :\n"
 "\n"
 "%F : Fréquence (en Hertz)\n"
 "%c : Nombre de canaux\n"
@@ -4102,20 +3390,19 @@
 "%b : Album du morceau\n"
 "%T : Titre du morceau"
 
-#: src/song_change/song_change.c:507
+#: src/song_change/song_change.c:498
 msgid ""
 "Parameters passed to the shell should be encapsulated in "
 "quotes. Doing otherwise is a security risk."
 msgstr ""
-"Les arguments à lancer dans la console doivent être "
-"entourés de guillemets.\n"
+"Les arguments à lancer dans la console doivent être entourés de guillemets.\n"
 "Une utilisation différente constitue un risque en matière de sécurité."
 
-#: src/song_change/song_change.c:518
+#: src/song_change/song_change.c:509
 msgid "Commands"
 msgstr "Commandes"
 
-#: src/song_change/song_change.c:555
+#: src/song_change/song_change.c:539
 msgid "Song Change"
 msgstr "Song Change"
 
@@ -4181,7 +3468,7 @@
 msgid "Close to the notification area (system tray)"
 msgstr "Réduire dans la zone de notification à la fermeture"
 
-#: src/stereo_plugin/stereo.c:41
+#: src/stereo_plugin/stereo.c:45
 msgid ""
 "Extra Stereo Plugin\n"
 "\n"
@@ -4191,14 +3478,52 @@
 "\n"
 "Écrit par Johan Levin (1999)."
 
-#: src/stereo_plugin/stereo.c:65
+#: src/stereo_plugin/stereo.c:64
 msgid "About Extra Stereo Plugin"
 msgstr "À propos de « Extra Stereo »"
 
-#: src/stereo_plugin/stereo.c:102
+#: src/stereo_plugin/stereo.c:95
 msgid "Configure Extra Stereo"
 msgstr "Configuration de « Extra Stereo »"
 
+#: src/streambrowser/gui/streambrowser_win.c:78
+msgid "Search:"
+msgstr ""
+
+#: src/streambrowser/gui/streambrowser_win.c:97
+#: src/streambrowser/gui/streambrowser_win.c:372
+msgid "Add Bookmark"
+msgstr ""
+
+#: src/streambrowser/gui/streambrowser_win.c:324
+msgid "Stream name"
+msgstr ""
+
+#: src/streambrowser/gui/streambrowser_win.c:331
+msgid "Now playing"
+msgstr ""
+
+#: src/streambrowser/gui/streambrowser_win.c:369
+msgid "Remove Bookmark"
+msgstr ""
+
+#: src/streambrowser/streambrowser.c:330
+msgid "About Stream Browser"
+msgstr ""
+
+#: src/streambrowser/streambrowser.c:331
+msgid ""
+"Copyright (c) 2008, by Calin Crisan <ccrisan@gmail.com> and The Audacious Team.\n"
+"\n"
+"This is a simple stream browser that includes the most popular streaming directories.\n"
+"Many thanks to the Streamtuner developers <http://www.nongnu.org/streamtuner>,\n"
+"\tand of course to the whole Audacious community.\n"
+"\n"
+"Also thank you Tony Vroon for mentoring & guiding me, again.\n"
+"\n"
+"This was a Google Summer of Code 2008 project."
+msgstr ""
+
 #: src/tonegen/tonegen.c:48
 msgid "About Tone Generator"
 msgstr "À propos de « Tone Generator »"
@@ -4218,8 +3543,7 @@
 "Pour utiliser ce module, il suffit d'ajouter une adresse du type :\n"
 "tone://fréquence1;fréquence2;fréquence3;...\n"
 "\n"
-"Par exemple, \"tone://2000;2005\" émettra un son de 2000 Hz et un son de "
-"2005 Hz."
+"Par exemple, \"tone://2000;2005\" émettra un son de 2000 Hz et un son de 2005 Hz."
 
 #: src/tonegen/tonegen.c:100
 #, c-format
@@ -4231,31 +3555,14 @@
 msgstr "Générateur de sons : "
 
 #: src/unix-io/gtk.c:34
-#, fuzzy
 msgid "About File I/O Plugin"
-msgstr "À propos du module « OSS4 »"
-
-#: src/vorbis/configure.c:31
-msgid "Override generic titles"
-msgstr "Remplacer les titres génériques"
-
-#: src/vorbis/configure.c:32
-msgid "Title format:"
-msgstr "Format du titre :"
-
-#: src/vorbis/configure.c:36
-msgid "Ogg Vorbis Tags"
-msgstr "Métadonnées « Ogg Vorbis »"
-
-#: src/vorbis/configure.c:69
-msgid "Ogg Vorbis Audio Plugin Configuration"
-msgstr "Configuration du module audio « Ogg Vorbis »"
+msgstr ""
 
-#: src/vorbis/vorbis.c:581
+#: src/vorbis/vorbis.c:572
 msgid "About Ogg Vorbis Audio Plugin"
 msgstr "À propos du module audio « Ogg Vorbis »"
 
-#: src/vorbis/vorbis.c:586
+#: src/vorbis/vorbis.c:577
 msgid ""
 "Ogg Vorbis Plugin by the Xiph.org Foundation\n"
 "\n"
@@ -4299,8 +3606,7 @@
 #: src/vtx/about.c:15
 msgid ""
 "Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
-"Founded on original source in_vtx.dll by Roman Sherbakov <v_soft@microfor."
-"ru>\n"
+"Founded on original source in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
 "\n"
 "Music in vtx format can be found at http://vtx.microfor.ru/music.htm\n"
 "and other AY/YM music sites.\n"
@@ -4340,1761 +3646,4 @@
 "Vous pouvez visiter le site « Wavpack » à l'adresse suivante :\n"
 "http://www.wavpack.com/\n"
 
-#~ msgid "Use Bitmap fonts if available"
-#~ msgstr "Utiliser les polices matricielles (si elles sont disponibles)"
-
-#~ msgid ""
-#~ "Use bitmap fonts if they are available. Bitmap fonts do not support "
-#~ "Unicode strings."
-#~ msgstr ""
-#~ "Cette option permet d'utiliser les polices matricielles ('bitmap'), si "
-#~ "elles sont disponibles. Ces polices ne gèrent pas la norme « Unicode "
-#~ "» (caractères accentués)."
-
-#~ msgid "_Miscellaneous"
-#~ msgstr "_Divers"
-
-#~ msgid "Use two-way text scroller"
-#~ msgstr "Utiliser le défilement de texte bidirectionnel"
-
-#~ msgid "About "
-#~ msgstr "À propos du module "
-
-#~ msgid ""
-#~ "\n"
-#~ "Copyright (C) 2002, 2003 Simon Peter <dn.tlp@gmx.net>\n"
-#~ "\n"
-#~ "This plugin is released under the terms and conditions of the GNU LGPL.\n"
-#~ "See http://www.gnu.org/licenses/lgpl.html for details.\n"
-#~ "\n"
-#~ "This plugin uses the AdPlug library, which is copyright (C) Simon Peter, "
-#~ "et al.\n"
-#~ "Linked AdPlug library version: "
-#~ msgstr ""
-#~ "\n"
-#~ "Droits d'utilisation : Simon Peter <dn.tlp@gmx.net> (2002, 2003)\n"
-#~ "\n"
-#~ "Ce module est distribué sous les termes et les conditions de la licence "
-#~ "GNU LGPL.\n"
-#~ "Consultez la page suivante pour les détails : http://www.gnu.org/licenses/"
-#~ "lgpl.html\n"
-#~ "\n"
-#~ "Cette extension utilise la bibliothèque « AdPlug ».\n"
-#~ "Droits d'utilisation : Simon Peter, et al.\n"
-#~ "\n"
-#~ "Version de la bibliothèque « AdPlug » liée : "
-
-#~ msgid "AdPlug :: Configuration"
-#~ msgstr "Configuration du module « AdPlug »"
-
-#~ msgid "Sound quality"
-#~ msgstr "Qualité du son"
-
-#~ msgid "Resolution"
-#~ msgstr "Résolution"
-
-#~ msgid "8bit"
-#~ msgstr "8 bits"
-
-#~ msgid "16bit"
-#~ msgstr "16 bits"
-
-#~ msgid "Channels"
-#~ msgstr "Sortie"
-
-#~ msgid ""
-#~ "Setting stereo is not recommended, unless you need to. This won't add any "
-#~ "stereo effects to the sound - OPL2 is just mono - but eats up more CPU "
-#~ "power!"
-#~ msgstr ""
-#~ "Activer le mode stéréo n'est pas recommandé, à moins que vous ne le "
-#~ "vouliez vraiment. Cette option n'ajoutera pas d'effet stéréo au son "
-#~ "produit (OPL2 n'utilise que le mode mono), mais nécessitera beaucoup plus "
-#~ "de puissance CPU !"
-
-#~ msgid "Frequency"
-#~ msgstr "Fréquence"
-
-#~ msgid "Detect songend"
-#~ msgstr "Détecter la fin du morceau"
-
-#~ msgid ""
-#~ "If enabled, XMMS will detect a song's ending, stop it and advance in the "
-#~ "playlist. If disabled, XMMS won't take notice of a song's ending and loop "
-#~ "it all over again and again."
-#~ msgstr ""
-#~ "Si cette option est activée, Audacious détectera la fin du morceau, "
-#~ "interrompra la lecture, puis passera au titre suivant dans la liste de "
-#~ "lecture. Dans le cas contraire, Audacious ne se préoccupera pas de la fin "
-#~ "des morceaux : le titre sera lu en boucle."
-
-#~ msgid "Formats"
-#~ msgstr "Formats"
-
-#~ msgid "Format selection"
-#~ msgstr "Choix des formats"
-
-#~ msgid "Format"
-#~ msgstr "Format"
-
-#~ msgid "Extension"
-#~ msgstr "Extension"
-
-#~ msgid ""
-#~ "Selected file types will be recognized and played back by this plugin. "
-#~ "Deselected types will be ignored to make room for other plugins to play "
-#~ "these files."
-#~ msgstr ""
-#~ "Les types de fichiers sélectionnés seront reconnus et gérés par ce "
-#~ "module. Les autres seront ignorés, de manière à pouvoir être supportés "
-#~ "par d'autres extensions."
-
-#~ msgid "AdPlug :: File Info"
-#~ msgstr "Informations sur le fichier"
-
-#~ msgid "Author: "
-#~ msgstr "Auteur : "
-
-#~ msgid "File Type: "
-#~ msgstr "Format : "
-
-#~ msgid "Subsongs: "
-#~ msgstr "Sous-modules : "
-
-#~ msgid "Instruments: "
-#~ msgstr "Instruments : "
-
-#~ msgid "Orders: "
-#~ msgstr "Partitions : "
-
-#~ msgid "Patterns: "
-#~ msgstr "Séquences : "
-
-#~ msgid "Song"
-#~ msgstr "Morceau"
-
-#~ msgid "Instrument name"
-#~ msgstr "Nom de l'instrument"
-
-#~ msgid "Song message"
-#~ msgstr "Commentaires"
-
-#~ msgid "Subsong selection"
-#~ msgstr "Sélection du sous-module"
-
-#~ msgid "Order: "
-#~ msgstr "Partition : "
-
-#~ msgid "Pattern: "
-#~ msgstr "Séquence : "
-
-#~ msgid "Row: "
-#~ msgstr "Ligne : "
-
-#~ msgid "Speed: "
-#~ msgstr "Vitesse : "
-
-#~ msgid "Timer: "
-#~ msgstr "Fréquence : "
-
-#~ msgid "About XMMS Alarm"
-#~ msgstr "À propos du module « XMMS Alarm »"
-
-#~ msgid "XMMS Alarm"
-#~ msgstr "XMMS Alarm"
-
-#~ msgid ""
-#~ "An XMMS plugin which can be used\n"
-#~ "to start playing at a certain time.\n"
-#~ "\n"
-#~ "Send all complaints to:\n"
-#~ "Adam Feakin <adamf@snika.uklinux.net>\n"
-#~ "Daniel Stodden <stodden@in.tum.de>\n"
-#~ "\n"
-#~ "http://www.snika.uklinux.net/xmms-alarm/"
-#~ msgstr ""
-#~ "Ce module pour XMMS peut être utilisé pour\n"
-#~ "commencer la lecture à un moment donné.\n"
-#~ "\n"
-#~ "\n"
-#~ "Vous pouvez envoyer toutes vos remarques à :\n"
-#~ "\n"
-#~ "Adam Feakin <adamf@snika.uklinux.net>\n"
-#~ "Daniel Stodden <stodden@in.tum.de>\n"
-#~ "\n"
-#~ "\n"
-#~ "http://www.snika.uklinux.net/xmms-alarm/"
-
-#~ msgid "Alarm"
-#~ msgstr "Alarm"
-
-#~ msgid "This is your wakeup call."
-#~ msgstr "L'appel du réveil... ;-)"
-
-#~ msgid "Select Playlist"
-#~ msgstr "Choix d'une liste de lecture"
-
-#~ msgid "Sorry"
-#~ msgstr "Désolé"
-
-#~ msgid "Warning"
-#~ msgstr "Avertissement"
-
-#~ msgid ""
-#~ "For safety reasons the \"quiet\" time must be at least 65 seconds longer "
-#~ "than the fading time, it must also be more than 10 seconds. This "
-#~ "basically means that there is a bug in the code and until I find a way of "
-#~ "really fixing it this message will appear :)\n"
-#~ "\n"
-#~ "Your fading settings have NOT been saved\n"
-#~ "\n"
-#~ "--\n"
-#~ "Adam"
-#~ msgstr ""
-#~ "Pour des raisons de sécurité, le temps de « repos » doit au moins durer "
-#~ "65 secondes de plus que le temps du fondu. Il doit aussi être supérieur à "
-#~ "10 secondes. Cela signifie simplement que le code du module comporte une "
-#~ "erreur... Jusqu'à ce que je trouve un moyen de la corriger de manière "
-#~ "définitive, ce message sera affiché :)\n"
-#~ "\n"
-#~ "Les préférences relatives au fondu n'ont PAS été enregistrées.\n"
-#~ "\n"
-#~ "--------\n"
-#~ "Adam"
-
-#~ msgid "Oh Well"
-#~ msgstr "Bon, d'accord"
-
-#~ msgid "Alarm Settings"
-#~ msgstr "Préférences du module « Alarm »"
-
-#~ msgid "Time"
-#~ msgstr "Heure"
-
-#~ msgid "hours"
-#~ msgstr " heures "
-
-#~ msgid "h"
-#~ msgstr " minutes "
-
-#~ msgid "minutes"
-#~ msgstr " minutes "
-
-#~ msgid "Quiet after:"
-#~ msgstr "Extinction après :"
-
-#~ msgid "Alarm at (default):"
-#~ msgstr "Heure du réveil (par défaut) :"
-
-#~ msgid "Choose the days for the alarm to come on"
-#~ msgstr "Jours d'activation de l'alarme"
-
-#~ msgid "Day"
-#~ msgstr "Jour"
-
-#~ msgid "Tuesday"
-#~ msgstr "Mardi"
-
-#~ msgid "Wednesday"
-#~ msgstr "Mercredi"
-
-#~ msgid "Thursday"
-#~ msgstr "Jeudi"
-
-#~ msgid "Friday"
-#~ msgstr "Vendredi"
-
-#~ msgid "Saturday"
-#~ msgstr "Samedi"
-
-#~ msgid "Sunday"
-#~ msgstr "Dimanche"
-
-#~ msgid "Monday"
-#~ msgstr "Lundi"
-
-#~ msgid "Days"
-#~ msgstr "Jours"
-
-#~ msgid "Fading"
-#~ msgstr "Fondu"
-
-#~ msgid "Volume"
-#~ msgstr "Volume"
-
-#~ msgid "Current"
-#~ msgstr "Volume actuel"
-
-#~ msgid "reset to current output volume"
-#~ msgstr "Réinitialise au volume de sortie actuel."
-
-#~ msgid "Start at"
-#~ msgstr "Début"
-
-#~ msgid "%"
-#~ msgstr "%"
-
-#~ msgid "Final"
-#~ msgstr "Fin"
-
-#~ msgid "Additional Command"
-#~ msgstr "Commande supplémentaire"
-
-#~ msgid "enable"
-#~ msgstr "Activer"
-
-#~ msgid "Playlist (optional)"
-#~ msgstr "Liste de lecture (option facultative)"
-
-#~ msgid "Browse..."
-#~ msgstr "Parcourir"
-
-#~ msgid "Reminder"
-#~ msgstr "Pense-bête"
-
-#~ msgid "Use reminder"
-#~ msgstr "Utiliser le pense-bête"
-
-#~ msgid "What do these options mean?"
-#~ msgstr "Que signifient ces options ?"
-
-#~ msgid ""
-#~ "\n"
-#~ "Time\n"
-#~ " Alarm at: \n"
-#~ " The time for the alarm to come on.\n"
-#~ "\n"
-#~ " Quiet After: \n"
-#~ " Stop alarm after this amount of time.\n"
-#~ " (if the wakeup dialog is not closed)\n"
-#~ "\n"
-#~ "\n"
-#~ "Days\n"
-#~ " Day:\n"
-#~ " Select the days for the alarm to activate.\n"
-#~ "\n"
-#~ " Time:\n"
-#~ " Choose the time for the alarm on each day,\n"
-#~ " or select the toggle button to use the default\n"
-#~ " time.\n"
-#~ "\n"
-#~ "\n"
-#~ "Volume\n"
-#~ " Fading: \n"
-#~ " Fade the volume up to the chosen volume \n"
-#~ " for this amount of time.\n"
-#~ "\n"
-#~ " Start at: \n"
-#~ " Start fading from this volume.\n"
-#~ "\n"
-#~ " Final: \n"
-#~ " The volume to stop fading at. If the fading\n"
-#~ " time is 0 then set volume to this and start\n"
-#~ " playing.\n"
-#~ "\n"
-#~ "\n"
-#~ "Options:\n"
-#~ " Additional Command:\n"
-#~ " Run this command at the alarm time.\n"
-#~ "\n"
-#~ " Playlist: \n"
-#~ " Load this playlist for playing songs from \n"
-#~ " (must have .m3u extension). If no playlist\n"
-#~ " is given then the songs which are currently\n"
-#~ " in the list will be used.\n"
-#~ " The URL of an mp3/ogg stream can also be\n"
-#~ " entered here, but loading of playlists from\n"
-#~ " URLs is not currently supported by xmms.\n"
-#~ "\n"
-#~ " Reminder:\n"
-#~ " Display a reminder when the alarm goes off,\n"
-#~ " type the reminder in the box and turn on the\n"
-#~ " toggle button if you want it to be shown.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "*** Alarme ***\n"
-#~ "\n"
-#~ "\n"
-#~ "Heure de l'alarme :\n"
-#~ "\n"
-#~ "heure à laquelle l'alarme sera activée.\n"
-#~ "\n"
-#~ "\n"
-#~ "Extinction :\n"
-#~ "\n"
-#~ "laps de temps après lequel l'alarme cessera\n"
-#~ "(si la fenêtre du réveil n'est pas fermée).\n"
-#~ "\n"
-#~ "\n"
-#~ "*** Jours ***\n"
-#~ "\n"
-#~ "\n"
-#~ "Jour :\n"
-#~ "\n"
-#~ "détermine le jour d'activation de l'alarme.\n"
-#~ "\n"
-#~ "\n"
-#~ "Heure :\n"
-#~ "\n"
-#~ "détermine l'heure d'activation de l'alarme\n"
-#~ "(vous pouvez spécifier une heure précise ou utiliser le bouton « Défaut "
-#~ "»).\n"
-#~ "\n"
-#~ "\n"
-#~ "*** Volume ***\n"
-#~ "\n"
-#~ "\n"
-#~ "Fondu :\n"
-#~ "\n"
-#~ "applique un effet de fondu au volume sonore, pour le laps de temps "
-#~ "indiqué.\n"
-#~ "\n"
-#~ "\n"
-#~ "Début :\n"
-#~ "\n"
-#~ "applique le fondu à partir du niveau sonore déterminé.\n"
-#~ "\n"
-#~ "\n"
-#~ "Fin :\n"
-#~ "\n"
-#~ "détermine le volume à partir duquel le fondu ne sera plus appliqué\n"
-#~ "(si la durée du fondu correspond à 0, le volume de fin de fondu "
-#~ "déterminera\n"
-#~ "le niveau sonore de l'alarme).\n"
-#~ "\n"
-#~ "\n"
-#~ "*** Options ***\n"
-#~ "\n"
-#~ "\n"
-#~ "Commande supplémentaire :\n"
-#~ "\n"
-#~ "la commande spécifiée sera exécutée en même temps que l'alarme.\n"
-#~ "\n"
-#~ "\n"
-#~ "Liste de lecture :\n"
-#~ "\n"
-#~ "lit une liste de lecture particulière (l'extension doit être \".m3u\").\n"
-#~ "Si aucune liste n'est spécifiée, ce sont les titres de la liste active\n"
-#~ "du lecteur qui seront utilisés.\n"
-#~ "L'adresse d'un flux distant « mp3 » ou « ogg » peut également constituer "
-#~ "une source.\n"
-#~ "\n"
-#~ "\n"
-#~ "Pense-bête :\n"
-#~ "\n"
-#~ "affiche un texte de rappel, lors de l'extinction de l'alarme\n"
-#~ "(écrivez le message dans le champ prévu à cet effet, puis cochez l'option "
-#~ "d'activation).\n"
-
-#~ msgid "Your reminder for today is.."
-#~ msgstr "Le pense-bête du jour est..."
-
-#~ msgid "Thankyou"
-#~ msgstr "Merci"
-
-#~ msgid "Pairing request for '%s'"
-#~ msgstr "Demande de connexion couplée pour \"%s\""
-
-#~ msgid "Authorization request for %s"
-#~ msgstr "Demande d'autorisation pour \"%s\""
-
-#~ msgid "Created bonding with %s"
-#~ msgstr "Une liaison avec \"%s\" a été créée."
-
-#~ msgid "Removed bonding with %s"
-#~ msgstr "La liaison avec \"%s\" a été supprimée."
-
-#~ msgid "Device has been switched off"
-#~ msgstr "Le périphérique a été éteint."
-
-#~ msgid "Device has been made non-discoverable"
-#~ msgstr "Le périphérique est maintenant en mode « privé »."
-
-#~ msgid "Device has been made connectable"
-#~ msgstr "Le périphérique peut maintenant initier une connexion."
-
-#~ msgid "Device has been made discoverable"
-#~ msgstr "Le périphérique est maintenant en mode « public »."
-
-#~ msgid "Device has been made limited discoverable"
-#~ msgstr "Le périphérique est maintenant en mode « public limité »."
-
-#~ msgid "Device has been switched into pairing mode"
-#~ msgstr "Le périphérique est entré en mode « connexion couplée »."
-
-#~ msgid "Bluetooth headset support plugin"
-#~ msgstr "Module de gestion des périphériques audio « Bluetooth »"
-
-#~ msgid ""
-#~ "Bluetooth headset support\n"
-#~ "Copyright (c) 2008 Paula Stanciu paula.stanciu@gmail.com\n"
-#~ "This was a GSoC 2008 Project - Many thanks to my mentor Tony Vroon and "
-#~ "the Audacious team\n"
-#~ " \n"
-#~ "In order to use the AVRCP you need the uinput module loaded into the "
-#~ "kernel\n"
-#~ "The headset keys will be recognized as normal mutimedia keys and \n"
-#~ "can be configured using the Audacious Global Hotkey plugin or ohter "
-#~ "tools \n"
-#~ "provided by your window manager\n"
-#~ msgstr ""
-#~ "Module de gestion des périphériques audio « Bluetooth »\n"
-#~ "Droits d'utilisation : Paula Stanciu paula.stanciu@gmail.com (2008)\n"
-#~ "\n"
-#~ "Ce projet est issu du « GSoC 2008 ».\n"
-#~ "Remerciements cordiaux à mon conseiller Tony Vroon et à l'équipe "
-#~ "d'Audacious.\n"
-#~ "\n"
-#~ "Afin de pouvoir utiliser le mode « AVRCP », le module d'entrée "
-#~ "correspondant doit\n"
-#~ "être chargé dans le noyau.\n"
-#~ "\n"
-#~ "Les boutons du périphérique audio seront reconnus comme des touches "
-#~ "multimédia\n"
-#~ "et pourront être configurés grâce au module « Global Hotkey » d'Audacious "
-#~ "ou\n"
-#~ "aux outils que propose le gestionnaire de fenêtres de votre système.\n"
-
-#~ msgid "Producer"
-#~ msgstr "Fabricant"
-
-#~ msgid "Available Headsets"
-#~ msgstr "Casques/écouteurs disponibles"
-
-#~ msgid "Current Headset"
-#~ msgstr "Casque/accessoire actuel"
-
-#~ msgid "_Connect"
-#~ msgstr "_Connecter"
-
-#~ msgid "Class"
-#~ msgstr "Classe"
-
-#~ msgid "Address:"
-#~ msgstr "Adresse :"
-
-#~ msgid "Bonding finish!"
-#~ msgstr "Liaison terminée !"
-
-#~ msgid "No devices found!"
-#~ msgstr "Aucun accessoire détecté !"
-
-#~ msgid "Scanning..."
-#~ msgstr "Détection..."
-
-#~ msgid "Pairing..."
-#~ msgstr "Processus de connexion couplée..."
-
-#~ msgid "Rescan"
-#~ msgstr "Redétecter"
-
-#~ msgid "Playback->Play"
-#~ msgstr "Lecture -> Lire"
-
-#~ msgid "Playback->Stop"
-#~ msgstr "Lecture -> Arrêter"
-
-#~ msgid "Playback->Pause"
-#~ msgstr "Lecture -> Pause"
-
-#~ msgid "Playback->Prev"
-#~ msgstr "Lecture -> Précédent"
-
-#~ msgid "Playback->Next"
-#~ msgstr "Lecture -> Suivant"
-
-#~ msgid "Playback->Eject"
-#~ msgstr "Lecture -> Éjecter"
-
-#~ msgid "Playlist->Repeat"
-#~ msgstr "Liste de lecture -> Répéter"
-
-#~ msgid "Playlist->Shuffle"
-#~ msgstr "Liste de lecture -> Aléatoire"
-
-#~ msgid "Volume->Up_5"
-#~ msgstr "Volume -> Augmenter de 5"
-
-#~ msgid "Volume->Down_5"
-#~ msgstr "Volume -> Diminuer de 5"
-
-#~ msgid "Volume->Up_10"
-#~ msgstr "Volume -> Augmenter de 10"
-
-#~ msgid "Volume->Down_10"
-#~ msgstr "Volume -> Diminuer de 10"
-
-#~ msgid "Volume->Mute"
-#~ msgstr "Volume -> Couper"
-
-#~ msgid "Window->Main"
-#~ msgstr "Fenêtre -> Principale"
-
-#~ msgid "Window->Playlist"
-#~ msgstr "Fenêtre -> Liste de lecture"
-
-#~ msgid "Window->Equalizer"
-#~ msgstr "Fenêtre -> Égaliseur"
-
-#~ msgid "Window->JumpToFile"
-#~ msgstr "Fenêtre -> Aller au titre..."
-
-#~ msgid ""
-#~ "event-device-plugin: unable to open device file %s , skipping this "
-#~ "device; check that the file exists and that you have read permission for "
-#~ "it\n"
-#~ msgstr ""
-#~ "Module « Event-Device » : impossible d'ouvrir le fichier de périphérique "
-#~ "%s ; le périphérique sera ignoré...Veuillez vérifier que le fichier "
-#~ "existe et que disposez des permissions de lecture requises.\n"
-
-#~ msgid ""
-#~ "event-device-plugin: unable to create a io_channel for device file %s ,"
-#~ "skipping this device\n"
-#~ msgstr ""
-#~ "Module « Event-Device » : impossible de créer un canal 'io' pour le "
-#~ "fichier de périphérique %s ; le périphérique sera ignoré...\n"
-
-#~ msgid ""
-#~ "event-device-plugin: unable to open /proc/bus/input/devices , automatic "
-#~ "detection of event devices won't work.\n"
-#~ msgstr ""
-#~ "Module « Event-Device » : impossible d'ouvrir \"/proc/bus/input/devices"
-#~ "\" ; la détection automatique des périphériques échouera...\n"
-
-#~ msgid ""
-#~ "event-device-plugin: unable to open a io_channel for /proc/bus/input/"
-#~ "devices , automatic detection of event devices won't work.\n"
-#~ msgstr ""
-#~ "Module « Event-Device » : impossible de créer un canal 'io' pour \"/proc/"
-#~ "bus/input/devices\" ; la détection automatique des périphériques "
-#~ "échouera...\n"
-
-#~ msgid ""
-#~ "event-device-plugin: an error occurred while reading /proc/bus/input/"
-#~ "devices , automatic detection of event devices won't work.\n"
-#~ msgstr ""
-#~ "Module « Event-Device » : une erreur s'est produite lors de lecture de \"/"
-#~ "proc/bus/input/devices\" ; la détection automatique des périphériques "
-#~ "échouera...\n"
-
-#~ msgid "event-device-plugin: device %s not found in /dev/input , skipping.\n"
-#~ msgstr ""
-#~ "Module « Event-Device » : le périphérique %s n'a pas été trouvé dans \"/"
-#~ "dev/input\" ; le périphérique sera ignoré...\n"
-
-#~ msgid ""
-#~ "event-device-plugin: unable to load config file %s , default settings "
-#~ "will be used.\n"
-#~ msgstr ""
-#~ "Module « Event-Device » : impossible de charger le fichier de "
-#~ "configuration %s ; les paramètres par défaut seront utilisés...\n"
-
-#~ msgid ""
-#~ "event-device-plugin: incomplete information in config file for device \"%s"
-#~ "\" , skipping.\n"
-#~ msgstr ""
-#~ "Module « Event-Device » : information incomplète au sujet du périphérique "
-#~ "\"%s\" ; le périphérique sera ignoré...\n"
-
-#~ msgid ""
-#~ "event-device-plugin: configuration, unable to get is_active value for "
-#~ "device \"%s\", skipping it.\n"
-#~ msgstr ""
-#~ "Configuration du module « Event-Device » : impossible d'obtenir la valeur "
-#~ "de 'is_active' dans le fichier de configuration pour le périphérique \"%s"
-#~ "\" ; le périphérique sera ignoré...\n"
-
-#~ msgid ""
-#~ "event-device-plugin: unable to access local directory %s , settings will "
-#~ "not be saved.\n"
-#~ msgstr ""
-#~ "Module « Event-Device » : impossible d'accéder au dossier local %s ; les "
-#~ "paramètres ne seront pas enregistrés...\n"
-
-#~ msgid ""
-#~ "event-device-plugin: configuration, unable to get filename value for "
-#~ "device \"%s\", skipping it.\n"
-#~ msgstr ""
-#~ "Configuration du module « Event-Device » : impossible d'obtenir, dans le "
-#~ "fichier de configuration, le nom du fichier du périphérique \"%s\" ;le "
-#~ "périphérique sera ignoré...\n"
-
-#~ msgid ""
-#~ "event-device-plugin: configuration, unable to get phys value for device "
-#~ "\"%s\", skipping it.\n"
-#~ msgstr ""
-#~ "Configuration du module « Event-Device » : impossible d'obtenir la valeur "
-#~ "physique du périphérique \"%s\" ; opération ignorée.\n"
-
-#~ msgid ""
-#~ "event-device-plugin: configuration, unable to get is_custom value for "
-#~ "device \"%s\", skipping it.\n"
-#~ msgstr ""
-#~ "Configuration du module « Event-Device » : impossible d'obtenir la valeur "
-#~ "\"is_custom\" pour le périphérique \"%s\" ; opération ignorée.\n"
-
-#~ msgid ""
-#~ "event-device-plugin: configuration, unexpected value for device \"%s\", "
-#~ "skipping it.\n"
-#~ msgstr ""
-#~ "Configuration du module « Event-Device » : valeur inattendue pour le "
-#~ "périphérique \"%s\" ; opération ignorée.\n"
-
-#~ msgid "Detected"
-#~ msgstr "Détecté"
-
-#~ msgid "Custom"
-#~ msgstr "Personnalisé"
-
-#~ msgid "Not Detected"
-#~ msgstr "Non détécté"
-
-#~ msgid "Information"
-#~ msgstr "Informations"
-
-#~ msgid ""
-#~ "Cannot open bindings window for a not-detected device.\n"
-#~ "Ensure that the device has been correctly plugged in."
-#~ msgstr ""
-#~ "Il n'est pas possible d'ouvrir la fenêtre des associations pour un "
-#~ "périphérique qui n'a pas été détecté.\n"
-#~ "Veuillez vous assurer que le périphérique a été correctement branché."
-
-#~ msgid ""
-#~ "Unable to open selected device.\n"
-#~ "Please check read permissions on device file."
-#~ msgstr ""
-#~ "Impossible d'ouvrir le périphérique sélectionné.\n"
-#~ "Veuillez vérifier les permissions de lecture du fichier du périphérique."
-
-#~ msgid "EvDev-Plug - Add custom device"
-#~ msgstr "Ajouter un périphérique personnalisé"
-
-#~ msgid ""
-#~ "EvDev-Plug tries to automatically detect and update information about\n"
-#~ "event devices available on the system.\n"
-#~ "However, if auto-detect doesn't work for your system, or you have event\n"
-#~ "devices in a non-standard location (currently they're only searched in\n"
-#~ "/dev/input/ ), you may want to add a custom device, explicitly "
-#~ "specifying\n"
-#~ "name and device file."
-#~ msgstr ""
-#~ "« EvDev-Plug » essaye de détecter et de mettre à jour automatiquement\n"
-#~ "les informations concernant les périphériques disponibles sur le "
-#~ "système.\n"
-#~ "Toutefois, si la détection automatique ne fonctionne pas pour votre\n"
-#~ "système ou si les périphériques ne sont pas installés dans un "
-#~ "emplacement\n"
-#~ "standard, vous pouvez ajouter un périphérique personnalisé, en "
-#~ "spécifiant\n"
-#~ "de manière précise le nom et le fichier du périphérique."
-
-#~ msgid "Device name:"
-#~ msgstr "Nom du périphérique :"
-
-#~ msgid "Device file:"
-#~ msgstr "Fichier du périphérique :"
-
-#~ msgid "(custom)"
-#~ msgstr "(personnalisée)"
-
-#~ msgid ""
-#~ "Please specify both name and filename.\n"
-#~ "Filename must be specified with absolute path."
-#~ msgstr ""
-#~ "Veuillez spécifier à la fois le nom du périphérique et le nom du "
-#~ "fichier.\n"
-#~ "\n"
-#~ "Le nom du fichier doit être déterminé par le chemin absolu."
-
-#~ msgid ""
-#~ "Do you want to remove the existing configuration for selected device?\n"
-#~ msgstr ""
-#~ "Voulez-vous supprimer la configuration du périphérique sélectionné ?\n"
-
-#~ msgid "Do you want to remove the selected custom device?\n"
-#~ msgstr "Voulez-vous supprimer le périphérique personnalisé sélectionné ?\n"
-
-#~ msgid "EvDev-Plug - Configuration"
-#~ msgstr "Configuration du module « EvDev-Plug »"
-
-#~ msgid "Active"
-#~ msgstr "Actif"
-
-#~ msgid "Status"
-#~ msgstr "État"
-
-#~ msgid "Device Name"
-#~ msgstr "Nom du périphérique"
-
-#~ msgid "Device File"
-#~ msgstr "Fichier du périphérique"
-
-#~ msgid "Device Address"
-#~ msgstr "Adresse du périphérique"
-
-#~ msgid "_Bindings"
-#~ msgstr "_Associations"
-
-#~ msgid ""
-#~ "Press a key of your device to bind it;\n"
-#~ "if no key is pressed in five seconds, this window\n"
-#~ "will close without binding changes."
-#~ msgstr ""
-#~ "Appuyez sur une touche de votre périphérique pour l'associer.\n"
-#~ "Si aucune touche n'a été pressée avant cinq secondes, cette\n"
-#~ "fenêtre sera fermée et aucun changement ne sera effectué."
-
-#~ msgid ""
-#~ "This input event has been already assigned.\n"
-#~ "\n"
-#~ "It's not possible to assign multiple actions to the same input event "
-#~ "(although it's possible to assign the same action to multiple events)."
-#~ msgstr ""
-#~ "Cet événement a déjà été assigné.\n"
-#~ "\n"
-#~ "Il n'est pas possible d'associer des plusieurs actions au même événement "
-#~ "(cepndant, il est possible d'attribuer la même action à plusieurs "
-#~ "événements)."
-
-#~ msgid "EvDev-Plug - Bindings Configuration"
-#~ msgstr "Configuration des associations"
-
-#~ msgid "Name: "
-#~ msgstr "Nom : "
-
-#~ msgid "Filename: "
-#~ msgstr "Nom du fichier : "
-
-#~ msgid "Phys.Address: "
-#~ msgstr "Adresse physique : "
-
-#~ msgid "EvDev-Plug - about"
-#~ msgstr "À propos du module « EvDev-Plug »"
-
-#~ msgid ""
-#~ "\n"
-#~ "player remote control via event devices\n"
-#~ "http://www.develia.org/projects.php?p=audacious#evdevplug\n"
-#~ "\n"
-#~ "written by Giacomo Lozito\n"
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "Cette extension permet de contrôler le lecteur à distance,\n"
-#~ "par l'intermédiaire des événements des périphériques.\n"
-#~ "\n"
-#~ "http://www.develia.org/projects.php?p=evdevplug\n"
-#~ "\n"
-#~ "Écrit par Giacomo Lozito < james@develia.org >\n"
-#~ "\n"
-
-#~ msgid "This LADSPA plugin has no user controls"
-#~ msgstr "Cette extension « LADSPA » ne dispose pas de contrôles utilisateur"
-
-#~ msgid "Name"
-#~ msgstr "Nom"
-
-#~ msgid "UID"
-#~ msgstr "UID"
-
-#~ msgid "Installed plugins"
-#~ msgstr "Extensions installées"
-
-#~ msgid "Running plugins"
-#~ msgstr "Extensions utilisées"
-
-#~ msgid "Add"
-#~ msgstr "Ajouter"
-
-#~ msgid "Remove"
-#~ msgstr "Enlever"
-
-#~ msgid "LADSPA Plugin Catalog"
-#~ msgstr "Liste des extensions « LADSPA »"
-
-#~ msgid "About LIRC Audacious Plugin"
-#~ msgstr "À propos du module « LIRC »"
-
-#~ msgid "LIRC Plugin "
-#~ msgstr "Module « LIRC » "
-
-#~ msgid ""
-#~ "\n"
-#~ "A simple plugin that lets you control\n"
-#~ "Audacious using the LIRC remote control daemon\n"
-#~ "\n"
-#~ "Adapted for Audacious usage by Tony Vroon <chainsaw@gentoo.org>\n"
-#~ "from the XMMS LIRC plugin by:\n"
-#~ "Carl van Schaik <carl@leg.uct.ac.za>\n"
-#~ "Christoph Bartelmus <xmms@bartelmus.de>\n"
-#~ "Andrew O. Shadoura <bugzilla@tut.by>\n"
-#~ "You can get LIRC information at:\n"
-#~ "http://lirc.org"
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "« LIRC » est un module simple qui permet de contrôler\n"
-#~ "Audacious en utilisant le démon de contrôle distant « LIRC ».\n"
-#~ "\n"
-#~ "Le module a été adapté pour Audacious par\n"
-#~ "Tony Vroon <chainsaw@gentoo.org>,\n"
-#~ "à partir du module « LIRC » pour XMMS écrit par :\n"
-#~ "\n"
-#~ "Carl van Schaik <carl@leg.uct.ac.za>\n"
-#~ "Christoph Bartelmus <xmms@bartelmus.de>\n"
-#~ "Andrew O. Shadoura <bugzilla@tut.by>\n"
-#~ "\n"
-#~ "Vous pouvez obtenir des informations sur « LIRC » à cette adresse :\n"
-#~ "http://lirc.org"
-
-#~ msgid "LIRC plugin settings"
-#~ msgstr "Paramètres du module « LIRC » "
-
-#~ msgid "Reconnect to LIRC server"
-#~ msgstr "Se reconnecter au serveur « LIRC »"
-
-#~ msgid "Timeout before reconnecting (seconds): "
-#~ msgstr "Délai (secondes) avant la reconnexion :"
-
-#~ msgid "Reconnect"
-#~ msgstr "Reconnexion"
-
-#~ msgid "Connection"
-#~ msgstr "Connexion"
-
-#~ msgid "%s: could not init LIRC support\n"
-#~ msgstr "%s: impossible d'initialiser le support « LIRC »\n"
-
-#~ msgid ""
-#~ "%s: could not read LIRC config file\n"
-#~ "%s: please read the documentation of LIRC\n"
-#~ "%s: how to create a proper config file\n"
-#~ msgstr ""
-#~ "%s: impossible de lire le fichier de configuration de « LIRC »\n"
-#~ "%s: veuillez consulter la documentation de « LIRC »\n"
-#~ "%s: relative à la création d'un fichier de configuration correct\n"
-
-#~ msgid "%s: trying to reconnect...\n"
-#~ msgstr "%s: tentative de reconnexion...\n"
-
-#~ msgid "%s: unknown command \"%s\"\n"
-#~ msgstr "%s: commande inconnue \"%s\"\n"
-
-#~ msgid "%s: disconnected from LIRC\n"
-#~ msgstr "%s: déconnecté de « LIRC »\n"
-
-#~ msgid "%s: will try reconnect every %d seconds...\n"
-#~ msgstr ""
-#~ "%s: le système va essayer de se reconnecter toutes les %d secondes...\n"
-
-#~ msgid "ModPlug Configuration"
-#~ msgstr "Configuration du module « ModPlug »"
-
-#~ msgid "16 bit"
-#~ msgstr "16 bits"
-
-#~ msgid "8 bit"
-#~ msgstr "8 bits"
-
-#~ msgid "Mono (downmix)"
-#~ msgstr "Mono (sous-mélange)"
-
-#~ msgid "Nearest (fastest)"
-#~ msgstr "Méthode « au plus proche » (la plus rapide)"
-
-#~ msgid "Linear (fast)"
-#~ msgstr "Interpolation linéaire (rapide)"
-
-#~ msgid "Spline (good quality)"
-#~ msgstr "Interpolation par segments ('spline') (bonne qualité)"
-
-#~ msgid "8-tap Fir (extremely high quality)"
-#~ msgstr ""
-#~ "Filtre à réponse impulsionnelle finie ('8-tap FIR') (qualité optimale)"
-
-#~ msgid "96 kHz"
-#~ msgstr "96 kHz"
-
-#~ msgid "48 kHz"
-#~ msgstr "48 kHz"
-
-#~ msgid "44 kHz"
-#~ msgstr "44 kHz"
-
-#~ msgid "22 kHz"
-#~ msgstr "22 kHz"
-
-#~ msgid "Sampling Rate"
-#~ msgstr "Fréquence d'échantillonnage"
-
-#~ msgid "Enable"
-#~ msgstr "Activer"
-
-#~ msgid "Depth"
-#~ msgstr "Profondeur"
-
-#~ msgid "Delay"
-#~ msgstr "Délai"
-
-#~ msgid "Reverb"
-#~ msgstr "Réverbération"
-
-#~ msgid "Amount"
-#~ msgstr "Intensité"
-
-#~ msgid "Range"
-#~ msgstr "Portée"
-
-#~ msgid "Bass Boost"
-#~ msgstr "Amplification des basses"
-
-#~ msgid ""
-#~ "Note: Setting the preamp\n"
-#~ "too high may cause clipping\n"
-#~ "(annoying clicks and pops)!"
-#~ msgstr ""
-#~ "Note : une valeur de préamplification excessive\n"
-#~ "peut produire des coupures et des distorsions\n"
-#~ "(des clics et des bruits secs assez agaçants) !"
-
-#~ msgid "Effects"
-#~ msgstr "Effets audio"
-
-#~ msgid "Use Filename as Song Title"
-#~ msgstr "Utiliser le nom du fichier comme titre du morceau"
-
-#~ msgid "Fast Playlist Info"
-#~ msgstr "Informations rapides sur la liste de lecture"
-
-#~ msgid "Noise Reduction"
-#~ msgstr "Réduction du bruit"
-
-#~ msgid "Play Amiga MOD"
-#~ msgstr "Lire les modules musicaux Amiga"
-
-#~ msgid "Don't loop"
-#~ msgstr "Ne pas répéter"
-
-#~ msgid "Loop"
-#~ msgstr "Répéter"
-
-#~ msgid "time(s)"
-#~ msgstr "fois"
-
-#~ msgid "Loop forever"
-#~ msgstr "Répéter en boucle"
-
-#~ msgid "Looping"
-#~ msgstr "Répétition"
-
-#~ msgid "MOD Info"
-#~ msgstr "Informations sur le module"
-
-#~ msgid ""
-#~ "Filename:\n"
-#~ "Title:\n"
-#~ "Type:\n"
-#~ "Length:\n"
-#~ "Speed:\n"
-#~ "Tempo:\n"
-#~ "Samples:\n"
-#~ "Instruments:\n"
-#~ "Patterns:\n"
-#~ "Channels:"
-#~ msgstr ""
-#~ "Nom du fichier :\n"
-#~ "Titre :\n"
-#~ "Type :\n"
-#~ "Durée :\n"
-#~ "Vitesse :\n"
-#~ "Tempo :\n"
-#~ "Échantillons :\n"
-#~ "Instruments :\n"
-#~ "Séquences :\n"
-#~ "Voies :"
-
-#~ msgid ""
-#~ "---\n"
-#~ "---\n"
-#~ "---\n"
-#~ "---\n"
-#~ "---\n"
-#~ "---\n"
-#~ "---\n"
-#~ "---\n"
-#~ "---\n"
-#~ "---"
-#~ msgstr ""
-#~ "---\n"
-#~ "---\n"
-#~ "---\n"
-#~ "---\n"
-#~ "---\n"
-#~ "---\n"
-#~ "---\n"
-#~ "---\n"
-#~ "---\n"
-#~ "---"
-
-#~ msgid "Samples"
-#~ msgstr "Échantillons"
-
-#~ msgid "Instruments"
-#~ msgstr "Instruments"
-
-#~ msgid "Message"
-#~ msgstr "Commentaires"
-
-#~ msgid "Modplug Input Plugin for Audacious ver"
-#~ msgstr "Module d'entrée « Modplug » pour Audacious, version "
-
-#~ msgid ""
-#~ "\n"
-#~ "Modplug sound engine written by Olivier Lapicque.\n"
-#~ "XMMS interface for Modplug by Kenton Varda.\n"
-#~ "(c)2000 Olivier Lapicque and Kenton Varda.\n"
-#~ "Updates and maintenance by Konstanty Bialkowski.\n"
-#~ "Ported to BMP by Theofilos Intzoglou."
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "Le moteur sonore de « Modplug » a été écrit par Olivier Lapicque.\n"
-#~ "L'interface XMMS pour « Modplug » a été conçue par Kenton Varda.\n"
-#~ "\n"
-#~ "Droits d'utilisation (2000) : Olivier Lapicque et Kenton Varda.\n"
-#~ "\n"
-#~ "Mises à jour et maintenance : Konstanty Bialkowski.\n"
-#~ "Rétroportage pour BMP : Theofilos Intzoglou."
-
-#~ msgid "About Modplug"
-#~ msgstr "À propos de « Modplug »"
-
-#~ msgid "Show separators in playlist"
-#~ msgstr "Afficher les barres de séparation dans la liste de lecture"
-
-#~ msgid "Show window manager decoration"
-#~ msgstr "Montrer la décoration du gestionnaire de fenêtres"
-
-#~ msgid "This enables the window manager to show decorations for windows."
-#~ msgstr ""
-#~ "Cette option affiche les ornements propres au gestionnaire de fenêtres du "
-#~ "système."
-
-#~ msgid ""
-#~ "If selected, the file information text in the main window will scroll "
-#~ "back and forth. If not selected, the text will only scroll in one "
-#~ "direction."
-#~ msgstr ""
-#~ "Si cette option est cochée, le texte d'information relatif au morceau "
-#~ "écouté défilera dans la fenêtre principale, vers la gauche et vers la "
-#~ "droite. Sinon, le texte défilera dans une seule direction."
-
-#~ msgid "Disable inline gtk theme"
-#~ msgstr "Ne pas appliquer aux menus le style « GTK » du thème sélectionné"
-
-#~ msgid "Random skin on play"
-#~ msgstr "Changer de thème de manière aléatoire, lors de la lecture"
-
-#~ msgid "Allow loading incomplete skins"
-#~ msgstr "Permettre le chargement des thèmes incomplets"
-
-#~ msgid ""
-#~ "If selected, audacious won't refuse loading broken skins. Use only if "
-#~ "your favourite skin doesn't work"
-#~ msgstr ""
-#~ "Si cette option est cochée, Audacious ne refusera pas de charger les "
-#~ "thèmes corrompus. N'utilisez cette option que si votre thème préféré ne "
-#~ "fonctionne pas autrement."
-
-#~ msgid "Color Adjustment"
-#~ msgstr "Ajustement des couleurs"
-
-#~ msgid ""
-#~ "Audacious allows you to alter the color balance of the skinned UI. The "
-#~ "sliders below will allow you to do this."
-#~ msgstr ""
-#~ "Audacious permet de modifier la balance des couleurs de l'interface, à "
-#~ "l'aide des curseurs ci-dessous."
-
-#~ msgid "Blue"
-#~ msgstr "Bleu"
-
-#~ msgid "Green"
-#~ msgstr "Vert"
-
-#~ msgid "Red"
-#~ msgstr "Rouge"
-
-#~ msgid "Color adjustment ..."
-#~ msgstr "Ajustement des couleurs ..."
-
-#~ msgid "Disable 'GUI Scaling'"
-#~ msgstr "Annuler « Agrandissement de l'interface »"
-
-#~ msgid "Enable 'GUI Scaling'"
-#~ msgstr "Activer « Agrandissement de l'interface »"
-
-#~ msgid "DoubleSize"
-#~ msgstr "Taille double"
-
-#~ msgid "Easy Move"
-#~ msgstr "Déplacement facile"
-
-#~ msgid "Spectrum Analyzer"
-#~ msgstr "Analyseur Spectral"
-
-#~ msgid "Search:"
-#~ msgstr "Recherche :"
-
-#~ msgid "Add Bookmark"
-#~ msgstr "Ajouter le favori"
-
-#~ msgid "Stream name"
-#~ msgstr "Nom du flux"
-
-#~ msgid "Now playing"
-#~ msgstr "En cours de diffusion"
-
-#~ msgid "Remove Bookmark"
-#~ msgstr "Supprimer le favori"
-
-#~ msgid "About Stream Browser"
-#~ msgstr "À propos du module « Stream Browser »"
-
-#~ msgid ""
-#~ "Copyright (c) 2008, by Calin Crisan <ccrisan@gmail.com> and The Audacious "
-#~ "Team.\n"
-#~ "\n"
-#~ "This is a simple stream browser that includes the most popular streaming "
-#~ "directories.\n"
-#~ "Many thanks to the Streamtuner developers <http://www.nongnu.org/"
-#~ "streamtuner>,\n"
-#~ "\tand of course to the whole Audacious community.\n"
-#~ "\n"
-#~ "Also thank you Tony Vroon for mentoring & guiding me, again.\n"
-#~ "\n"
-#~ "This was a Google Summer of Code 2008 project."
-#~ msgstr ""
-#~ "Droits d'utilisation (2008) : Calin Crisan <ccrisan@gmail.com> et "
-#~ "l'Équipe d'Audacious.\n"
-#~ "\n"
-#~ "Ce module est un simple explorateur de flux qui propose les répertoires "
-#~ "de flux en ligne\n"
-#~ "les plus connus.\n"
-#~ "\n"
-#~ "Remerciements cordiaux aux développeurs de « Streamtuner » <http://www."
-#~ "nongnu.org/streamtuner>,\n"
-#~ "et, bien entendu, à toute la communauté d'Audacious.\n"
-#~ "\n"
-#~ "Je remercie également Tony Vroon de m'avoir conseillé et soutenu, à "
-#~ "nouveau.\n"
-#~ "\n"
-#~ "Ce module était un projet de « Google Summer Of Code 2008 »."
-
-#~ msgid "Can't jump to time when no track is being played.\n"
-#~ msgstr ""
-#~ "Impossible d'accéder au temps spécifié, si aucune piste n'est en cours de "
-#~ "lecture.\n"
-
-#~ msgid "minutes:seconds"
-#~ msgstr " minutes : secondes"
-
-#~ msgid "Track length:"
-#~ msgstr "Durée du morceau :"
-
-#~ msgid "Error writing playlist \"%s\": %s"
-#~ msgstr "Erreur lors de l'écriture de la liste de lecture \"%s\": %s"
-
-#~ msgid "%s already exist. Continue?"
-#~ msgstr "%s existe déjà. Faut-il continuer ?"
-
-#~ msgid "Show/hide infoarea"
-#~ msgstr "Afficher/cacher l'espace informatif"
-
-#~ msgid "Show main menu"
-#~ msgstr "Afficher le menu principal"
-
-#~ msgid "Show/hide main menu"
-#~ msgstr "Afficher/cacher le menu principal"
-
-#~ msgid "Show/hide statusbar"
-#~ msgstr "Afficher/cacher la barre d'état"
-
-#~ msgid "Import Playlist ..."
-#~ msgstr "Importer une liste de lecture ..."
-
-#~ msgid "Export Playlist ..."
-#~ msgstr "Exporter la liste de lecture ..."
-
-#~ msgid "Refresh"
-#~ msgstr "Réactualiser"
-
-#~ msgid "Refresh Selected"
-#~ msgstr "Réactualiser la sélection"
-
-#~ msgid "Refreshes metadata associated with selected entries."
-#~ msgstr ""
-#~ "Actualise les métadonnées associées aux entrées de la liste.sélectionnées"
-
-#~ msgid "Edit title"
-#~ msgstr "Modifier le titre"
-
-#~ msgid "Edit the playlist title."
-#~ msgstr "Modifie le titre de la liste de lecture."
-
-#~ msgid "By Formatted Title"
-#~ msgstr "Par titre formaté"
-
-#~ msgid "Components"
-#~ msgstr "Composants"
-
-#~ msgid "Upload selected track(s)"
-#~ msgstr "Transférer la sélection"
-
-#~ msgid "MTP device handler"
-#~ msgstr "Support MTP"
-
-#~ msgid "Show main player window"
-#~ msgstr "Montrer la fenêtre principale"
-
-#~ msgid "Ignore"
-#~ msgstr "Ignorer"
-
-#~ msgid ""
-#~ "Audacious has been started with all of its windows hidden.\n"
-#~ "You may want to show the player window again to control Audacious; "
-#~ "otherwise, you'll have to control it remotely via audtool or enabled "
-#~ "plugins (such as the statusicon plugin)."
-#~ msgstr ""
-#~ "Audacious a démarré, mais toutes les fenêtres de l'interface sont "
-#~ "cachées.\n"
-#~ "\n"
-#~ "Peut-être voulez-vous voir à nouveau la fenêtre principale, afin de "
-#~ "pouvoir contrôler Audacious.\n"
-#~ "Dans le cas contraire, vous devrez utiliser les commandes distantes, par "
-#~ "l'intermédiaire de « audtool » ou des extensions activées (le module « "
-#~ "statusicon », par exemple).\n"
-#~ " "
-
-#~ msgid "Always ignore, show/hide is controlled remotely"
-#~ msgstr ""
-#~ "Toujours ignorer : la fonction « montrer/cacher » est contrôlée à "
-#~ "distance."
-
-#~ msgid "Audacious - broken GTK engine usage warning"
-#~ msgstr "Audacious - défaillance du moteur « GTK »"
-
-#~ msgid ""
-#~ "<big>Broken GTK engine in use</big>\n"
-#~ "\n"
-#~ "Audacious has detected that you are using a broken GTK engine.\n"
-#~ "\n"
-#~ "The theme engine you are using, %s, is incompatible with some of "
-#~ "the features used by modern skins. The incompatible features have been "
-#~ "disabled for this session.\n"
-#~ "\n"
-#~ "To use these features, please consider using a different GTK theme engine."
-#~ msgstr ""
-#~ "<big>Utilisation d'un moteur « GTK » défaillant</big>\n"
-#~ "\n"
-#~ "Audacious a détecté un moteur « GTK » défaillant.\n"
-#~ "\n"
-#~ "Le moteur de rendu de votre système (%s) est incompatible avec "
-#~ "certaines fonctions propres aux thèmes modernes d'Audacious. Les "
-#~ "caractéristiques concernées ont donc été désactivées pour cette session.\n"
-#~ "\n"
-#~ "Pour disposer de ces options particulières, vous devrez utilisez un autre "
-#~ "moteur de rendu « GTK ».\n"
-#~ " "
-
-#~ msgid "Do not display this warning again"
-#~ msgstr "Ne plus afficher cet avertissement"
-
-#~ msgid "Save as Static Playlist"
-#~ msgstr "Enregistrer comme liste statique"
-
-#~ msgid "Use Relative Path"
-#~ msgstr "Utiliser une arborescence relative"
-
-#~ msgid "Load Playlist"
-#~ msgstr "Charger une liste de lecture"
-
-#~ msgid "Save Playlist"
-#~ msgstr "Enregistrer la liste"
-
-#~ msgid "Skinned Interface"
-#~ msgstr "Interface à thème"
-
-#~ msgid "%s: %d kbps, %d Hz, %s"
-#~ msgstr "%s: %d kbps, %d Hz, %s"
-
-#~ msgid ""
-#~ "* Select ALSA output ports *\n"
-#~ "MIDI events will be sent to the ports selected here. In example, if your "
-#~ "audio card provides a hardware synth and you want to play MIDI with it, "
-#~ "you'll probably want to select the wavetable synthesizer ports."
-#~ msgstr ""
-#~ "* Choix des ports de sortie « ALSA » *\n"
-#~ "Les événements MIDI seront envoyés aux ports spécifiés ici. Par exemple, "
-#~ "si votre carte son dispose d'un synthétiseur matériel et que vous désirez "
-#~ "écouter les fichiers MIDI avec celui-ci, vous voudrez probabement choisir "
-#~ "les ports du synthétiseur à tables d'ondes à utiliser."
-
-#~ msgid ""
-#~ "* Select ALSA mixer card *\n"
-#~ "The ALSA backend outputs directly through ALSA, it doesn't use effect and "
-#~ "ouput plugins from the player. During playback, the player volumeslider "
-#~ "will manipulate the mixer control you select here. If you're using "
-#~ "wavetable synthesizer ports, you'll probably want to select the Synth "
-#~ "control here."
-#~ msgstr ""
-#~ "* Choix du périphérique audio « ALSA » *\n"
-#~ "Le système de sortie « ALSA » émet directement via « ALSA » : il "
-#~ "n'utilise pas les modules d'effets du lecteur, ni les modules de sortie. "
-#~ "Lors de la lecture, le curseur du volume du lecteur opérera sur le "
-#~ "contrôleur du mélangeur audio que vous avez sélectionné ici. Si vous "
-#~ "utilisez les ports d'un synthétiseur à tables d'ondes, vous voudrez "
-#~ "probabement choisir le contrôleur du synthétiseur ici."
-
-#~ msgid ""
-#~ "* Select ALSA mixer control *\n"
-#~ "The ALSA backend outputs directly through ALSA, it doesn't use effect and "
-#~ "ouput plugins from the player. During playback, the player volume slider "
-#~ "will manipulate the mixer control you select here. If you're using "
-#~ "wavetable synthesizer ports, you'll probably want to select the Synth "
-#~ "control here."
-#~ msgstr ""
-#~ "* Choix du canal du mélangeur audio « ALSA » *\n"
-#~ "Le système de sortie « ALSA » émet directement via « ALSA » : il "
-#~ "n'utilise pas les modules d'effets du lecteur, ni les modules de sortie. "
-#~ "Lors de la lecture, le curseur du volume du lecteur opérera sur le canal "
-#~ "du mélangeur audio que vous avez sélectionné ici. Si vous utilisez les "
-#~ "ports d'un synthétiseur à tables d'ondes, vous voudrez probabement "
-#~ "choisir le canal du synthétiseur ici."
-
-#~ msgid ""
-#~ "* Backend selection *\n"
-#~ "AMIDI-Plug works with backends, in a modular fashion; here you should "
-#~ "select your backend; that is, the way MIDI events are going to be handled "
-#~ "and played.\n"
-#~ "If you have a hardware synthesizer on your audio card, and ALSA supports "
-#~ "it, you'll want to use the ALSA backend. It can also be used with "
-#~ "anything that provides an interface to the ALSA sequencer, including "
-#~ "software synths or external devices.\n"
-#~ "If you want to rely on a software synthesizer and/or want to pipe audio "
-#~ "into effect and output plugins of the player you'll want to use the good "
-#~ "FluidSynth backend.\n"
-#~ "Press the info button to read specific information about each backend."
-#~ msgstr ""
-#~ "* Choix du système de sortie *\n"
-#~ "« AMIDI-Plug » utilise des systèmes de sortie, de manière modulaire. "
-#~ "C'est par le système de sortie que vous aurez choisi que seront gérés et "
-#~ "restitués les événements MIDI. Si votre périphérique audio dispose d'un "
-#~ "synthétiseur matériel supporté par « ALSA », vous pourrez utiliser le "
-#~ "système de sortie « ALSA ». Celui-ci peut aussi être utilisé par tout ce "
-#~ "qui peut offrir une interface au séquenceur « ALSA » (les synthétiseurs "
-#~ "logiciels ou les périphériques externes, notamment).\n"
-#~ " Si vous désirez dépendre d'un synthétiseur logiciel et/ou si vous voulez "
-#~ "rediriger le flux audio vers les modules de sortie du lecteur, vous "
-#~ "pourrez utiliser le système de sortie « FluidSynth ». N'hésitez pas à "
-#~ "activer le bouton d'informations, afin d'obtenir des renseignements "
-#~ "spécifiques à chaque système de sortie."
-
-#~ msgid ""
-#~ "* Transpose function *\n"
-#~ "This option allows you to play the midi file transposed in a different "
-#~ "key, by shifting of the desired number of semitones all its notes "
-#~ "(excepting those on midi channel 10, reserved for percussions). "
-#~ "Especially useful if you wish to sing or play along with another "
-#~ "instrument."
-#~ msgstr ""
-#~ "* Fonction de transposition *\n"
-#~ "Cette option permet de restituer le fichier MIDI alors transposé dans une "
-#~ "tonalité différente, en décalant du nombre désiré de demi-tons toutes les "
-#~ "les notes du morceau (à l'exception de celles du canal MIDI 10, réservé "
-#~ "aux percussions). Cette fonction est particulièrement utile, si vous "
-#~ "désirez chanter ou jouer accompagné d'un autre instrument."
-
-#~ msgid ""
-#~ "* Drumshift function *\n"
-#~ "This option allows you to shift notes on midi channel 10 (the standard "
-#~ "percussions channel) of the desired number of semitones. This results in "
-#~ "different drumset and percussions being used during midi playback, so if "
-#~ "you wish to enhance (or reduce, or alter) percussion sounds, try to play "
-#~ "with this value."
-#~ msgstr ""
-#~ "* Fonction de décalage des percussions *\n"
-#~ "Cette option permet de décaler toutes les notes du canal MIDI 10 (le "
-#~ "canal standard des percussions) du nombre désiré de demi-tons. Cela se "
-#~ "traduit par l'utilisation d'un ensemble de batteries et de percussions "
-#~ "différent, lors de la lecture. Donc, si vous désirez améliorer (ou "
-#~ "réduire, ou bien encore modifier) les percussions, n'hésitez pas à "
-#~ "essayer différentes valeurs."
-
-#~ msgid ""
-#~ "* Pre-calculate MIDI length *\n"
-#~ "If this option is enabled, AMIDI-Plug will calculate the MIDI file length "
-#~ "as soon as the player requests it, instead of doing that only when the "
-#~ "MIDI file is being played. In example, MIDI length will be calculated "
-#~ "straight after adding MIDI files in a playlist. Disable this option if "
-#~ "you want faster playlist loading (when a lot of MIDI files are added), "
-#~ "enable it to display more information in the playlist straight after "
-#~ "loading."
-#~ msgstr ""
-#~ "* Pré-calculer la durée des fichiers MIDI *\n"
-#~ "Si cette option est activée, « AMIDI-Plug » déterminera la durée du "
-#~ "fichier MIDI dès que le lecteur le demandera, au lieu le faire seulement "
-#~ "lorsque le morceau est lu. Par exemple, la durée des fichiers MIDI sera "
-#~ "calculée immédiatement après l'ajout des titres dans la liste de lecture. "
-#~ "Désactivez cette option, si vous voulez un chargement plus rapide de la "
-#~ "liste de lecture (lorsque de nombreux fichiers MIDI sont ajoutés) ; "
-#~ "activez cette option pour que s'affichent plus d'informations dans la "
-#~ "liste de lecture, directement après le chargement des fichiers."
-
-#~ msgid ""
-#~ "* Extract comments from MIDI files *\n"
-#~ "Some MIDI files contain text comments (author, copyright, instrument "
-#~ "notes, etc.). If this option is enabled, AMIDI-Plug will extract and "
-#~ "display comments (if available) in the file information dialog."
-#~ msgstr ""
-#~ "* Extraire les commentaires des fichiers MIDI *\n"
-#~ "Certains fichiers MIDI contiennent des commentaires (auteur, droits "
-#~ "d'utilisation, notes relatives aux instruments, etc.). Si cette option "
-#~ "est activée, « AMIDI-Plug » extraira et affichera ces commentaires (s'ils "
-#~ "sont disponibles) dans la fenêtre d'informations sur le fichier."
-
-#~ msgid ""
-#~ "* Extract lyrics from MIDI files *\n"
-#~ "Some MIDI files contain song lyrics. If this option is enabled, AMIDI-"
-#~ "Plug will extract and display song lyrics (if available) in the file "
-#~ "information dialog."
-#~ msgstr ""
-#~ "* Extraire les paroles des fichiers MIDI *\n"
-#~ "Certains fichiers MIDI contiennent les paroles relatives au morceau joué. "
-#~ "Si cette option est activée, « AMIDI-Plug » extraira et affichera les "
-#~ "paroles (si elles sont disponibles) dans la fenêtre d'informations sur le "
-#~ "fichier."
-
-#~ msgid ""
-#~ "* Select SoundFont files *\n"
-#~ "In order to play MIDI with FluidSynth, you need to specify at least one "
-#~ "valid SoundFont file here (use absolute paths). The loading order is from "
-#~ "the top (first) to the bottom (last)."
-#~ msgstr ""
-#~ "* Sélectionner les fichier « SoundFont » *\n"
-#~ "Afin de pouvoir écouter des fichiers MIDI avec « FluidSynth », vous devez "
-#~ "spécifier au moins un fichier « SoundFont » valide (veillez à utiliser "
-#~ "des chemins absolus). Le chargement s'opère, par ordre, du haut (le "
-#~ "premier fichier) vers le bas (le dernier fichier)."
-
-#~ msgid ""
-#~ "* Load SoundFont on player start *\n"
-#~ "Depending on your system speed, SoundFont loading in FluidSynth will "
-#~ "require up to a few seconds. This is a one-time task (the soundfont will "
-#~ "stay loaded until it is changed or the backend is unloaded) that can be "
-#~ "done at player start, or before the first MIDI file is played (the latter "
-#~ "is a better choice if you don't use your player to listen MIDI files "
-#~ "only)."
-#~ msgstr ""
-#~ "* Charger la banque de sons au démarrage du lecteur *\n"
-#~ "En fonction de la vitesse de votre système, le chargement du fichier « "
-#~ "SoundFont » dans « FluidSynth » peut nécessiter plusieurs secondes. Cette "
-#~ "opération, qui ne sera exécutée qu'une fois (la banque de sons restera en "
-#~ "mémoire, jusqu'à ce qu'elle soit modifiée ou que le système de sortie ne "
-#~ "soit supprimé de la mémoire), peut être accomplie au démarrage du "
-#~ "lecteur, ou avant que ne soit lu le premier fichier MIDI (la seconde "
-#~ "proposition constitue un meilleur choix, si vous n'utilisez pas le "
-#~ "lecteur pour écouter des fichiers MIDI uniquement)."
-
-#~ msgid ""
-#~ "* Load SoundFont on first midifile play *\n"
-#~ "Depending on your system speed, SoundFont loading in FluidSynth will "
-#~ "require up to a few seconds. This is a one-time task (the soundfont will "
-#~ "stay loaded until it is changed or the backend is unloaded) that can be "
-#~ "done at player start, or before the first MIDI file is played (the latter "
-#~ "is a better choice if you don't use your player to listen MIDI files "
-#~ "only)."
-#~ msgstr ""
-#~ "* Charger la banque de sons à la lecture du premier fichier MIDI *\n"
-#~ "En fonction de la vitesse de votre système, le chargement du fichier « "
-#~ "SoundFont » dans « FluidSynth » peut nécessiter plusieurs secondes. Cette "
-#~ "opération, qui ne sera exécutée qu'une fois (la banque de sons restera en "
-#~ "mémoire, jusqu'à ce qu'elle soit modifiée ou que le système de sortie ne "
-#~ "soit supprimé de la mémoire), peut être accomplie au démarrage du "
-#~ "lecteur, ou avant que ne soit lu le premier fichier MIDI (la seconde "
-#~ "proposition constitue un meilleur choix, si vous n'utilisez pas le "
-#~ "lecteur pour écouter des fichiers MIDI uniquement)."
-
-#~ msgid ""
-#~ "* Synthesizer gain *\n"
-#~ "From FluidSynth docs: the gain is applied to the final or master output "
-#~ "of the synthesizer; it is set to a low value by default to avoid the "
-#~ "saturation of the output when random MIDI files are played."
-#~ msgstr ""
-#~ "* Gain du synthétiseur *\n"
-#~ "Extrait de la documentation de « FluidSynth » (traduction) : « Le gain "
-#~ "est appliqué à la sortie finale ou principale du synthétiseur. Par "
-#~ "défaut, il est réglé sur une valeur basse, afin d'éviter la saturation de "
-#~ "la sortie, lorsque des fichiers MIDI sont lus de manière aléatoire. »"
-
-#~ msgid ""
-#~ "* Synthesizer polyphony *\n"
-#~ "From FluidSynth docs: the polyphony defines how many voices can be played "
-#~ "in parallel; the number of voices is not necessarily equivalent to the "
-#~ "number of notes played simultaneously; indeed, when a note is struck on a "
-#~ "specific MIDI channel, the preset on that channel may create several "
-#~ "voices, for example, one for the left audio channel and one for the right "
-#~ "audio channels; the number of voices activated depends on the number of "
-#~ "instrument zones that fall in the correspond to the velocity and key of "
-#~ "the played note."
-#~ msgstr ""
-#~ "* Polyphonie du synthétiseur *\n"
-#~ "Extrait de la documentation de « FluidSynth » (traduction) : « La "
-#~ "polyphonie définit le nombre de voix qui peuvent être jouées en "
-#~ "parallèle. Le nombre de voix ne correspond pas nécessairement au nombre "
-#~ "de notes jouées simultanément. En effet, lorsqu'une note est envoyée à un "
-#~ "canal MIDI spécifique, le préréglage de ce canal peut créer plusieurs "
-#~ "voix (par exemple, une voix pour le canal audio gauche et une autre pour "
-#~ "le canal audio droit). Le nombre de voix activées dépend du nombre de "
-#~ "pistes d'instruments relatives à la vélocité et à la tonalité de la note "
-#~ "jouée. »"
-
-#~ msgid ""
-#~ "* Synthesizer reverb *\n"
-#~ "From FluidSynth docs: when set to \"yes\" the reverb effects module is "
-#~ "activated; note that when the reverb module is active, the amount of "
-#~ "signal sent to the reverb module depends on the \"reverb send\" generator "
-#~ "defined in the SoundFont."
-#~ msgstr ""
-#~ "* Réverbération du synthétiseur *\n"
-#~ "Extrait de la documentation de « FluidSynth » (traduction) : \"Lorsque "
-#~ "l'option « Oui » est cochée, le module d'effet de réverbération est "
-#~ "activé. Veuillez noter que, lorsque le module de réverbération est actif, "
-#~ "la quantité de signaux envoyés au module dépend du générateur d'« envoi "
-#~ "de réverbération » défini dans le fichier « SoundFont ».\""
-
-#~ msgid ""
-#~ "* Synthesizer chorus *\n"
-#~ "From FluidSynth docs: when set to \"yes\" the chorus effects module is "
-#~ "activated; note that when the chorus module is active, the amount of "
-#~ "signal sent to the chorus module depends on the \"chorus send\" generator "
-#~ "defined in the SoundFont."
-#~ msgstr ""
-#~ "* Effet de choeur du synthétiseur *\n"
-#~ "Extrait de la documentation de « FluidSynth » (traduction) : \"Lorsque "
-#~ "l'option « Oui » est cochée, le module d'effet de choeur est activé. "
-#~ "Veuillez noter que, lorsque le module d'effet de choeur est actif, la "
-#~ "quantité de signaux envoyés au module dépend du générateur d'« envoi "
-#~ "d'effet de choeur » défini dans le fichier « SoundFont ».\""
-
-#~ msgid ""
-#~ "* Synthesizer samplerate *\n"
-#~ "The sample rate of the audio generated by the synthesizer. You can also "
-#~ "specify a custom value in the interval 22050Hz-96000Hz."
-#~ msgstr ""
-#~ "* Fréquence d'échantillonnage du synthétiseur *\n"
-#~ "Cette option définit la fréquence d'échantillonnage du flux audio produit "
-#~ "par le synthétiseur. Vous pouvez aussi spécifier une valeur "
-#~ "personnalisée, située dans l'intervalle 22050 - 96000 Hz."
-
-#~ msgid ""
-#~ "If enabled, the extension from the original filename will not be stripped "
-#~ "before adding the new file extension to the end."
-#~ msgstr ""
-#~ "Si cette option est activée, l'extension du nom du fichier source ne sera "
-#~ "pas supprimée avant l'ajout de la nouvelle extension."
-
-#~ msgid ""
-#~ "best/slowest:0;\n"
-#~ "worst/fastest:9;\n"
-#~ "recommended:2;\n"
-#~ "default:5;"
-#~ msgstr ""
-#~ "meilleure / la plus lente : 0\n"
-#~ "pire / la plus rapide : 9\n"
-#~ "recommandée : 2\n"
-#~ "par défaut : 5"
-
-#~ msgid "Adds 16 bit checksum to every frame"
-#~ msgstr "Ajoute à chaque trame une somme de contrôle sur 16 bits"
-
-#~ msgid "Variable bitrate"
-#~ msgstr "Débit binaire variable"
-
-#~ msgid "Average bitrate"
-#~ msgstr "Débit binaire moyen"
-
-#~ msgid ""
-#~ "For use with players that do not support low bitrate mp3 (Apex AD600-A "
-#~ "DVD/mp3 player)"
-#~ msgstr ""
-#~ "Cette option est destinée aux lecteurs qui ne supportent pas les fichiers "
-#~ "« mp3 » dont le débit binaire est bas (le lecteur DVD/mp3 « Apex AD600-A "
-#~ "», notamment)."
-
-#~ msgid ""
-#~ "highest:0;\n"
-#~ "lowest:9;\n"
-#~ "default:4;"
-#~ msgstr ""
-#~ "Le plus élevé : 0\n"
-#~ "Le plus bas : 9\n"
-#~ "Défaut : 4"
-
-#~ msgid "Show playlists"
-#~ msgstr "Afficher les listes de lecture"
-
-#~ msgid "Show/hide playlists"
-#~ msgstr "Afficher/cacher les listes de lecture"
-
-#~ msgid "About the Sun Driver"
-#~ msgstr "À propos du pilote « Sun »"
-
-#~ msgid ""
-#~ "XMMS BSD Sun Driver\n"
-#~ "\n"
-#~ "Copyright (c) 2001 CubeSoft Communications, Inc.\n"
-#~ "Maintainer: <vedge at csoft.org>.\n"
-#~ msgstr ""
-#~ "Pilote « Sun BSD » pour XMMS\n"
-#~ "\n"
-#~ "Droits d'utilisation :\n"
-#~ "(c) 2001, CubeSoft Communications, Inc.\n"
-#~ "\n"
-#~ "Responsable de la maintenance :\n"
-#~ "<vedge at csoft.org>.\n"
-
-#~ msgid "Audio control device:"
-#~ msgstr "Périphérique de contrôle audio :"
-
-#~ msgid "Buffer size (ms):"
-#~ msgstr "Taille du tampon (ms) :"
-
-#~ msgid "Volume controls device:"
-#~ msgstr "Périphérique de contrôle du volume :"
-
-#~ msgid "XMMS uses mixer exclusively."
-#~ msgstr "XMMS utilise le mélangeur audio de manière exclusive."
-
-#~ msgid "Sun driver configuration"
-#~ msgstr "Configuration du pilote « Sun »"
-
-#~ msgid "Target volume:"
-#~ msgstr "Volume cible :"
-
-#~ msgid "Effect strength:"
-#~ msgstr "Intensité de l'effet :"
-
-#~ msgid "FLAC Audio Plugin "
-#~ msgstr "Module audio « Flac » "
-
-#~ msgid "LyricWiki"
-#~ msgstr "LyricWiki"
-
-#~ msgid "Streambrowser"
-#~ msgstr "Explorateur de flux"
 
-#~ msgid "Stream browser"
-#~ msgstr "Explorateur de flux"

audacious-plugins-3.0.3.tar.bz2/po/hu.po -> audacious-plugins-3.1.tar.bz2/po/hu.po Changed

@@ -1,22 +1,23 @@
-# Hungarian translation of audacious-plugins.
-# Copyright (C) 2006 Free Software Foundation, Inc.
-# This file is distributed under the same license as the audacious-plugins package.
-# Peter Polonkai <polesz@nedudu.hu>, 2010.
+# Hungarian translation for Audacious Plugins
+# Copyright (C) Audacious translators
+# This file is distributed under the same license as the Audacious Plugins package.
 #
+# Translators:
+# Peter Polonkai <polesz@nedudu.hu>, 2010.
+# Péter Polonkai <polesz@nedudu.hu>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: audacious 2.4\n"
-"Report-Msgid-Bugs-To: http://jira.atheme.org/\n"
-"POT-Creation-Date: 2011-09-18 14:13-0400\n"
-"PO-Revision-Date: 2010-08-23 12:00+0100\n"
-"Last-Translator: Peter Polonkai <polesz@nedudu.hu>\n"
-"Language-Team: Nedudu Team <nedudu@nedudu.hu>\n"
-"Language: hu\n"
+"Project-Id-Version: Audacious Plugins\n"
+"Report-Msgid-Bugs-To: http://jira.atheme.org/browse/AUDPLUG\n"
+"POT-Creation-Date: 2011-10-24 16:38-0400\n"
+"PO-Revision-Date: 2011-11-01 18:12+0000\n"
+"Last-Translator: Polesz <polesz@nedudu.hu>\n"
+"Language-Team: Hungarian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Hungarian\n"
-"X-Poedit-Country: HUNGARY\n"
+"Language: hu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: src/aac/libmp4.c:256
 #, c-format
@@ -33,6 +34,274 @@
 msgid "About MP4 AAC decoder plugin"
 msgstr "MP4 AAC dekóder bővítmény névjegye"
 
+#: src/alarm/interface.c:34
+msgid "About XMMS Alarm"
+msgstr "XMMS Riasztó névjegye"
+
+#: src/alarm/interface.c:41
+msgid "XMMS Alarm"
+msgstr "XMMS Riasztó"
+
+#: src/alarm/interface.c:50
+msgid ""
+"An XMMS plugin which can be used\n"
+"to start playing at a certain time.\n"
+"\n"
+"Send all complaints to:\n"
+"Adam Feakin <adamf@snika.uklinux.net>\n"
+"Daniel Stodden <stodden@in.tum.de>\n"
+"\n"
+"http://www.snika.uklinux.net/xmms-alarm/"
+msgstr ""
+
+#: src/alarm/interface.c:65
+msgid "Close"
+msgstr "Bezár"
+
+#: src/alarm/interface.c:95
+msgid "Alarm"
+msgstr "Riasztás"
+
+#: src/alarm/interface.c:102
+msgid "This is your wakeup call."
+msgstr "Ez egy ébresztési hívás."
+
+#: src/alarm/interface.c:117 src/alarm/interface.c:1338
+msgid "OK"
+msgstr "OK"
+
+#: src/alarm/interface.c:151
+msgid "Sorry"
+msgstr "Sajnálom"
+
+#: src/alarm/interface.c:158
+msgid "Warning"
+msgstr "Figyelmeztetés"
+
+#: src/alarm/interface.c:167
+msgid ""
+"For safety reasons the \"quiet\" time must be at least 65 seconds longer than the fading time, it must also be more than 10 seconds. This basically means that there is a bug in the code and until I find a way of really fixing it this message will appear :)\n"
+"\n"
+"Your fading settings have NOT been saved\n"
+"\n"
+"--\n"
+"Adam"
+msgstr ""
+
+#: src/alarm/interface.c:183
+msgid "Oh Well"
+msgstr ""
+
+#: src/alarm/interface.c:339
+msgid "Alarm Settings"
+msgstr "Riasztási beállítások"
+
+#: src/alarm/interface.c:354 src/alarm/interface.c:526
+#: src/alarm/interface.c:898
+msgid "Time"
+msgstr "Idő"
+
+#: src/alarm/interface.c:395
+msgid "hours"
+msgstr "óra"
+
+#: src/alarm/interface.c:456
+msgid "h"
+msgstr "h"
+
+#: src/alarm/interface.c:486
+msgid "minutes"
+msgstr "perc"
+
+#: src/alarm/interface.c:504
+msgid "Quiet after:"
+msgstr "Csendes ezután:"
+
+#: src/alarm/interface.c:514
+msgid "Alarm at (default):"
+msgstr "Riasztás (alapértelmezett):"
+
+#: src/alarm/interface.c:534
+msgid "Choose the days for the alarm to come on"
+msgstr "Válassza ki a riasztás napját a következőekből"
+
+#: src/alarm/interface.c:562 src/alarm/interface.c:610
+#: src/alarm/interface.c:658 src/alarm/interface.c:706
+#: src/alarm/interface.c:754 src/alarm/interface.c:802
+#: src/alarm/interface.c:850 src/bs2b/plugin.c:198 src/OSS/configure.c:153
+#: src/skins/ui_manager.c:450 src/skins/ui_manager.c:471
+msgid "Default"
+msgstr "Alapértelmezett"
+
+#: src/alarm/interface.c:888
+msgid "Day"
+msgstr "Nap"
+
+#: src/alarm/interface.c:908
+msgid "Tuesday"
+msgstr "Kedd"
+
+#: src/alarm/interface.c:919
+msgid "Wednesday"
+msgstr "Szerda"
+
+#: src/alarm/interface.c:930
+msgid "Thursday"
+msgstr "Csütörtök"
+
+#: src/alarm/interface.c:941
+msgid "Friday"
+msgstr "Péntek"
+
+#: src/alarm/interface.c:952
+msgid "Saturday"
+msgstr "Szombat"
+
+#: src/alarm/interface.c:963
+msgid "Sunday"
+msgstr "Vasárnap"
+
+#: src/alarm/interface.c:973
+msgid "Monday"
+msgstr "Hétfő"
+
+#: src/alarm/interface.c:984
+msgid "Days"
+msgstr "Napok"
+
+#: src/alarm/interface.c:1000
+msgid "Fading"
+msgstr "Elhalványulás"
+
+#: src/alarm/interface.c:1037
+msgid "seconds"
+msgstr "másodperc"
+
+#: src/alarm/interface.c:1045 src/alarm/interface.c:1160
+msgid "Volume"
+msgstr "Hangerő"
+
+#: src/alarm/interface.c:1071
+msgid "Current"
+msgstr "Jelenlegi"
+
+#: src/alarm/interface.c:1079
+msgid "Start at"
+msgstr "Kezdjük a"
+
+#: src/alarm/interface.c:1107 src/alarm/interface.c:1151
+msgid "%"
+msgstr "%"
+
+#: src/alarm/interface.c:1123
+msgid "Final"
+msgstr "Vége"
+
+#: src/alarm/interface.c:1176
+msgid "Additional Command"
+msgstr "További parancs"
+
+#: src/alarm/interface.c:1202
+msgid "enable"
+msgstr "engedélyez"
+
+#: src/alarm/interface.c:1210
+msgid "Playlist (optional)"
+msgstr "Lejátszólista (opcionális)"
+
+#: src/alarm/interface.c:1236
+msgid "Browse..."
+msgstr "Tallózás…"
+
+#: src/alarm/interface.c:1244 src/alarm/interface.c:1408
+msgid "Reminder"
+msgstr "Emlékeztető"
+
+#: src/alarm/interface.c:1261
+msgid "Use reminder"
+msgstr "Emlékeztető használata"
+
+#: src/alarm/interface.c:1277 src/sndstretch/sndstretch_xmms.c:358
+msgid "Options"
+msgstr "Opciók"
+
+#: src/alarm/interface.c:1285
+msgid "What do these options mean?"
+msgstr "Mit jelentenek ezek a lehetőségek?"
+
+#: src/alarm/interface.c:1313
+msgid ""
+"\n"
+"Time\n"
+" Alarm at: \n"
+" The time for the alarm to come on.\n"
+"\n"
+" Quiet After: \n"
+" Stop alarm after this amount of time.\n"
+" (if the wakeup dialog is not closed)\n"
+"\n"
+"\n"
+"Days\n"
+" Day:\n"
+" Select the days for the alarm to activate.\n"
+"\n"
+" Time:\n"
+" Choose the time for the alarm on each day,\n"
+" or select the toggle button to use the default\n"
+" time.\n"
+"\n"
+"\n"
+"Volume\n"
+" Fading: \n"
+" Fade the volume up to the chosen volume \n"
+" for this amount of time.\n"
+"\n"
+" Start at: \n"
+" Start fading from this volume.\n"
+"\n"
+" Final: \n"
+" The volume to stop fading at. If the fading\n"
+" time is 0 then set volume to this and start\n"
+" playing.\n"
+"\n"
+"\n"
+"Options:\n"
+" Additional Command:\n"
+" Run this command at the alarm time.\n"
+"\n"
+" Playlist: \n"
+" Load this playlist for playing songs from \n"
+" (must have .m3u extension). If no playlist\n"
+" is given then the songs which are currently\n"
+" in the list will be used.\n"
+" The URL of an mp3/ogg stream can also be\n"
+" entered here, but loading of playlists from\n"
+" URLs is not currently supported by xmms.\n"
+"\n"
+" Reminder:\n"
+" Display a reminder when the alarm goes off,\n"
+" type the reminder in the box and turn on the\n"
+" toggle button if you want it to be shown.\n"
+msgstr ""
+
+#: src/alarm/interface.c:1315 src/skins/ui_manager.c:382
+msgid "Help"
+msgstr "Súgó"
+
+#: src/alarm/interface.c:1347 src/cdaudio-ng/configure.c:249
+#: src/crystalizer/crystalizer.c:130 src/echo_plugin/gui.c:125
+#: src/jack/configure.c:148 src/null/null.c:108 src/stereo_plugin/stereo.c:125
+msgid "Cancel"
+msgstr "Mégsem"
+
+#: src/alarm/interface.c:1415
+msgid "Your reminder for today is.."
+msgstr "Mai emlékeztető.."
+
+#: src/alarm/interface.c:1440
+msgid "Thankyou"
+msgstr "Köszönöm"
+
 #: src/alsa/config.c:210
 msgid "Default PCM device"
 msgstr "Alapértelmezett PCM eszköz"
@@ -41,23 +310,23 @@
 msgid "Default mixer device"
 msgstr "Alapértelmezett keverő eszköz"
 
-#: src/alsa/config.c:447
+#: src/alsa/config.c:438
 msgid "ALSA Output Plugin Preferences"
 msgstr "ALSA Kimeneti bővítmény beállítások"
 
-#: src/alsa/config.c:454
+#: src/alsa/config.c:445
 msgid "PCM device:"
 msgstr "PCM eszköz:"
 
-#: src/alsa/config.c:456 src/OSS/configure.c:246
+#: src/alsa/config.c:447 src/OSS/configure.c:237
 msgid "Mixer device:"
 msgstr "Keverő eszköz:"
 
-#: src/alsa/config.c:458
+#: src/alsa/config.c:449
 msgid "Mixer element:"
 msgstr "Mixer elem:"
 
-#: src/alsa/config.c:461
+#: src/alsa/config.c:452
 msgid "Work around drain hangup"
 msgstr ""
 
@@ -81,13 +350,8 @@
 
 #: src/amidi-plug/backend-alsa/b-alsa.c:37
 msgid ""
-"This backend sends MIDI events to a group of user-chosen ALSA sequencer "
-"ports. The ALSA sequencer interface is very versatile, it can provide ports "
-"for audio cards hardware synthesizers (i.e. emu10k1) but also for software "
-"synths, external devices, etc.\n"
-"This backend does not produce audio, MIDI events are handled directly from "
-"devices/programs behind the ALSA ports; in example, MIDI events sent to the "
-"hardware synth will be directly played.\n"
+"This backend sends MIDI events to a group of user-chosen ALSA sequencer ports. The ALSA sequencer interface is very versatile, it can provide ports for audio cards hardware synthesizers (i.e. emu10k1) but also for software synths, external devices, etc.\n"
+"This backend does not produce audio, MIDI events are handled directly from devices/programs behind the ALSA ports; in example, MIDI events sent to the hardware synth will be directly played.\n"
 "Backend written by Giacomo Lozito."
 msgstr ""
 
@@ -97,11 +361,8 @@
 
 #: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:40
 msgid ""
-"This backend produces audio by sending MIDI events to FluidSynth, a real-"
-"time software synthesizer based on the SoundFont2 specification (www."
-"fluidsynth.org).\n"
-"Produced audio can be manipulated via player effect plugins and is processed "
-"by chosen ouput plugin.\n"
+"This backend produces audio by sending MIDI events to FluidSynth, a real-time software synthesizer based on the SoundFont2 specification (www.fluidsynth.org).\n"
+"Produced audio can be manipulated via player effect plugins and is processed by chosen ouput plugin.\n"
 "Backend written by Giacomo Lozito."
 msgstr ""
 
@@ -171,7 +432,7 @@
 
 #: src/amidi-plug/i_configure-ap.c:262
 msgid "Transpose: "
-msgstr ""
+msgstr "Transzponálás:"
 
 #: src/amidi-plug/i_configure-ap.c:271
 msgid "Drum shift: "
@@ -183,11 +444,11 @@
 
 #: src/amidi-plug/i_configure-ap.c:293
 msgid "pre-calculate length of MIDI files in playlist"
-msgstr ""
+msgstr "előre kiszámítani a MIDI fájlok hosszát a lejátszólistában"
 
 #: src/amidi-plug/i_configure-ap.c:298
 msgid "extract comments from MIDI file (if available)"
-msgstr ""
+msgstr "extra megjegyzések a MIDI fájlból (ha van)"
 
 #: src/amidi-plug/i_configure-ap.c:303
 msgid "extract lyrics from MIDI file (if available)"
@@ -327,7 +588,7 @@
 "TiMidity\n"
 "backend"
 
-#: src/amidi-plug/i_fileinfo.c:169 src/sid/xs_interface.c:1769
+#: src/amidi-plug/i_fileinfo.c:169
 msgid "Name:"
 msgstr "Név"
 
@@ -570,8 +831,7 @@
 msgid "Skin file:"
 msgstr "Téma fájl:"
 
-#: src/aosd/aosd_ui.c:672 src/sid/xs_interface.c:1044
-#: src/sid/xs_interface.c:1236 src/sid/xs_interface.c:1292
+#: src/aosd/aosd_ui.c:672
 msgid "Browse"
 msgstr "Böngészés"
 
@@ -590,12 +850,10 @@
 #: src/aosd/aosd_ui.c:836
 msgid ""
 "Composite manager not detected;\n"
-"unless you know that you have one running, please activate a composite "
-"manager otherwise the OSD won't work properly"
+"unless you know that you have one running, please activate a composite manager otherwise the OSD won't work properly"
 msgstr ""
 "Kompozít kezelő nem érzékelhető;\n"
-"ha tudja, hogy van egy futó kompozít kezelő, kérjük aktiválja, egyébként az "
-"OSD nem fog megfelelően működni"
+"ha tudja, hogy van egy futó kompozít kezelő, kérjük aktiválja, egyébként az OSD nem fog megfelelően működni"
 
 #: src/aosd/aosd_ui.c:844
 msgid "Composite manager not required for fake transparency"
@@ -655,7 +913,6 @@
 msgstr "Esemény"
 
 #: src/aosd/aosd_ui.c:1101 src/cdaudio-ng/configure.c:171
-#: src/sid/xs_interface.c:1302
 msgid "Misc"
 msgstr "Egyéb"
 
@@ -697,18 +954,33 @@
 msgid "Blur Scope: Color selection"
 msgstr "Blur Scope: Szín választás"
 
-#: src/blur_scope/config.c:83 src/jack/configure.c:111
+#: src/blur_scope/config.c:83 src/jack/configure.c:106
 msgid "Options:"
 msgstr "Beállítások:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:264
+#: src/bs2b/plugin.c:157
+msgid "Bauer stereophonic-to-binaural Preferences"
+msgstr ""
+
+#: src/bs2b/plugin.c:168
+msgid "Feed level:"
+msgstr ""
+
+#: src/bs2b/plugin.c:182
+msgid "Cut frequency:"
+msgstr ""
+
+#: src/bs2b/plugin.c:196
+msgid "Presets:"
+msgstr ""
+
+#: src/cdaudio-ng/cdaudio-ng.c:241
 msgid "About Audio CD Plugin"
 msgstr "Audio CD bővítmény néjvegye"
 
-#: src/cdaudio-ng/cdaudio-ng.c:265
+#: src/cdaudio-ng/cdaudio-ng.c:242
 msgid ""
-"Copyright (c) 2007, by Calin Crisan <ccrisan@gmail.com> and The Audacious "
-"Team.\n"
+"Copyright (c) 2007, by Calin Crisan <ccrisan@gmail.com> and The Audacious Team.\n"
 "\n"
 "Many thanks to libcdio developers <http://www.gnu.org/software/libcdio/>\n"
 "\tand to libcddb developers <http://libcddb.sourceforge.net/>.\n"
@@ -720,18 +992,17 @@
 "Copyright 2009 John Lindgren"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:558
-#, fuzzy
+#: src/cdaudio-ng/cdaudio-ng.c:550
 msgid "Audio CD"
-msgstr "Hang"
+msgstr "Audio CD"
 
-#: src/cdaudio-ng/cdaudio-ng.c:913
+#: src/cdaudio-ng/cdaudio-ng.c:922
 msgid "Drive is empty."
-msgstr ""
+msgstr "A meghajtó üres."
 
-#: src/cdaudio-ng/cdaudio-ng.c:915
+#: src/cdaudio-ng/cdaudio-ng.c:924
 msgid "Unsupported disk type."
-msgstr ""
+msgstr "Nem támogatott lemez típus."
 
 #: src/cdaudio-ng/configure.c:148
 msgid "CD Audio Plugin Configuration"
@@ -777,18 +1048,12 @@
 msgid "Override default device: "
 msgstr "Alapértelmezett eszköz felülírása:"
 
-#: src/cdaudio-ng/configure.c:244 src/crystalizer/crystalizer.c:131
-#: src/echo_plugin/gui.c:123 src/jack/configure.c:146 src/null/null.c:112
-#: src/stereo_plugin/stereo.c:125
+#: src/cdaudio-ng/configure.c:244 src/crystalizer/crystalizer.c:123
+#: src/echo_plugin/gui.c:118 src/jack/configure.c:141 src/null/null.c:107
+#: src/stereo_plugin/stereo.c:118
 msgid "Ok"
 msgstr "Ok"
 
-#: src/cdaudio-ng/configure.c:249 src/crystalizer/crystalizer.c:138
-#: src/echo_plugin/gui.c:130 src/jack/configure.c:153 src/null/null.c:113
-#: src/stereo_plugin/stereo.c:132
-msgid "Cancel"
-msgstr "Mégsem"
-
 #: src/cd-menu-items/cd-menu-items.c:34
 msgid "Play CD"
 msgstr "CD lejátszása"
@@ -797,84 +1062,83 @@
 msgid "Add CD"
 msgstr "CD Hozzáadása"
 
-#: src/compressor/plugin.c:67
+#: src/compressor/plugin.c:63
 msgid "About Dynamic Range Compression Plugin"
 msgstr "Dinamikus tartomány kompresszió bővítmény névjegye"
 
-#: src/compressor/plugin.c:99
+#: src/compressor/plugin.c:95
 msgid "Dynamic Range Compressor Preferences"
 msgstr "Dinamika tartomány kompresszió beállítások"
 
-#: src/compressor/plugin.c:111
-#, fuzzy
+#: src/compressor/plugin.c:107
 msgid "Center volume:"
-msgstr "Hangerő váltás"
+msgstr "Közép hangerő:"
 
-#: src/compressor/plugin.c:124
+#: src/compressor/plugin.c:120
 msgid "Dynamic range:"
-msgstr ""
+msgstr "Dinamikus tartomány:"
 
-#: src/console/configure.c:138
+#: src/console/configure.c:136
 msgid "Game Console Music Decoder"
 msgstr "Játék Konzol Zene Dekóder"
 
-#: src/console/configure.c:155
+#: src/console/configure.c:153
 msgid "General"
 msgstr "Általános"
 
-#: src/console/configure.c:157 src/skins/ui_manager.c:176
+#: src/console/configure.c:155 src/skins/ui_manager.c:176
 msgid "Playback"
 msgstr "Lejátszás"
 
-#: src/console/configure.c:172
+#: src/console/configure.c:170
 msgid "Bass:"
 msgstr "Basszus:"
 
-#: src/console/configure.c:176 src/console/configure.c:187
-#: src/console/configure.c:208
+#: src/console/configure.c:174 src/console/configure.c:185
+#: src/console/configure.c:206
 msgid "secs"
 msgstr "mp"
 
-#: src/console/configure.c:183
+#: src/console/configure.c:181
 msgid "Treble:"
 msgstr "Magas:"
 
-#: src/console/configure.c:204
+#: src/console/configure.c:202
 msgid "Default song length:"
 msgstr "Alapértelmezett szám hossz:"
 
-#: src/console/configure.c:210 src/sid/xs_interface.c:666
+#: src/console/configure.c:208
 msgid "Resampling"
 msgstr "Újra mintavételezés"
 
-#: src/console/configure.c:216
+#: src/console/configure.c:214
 msgid "Enable audio resampling"
 msgstr "Engedélyezi az audio újra mintavételezést"
 
-#: src/console/configure.c:231
+#: src/console/configure.c:229
 msgid "Resampling rate:"
 msgstr "Újra mintavételezési arány:"
 
-#: src/console/configure.c:235 src/sid/xs_interface.c:354
+#: src/console/configure.c:233
 msgid "Hz"
 msgstr "Hz"
 
-#: src/console/configure.c:246
+#: src/console/configure.c:244
 msgid "SPC"
 msgstr "SPC"
 
-#: src/console/configure.c:247
+#: src/console/configure.c:245
 msgid "Ignore length from SPC tags"
 msgstr ""
 
-#: src/console/configure.c:248
+#: src/console/configure.c:246
 msgid "Increase reverb"
 msgstr "Visszhang növelése"
 
-#: src/console/configure.c:273
+#: src/console/configure.c:271
 msgid ""
-"The default song length, expressed in seconds, is used for songs that do not "
-"provide length information (i.e. looping tracks)."
+"The default song length, expressed in seconds, is used for songs that do not"
+" provide length information (i.e. looping tracks)."
 msgstr ""
 
 #: src/console/plugin.c:33
@@ -889,52 +1153,47 @@
 " Shay Green <gblargg@gmail.com>\n"
 msgstr ""
 
-#: src/crossfade/plugin.c:65
+#: src/crossfade/plugin.c:60
 msgid "About Crossfade"
 msgstr "Átfedés névjegye"
 
-#: src/crossfade/plugin.c:97
+#: src/crossfade/plugin.c:92
 msgid "Crossfade Preferences"
 msgstr "Átfedés beállítások"
 
-#: src/crossfade/plugin.c:109
+#: src/crossfade/plugin.c:104
 msgid "Overlap (in seconds):"
 msgstr "Átfedés (másodpercben):"
 
-#: src/crossfade/plugin.c:140 src/crossfade/plugin.c:146
+#: src/crossfade/plugin.c:135 src/crossfade/plugin.c:141
 msgid "Crossfade Error"
 msgstr "Átfedési hiba"
 
-#: src/crossfade/plugin.c:140
+#: src/crossfade/plugin.c:135
 msgid ""
 "Crossfading failed because the songs had a different number of channels."
 msgstr ""
 
-#: src/crossfade/plugin.c:148
+#: src/crossfade/plugin.c:143
 msgid ""
 "Crossfading failed because the songs had different sample rates.\n"
 "\n"
-"You can use the Sample Rate Converter effect to resample the songs to the "
-"same rate."
+"You can use the Sample Rate Converter effect to resample the songs to the same rate."
 msgstr ""
 
-#: src/crystalizer/crystalizer.c:108
+#: src/crystalizer/crystalizer.c:100
 msgid "Configure Crystalizer"
 msgstr "Crystalizer beállítása"
 
-#: src/crystalizer/crystalizer.c:110 src/stereo_plugin/stereo.c:104
+#: src/crystalizer/crystalizer.c:102 src/stereo_plugin/stereo.c:97
 msgid "Effect intensity:"
 msgstr "Effektus intenzitása:"
 
-#: src/crystalizer/crystalizer.c:144 src/echo_plugin/gui.c:136
-#: src/stereo_plugin/stereo.c:138
+#: src/crystalizer/crystalizer.c:136 src/echo_plugin/gui.c:131
+#: src/stereo_plugin/stereo.c:131
 msgid "Apply"
 msgstr "Alkalmazás"
 
-#: src/daemon/daemon.c:58
-msgid "Daemon Interface (like old headless mode)"
-msgstr ""
-
 #: src/echo_plugin/gui.c:15
 msgid ""
 "Echo Plugin\n"
@@ -951,23 +1210,23 @@
 msgid "About Echo Plugin"
 msgstr "Visszhang bővítmény névjegye"
 
-#: src/echo_plugin/gui.c:72
+#: src/echo_plugin/gui.c:67
 msgid "Configure Echo"
 msgstr "Visszhang beállítása"
 
-#: src/echo_plugin/gui.c:88
+#: src/echo_plugin/gui.c:83
 msgid "Delay: (ms)"
 msgstr "Késleltetés: (ms)"
 
-#: src/echo_plugin/gui.c:93
+#: src/echo_plugin/gui.c:88
 msgid "Feedback: (%)"
 msgstr "Visszacsatolás: (%)"
 
-#: src/echo_plugin/gui.c:98
+#: src/echo_plugin/gui.c:93
 msgid "Volume: (%)"
 msgstr "Hangerő: (%)"
 
-#: src/ffaudio/ffaudio-core.c:789
+#: src/ffaudio/ffaudio-core.c:795
 #, c-format
 msgid ""
 "Multi-format audio decoding plugin for Audacious based on\n"
@@ -983,228 +1242,207 @@
 "libavutil %s (%s)\n"
 msgstr ""
 
-#: src/ffaudio/ffaudio-core.c:803
+#: src/ffaudio/ffaudio-core.c:809
 msgid "About FFaudio Plugin"
 msgstr "FFaudio bővítmény névjegye"
 
-#: src/filewriter/filewriter.c:155
+#: src/filewriter/filewriter.c:166
 msgid "About FileWriter-Plugin"
 msgstr "Fájlíró bővítmény névjegye"
 
-#: src/filewriter/filewriter.c:156
-msgid ""
-"FileWriter-Plugin\n"
-"\n"
-"This program is free software; you can redistribute it and/or modify\n"
-"it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
-"(at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
-"GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
-msgstr ""
-
-#: src/filewriter/filewriter.c:450
+#: src/filewriter/filewriter.c:455
 msgid "File Writer Configuration"
 msgstr "Fájl Író beállítások"
 
-#: src/filewriter/filewriter.c:462
+#: src/filewriter/filewriter.c:467
 msgid "Output file format:"
 msgstr "Kimeneti fájl formátum:"
 
-#: src/filewriter/filewriter.c:480
+#: src/filewriter/filewriter.c:485
 msgid "Configure"
 msgstr "Beállítás"
 
-#: src/filewriter/filewriter.c:495
+#: src/filewriter/filewriter.c:500
 msgid "Save into original directory"
 msgstr "Mentés az eredeti könyvtárba"
 
-#: src/filewriter/filewriter.c:500
+#: src/filewriter/filewriter.c:505
 msgid "Save into custom directory"
 msgstr "Mentés egyéb könyvtárba"
 
-#: src/filewriter/filewriter.c:510
+#: src/filewriter/filewriter.c:515
 msgid "Output file folder:"
 msgstr "Kimeneti fájl könyvtára:"
 
-#: src/filewriter/filewriter.c:514
+#: src/filewriter/filewriter.c:519
 msgid "Pick a folder"
 msgstr "Válasszon egy mappát"
 
-#: src/filewriter/filewriter.c:533
+#: src/filewriter/filewriter.c:538
 msgid "Get filename from:"
 msgstr "Legyen a fájlnévből:"
 
-#: src/filewriter/filewriter.c:536
+#: src/filewriter/filewriter.c:541
 msgid "original file tags"
 msgstr "eredeti fájl kiterjesztések"
 
-#: src/filewriter/filewriter.c:542
+#: src/filewriter/filewriter.c:547
 msgid "original filename"
 msgstr "eredeti fájlnév"
 
-#: src/filewriter/filewriter.c:552
+#: src/filewriter/filewriter.c:557
 msgid "Don't strip file name extension"
 msgstr "Ne vágja le a fájl kiterjesztést"
 
-#: src/filewriter/filewriter.c:567
+#: src/filewriter/filewriter.c:572
 msgid "Prepend track number to filename"
 msgstr ""
 
-#: src/filewriter/mp3.c:38 src/filewriter/mp3.c:783
+#: src/filewriter/mp3.c:38 src/filewriter/mp3.c:771
 msgid "Auto"
 msgstr "Automatikus"
 
 #: src/filewriter/mp3.c:38
-#, fuzzy
 msgid "Joint Stereo"
-msgstr "Joint-Stereo"
+msgstr "Joint Stereo"
 
-#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183 src/sid/xs_interface.c:308
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183
 msgid "Stereo"
 msgstr "Sztereó"
 
-#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183 src/sid/xs_interface.c:301
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183
 msgid "Mono"
 msgstr "Monó"
 
-#: src/filewriter/mp3.c:724
+#: src/filewriter/mp3.c:712
 msgid "MP3 Configuration"
 msgstr "MP3 Beállítás"
 
-#: src/filewriter/mp3.c:747
+#: src/filewriter/mp3.c:735
 msgid "Algorithm Quality:"
 msgstr "Algoritmus minősége:"
 
-#: src/filewriter/mp3.c:772
+#: src/filewriter/mp3.c:760
 msgid "Output Samplerate:"
 msgstr "Kimenet mintavétele:"
 
-#: src/filewriter/mp3.c:800
+#: src/filewriter/mp3.c:788
 msgid "(Hz)"
 msgstr "(Hz)"
 
-#: src/filewriter/mp3.c:807
+#: src/filewriter/mp3.c:795
 msgid "Bitrate / Compression ratio:"
 msgstr "Bitráta / Tömörítési arány:"
 
-#: src/filewriter/mp3.c:831
+#: src/filewriter/mp3.c:819
 msgid "Bitrate (kbps):"
 msgstr "Bitráta (kbps):"
 
-#: src/filewriter/mp3.c:864
+#: src/filewriter/mp3.c:852
 msgid "Compression ratio:"
 msgstr "Tömörítési arány:"
 
-#: src/filewriter/mp3.c:888
+#: src/filewriter/mp3.c:876
 msgid "Audio Mode:"
 msgstr "Audio mód:"
 
-#: src/filewriter/mp3.c:913
+#: src/filewriter/mp3.c:901
 msgid "Misc:"
 msgstr "Egyéb:"
 
-#: src/filewriter/mp3.c:924
+#: src/filewriter/mp3.c:912
 msgid "Enforce strict ISO complience"
 msgstr ""
 
-#: src/filewriter/mp3.c:935
+#: src/filewriter/mp3.c:923
 msgid "Error protection"
 msgstr "Hiba védelem"
 
-#: src/filewriter/mp3.c:947 src/filewriter/vorbis.c:245
+#: src/filewriter/mp3.c:935 src/filewriter/vorbis.c:243
 msgid "Quality"
 msgstr "Minőség"
 
-#: src/filewriter/mp3.c:957
+#: src/filewriter/mp3.c:945
 msgid "Enable VBR/ABR"
 msgstr "VBR/ABR engedélyezése"
 
-#: src/filewriter/mp3.c:967
+#: src/filewriter/mp3.c:955
 msgid "Type:"
 msgstr "Típus:"
 
-#: src/filewriter/mp3.c:1000
+#: src/filewriter/mp3.c:988
 msgid "VBR Options:"
 msgstr "VBR beállítások:"
 
-#: src/filewriter/mp3.c:1016
+#: src/filewriter/mp3.c:1004
 msgid "Minimum bitrate (kbps):"
 msgstr "Minimális bitsebesség (kbps):"
 
-#: src/filewriter/mp3.c:1043
+#: src/filewriter/mp3.c:1031
 msgid "Maximum bitrate (kbps):"
 msgstr "Maximális bitsebesség (kbps):"
 
-#: src/filewriter/mp3.c:1066
+#: src/filewriter/mp3.c:1054
 msgid "Strictly enforce minimum bitrate"
 msgstr ""
 
-#: src/filewriter/mp3.c:1078
+#: src/filewriter/mp3.c:1066
 msgid "ABR Options:"
 msgstr "ABR beállítások:"
 
-#: src/filewriter/mp3.c:1088
+#: src/filewriter/mp3.c:1076
 msgid "Average bitrate (kbps):"
 msgstr "Átlagos bitráta (kbps):"
 
-#: src/filewriter/mp3.c:1116
+#: src/filewriter/mp3.c:1104
 msgid "VBR quality level:"
 msgstr "VBR minőségi szint:"
 
-#: src/filewriter/mp3.c:1135
+#: src/filewriter/mp3.c:1123
 msgid "Don't write Xing VBR header"
 msgstr "Ne írjon Xing VBR fejlécet"
 
-#: src/filewriter/mp3.c:1149
+#: src/filewriter/mp3.c:1137
 msgid "VBR/ABR"
 msgstr "VBR/ABR"
 
-#: src/filewriter/mp3.c:1159
+#: src/filewriter/mp3.c:1147
 msgid "Frame params:"
 msgstr "Keret paraméterek:"
 
-#: src/filewriter/mp3.c:1171
+#: src/filewriter/mp3.c:1159
 msgid "Mark as copyright"
 msgstr "Megjelölés jogvédettként"
 
-#: src/filewriter/mp3.c:1182
+#: src/filewriter/mp3.c:1170
 msgid "Mark as original"
 msgstr "Megjelölés eredetiként"
 
-#: src/filewriter/mp3.c:1194
+#: src/filewriter/mp3.c:1182
 msgid "ID3 params:"
 msgstr "ID3 paraméterek:"
 
-#: src/filewriter/mp3.c:1205
+#: src/filewriter/mp3.c:1193
 msgid "Force addition of version 2 tag"
 msgstr "Mindig adja hozzá a 2-es verzió címkéit"
 
-#: src/filewriter/mp3.c:1215
+#: src/filewriter/mp3.c:1203
 msgid "Only add v1 tag"
 msgstr "Csak v1 címkék hozzáadása"
 
-#: src/filewriter/mp3.c:1222
+#: src/filewriter/mp3.c:1210
 msgid "Only add v2 tag"
 msgstr "Csak v2 címkék hozzáadása"
 
-#: src/filewriter/mp3.c:1243
+#: src/filewriter/mp3.c:1231
 msgid "Tags"
 msgstr "Címkék"
 
-#: src/filewriter/vorbis.c:238
+#: src/filewriter/vorbis.c:236
 msgid "Vorbis Encoder Configuration"
 msgstr "Vorbis kódoló beállítások"
 
-#: src/filewriter/vorbis.c:258
+#: src/filewriter/vorbis.c:256
 msgid "Quality level (0 - 10):"
 msgstr "Minőségi szint (0-10):"
 
@@ -1253,416 +1491,364 @@
 
 #: src/gtkui/columns.c:36
 msgid "Entry number"
-msgstr ""
+msgstr "Bejegyzés száma"
 
-#: src/gtkui/columns.c:36 src/sid/xs_interface.c:1103
+#: src/gtkui/columns.c:36
 msgid "Title"
 msgstr "Cím"
 
 #: src/gtkui/columns.c:37
-#, fuzzy
 msgid "Artist"
-msgstr "Előadó:"
+msgstr "Előadó"
 
 #: src/gtkui/columns.c:37
 msgid "Year"
-msgstr ""
+msgstr "Év"
 
 #: src/gtkui/columns.c:37
-#, fuzzy
 msgid "Album"
-msgstr "Album:"
+msgstr "Album"
 
 #: src/gtkui/columns.c:37
-#, fuzzy
 msgid "Track"
-msgstr "Következő szám"
+msgstr "Sáv"
 
 #: src/gtkui/columns.c:37
-#, fuzzy
 msgid "Queue position"
-msgstr "Pozíció"
+msgstr "Várakozási sor pozíció"
 
 #: src/gtkui/columns.c:38
-#, fuzzy
 msgid "Length"
-msgstr "Dalhossz"
+msgstr "Hossz"
 
 #: src/gtkui/columns.c:38
-#, fuzzy
 msgid "File path"
-msgstr "Fájl útvonal szerint"
+msgstr "Fájl elérési útja"
 
 #: src/gtkui/columns.c:38
-#, fuzzy
 msgid "File name"
 msgstr "Fájlnév"
 
 #: src/gtkui/columns.c:38
-#, fuzzy
 msgid "Custom title"
-msgstr "Egyedi téma"
+msgstr "Egyéni cím"
 
 #: src/gtkui/columns.c:39
-#, fuzzy
 msgid "Bitrate"
-msgstr "Bitráta (kbps):"
+msgstr "Bitráta"
 
-#: src/gtkui/columns.c:286
-#, fuzzy
+#: src/gtkui/columns.c:278
 msgid "Choose Columns"
-msgstr "Lejátszó mutatása"
+msgstr "Oszlopok választása"
 
-#: src/gtkui/columns.c:300
-#, fuzzy
+#: src/gtkui/columns.c:292
 msgid "Available:"
-msgstr "változó"
+msgstr "Elérhető:"
 
-#: src/gtkui/columns.c:334
+#: src/gtkui/columns.c:326
 msgid "Chosen:"
-msgstr ""
+msgstr "Választott:"
 
 #: src/gtkui/layout.c:122
 msgid "Dock at Left"
-msgstr ""
+msgstr "Balra rögzít"
 
 #: src/gtkui/layout.c:122
 msgid "Dock at Right"
-msgstr ""
+msgstr "Jobbra rögzít"
 
 #: src/gtkui/layout.c:123
 msgid "Dock at Top"
-msgstr ""
+msgstr "Felülre rögzít"
 
 #: src/gtkui/layout.c:123
 msgid "Dock at Bottom"
-msgstr ""
+msgstr "Alulra rögzít"
 
 #: src/gtkui/layout.c:123
 msgid "Undock"
-msgstr ""
+msgstr "Rögzítés feloldása"
 
-#: src/gtkui/layout.c:123
-#, fuzzy
+#: src/gtkui/layout.c:123 src/ladspa/plugin.c:643
 msgid "Disable"
-msgstr "változó"
+msgstr "Letiltás"
 
-#: src/gtkui/menus.c:132
-#, fuzzy
+#: src/gtkui/menus.c:130
 msgid "_Open Files ..."
-msgstr "Fájlok megnyitása ..."
+msgstr "Fájl_ok megnyitása ..."
 
-#: src/gtkui/menus.c:133
-#, fuzzy
+#: src/gtkui/menus.c:131
 msgid "Open _URL ..."
-msgstr "URL megnyitása ..."
+msgstr "_URL megnyitása ..."
 
-#: src/gtkui/menus.c:134
-#, fuzzy
+#: src/gtkui/menus.c:132
 msgid "_Add File ..."
-msgstr "Fájlok hozzáadása ..."
+msgstr "Fájlok hozzá_adása ..."
 
-#: src/gtkui/menus.c:135
-#, fuzzy
+#: src/gtkui/menus.c:133
 msgid "Add U_RL ..."
-msgstr "URL hozzáadása ..."
+msgstr "U_RL hozzáadása ..."
 
-#: src/gtkui/menus.c:137
-#, fuzzy
+#: src/gtkui/menus.c:135
 msgid "A_bout ..."
-msgstr "Névjegy"
+msgstr "_Névjegy ..."
 
-#: src/gtkui/menus.c:138
-#, fuzzy
+#: src/gtkui/menus.c:136
 msgid "_Preferences ..."
-msgstr "Beállítások"
+msgstr "_Beállítások ..."
 
-#: src/gtkui/menus.c:139 src/skins/ui_manager.c:412
+#: src/gtkui/menus.c:137 src/skins/ui_manager.c:406
 msgid "_Quit"
 msgstr "_Kilépés"
 
-#: src/gtkui/menus.c:142
-#, fuzzy
+#: src/gtkui/menus.c:140
 msgid "_Play"
-msgstr "Lejátszás"
+msgstr "_Lejátszás"
 
-#: src/gtkui/menus.c:143
-#, fuzzy
+#: src/gtkui/menus.c:141
 msgid "Paus_e"
-msgstr "Szünet"
+msgstr "_Szünet"
 
-#: src/gtkui/menus.c:144
-#, fuzzy
+#: src/gtkui/menus.c:142
 msgid "_Stop"
-msgstr "Leállít"
+msgstr "_Megállítás"
 
-#: src/gtkui/menus.c:145
-#, fuzzy
+#: src/gtkui/menus.c:143
 msgid "Pre_vious"
-msgstr "Előző"
+msgstr "Elő_ző"
 
-#: src/gtkui/menus.c:146
-#, fuzzy
+#: src/gtkui/menus.c:144
 msgid "_Next"
-msgstr "Következő"
+msgstr "_Következő"
 
-#: src/gtkui/menus.c:148
-#, fuzzy
+#: src/gtkui/menus.c:146
 msgid "_Repeat"
-msgstr "Ismétlés"
+msgstr "_Ismétlés"
 
-#: src/gtkui/menus.c:149
-#, fuzzy
+#: src/gtkui/menus.c:147
 msgid "S_huffle"
-msgstr "Véletlenszerű"
+msgstr "_Véletlenszerű"
 
-#: src/gtkui/menus.c:150
-#, fuzzy
+#: src/gtkui/menus.c:148
 msgid "N_o Playlist Advance"
-msgstr "Ne legyen léptetés a lejátszólistában"
+msgstr ""
 
-#: src/gtkui/menus.c:151
-#, fuzzy
+#: src/gtkui/menus.c:149
 msgid "Stop _After This Song"
-msgstr "Leállítás az aktuális dal után."
+msgstr "Megállítás _az aktuális szám után"
 
-#: src/gtkui/menus.c:153 src/gtkui/menus.c:210
+#: src/gtkui/menus.c:151 src/gtkui/menus.c:209
 msgid "Song _Info ..."
-msgstr ""
+msgstr "Dal _információ ..."
 
-#: src/gtkui/menus.c:154
-#, fuzzy
+#: src/gtkui/menus.c:152
 msgid "Jump to _Time ..."
-msgstr "Ugrás a megadott időre"
+msgstr "Ugrás _időre ..."
 
-#: src/gtkui/menus.c:155
+#: src/gtkui/menus.c:153
 msgid "_Jump to Song ..."
-msgstr ""
+msgstr "Ugrás _dalra ..."
 
-#: src/gtkui/menus.c:158
-#, fuzzy
+#: src/gtkui/menus.c:156
 msgid "By Track _Number"
-msgstr "A dal sorszáma szerint"
+msgstr "Sáv szeri_nt"
 
-#: src/gtkui/menus.c:159
-#, fuzzy
+#: src/gtkui/menus.c:157
 msgid "By _Title"
-msgstr "Cím szerint"
+msgstr "Cím szerin_t"
 
-#: src/gtkui/menus.c:160
-#, fuzzy
+#: src/gtkui/menus.c:158
 msgid "By _Artist"
-msgstr "Előadó szerint"
+msgstr "Elő_adó szerint"
 
-#: src/gtkui/menus.c:161
-#, fuzzy
+#: src/gtkui/menus.c:159
 msgid "By A_lbum"
-msgstr "Album szerint"
+msgstr "A_lbum szerint"
 
-#: src/gtkui/menus.c:162
-#, fuzzy
+#: src/gtkui/menus.c:160
 msgid "By Release _Date"
-msgstr "Dátum alapján"
+msgstr "_Dátum szerint"
 
-#: src/gtkui/menus.c:163
-#, fuzzy
+#: src/gtkui/menus.c:161
 msgid "By _File Path"
-msgstr "Fájl útvonal szerint"
+msgstr "_Fájl útvonal szerint"
 
-#: src/gtkui/menus.c:164
-#, fuzzy
+#: src/gtkui/menus.c:162
 msgid "By _Custom Title"
-msgstr "Egyedi téma"
+msgstr "_Egyedi cím szerint"
 
-#: src/gtkui/menus.c:166
-#, fuzzy
+#: src/gtkui/menus.c:164
 msgid "R_everse Order"
-msgstr "Fordított sorrend"
+msgstr "Fo_rdított sorrend"
 
-#: src/gtkui/menus.c:167
+#: src/gtkui/menus.c:165
 msgid "_Random Order"
-msgstr ""
+msgstr "Véletlensze_rű sorrend"
 
-#: src/gtkui/menus.c:170 src/gtkui/menus.c:212
+#: src/gtkui/menus.c:168 src/gtkui/menus.c:211
 msgid "_Refresh"
 msgstr "_Frissítés"
 
-#: src/gtkui/menus.c:172
-#, fuzzy
+#: src/gtkui/menus.c:170
 msgid "_Sort"
-msgstr "Rendezés"
+msgstr "Rendezé_s"
 
-#: src/gtkui/menus.c:174
+#: src/gtkui/menus.c:172
 msgid "_New"
-msgstr ""
+msgstr "_Új"
 
-#: src/gtkui/menus.c:175
+#: src/gtkui/menus.c:173 src/gtkui/menus.c:222
 msgid "_Close"
 msgstr "_Bezár"
 
-#: src/gtkui/menus.c:177
-#, fuzzy
+#: src/gtkui/menus.c:175
 msgid "_Import ..."
-msgstr "Importálás"
+msgstr "_Importálás ..."
 
-#: src/gtkui/menus.c:178
-#, fuzzy
+#: src/gtkui/menus.c:176
 msgid "_Export ..."
-msgstr "Exportálás"
+msgstr "_Exportálás ..."
 
-#: src/gtkui/menus.c:180
-#, fuzzy
+#: src/gtkui/menus.c:178
 msgid "_Playlist Manager ..."
-msgstr "Lejátszólista kezelő"
+msgstr "_Lejátszólista kezelő ..."
 
-#: src/gtkui/menus.c:183
-#, fuzzy
+#: src/gtkui/menus.c:179
+msgid "_Queue Manager ..."
+msgstr "_Várakozási sor kezelő ..."
+
+#: src/gtkui/menus.c:182
 msgid "Volume _Up"
-msgstr "Hangerő fel"
+msgstr "Hangerő _fel"
 
-#: src/gtkui/menus.c:184
-#, fuzzy
+#: src/gtkui/menus.c:183
 msgid "Volume _Down"
-msgstr "Hangerő le"
+msgstr "Hangerő _le"
 
-#: src/gtkui/menus.c:186
-#, fuzzy
+#: src/gtkui/menus.c:185
 msgid "_Equalizer"
-msgstr "Hangszínszabályzó"
+msgstr "_Hangszínszabályzó"
 
-#: src/gtkui/menus.c:188
-#, fuzzy
+#: src/gtkui/menus.c:187
 msgid "E_ffects"
-msgstr "Effektek"
+msgstr "E_ffektusok"
 
-#: src/gtkui/menus.c:191
-#, fuzzy
+#: src/gtkui/menus.c:190
 msgid "_Interface"
-msgstr "Felület"
+msgstr "_Felület"
 
-#: src/gtkui/menus.c:193
+#: src/gtkui/menus.c:192
 msgid "Show _Menu Bar"
-msgstr ""
+msgstr "_Menü sor mutatása"
 
-#: src/gtkui/menus.c:194
-#, fuzzy
+#: src/gtkui/menus.c:193
 msgid "Show I_nfo Bar"
-msgstr "Információs terület mutatása"
+msgstr "I_nfo sor mutatása"
 
-#: src/gtkui/menus.c:195
-#, fuzzy
+#: src/gtkui/menus.c:194
 msgid "Show _Status Bar"
-msgstr "Az állapotsor megjelenítése"
+msgstr "_Státusz sor mutatása"
 
-#: src/gtkui/menus.c:197
-#, fuzzy
+#: src/gtkui/menus.c:196
 msgid "Show Column _Headers"
-msgstr "Lejátszó mutatása"
+msgstr "O_szlop fejlécek mutatása"
 
-#: src/gtkui/menus.c:198
-#, fuzzy
+#: src/gtkui/menus.c:197
 msgid "Choose _Columns ..."
-msgstr "Lejátszó mutatása"
+msgstr "_Válasszon oszlopokat ..."
 
-#: src/gtkui/menus.c:199
-#, fuzzy
+#: src/gtkui/menus.c:198
 msgid "Scrol_l on Song Change"
-msgstr "Szám váltás"
+msgstr ""
 
-#: src/gtkui/menus.c:202
-#, fuzzy
+#: src/gtkui/menus.c:201
 msgid "_File"
-msgstr "Fájl"
+msgstr "_Fájl"
 
-#: src/gtkui/menus.c:203
-#, fuzzy
+#: src/gtkui/menus.c:202
 msgid "_Playback"
-msgstr "Lejátszás"
+msgstr "L_ejátszás"
 
-#: src/gtkui/menus.c:204
-#, fuzzy
+#: src/gtkui/menus.c:203
 msgid "P_laylist"
-msgstr "Lejátszólista"
+msgstr "_Lejátszólista"
 
-#: src/gtkui/menus.c:205 src/gtkui/menus.c:219
-#, fuzzy
+#: src/gtkui/menus.c:204 src/gtkui/menus.c:218
 msgid "_Services"
-msgstr "Eszközök"
+msgstr "_Szervizek"
 
-#: src/gtkui/menus.c:206
-#, fuzzy
+#: src/gtkui/menus.c:205
 msgid "_Output"
-msgstr "Kimenet"
+msgstr "_Kimenet"
 
-#: src/gtkui/menus.c:207
-#, fuzzy
+#: src/gtkui/menus.c:206
 msgid "_View"
-msgstr "Nézet"
+msgstr ""
 
-#: src/gtkui/menus.c:211
+#: src/gtkui/menus.c:210
 msgid "_Queue/Unqueue"
 msgstr ""
 
-#: src/gtkui/menus.c:214
+#: src/gtkui/menus.c:213
 msgid "Cu_t"
 msgstr ""
 
-#: src/gtkui/menus.c:215
-#, fuzzy
+#: src/gtkui/menus.c:214
 msgid "_Copy"
-msgstr "Másolás"
+msgstr ""
 
-#: src/gtkui/menus.c:216
-#, fuzzy
+#: src/gtkui/menus.c:215
 msgid "_Paste"
-msgstr "Beillesztés"
+msgstr ""
 
-#: src/gtkui/menus.c:217
-#, fuzzy
+#: src/gtkui/menus.c:216
 msgid "Select _All"
-msgstr "Mindet kijelöl"
+msgstr ""
 
-#: src/gtkui/menus.c:222
-#, fuzzy
+#: src/gtkui/menus.c:221
 msgid "_Rename"
-msgstr "Fájlnév"
+msgstr ""
 
-#: src/gtkui/ui_gtk.c:75
+#: src/gtkui/ui_gtk.c:95
 msgid "GTK Interface"
 msgstr "GTK+ felület"
 
-#: src/gtkui/ui_gtk.c:132 src/skins/ui_main.c:303
+#: src/gtkui/ui_gtk.c:156 src/skins/ui_main.c:302
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.c:138 src/skins/ui_main.c:305 src/skins/ui_main.c:1498
+#: src/gtkui/ui_gtk.c:162
+msgid "Buffering ..."
+msgstr ""
+
+#: src/gtkui/ui_gtk.c:165 src/skins/ui_main.c:304 src/skins/ui_main.c:1499
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_gtk.c:177 src/skins/plugin.c:185
+#: src/gtkui/ui_gtk.c:211 src/skins/plugin.c:183
 msgid "Error"
 msgstr "Hiba"
 
-#: src/gtkui/ui_statusbar.c:102 src/skins/ui_main.c:460
+#: src/gtkui/ui_statusbar.c:102 src/skins/ui_main.c:459
 msgid "mono"
 msgstr "mono"
 
-#: src/gtkui/ui_statusbar.c:104 src/skins/ui_main.c:459
+#: src/gtkui/ui_statusbar.c:104 src/skins/ui_main.c:458
 msgid "stereo"
 msgstr "sztereó"
 
 #: src/gtkui/ui_statusbar.c:106
-#, fuzzy, c-format
+#, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
-msgstr[0] "%d csatorna"
-msgstr[1] "%d csatorna"
+msgstr[0] ""
+msgstr[1] ""
 
 #: src/gtkui/ui_statusbar.c:121
-#, fuzzy, c-format
+#, c-format
 msgid "%d kbps"
-msgstr "kbps"
+msgstr ""
 
 #: src/hotkey/gui.c:71
 msgid "Previous Track"
@@ -1704,7 +1890,7 @@
 msgid "Volume Down"
 msgstr "Hangerő le"
 
-#: src/hotkey/gui.c:81 src/skins/ui_manager.c:424 src/skins/ui_manager.c:425
+#: src/hotkey/gui.c:81 src/skins/ui_manager.c:418 src/skins/ui_manager.c:419
 msgid "Jump to File"
 msgstr "Ugrás fájlhoz"
 
@@ -1717,14 +1903,12 @@
 msgstr "On-Screen-Display mutatása"
 
 #: src/hotkey/gui.c:84
-#, fuzzy
 msgid "Toggle Repeat"
-msgstr "Ismétlés"
+msgstr ""
 
 #: src/hotkey/gui.c:85
-#, fuzzy
 msgid "Toggle Shuffle"
-msgstr "Véletlenszerű"
+msgstr ""
 
 #: src/hotkey/gui.c:95
 msgid "(none)"
@@ -1732,8 +1916,7 @@
 
 #: src/hotkey/gui.c:232
 msgid ""
-"It is not recommended to bind the primary mouse buttons without "
-"modificators.\n"
+"It is not recommended to bind the primary mouse buttons without modificators.\n"
 "\n"
 "Do you want to continue?"
 msgstr ""
@@ -1784,31 +1967,31 @@
 "\n"
 msgstr ""
 
-#: src/jack/configure.c:71
+#: src/jack/configure.c:66
 msgid "Connect to all available jack ports"
 msgstr "Kapcsolódás minden eléhető jack porthoz"
 
-#: src/jack/configure.c:78
+#: src/jack/configure.c:73
 msgid "Connect only the output ports"
 msgstr "Csatlakozás csak a kiválasztott kimeneti porthoz"
 
-#: src/jack/configure.c:85
+#: src/jack/configure.c:80
 msgid "Connect to no ports"
 msgstr "Csatlakozás portok nélkül"
 
-#: src/jack/configure.c:103
+#: src/jack/configure.c:98
 msgid "jack Plugin configuration"
 msgstr "Jack bővítmény beállítások"
 
-#: src/jack/configure.c:121
+#: src/jack/configure.c:116
 msgid "Connection mode:"
 msgstr "Kapcsolat módja:"
 
-#: src/jack/configure.c:133
+#: src/jack/configure.c:128
 msgid "Enable debug printing"
 msgstr "Hibakeresés engedélyezése"
 
-#: src/jack/jack.c:438
+#: src/jack/jack.c:422
 msgid ""
 "XMMS jack Driver 0.17\n"
 "\n"
@@ -1826,23 +2009,67 @@
 "Audacious bővítményt írta:\n"
 "Giacomo Lozito from develia.org"
 
-#: src/jack/jack.c:443
+#: src/jack/jack.c:427
 msgid "About JACK Output Plugin 0.17"
 msgstr "JACK kimenet bővítmény névjegye 0.17"
 
-#: src/lyricwiki/lyricwiki.c:226
+#: src/ladspa/plugin.c:414
+msgid "About LADSPA Host"
+msgstr ""
+
+#: src/ladspa/plugin.c:515
+#, c-format
+msgid "%s Settings"
+msgstr ""
+
+#: src/ladspa/plugin.c:583
+msgid "LADSPA Host Settings"
+msgstr ""
+
+#: src/ladspa/plugin.c:592
+msgid "Module paths:"
+msgstr ""
+
+#: src/ladspa/plugin.c:597
+msgid ""
+"Separate multiple paths with a colon.\n"
+"These paths are searched in addition to LADSPA_PATH.\n"
+"After adding new paths, press Enter to scan for new plugins."
+msgstr ""
+
+#: src/ladspa/plugin.c:613
+msgid "Available plugins:"
+msgstr ""
+
+#: src/ladspa/plugin.c:625
+msgid "Enable"
+msgstr ""
+
+#: src/ladspa/plugin.c:631
+msgid "Enabled plugins:"
+msgstr "Engedélyezett modulok:"
+
+#: src/ladspa/plugin.c:646
+msgid "Settings"
+msgstr "Beállítások"
+
+#: src/lyricwiki/lyricwiki.c:227
 msgid ""
 "\n"
 "Looking for lyrics..."
 msgstr ""
+"\n"
+"Dalszöveg keresése ..."
 
-#: src/lyricwiki/lyricwiki.c:249
+#: src/lyricwiki/lyricwiki.c:250
 msgid ""
 "\n"
 "Connecting to lyrics.wikia.com..."
 msgstr ""
+"\n"
+"Csatlakozás a lyrics.wikia.com-hoz ..."
 
-#: src/lyricwiki/lyricwiki.c:337
+#: src/lyricwiki/lyricwiki.c:338
 msgid ""
 "\n"
 "No lyrics were found."
@@ -1873,6 +2100,22 @@
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Tact generátor: %d bpm %d/%d"
 
+#: src/mixer/plugin.c:64
+msgid "About Channel Mixer"
+msgstr "Csatorna keverő névjegye"
+
+#: src/mixer/plugin.c:93
+msgid "Channel Mixer Settings"
+msgstr "Csatorna keverő beállítások"
+
+#: src/mixer/plugin.c:102
+msgid "Output channels:"
+msgstr "Kimeneti csatornák:"
+
+#: src/mixer/plugin.c:112
+msgid "Changes take effect at the next song change."
+msgstr "Változások a következő dal váltáskor lépnek életbe."
+
 #: src/mpg123/mpg123.c:183
 msgid "Surround"
 msgstr "Térhatású"
@@ -1883,22 +2126,19 @@
 
 #: src/mtp_up/mtp.c:310
 msgid "Upload to MTP Device"
-msgstr ""
+msgstr "Feltöltés az MTP Eszközre"
 
 #: src/mtp_up/mtp.c:311
-#, fuzzy
 msgid "Disconnect MTP Device"
-msgstr "Eszköz leválasztása"
+msgstr "MTP Eszköz leválasztása"
 
 #: src/notify/libnotify-aosd_event.c:47
-#, fuzzy
 msgid "Stopped"
-msgstr "Leállít"
+msgstr "Leállítva"
 
 #: src/notify/libnotify-aosd_event.c:47
-#, fuzzy
 msgid "Audacious is not playing."
-msgstr "Audacious - láthatósági figyelmeztetés"
+msgstr "Az Audacious nem játszik."
 
 #: src/null/null.c:64
 msgid "Null output plugin "
@@ -1909,112 +2149,87 @@
 " by Christian Birchinger <joker@netswarm.net>\n"
 "based on the XMMS plugin by Håvard Kvål <havardk@xmms.org>"
 msgstr ""
+" írta Christian Birchinger <joker@netswarm.net>\n"
+"XMMS plugin alapján Håvard Kvål <havardk@xmms.org>"
 
 #: src/null/null.c:68
 msgid "About Null Output"
 msgstr "Null kimeneti bővítmény névjegye"
 
-#: src/null/null.c:94
+#: src/null/null.c:89
 msgid "Null output preferences"
 msgstr "Null kimenet beállítások"
 
-#: src/null/null.c:105
+#: src/null/null.c:100
 msgid "Run in real time"
 msgstr "Futtatás valós időben"
 
-#: src/oss4/configure.c:89
+#: src/oss4/configure.c:76
 msgid "1. Default device"
 msgstr "1. Alapértelmezett eszköz"
 
-#: src/oss4/configure.c:151
+#: src/oss4/configure.c:132
 msgid "OSS4 Output Plugin Preferences"
 msgstr "OSS4 Kimeneti bővítmény beállítások"
 
-#: src/oss4/configure.c:163 src/OSS/configure.c:203
+#: src/oss4/configure.c:144 src/OSS/configure.c:194
 msgid "Audio device:"
 msgstr "Audio eszköz:"
 
-#: src/oss4/configure.c:189 src/OSS/configure.c:226 src/OSS/configure.c:269
+#: src/oss4/configure.c:172 src/OSS/configure.c:217 src/OSS/configure.c:260
 msgid "Use alternate device:"
 msgstr "Alternatív eszköz használata:"
 
-#: src/oss4/configure.c:202
+#: src/oss4/configure.c:187
 msgid "Save volume between sessions"
 msgstr "Hangerő mentése munkamentek között"
 
-#: src/oss4/configure.c:206
+#: src/oss4/configure.c:191
 msgid "Enable format conversions made by the OSS software."
-msgstr ""
+msgstr "Formátum konverzió engedélyezése az OSS szoftverben."
 
 #: src/oss4/plugin.c:51
 msgid "About OSS4 Plugin"
 msgstr "OSS4 bővítmény névjegye"
 
-#: src/oss4/plugin.c:52
-msgid ""
-"OSS4 Output Plugin for Audacious\n"
-"Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
-"\n"
-"I would like to thank people on #audacious, especially Tony Vroon and John "
-"Lindgren and of course the authors of the previous OSS plugin.\n"
-"\n"
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with "
-"this program. If not, see <http://www.gnu.org/licenses/>.\n"
-msgstr ""
-
-#: src/oss4/utils.c:204
+#: src/oss4/utils.c:211
 msgid "OSS4 error"
 msgstr "OSS4 hiba"
 
-#: src/OSS/configure.c:146
+#: src/OSS/configure.c:137
 #, c-format
 msgid "Default (%s)"
 msgstr "Alapértelmezett (%s)"
 
-#: src/OSS/configure.c:162 src/skins/ui_manager.c:456
-#: src/skins/ui_manager.c:477
-msgid "Default"
-msgstr "Alapértelmezett"
-
-#: src/OSS/configure.c:187
+#: src/OSS/configure.c:178
 msgid "OSS Driver configuration"
 msgstr "OSS meghajtó beállítások"
 
-#: src/OSS/configure.c:290
+#: src/OSS/configure.c:281
 msgid "Devices"
 msgstr "Eszközök"
 
-#: src/OSS/configure.c:292
+#: src/OSS/configure.c:283
 msgid "Buffering:"
 msgstr "Pufferelés:"
 
-#: src/OSS/configure.c:305
+#: src/OSS/configure.c:296
 msgid "Pre-buffer (percent):"
 msgstr "Elő-pufferelés (százalék):"
 
-#: src/OSS/configure.c:316
+#: src/OSS/configure.c:307
 msgid "Buffering"
 msgstr "Pufferelés"
 
-#: src/OSS/configure.c:317
+#: src/OSS/configure.c:308
 msgid "Mixer Settings:"
 msgstr "Keverő beállítások:"
 
-#: src/OSS/configure.c:323
+#: src/OSS/configure.c:314
 msgid "Volume controls Master not PCM"
 msgstr "Hangerőszabályzó a Főhangerőt nem a PCM-et használja"
 
-#: src/OSS/configure.c:329
+#: src/OSS/configure.c:320
 msgid "Mixer"
 msgstr "Keverő"
 
@@ -2022,746 +2237,124 @@
 msgid "About OSS Driver"
 msgstr "OSS meghajtó névjegye"
 
-#: src/OSS/OSS.c:41
-msgid ""
-"Audacious OSS Driver\n"
-"\n"
-" This program is free software; you can redistribute it and/or modify\n"
-"it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
-"(at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
-"GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
-msgstr ""
-
 #: src/pulse_audio/pulse_audio.c:687
 msgid "About Audacious PulseAudio Output Plugin"
 msgstr "Audacious PulseAudio kimeneti bővítmény névjegye"
 
-#: src/pulse_audio/pulse_audio.c:688
-msgid ""
-"Audacious PulseAudio Output Plugin\n"
-"\n"
-" This program is free software; you can redistribute it and/or modify\n"
-"it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
-"(at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
-"GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
-msgstr ""
-
-#: src/resample/plugin.c:91
+#: src/resample/plugin.c:89
 msgid "About Sample Rate Converter Plugin"
-msgstr ""
+msgstr "Mintavételi konverter modul névjegye"
 
-#: src/resample/plugin.c:146
+#: src/resample/plugin.c:144
 msgid "Sample Rate Converter Preferences"
-msgstr ""
+msgstr "Mintavételi konverter beállítások"
 
-#: src/resample/plugin.c:158
+#: src/resample/plugin.c:156
 msgid "Rate mappings:"
-msgstr ""
+msgstr "Ráta leképezések:"
 
-#: src/resample/plugin.c:181
+#: src/resample/plugin.c:179
 msgid "All others:"
 msgstr "Minden egyéb:"
 
-#: src/resample/plugin.c:193
+#: src/resample/plugin.c:191
 msgid "Method:"
 msgstr "Módszer: "
 
-#: src/scrobbler/configure.c:128 src/scrobbler/configure.c:204
+#: src/scrobbler/configure.c:122 src/scrobbler/configure.c:197
 msgid "Change password"
 msgstr "Jelszó megváltoztatása"
 
-#: src/scrobbler/configure.c:150
+#: src/scrobbler/configure.c:143
 msgid "Services"
 msgstr "Szolgáltatások"
 
-#: src/scrobbler/configure.c:172
+#: src/scrobbler/configure.c:165
 msgid "Username:"
 msgstr "Felhasználónév:"
 
-#: src/scrobbler/configure.c:178
+#: src/scrobbler/configure.c:171
 msgid "Password:"
 msgstr "Jelszó:"
 
-#: src/scrobbler/configure.c:186
+#: src/scrobbler/configure.c:179
 msgid "Scrobbler URL:"
 msgstr "Scrobbler URL:"
 
-#: src/scrobbler/configure.c:218
+#: src/scrobbler/configure.c:211
 msgid "Last.FM"
 msgstr "Last FM"
 
-#: src/scrobbler/configure.c:262
+#: src/scrobbler/configure.c:238
 msgid "Scrobbler"
 msgstr ""
 
-#: src/scrobbler/plugin.c:213
+#: src/scrobbler/plugin.c:194
 msgid ""
 "Audacious AudioScrobbler Plugin\n"
 "\n"
-"Originally created by Audun Hove <audun@nlc.no> and Pipian <pipian@pipian."
-"com>\n"
+"Originally created by Audun Hove <audun@nlc.no> and Pipian <pipian@pipian.com>\n"
 msgstr ""
 
-#: src/scrobbler/plugin.c:215
+#: src/scrobbler/plugin.c:196
 msgid "About Scrobbler Plugin"
 msgstr "Scrobbler bővítmény névjegye"
 
 #: src/sdlout/plugin.c:58
-#, fuzzy
 msgid "About SDL Output Plugin"
-msgstr "ALSA Kimeneti bővítmény névjegye"
+msgstr "SDL Kimeneti modul névjegye"
 
 #: src/sdlout/plugin.c:78
-#, fuzzy
 msgid "SDL error"
-msgstr "ALSA hiba"
-
-#: src/sid/xs_about.c:84
-#, c-format
-msgid "About %s"
-msgstr "%s névjegye"
-
-#: src/sid/xs_about.c:214 src/sid/xs_interface.c:1825
-msgid "Close"
-msgstr "Bezár"
-
-#: src/sid/xs_config.c:326
-msgid " Error"
-msgstr " Hiba"
-
-#: src/sid/xs_config.c:326
-msgid "OK"
-msgstr "OK"
-
-#: src/sid/xs_fileinfo.c:151
-msgid "General info"
-msgstr "Általános információ"
-
-#: src/sid/xs_fileinfo.c:164
-#, c-format
-msgid "Tune #%i: "
-msgstr ""
-
-#: src/sid/xs_glade.c:90 src/sid/xs_glade.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "Nem találom a pixmap fájlt: %s"
-
-#: src/sid/xs_interface.c:234
-msgid "Audacious-SID configuration"
-msgstr "Audacious SID beállítás"
-
-#: src/sid/xs_interface.c:270
-msgid "8-bit"
-msgstr "8-bit"
-
-#: src/sid/xs_interface.c:277
-msgid "16-bit"
-msgstr "16-bit"
-
-#: src/sid/xs_interface.c:284
-msgid "Resolution:"
-msgstr "Felbontás:"
-
-#: src/sid/xs_interface.c:315
-msgid "Autopanning"
-msgstr ""
-
-#: src/sid/xs_interface.c:322
-msgid "Channels:"
-msgstr "Csatornák:"
-
-#: src/sid/xs_interface.c:366
-msgid "Samplerate:"
-msgstr "Mintavételi arány:"
-
-#: src/sid/xs_interface.c:383
-msgid "Use oversampling"
-msgstr "Túlmintavételezés engedélyezése"
-
-#: src/sid/xs_interface.c:394
-msgid "Factor:"
-msgstr "Szorzó:"
-
-#: src/sid/xs_interface.c:406
-msgid "Large factors require more CPU-power"
-msgstr ""
-
-#: src/sid/xs_interface.c:412
-msgid "Oversampling:"
-msgstr ""
-
-#: src/sid/xs_interface.c:417
-msgid "Audio"
-msgstr "Hang"
-
-#: src/sid/xs_interface.c:445
-msgid "Force speed"
-msgstr "Kényszerített sebesség"
-
-#: src/sid/xs_interface.c:449
-msgid ""
-"If enabled, this option \"forces\" the emulation engine to use the selected "
-"clock speed/frequency. Otherwise the speed is determined from played file "
-"itself."
-msgstr ""
-
-#: src/sid/xs_interface.c:451
-msgid "PAL (50 Hz)"
-msgstr "PAL (50 Hz)"
-
-#: src/sid/xs_interface.c:455
-msgid ""
-"PAL is the european TV standard, which uses 50Hz vertical refresh frequency. "
-"Most of SID-tunes have been made for PAL computers."
-msgstr ""
-
-#: src/sid/xs_interface.c:459
-msgid "NTSC (60 Hz)"
-msgstr "NTSC (60 Hz)"
-
-#: src/sid/xs_interface.c:463
-msgid ""
-"NTSC is the TV standard with 60Hz vertical refresh rate (and other features "
-"that differ from PAL). It is mainly used in United States, Japan and certain "
-"other countries."
-msgstr ""
-
-#: src/sid/xs_interface.c:467
-msgid "Clock speed:"
-msgstr "Óra sebesség:"
-
-#: src/sid/xs_interface.c:484
-msgid "Force model"
-msgstr "Kényszerített modell"
-
-#: src/sid/xs_interface.c:488
-msgid ""
-"If enabled, this option \"forces\" the emulation engine to use the selected "
-"SID-chip model. Otherwise the preferred SID model is determined from the "
-"file (if PSIDv2NG type) or if not available, this setting is used."
-msgstr ""
-
-#: src/sid/xs_interface.c:490
-msgid "MOS 6581"
-msgstr "MOS 6581"
-
-#: src/sid/xs_interface.c:494
-msgid ""
-"MOS/CSG 6581 is the earlier major version of SID chip. It differs from 8580 "
-"in few ways, having much fuller filter (which, due to design error, is never "
-"same between two different SID-chips) and has the \"volume adjustment bug\", "
-"which enables playing of digital samples."
-msgstr ""
-
-#: src/sid/xs_interface.c:498
-msgid "MOS 8580"
-msgstr "MOS 8580"
-
-#: src/sid/xs_interface.c:505
-msgid "SID model:"
-msgstr "SID modell:"
-
-#: src/sid/xs_interface.c:522
-msgid "SIDPlay 1 (frame-based)"
-msgstr ""
-
-#: src/sid/xs_interface.c:526
-msgid ""
-"Use libSIDPlay 1.x emulation, faster but not so accurate. Good in most "
-"cases, though."
-msgstr ""
-
-#: src/sid/xs_interface.c:530
-msgid "SIDPlay 2 (cycle-based)"
-msgstr ""
-
-#: src/sid/xs_interface.c:534
-msgid ""
-"Use libSIDPlay 2.x emulation, which requires powerful CPU due to more exact "
-"emulation."
-msgstr ""
-
-#: src/sid/xs_interface.c:538
-msgid "Emulation library selection:"
-msgstr "Emulációs könyvtár választás:"
-
-#: src/sid/xs_interface.c:555
-msgid "Real C64 (SIDPlay 2 only)"
-msgstr "Valódi C64 (csak SIDPlay 2)"
-
-#: src/sid/xs_interface.c:562
-msgid "Bank switching"
-msgstr "Bank váltása"
-
-#: src/sid/xs_interface.c:569
-msgid "Transparent ROM"
-msgstr "Átlátszó ROM"
-
-#: src/sid/xs_interface.c:576
-msgid "PlaySID environment"
-msgstr "PlaySID környezet"
-
-#: src/sid/xs_interface.c:583
-msgid "Memory mode:"
-msgstr "Memória mód:"
-
-#: src/sid/xs_interface.c:588
-msgid "Emu#1"
-msgstr "Emu#1"
-
-#: src/sid/xs_interface.c:611
-msgid "Optimization mode (faster, inaccurate)"
-msgstr ""
-
-#: src/sid/xs_interface.c:615
-msgid ""
-"This setting can be used to enable libSIDPlay2's \"optimization mode\", "
-"which in downgrades the emulation from cycle-exact to something similar to "
-"frame-exact. The result is lower CPU usage, but worse accuracy."
-msgstr ""
-
-#: src/sid/xs_interface.c:617
-msgid "reSID-emulation"
-msgstr "reSID-emuláció"
-
-#: src/sid/xs_interface.c:621
-msgid ""
-"reSID is the software SID-chip simulator based on SID reverse-engineering, "
-"created by Dag Lem. It is probably the closest thing to real SID available "
-"as software-only emulation."
-msgstr ""
-
-#: src/sid/xs_interface.c:625
-msgid "HardSID"
-msgstr "HardSID"
-
-#: src/sid/xs_interface.c:629
-msgid ""
-"HardSID is a EISA/PCI card for PC-compatibles, which can be fitted with a "
-"real SID-chip. Software can be used to control the HardSID and combined with "
-"software emulation of rest of C64 via libSIDPlay2 HardSID can be used to "
-"achieve \"near 100%\" similarity to real C64. For more information, see "
-"http://www.hardsid.com/"
-msgstr ""
-
-#: src/sid/xs_interface.c:633
-msgid "SIDPlay 2 options:"
-msgstr "SIDPlay 2 beállítások:"
-
-#: src/sid/xs_interface.c:650
-msgid "Fast (nearest neighbour)"
-msgstr ""
-
-#: src/sid/xs_interface.c:654
-msgid ""
-"Fastest and also worst sounding sampling method, simply picks nearest "
-"neighbouring sample."
-msgstr ""
-
-#: src/sid/xs_interface.c:658
-msgid "Linear interpolation"
-msgstr "Lineáris interpoláció"
-
-#: src/sid/xs_interface.c:662
-msgid ""
-"Uses linear interpolation between samples, yielding higher audio quality "
-"with less sampling noise."
-msgstr ""
-
-#: src/sid/xs_interface.c:673
-msgid "Resampling (FIR)"
-msgstr "Újramintavételezés (FIR)"
-
-#: src/sid/xs_interface.c:680
-msgid "reSID sampling options:"
-msgstr "reSID mintavétel beállítások:"
-
-#: src/sid/xs_interface.c:685
-msgid "Emu#2"
-msgstr "Emu#2"
-
-#: src/sid/xs_interface.c:697
-msgid "Emulate filters"
-msgstr "Szűrők emulálása"
-
-#: src/sid/xs_interface.c:701
-msgid ""
-"This option enables emulation of SID filter. The filter is an essential part "
-"of SID's sound capacity, but accurate emulation of it may require quite much "
-"CPU power. However, if filter emulation is disabled, tunes won't sound "
-"authentic at all if they utilize the filter."
-msgstr ""
-
-#: src/sid/xs_interface.c:726
-msgid "FS"
-msgstr "FS"
-
-#: src/sid/xs_interface.c:743
-msgid "FM"
-msgstr "FM"
-
-#: src/sid/xs_interface.c:760
-msgid "FT"
-msgstr "FT"
-
-#: src/sid/xs_interface.c:771
-msgid "Reset values"
-msgstr "Visszaállítás az alapértelmezett értékekre"
-
-#: src/sid/xs_interface.c:776
-msgid "SIDPlay1"
-msgstr "SIDPlay1"
-
-#: src/sid/xs_interface.c:817
-msgid "Export"
-msgstr "Exportálás"
-
-#: src/sid/xs_interface.c:825
-msgid "Use"
-msgstr "Használ"
-
-#: src/sid/xs_interface.c:833 src/skins/ui_manager.c:447
-msgid "Save"
-msgstr "Mentés"
-
-#: src/sid/xs_interface.c:841 src/skins/ui_manager.c:446
-msgid "Import"
-msgstr "Importálás"
-
-#: src/sid/xs_interface.c:849 src/skins/ui_manager.c:448
-msgid "Delete"
-msgstr "Törlés"
-
-#: src/sid/xs_interface.c:863
-msgid "Filter curve:"
-msgstr ""
-
-#: src/sid/xs_interface.c:868
-msgid "SIDPlay2"
-msgstr "SIDPlay2"
-
-#: src/sid/xs_interface.c:874
-msgid "Filters"
-msgstr "Szűrők"
-
-#: src/sid/xs_interface.c:897
-msgid "Play at least for specified time"
-msgstr ""
-
-#: src/sid/xs_interface.c:901
-msgid ""
-"If enabled, the tune is played at least for the specified time, adding "
-"silence to the end if necessary."
-msgstr ""
-
-#: src/sid/xs_interface.c:908 src/sid/xs_interface.c:962
-#: src/sid/xs_interface.c:1142
-msgid "Playtime:"
-msgstr "Lejátszási idő:"
-
-#: src/sid/xs_interface.c:921 src/sid/xs_interface.c:975
-#: src/sid/xs_interface.c:1155
-msgid "seconds"
-msgstr "másodperc"
-
-#: src/sid/xs_interface.c:928
-msgid "Minimum playtime:"
-msgstr "Minimális lejátszási idő:"
-
-#: src/sid/xs_interface.c:945
-msgid "Play for specified time maximum"
-msgstr ""
-
-#: src/sid/xs_interface.c:949
-msgid ""
-"If enabled, tune is played until specified duration is reached (aka maximum "
-"playtime)."
-msgstr ""
-
-#: src/sid/xs_interface.c:951
-msgid "Only when song length is unknown"
-msgstr "Csak akkor ha a dal hossza ismeretlen"
-
-#: src/sid/xs_interface.c:955
-msgid ""
-"If enabled, the maximum playtime is applied only if song/tune length is not "
-"known."
-msgstr ""
-
-#: src/sid/xs_interface.c:982
-msgid "Maximum playtime:"
-msgstr "Maximális lejátszási idő:"
-
-#: src/sid/xs_interface.c:999
-msgid "Use XSIDPLAY-compatible database"
-msgstr ""
-
-#: src/sid/xs_interface.c:1003
-msgid ""
-"This option enables using of XSIDPLAY compatible song length database. "
-"(Refer to Audacious-SID documentation for more information)"
-msgstr ""
-
-#: src/sid/xs_interface.c:1010
-msgid "DB-file:"
-msgstr "DB-fájl:"
-
-#: src/sid/xs_interface.c:1020
-msgid "Database path and filename"
-msgstr "Adatbázis útvonal és fájlnév"
-
-#: src/sid/xs_interface.c:1027
-msgid "Browse for song length-database file"
-msgstr ""
-
-#: src/sid/xs_interface.c:1049
-msgid "Song length database:"
-msgstr "Számhossz adatbázis:"
-
-#: src/sid/xs_interface.c:1054
-msgid "Songlength"
-msgstr "Dalhossz"
-
-#: src/sid/xs_interface.c:1072
-msgid "Override generic Tuplez format string"
-msgstr ""
-
-#: src/sid/xs_interface.c:1076
-msgid ""
-"By enabling this option you can specify a custom Tuplez formatting string "
-"for SID-files. The SID-plugin specific Tuplez tags are described shortly "
-"below."
-msgstr ""
+msgstr "SDL hiba"
 
-#: src/sid/xs_interface.c:1087
-msgid "Tuplez format string for SID-files"
-msgstr ""
-
-#: src/sid/xs_interface.c:1090
-msgid ""
-"SID-specific Tuplez fields:\n"
-"\n"
-"sid-format\t\t- Specific fileformat\n"
-"sid-model\t\t- 6581 or 8580\n"
-"sid-speed\t\t- Timing or speed: PAL/NTSC/etc.\n"
-"\n"
-"Other \"special\" fields set:\n"
-"\n"
-"subsong-num, subsong-id"
-msgstr ""
-
-#: src/sid/xs_interface.c:1098
-msgid "Song title format:"
-msgstr "Szám címének formátuma:"
-
-#: src/sid/xs_interface.c:1125
-msgid "Add sub-tunes to playlist"
-msgstr ""
-
-#: src/sid/xs_interface.c:1129
-msgid ""
-"If enabled, sub-tunes of each file will be added to playlist. If disabled, "
-"only the default sub-tune will be added."
-msgstr ""
-
-#: src/sid/xs_interface.c:1131
-msgid "Only tunes with specified minimum duration"
-msgstr ""
-
-#: src/sid/xs_interface.c:1135
-msgid "Only add sub-tunes that have a duration of at least specified time."
-msgstr ""
-
-#: src/sid/xs_interface.c:1162
-msgid "Sub-tune handling:"
-msgstr ""
-
-#: src/sid/xs_interface.c:1179
-msgid "Use STIL database"
-msgstr "Használjon STIL adatbázist"
-
-#: src/sid/xs_interface.c:1183
-msgid ""
-"If this option is enabled (and the database & HVSC settings below are "
-"correctly set), Audacious-SID will use and display additional information "
-"from STIL database when HVSC SIDs are played."
-msgstr ""
-
-#: src/sid/xs_interface.c:1190
-msgid "STIL file:"
-msgstr "STIL fájl:"
-
-#: src/sid/xs_interface.c:1206
-msgid ""
-"Path and filename of STIL database file (STIL.txt), usually found from "
-"HVSC's DOCUMENTS-subdirectory."
-msgstr ""
-
-#: src/sid/xs_interface.c:1219
-msgid "Browse for STIL-database file"
-msgstr "STIL adatbázis fájl keresése"
-
-#: src/sid/xs_interface.c:1246
-msgid "HVSC path:"
-msgstr "HVSC útvonal:"
-
-#: src/sid/xs_interface.c:1262
-msgid ""
-"Path to base-directory of your High Voltage SID Collection (HVSC), for "
-"example /media/C64Music/"
-msgstr ""
-
-#: src/sid/xs_interface.c:1275
-msgid "Browse for HVSC path"
-msgstr ""
-
-#: src/sid/xs_interface.c:1297
-msgid "SID Tune Information List (STIL) database:"
-msgstr ""
-
-#: src/sid/xs_interface.c:1321
-msgid "Cancel any changes"
-msgstr "Mindem változtatás elvetése"
-
-#: src/sid/xs_interface.c:1328
-msgid "Accept and update changes"
-msgstr "Elfogad és frissíti a változásokat"
-
-#: src/sid/xs_interface.c:1628
-msgid "Audacious-SID Fileinfo"
-msgstr "Audacious SID fájl információ"
-
-#: src/sid/xs_interface.c:1649
-msgid "Filename:"
-msgstr "Fájlnév:"
-
-#: src/sid/xs_interface.c:1657
-msgid "Songname:"
-msgstr "Zene neve:"
-
-#: src/sid/xs_interface.c:1665
-msgid "Composer:"
-msgstr "Zeneszerző:"
-
-#: src/sid/xs_interface.c:1673
-msgid "Copyright:"
-msgstr "Copyright:"
-
-#: src/sid/xs_interface.c:1717
-msgid "Song Information:"
-msgstr "Száminformációk"
-
-#: src/sid/xs_interface.c:1752
-msgid "Author:"
-msgstr "Szerző:"
-
-#: src/sid/xs_interface.c:1786
-msgid "Duration:"
-msgstr "Időtartam:"
-
-#: src/sid/xs_interface.c:1820
-msgid "Sub-tune Information:"
-msgstr ""
-
-#: src/sid/xs_interface.c:1881
-msgid "Select HVSC song length database"
-msgstr ""
-
-#: src/sid/xs_interface.c:1922
-msgid "Select STIL-database"
-msgstr "STIL adatbázis kiválasztása"
-
-#: src/sid/xs_interface.c:1963
-msgid "Select HVSC location prefix"
-msgstr ""
-
-#: src/sid/xs_interface.c:2004
-msgid "Select SIDPlay2 filters file for importing"
-msgstr ""
-
-#: src/sid/xs_interface.c:2045
-msgid "Select SIDPlay2 filters file for exporting"
-msgstr ""
-
-#: src/sid/xs_interface.c:2093 src/sid/xs_interface.c:2106
-msgid "Confirm selected action"
-msgstr "Kiválasztott művelet megerősítése"
-
-#: src/sid/xs_interface.c:2123
-msgid "Yes"
-msgstr "Igen"
-
-#: src/sid/xs_interface.c:2129
-msgid "No"
-msgstr "Nem"
-
-#: src/skins/plugin.c:167
+#: src/skins/plugin.c:165
 msgid "About Skinned GUI"
 msgstr "Felhasználói GUI névjegye"
 
-#: src/skins/plugin.c:168
+#: src/skins/plugin.c:166
 msgid ""
 "Copyright (c) 2008, by Tomasz Moń <desowin@gmail.com>\n"
 "\n"
 msgstr ""
+"Copyright (c) 2008, by Tomasz Moń <desowin@gmail.com>\n"
+"\n"
 
-#: src/skins/skins_cfg.c:254
+#: src/skins/skins_cfg.c:207
 msgid "_Player:"
 msgstr "_Lejátszó:"
 
-#: src/skins/skins_cfg.c:254
+#: src/skins/skins_cfg.c:208
 msgid "Select main player window font:"
 msgstr "Főablak betűtípus kiválasztás:"
 
-#: src/skins/skins_cfg.c:255
+#: src/skins/skins_cfg.c:210
 msgid "_Playlist:"
 msgstr "_Lejátszólista:"
 
-#: src/skins/skins_cfg.c:255
+#: src/skins/skins_cfg.c:211
 msgid "Select playlist font:"
 msgstr "Válassza ki a lejátszólista betűkészletét:"
 
-#: src/skins/skins_cfg.c:259
+#: src/skins/skins_cfg.c:215
 msgid "_Fonts"
 msgstr "_Betűkészletek"
 
-#: src/skins/skins_cfg.c:261
+#: src/skins/skins_cfg.c:218
 msgid "Use bitmap fonts (supports ASCII only)"
-msgstr ""
+msgstr "Bitmap fontok használata (csak ASCII támogatása)"
 
-#: src/skins/skins_cfg.c:263
+#: src/skins/skins_cfg.c:220
 msgid "Scroll song title in both directions"
-msgstr ""
+msgstr "A dal címe mindkét irányba mozog"
 
-#: src/skins/skins_cfg.c:346
+#: src/skins/skins_cfg.c:298
 msgid "_Skin"
 msgstr "_Bőr"
 
-#: src/skins/skins_cfg.c:393
-#, fuzzy
+#: src/skins/skins_cfg.c:345
 msgid "Interface Preferences"
-msgstr "Átfedés beállítások"
+msgstr "Felület beállítások"
 
 #: src/skins/ui_equalizer.c:330
 msgid "Preamp"
@@ -2807,83 +2400,83 @@
 msgid "16 kHz"
 msgstr "16 kHz"
 
-#: src/skins/ui_equalizer.c:378
+#: src/skins/ui_equalizer.c:379
 msgid "Audacious Equalizer"
 msgstr "Audacious Equalizer"
 
-#: src/skins/ui_equalizer.c:884
+#: src/skins/ui_equalizer.c:896
 msgid "Presets"
 msgstr "Profilok"
 
-#: src/skins/ui_main.c:444
+#: src/skins/ui_main.c:443
 msgid "kbps"
 msgstr "kbps"
 
-#: src/skins/ui_main.c:452
+#: src/skins/ui_main.c:451
 msgid "kHz"
 msgstr "kHz"
 
-#: src/skins/ui_main.c:459
+#: src/skins/ui_main.c:458
 msgid "surround"
 msgstr "térhatású"
 
-#: src/skins/ui_main.c:807
-#, fuzzy, c-format
+#: src/skins/ui_main.c:806
+#, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
-msgstr "Pozicionálás: %d:%-2.2d/%d:%-2.2d (%d%%)"
+msgstr "Tekerés %d:%-2.2d / %d:%-2.2d"
 
-#: src/skins/ui_main.c:828
+#: src/skins/ui_main.c:827
 #, c-format
 msgid "Volume: %d%%"
 msgstr "Hangerő: %d%%"
 
-#: src/skins/ui_main.c:851
+#: src/skins/ui_main.c:850
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "Balansz: %d%% bal"
 
-#: src/skins/ui_main.c:853
+#: src/skins/ui_main.c:852
 msgid "Balance: center"
 msgstr "Balansz: közép"
 
-#: src/skins/ui_main.c:855
+#: src/skins/ui_main.c:854
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "Balansz: %d%% jobb"
 
-#: src/skins/ui_main.c:981
+#: src/skins/ui_main.c:980
 msgid "Options Menu"
 msgstr "Beállítások menü"
 
-#: src/skins/ui_main.c:985
+#: src/skins/ui_main.c:984
 msgid "Disable 'Always On Top'"
 msgstr "Tiltja a 'Mindig felül' opciót"
 
-#: src/skins/ui_main.c:987
+#: src/skins/ui_main.c:986
 msgid "Enable 'Always On Top'"
 msgstr "Engedélyezi a 'Mindig felül' opciót"
 
-#: src/skins/ui_main.c:990
+#: src/skins/ui_main.c:989
 msgid "File Info Box"
 msgstr "Fájl Információs doboz"
 
-#: src/skins/ui_main.c:995
+#: src/skins/ui_main.c:994
 msgid "Visualization Menu"
 msgstr "Megjelenítési menü"
 
-#: src/skins/ui_main.c:1645
+#: src/skins/ui_main.c:1648
 msgid "Single mode."
 msgstr "Egyszerű mód."
 
-#: src/skins/ui_main.c:1647
+#: src/skins/ui_main.c:1650
 msgid "Playlist mode."
 msgstr "Lejátszólista mód."
 
-#: src/skins/ui_main.c:1669
+#: src/skins/ui_main.c:1672
 msgid "Stopping after song."
 msgstr "Leállítás az aktuális dal után."
 
-#: src/skins/ui_main.c:1671
+#: src/skins/ui_main.c:1674
 msgid "Not stopping after song."
 msgstr "Nincs leállítás az aktuális dal után."
 
@@ -2949,11 +2542,11 @@
 
 #: src/skins/ui_manager.c:116
 msgid "Scope"
-msgstr ""
+msgstr "Szkóp"
 
 #: src/skins/ui_manager.c:117
 msgid "Voiceprint"
-msgstr ""
+msgstr "Voiceprint"
 
 #: src/skins/ui_manager.c:118
 msgid "Off"
@@ -2982,15 +2575,15 @@
 
 #: src/skins/ui_manager.c:133
 msgid "Dot Scope"
-msgstr ""
+msgstr "Pont szkóp"
 
 #: src/skins/ui_manager.c:134
 msgid "Line Scope"
-msgstr ""
+msgstr "Vonal szkóp"
 
 #: src/skins/ui_manager.c:135
 msgid "Solid Scope"
-msgstr ""
+msgstr "Szolid szkóp"
 
 #: src/skins/ui_manager.c:141
 msgid "Ice"
@@ -3054,11 +2647,11 @@
 
 #: src/skins/ui_manager.c:199
 msgid "Scope Mode"
-msgstr ""
+msgstr "Szkóp mód"
 
 #: src/skins/ui_manager.c:200
 msgid "Voiceprint Mode"
-msgstr ""
+msgstr "Voiceprint Mód"
 
 #: src/skins/ui_manager.c:201
 msgid "WindowShade VU Mode"
@@ -3109,470 +2702,466 @@
 msgstr "Kiválasztott lejátszólista mentése."
 
 #: src/skins/ui_manager.c:229
-msgid "Save All Playlists"
-msgstr "Minden lejátszó lista mentése"
-
-#: src/skins/ui_manager.c:230
-msgid ""
-"Saves all the playlists that are open. Note that this is done automatically "
-"when Audacious quits."
-msgstr ""
-"Minden nyitott lejátszólista mentése. Ez automatikus megtörténik amikor az "
-"Audaciousból kilép."
-
-#: src/skins/ui_manager.c:234
 msgid "Refresh List"
 msgstr "Lista frissítése"
 
-#: src/skins/ui_manager.c:235
+#: src/skins/ui_manager.c:230
 msgid "Refreshes metadata associated with a playlist entry."
 msgstr "A lejátszólista elemek metaadatainak frissítése."
 
-#: src/skins/ui_manager.c:238
-msgid "List Manager"
-msgstr "List kezelő"
+#: src/skins/ui_manager.c:233
+msgid "Playlist Manager"
+msgstr "Lejátszólista kezelő"
 
-#: src/skins/ui_manager.c:239
-msgid "Opens the playlist manager."
-msgstr "Lejátszólista kezelő megnyitása."
+#: src/skins/ui_manager.c:234
+msgid "Queue Manager"
+msgstr "Várakozási sor kezelő"
 
-#: src/skins/ui_manager.c:243
+#: src/skins/ui_manager.c:237
 msgid "View"
 msgstr "Nézet"
 
-#: src/skins/ui_manager.c:244
+#: src/skins/ui_manager.c:238
 msgid "Interface"
 msgstr "Felület"
 
-#: src/skins/ui_manager.c:245
-#, fuzzy
+#: src/skins/ui_manager.c:239
 msgid "Interface Preferences ..."
-msgstr "Átfedés beállítások"
+msgstr "Felület beállítások ..."
 
-#: src/skins/ui_manager.c:249
+#: src/skins/ui_manager.c:243
 msgid "Add Internet Address..."
 msgstr "Internetes cím hozzáadása ..."
 
-#: src/skins/ui_manager.c:250
+#: src/skins/ui_manager.c:244
 msgid "Adds a remote track to the playlist."
 msgstr "Távoli sávok hozzáadása a lejátszólistához."
 
-#: src/skins/ui_manager.c:253
+#: src/skins/ui_manager.c:247
 msgid "Add Files..."
 msgstr "Fájlok hozzáadása ..."
 
-#: src/skins/ui_manager.c:254
+#: src/skins/ui_manager.c:248
 msgid "Adds files to the playlist."
 msgstr "Fájlok hozzáadása a lejátszólistához."
 
-#: src/skins/ui_manager.c:259
+#: src/skins/ui_manager.c:253
 msgid "Search and Select"
 msgstr "Keresés és választ"
 
-#: src/skins/ui_manager.c:260
+#: src/skins/ui_manager.c:254
 msgid ""
 "Searches the playlist and selects playlist entries based on specific "
 "criteria."
 msgstr ""
+"Keres a lejátszási listán és kiválasztja azokat a lista bejegyzéseket amik "
+"megfelelnek a meghatározott kritériumoknak."
 
-#: src/skins/ui_manager.c:263
+#: src/skins/ui_manager.c:257
 msgid "Invert Selection"
 msgstr "Kijelölés megfordítása"
 
-#: src/skins/ui_manager.c:264
+#: src/skins/ui_manager.c:258
 msgid "Inverts the selected and unselected entries."
-msgstr ""
+msgstr "Megfordítja a kiválasztásokat."
 
-#: src/skins/ui_manager.c:267
+#: src/skins/ui_manager.c:261
 msgid "Select All"
 msgstr "Mindet kijelöl"
 
-#: src/skins/ui_manager.c:268
+#: src/skins/ui_manager.c:262
 msgid "Selects all of the playlist entries."
 msgstr "Minden szám kiválasztása a lejátszólistán."
 
-#: src/skins/ui_manager.c:271
+#: src/skins/ui_manager.c:265
 msgid "Select None"
 msgstr "Nincs kijelölés"
 
-#: src/skins/ui_manager.c:272
+#: src/skins/ui_manager.c:266
 msgid "Deselects all of the playlist entries."
 msgstr "Minden kijelölés megszüntetése a lejátszólista elemein."
 
-#: src/skins/ui_manager.c:277
+#: src/skins/ui_manager.c:271
 msgid "Remove All"
 msgstr "Összes törlése"
 
-#: src/skins/ui_manager.c:278
+#: src/skins/ui_manager.c:272
 msgid "Removes all entries from the playlist."
 msgstr "Minden elem eltávolítása a lejátszólistáról."
 
-#: src/skins/ui_manager.c:281
+#: src/skins/ui_manager.c:275
 msgid "Clear Queue"
 msgstr "Várólista törlése"
 
-#: src/skins/ui_manager.c:282
+#: src/skins/ui_manager.c:276
 msgid "Clears the queue associated with this playlist."
-msgstr ""
+msgstr "Törli a várakozási sorral kapcsolatos listát."
 
-#: src/skins/ui_manager.c:285
+#: src/skins/ui_manager.c:279
 msgid "Remove Unavailable Files"
 msgstr "Elérhetetlen fájlok törlése"
 
-#: src/skins/ui_manager.c:286
+#: src/skins/ui_manager.c:280
 msgid "Removes unavailable files from the playlist."
 msgstr "Törölje az elérhetetlen fájlokat a lejátszólistáról."
 
-#: src/skins/ui_manager.c:289
+#: src/skins/ui_manager.c:283
 msgid "Remove Duplicates"
 msgstr "Kettőzöttek eltávolítása"
 
-#: src/skins/ui_manager.c:291 src/skins/ui_manager.c:323
-#: src/skins/ui_manager.c:353
+#: src/skins/ui_manager.c:285 src/skins/ui_manager.c:317
+#: src/skins/ui_manager.c:347
 msgid "By Title"
 msgstr "Cím szerint"
 
-#: src/skins/ui_manager.c:292
+#: src/skins/ui_manager.c:286
 msgid "Removes duplicate entries from the playlist by title."
 msgstr "A többszörösen felvett elemek törlése a lejátszólistáról cím alapján."
 
-#: src/skins/ui_manager.c:295 src/skins/ui_manager.c:335
-#: src/skins/ui_manager.c:365
+#: src/skins/ui_manager.c:289 src/skins/ui_manager.c:329
+#: src/skins/ui_manager.c:359
 msgid "By Filename"
 msgstr "Fájlnév szerint"
 
-#: src/skins/ui_manager.c:296
+#: src/skins/ui_manager.c:290
 msgid "Removes duplicate entries from the playlist by filename."
 msgstr ""
 "A többszörösen felvett elemekt törlése a lejátszólistáról fájlnév alapján."
 
-#: src/skins/ui_manager.c:299 src/skins/ui_manager.c:339
-#: src/skins/ui_manager.c:369
+#: src/skins/ui_manager.c:293 src/skins/ui_manager.c:333
+#: src/skins/ui_manager.c:363
 msgid "By Path + Filename"
 msgstr "Útvonal + fájlnév szerint"
 
-#: src/skins/ui_manager.c:300
+#: src/skins/ui_manager.c:294
 msgid "Removes duplicate entries from the playlist by their full path."
 msgstr ""
 "A többszörösen felvett elemekt törlése a lejátszólistáról teljes elérési út "
 "alapján."
 
-#: src/skins/ui_manager.c:303
+#: src/skins/ui_manager.c:297
 msgid "Remove Unselected"
 msgstr "Nem kiválasztottak törlése"
 
-#: src/skins/ui_manager.c:304
+#: src/skins/ui_manager.c:298
 msgid "Remove unselected entries from the playlist."
 msgstr "Minden nem kiválasztott elem törlése a lejátszólistáról."
 
-#: src/skins/ui_manager.c:307
+#: src/skins/ui_manager.c:301
 msgid "Remove Selected"
 msgstr "Kijelölt törlése"
 
-#: src/skins/ui_manager.c:308
+#: src/skins/ui_manager.c:302
 msgid "Remove selected entries from the playlist."
 msgstr "Kijelölt elemek törlése a lejátszólistáról"
 
-#: src/skins/ui_manager.c:313
+#: src/skins/ui_manager.c:307
 msgid "Randomize List"
-msgstr ""
+msgstr "Véletlenszerű lista"
 
-#: src/skins/ui_manager.c:314
-#, fuzzy
+#: src/skins/ui_manager.c:308
 msgid "Randomizes the playlist."
-msgstr "Megfordítja a lejátszólistát."
+msgstr "Lejátszólista véletlenszerű keverése."
 
-#: src/skins/ui_manager.c:317
+#: src/skins/ui_manager.c:311
 msgid "Reverse List"
 msgstr "Fordított lista"
 
-#: src/skins/ui_manager.c:318
+#: src/skins/ui_manager.c:312
 msgid "Reverses the playlist."
 msgstr "Megfordítja a lejátszólistát."
 
-#: src/skins/ui_manager.c:321
+#: src/skins/ui_manager.c:315
 msgid "Sort List"
 msgstr "Lista rendezése"
 
-#: src/skins/ui_manager.c:324 src/skins/ui_manager.c:354
+#: src/skins/ui_manager.c:318 src/skins/ui_manager.c:348
 msgid "Sorts the list by title."
 msgstr "Lista rendezése cím alapján."
 
-#: src/skins/ui_manager.c:327 src/skins/ui_manager.c:357
+#: src/skins/ui_manager.c:321 src/skins/ui_manager.c:351
 msgid "By Album"
 msgstr "Album szerint"
 
-#: src/skins/ui_manager.c:328 src/skins/ui_manager.c:358
+#: src/skins/ui_manager.c:322 src/skins/ui_manager.c:352
 msgid "Sorts the list by album."
 msgstr "Lista rendezése album szerint."
 
-#: src/skins/ui_manager.c:331 src/skins/ui_manager.c:361
+#: src/skins/ui_manager.c:325 src/skins/ui_manager.c:355
 msgid "By Artist"
 msgstr "Előadó szerint"
 
-#: src/skins/ui_manager.c:332 src/skins/ui_manager.c:362
+#: src/skins/ui_manager.c:326 src/skins/ui_manager.c:356
 msgid "Sorts the list by artist."
 msgstr "Lista rendezése előadók szerint."
 
-#: src/skins/ui_manager.c:336 src/skins/ui_manager.c:366
+#: src/skins/ui_manager.c:330 src/skins/ui_manager.c:360
 msgid "Sorts the list by filename."
 msgstr "A lista rendezése fájlok neve szerint."
 
-#: src/skins/ui_manager.c:340 src/skins/ui_manager.c:370
+#: src/skins/ui_manager.c:334 src/skins/ui_manager.c:364
 msgid "Sorts the list by full pathname."
 msgstr "Lista rendezése teljes útvonal alapján."
 
-#: src/skins/ui_manager.c:343 src/skins/ui_manager.c:373
+#: src/skins/ui_manager.c:337 src/skins/ui_manager.c:367
 msgid "By Date"
 msgstr "Dátum alapján"
 
-#: src/skins/ui_manager.c:344 src/skins/ui_manager.c:374
+#: src/skins/ui_manager.c:338 src/skins/ui_manager.c:368
 msgid "Sorts the list by modification time."
 msgstr "A lista rendezése a módosítás ideje szerint"
 
-#: src/skins/ui_manager.c:347 src/skins/ui_manager.c:377
+#: src/skins/ui_manager.c:341 src/skins/ui_manager.c:371
 msgid "By Track Number"
 msgstr "A dal sorszáma szerint"
 
-#: src/skins/ui_manager.c:348 src/skins/ui_manager.c:378
+#: src/skins/ui_manager.c:342 src/skins/ui_manager.c:372
 msgid "Sorts the list by track number."
 msgstr "Lista rendezése a szám sorszáma alapján."
 
-#: src/skins/ui_manager.c:351
+#: src/skins/ui_manager.c:345
 msgid "Sort Selected"
 msgstr "Kijelöltek rendezése"
 
-#: src/skins/ui_manager.c:387
+#: src/skins/ui_manager.c:381
 msgid "File"
 msgstr "Fájl"
 
-#: src/skins/ui_manager.c:388
-msgid "Help"
-msgstr "Súgó"
-
-#: src/skins/ui_manager.c:390
+#: src/skins/ui_manager.c:384
 msgid "Plugin Services"
 msgstr "Bővítmények karbantartása"
 
-#: src/skins/ui_manager.c:392 src/skins/ui_manager.c:395
+#: src/skins/ui_manager.c:386 src/skins/ui_manager.c:389
 msgid "View Track Details"
 msgstr "Szám részleteinek megjelenítése"
 
-#: src/skins/ui_manager.c:393 src/skins/ui_manager.c:396
+#: src/skins/ui_manager.c:387 src/skins/ui_manager.c:390
 msgid "View track details"
 msgstr "Szám részleteinek megjelenítése"
 
-#: src/skins/ui_manager.c:398 src/skins/ui_manager.c:399
+#: src/skins/ui_manager.c:392 src/skins/ui_manager.c:393
 msgid "About Audacious"
 msgstr "Audacious névjegye"
 
-#: src/skins/ui_manager.c:401
+#: src/skins/ui_manager.c:395
 msgid "Play File"
 msgstr "Fájl lejátszáa"
 
-#: src/skins/ui_manager.c:402
+#: src/skins/ui_manager.c:396
 msgid "Load and play a file"
 msgstr "Megyitja és lejátsza a fájlt"
 
-#: src/skins/ui_manager.c:404
+#: src/skins/ui_manager.c:398
 msgid "Play Location"
 msgstr "Hely lejátszása"
 
-#: src/skins/ui_manager.c:405
+#: src/skins/ui_manager.c:399
 msgid "Play media from the selected location"
 msgstr "Média lejátszása a kiválasztott helyről"
 
-#: src/skins/ui_manager.c:407
+#: src/skins/ui_manager.c:401
 msgid "Plugin services"
 msgstr "Szolgáltatások kezelése"
 
-#: src/skins/ui_manager.c:409
+#: src/skins/ui_manager.c:403
 msgid "Preferences"
 msgstr "Beállítások"
 
-#: src/skins/ui_manager.c:410
+#: src/skins/ui_manager.c:404
 msgid "Open preferences window"
 msgstr "Tulajdonságok ablak megnyitása"
 
-#: src/skins/ui_manager.c:413
+#: src/skins/ui_manager.c:407
 msgid "Quit Audacious"
 msgstr "Kilépés az Audaciousból"
 
-#: src/skins/ui_manager.c:415 src/skins/ui_manager.c:416
+#: src/skins/ui_manager.c:409 src/skins/ui_manager.c:410
 msgid "Set A-B"
 msgstr "Beállítás A-B"
 
-#: src/skins/ui_manager.c:418 src/skins/ui_manager.c:419
+#: src/skins/ui_manager.c:412 src/skins/ui_manager.c:413
 msgid "Clear A-B"
 msgstr "Törlés A-B"
 
-#: src/skins/ui_manager.c:421 src/skins/ui_manager.c:422
+#: src/skins/ui_manager.c:415 src/skins/ui_manager.c:416
 msgid "Jump to Playlist Start"
 msgstr "Ugrás a lejátszólista kezdetére"
 
-#: src/skins/ui_manager.c:427 src/skins/ui_manager.c:428
+#: src/skins/ui_manager.c:421 src/skins/ui_manager.c:422
 msgid "Jump to Time"
 msgstr "Ugrás a megadott időre"
 
-#: src/skins/ui_manager.c:430
+#: src/skins/ui_manager.c:424
 msgid "Queue Toggle"
 msgstr "Várakozási sor váltása"
 
-#: src/skins/ui_manager.c:431
+#: src/skins/ui_manager.c:425
 msgid "Enables/disables the entry in the playlist's queue."
 msgstr "Engedélyezi/letiltja az elemek lejátszólista várósorba helyezését."
 
-#: src/skins/ui_manager.c:434
+#: src/skins/ui_manager.c:428
 msgid "Copy"
 msgstr "Másolás"
 
-#: src/skins/ui_manager.c:436
+#: src/skins/ui_manager.c:430
 msgid "Cut"
 msgstr "Kivágás"
 
-#: src/skins/ui_manager.c:438
+#: src/skins/ui_manager.c:432
 msgid "Paste"
 msgstr "Beillesztés"
 
-#: src/skins/ui_manager.c:445
+#: src/skins/ui_manager.c:439
 msgid "Load"
 msgstr "Betöltés"
 
-#: src/skins/ui_manager.c:450 src/skins/ui_manager.c:471
-#: src/skins/ui_manager.c:486
+#: src/skins/ui_manager.c:440
+msgid "Import"
+msgstr "Importálás"
+
+#: src/skins/ui_manager.c:441
+msgid "Save"
+msgstr "Mentés"
+
+#: src/skins/ui_manager.c:442
+msgid "Delete"
+msgstr "Törlés"
+
+#: src/skins/ui_manager.c:444 src/skins/ui_manager.c:465
+#: src/skins/ui_manager.c:480
 msgid "Preset"
 msgstr "Előre beállított"
 
-#: src/skins/ui_manager.c:451
+#: src/skins/ui_manager.c:445
 msgid "Load preset"
 msgstr "Előre beállított betöltése"
 
-#: src/skins/ui_manager.c:453 src/skins/ui_manager.c:474
-#: src/skins/ui_manager.c:489
+#: src/skins/ui_manager.c:447 src/skins/ui_manager.c:468
+#: src/skins/ui_manager.c:483
 msgid "Auto-load preset"
 msgstr "Előre beállított automatikus betöltése"
 
-#: src/skins/ui_manager.c:454
+#: src/skins/ui_manager.c:448
 msgid "Load auto-load preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:457
+#: src/skins/ui_manager.c:451
 msgid "Load default preset into equalizer"
 msgstr ""
 
-#: src/skins/ui_manager.c:459
+#: src/skins/ui_manager.c:453
 msgid "Zero"
 msgstr "Nulla"
 
-#: src/skins/ui_manager.c:460
+#: src/skins/ui_manager.c:454
 msgid "Set equalizer preset levels to zero"
 msgstr "Legyen minden hangszínszabályozó értéke nulla"
 
-#: src/skins/ui_manager.c:462
+#: src/skins/ui_manager.c:456
 msgid "From file"
 msgstr "Fájlból"
 
-#: src/skins/ui_manager.c:463
+#: src/skins/ui_manager.c:457
 msgid "Load preset from file"
 msgstr ""
 
-#: src/skins/ui_manager.c:465
+#: src/skins/ui_manager.c:459
 msgid "From WinAMP EQF file"
 msgstr ""
 
-#: src/skins/ui_manager.c:466
+#: src/skins/ui_manager.c:460
 msgid "Load preset from WinAMP EQF file"
 msgstr ""
 
-#: src/skins/ui_manager.c:468
+#: src/skins/ui_manager.c:462
 msgid "WinAMP Presets"
 msgstr ""
 
-#: src/skins/ui_manager.c:469
+#: src/skins/ui_manager.c:463
 msgid "Import WinAMP presets"
 msgstr ""
 
-#: src/skins/ui_manager.c:472
+#: src/skins/ui_manager.c:466
 msgid "Save preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:475
+#: src/skins/ui_manager.c:469
 msgid "Save auto-load preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:478
+#: src/skins/ui_manager.c:472
 msgid "Save default preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:480
+#: src/skins/ui_manager.c:474
 msgid "To file"
 msgstr "Fájlba"
 
-#: src/skins/ui_manager.c:481
+#: src/skins/ui_manager.c:475
 msgid "Save preset to file"
 msgstr ""
 
-#: src/skins/ui_manager.c:483
+#: src/skins/ui_manager.c:477
 msgid "To WinAMP EQF file"
 msgstr ""
 
-#: src/skins/ui_manager.c:484
+#: src/skins/ui_manager.c:478
 msgid "Save preset to WinAMP EQF file"
 msgstr ""
 
-#: src/skins/ui_manager.c:487
+#: src/skins/ui_manager.c:481
 msgid "Delete preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:490
+#: src/skins/ui_manager.c:484
 msgid "Delete auto-load preset"
 msgstr ""
 
-#: src/skins/ui_playlist.c:245
+#: src/skins/ui_playlist.c:244
 msgid "Search entries in active playlist"
 msgstr "Elemek keresése az aktív lejátszólistában"
 
-#: src/skins/ui_playlist.c:253
+#: src/skins/ui_playlist.c:252
 msgid ""
-"Select entries in playlist by filling one or more fields. Fields use regular "
-"expressions syntax, case-insensitive. If you don't know how regular "
+"Select entries in playlist by filling one or more fields. Fields use regular"
+" expressions syntax, case-insensitive. If you don't know how regular "
 "expressions work, simply insert a literal portion of what you're searching "
 "for."
 msgstr ""
 
-#: src/skins/ui_playlist.c:261
+#: src/skins/ui_playlist.c:260
 msgid "Title: "
 msgstr "Cím:"
 
-#: src/skins/ui_playlist.c:268
+#: src/skins/ui_playlist.c:267
 msgid "Album: "
 msgstr "Album:"
 
-#: src/skins/ui_playlist.c:275
+#: src/skins/ui_playlist.c:274
 msgid "Artist: "
 msgstr "Előadó:"
 
-#: src/skins/ui_playlist.c:282
+#: src/skins/ui_playlist.c:281
 msgid "Filename: "
 msgstr "Fájlnév:"
 
-#: src/skins/ui_playlist.c:290
+#: src/skins/ui_playlist.c:289
 msgid "Clear previous selection before searching"
 msgstr "Az előző kiválasztások törlése keresés előtt"
 
-#: src/skins/ui_playlist.c:293
+#: src/skins/ui_playlist.c:292
 msgid "Automatically toggle queue for matching entries"
 msgstr "Automatikusan várólistára kerülnek a talált elemek"
 
-#: src/skins/ui_playlist.c:296
+#: src/skins/ui_playlist.c:295
 msgid "Create a new playlist with matching entries"
 msgstr "Hozzon létre új lejátszólistát az egyező elemekből"
 
-#: src/skins/ui_playlist.c:763
+#: src/skins/ui_playlist.c:762
 msgid "Audacious Playlist Editor"
 msgstr "Audacious lejátszólista szerkesztő"
 
-#: src/skins/ui_playlist.c:810
+#: src/skins/ui_playlist.c:809
 #, c-format
 msgid "%s (%d of %d)"
 msgstr "%s (%d / %d)"
@@ -3594,84 +3183,57 @@
 msgid "About sndfile plugin"
 msgstr "sndfile bővítmény névjegye"
 
-#: src/sndfile/plugin.c:455
-msgid ""
-"Adapted for Audacious usage by Tony Vroon <chainsaw@gentoo.org>\n"
-"from the xmms_sndfile plugin which is:\n"
-"Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
-"\n"
-"This program is free software ; you can redistribute it and/or modify \n"
-"it under the terms of the GNU General Public License as published by \n"
-"the Free Software Foundation ; either version 2 of the License, or \n"
-"(at your option) any later version. \n"
-" \n"
-"This program is distributed in the hope that it will be useful, \n"
-"but WITHOUT ANY WARRANTY ; without even the implied warranty of \n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. \n"
-"See the GNU General Public License for more details. \n"
-"\n"
-"You should have received a copy of the GNU General Public \n"
-"License along with this program ; if not, write to \n"
-"the Free Software Foundation, Inc., \n"
-"51 Franklin Street, Fifth Floor, \n"
-"Boston, MA 02110-1301 USA"
-msgstr ""
-
 #: src/sndstretch/sndstretch_xmms.c:155
 msgid "About SndStretch"
 msgstr "SndStretch névjegye"
 
-#: src/sndstretch/sndstretch_xmms.c:313
+#: src/sndstretch/sndstretch_xmms.c:308
 msgid "Volume corr."
 msgstr "Hangerő korrekció"
 
-#: src/sndstretch/sndstretch_xmms.c:314
+#: src/sndstretch/sndstretch_xmms.c:309
 msgid "Short Overlap"
 msgstr "Rövid átfedés"
 
-#: src/sndstretch/sndstretch_xmms.c:360
+#: src/sndstretch/sndstretch_xmms.c:355
 msgid "Speed"
 msgstr "Sebesség"
 
-#: src/sndstretch/sndstretch_xmms.c:361
+#: src/sndstretch/sndstretch_xmms.c:356
 msgid "Pitch"
 msgstr "Hangmagasság"
 
-#: src/sndstretch/sndstretch_xmms.c:362
+#: src/sndstretch/sndstretch_xmms.c:357
 msgid "Scale"
 msgstr "Skála"
 
-#: src/sndstretch/sndstretch_xmms.c:363
-msgid "Options"
-msgstr "Opciók"
-
-#: src/sndstretch/sndstretch_xmms.c:382
+#: src/sndstretch/sndstretch_xmms.c:377
 msgid "SndStretch - Configuration"
 msgstr "SndStretch - beállítások"
 
-#: src/song_change/song_change.c:464
+#: src/song_change/song_change.c:447
 msgid "Command to run when Audacious starts a new song."
 msgstr "Parancs futtatása ha az Audacious elindít egy új számot."
 
-#: src/song_change/song_change.c:465 src/song_change/song_change.c:469
-#: src/song_change/song_change.c:473 src/song_change/song_change.c:477
+#: src/song_change/song_change.c:449 src/song_change/song_change.c:455
+#: src/song_change/song_change.c:461 src/song_change/song_change.c:467
 msgid "Command:"
 msgstr "Parancs:"
 
-#: src/song_change/song_change.c:468
+#: src/song_change/song_change.c:453
 msgid "Command to run toward the end of a song."
-msgstr ""
+msgstr "Parancs futtatása a dal végén."
 
-#: src/song_change/song_change.c:472
+#: src/song_change/song_change.c:459
 msgid "Command to run when Audacious reaches the end of the playlist."
-msgstr ""
+msgstr "Parancs futtatása amikor Audacious elér a lejátszási lista végéhez."
 
-#: src/song_change/song_change.c:476
+#: src/song_change/song_change.c:465
 msgid ""
 "Command to run when title changes for a song (i.e. network streams titles)."
-msgstr ""
+msgstr "Parancs futtatása ha a dal cím változik (pl. hálózati stream-címek)."
 
-#: src/song_change/song_change.c:480
+#: src/song_change/song_change.c:471
 msgid ""
 "You can use the following format strings which\n"
 "will be substituted before calling the command\n"
@@ -3690,17 +3252,17 @@
 "%T: Track title"
 msgstr ""
 
-#: src/song_change/song_change.c:507
+#: src/song_change/song_change.c:498
 msgid ""
 "Parameters passed to the shell should be encapsulated in "
 "quotes. Doing otherwise is a security risk."
 msgstr ""
 
-#: src/song_change/song_change.c:518
+#: src/song_change/song_change.c:509
 msgid "Commands"
 msgstr "Parancsok"
 
-#: src/song_change/song_change.c:555
+#: src/song_change/song_change.c:539
 msgid "Song Change"
 msgstr "Szám váltás"
 
@@ -3755,19 +3317,18 @@
 msgstr "Váltja a lejátszott dalt"
 
 #: src/statusicon/statusicon.c:500
-#, fuzzy
 msgid "Other settings"
-msgstr "Keverő beállítások"
+msgstr "Egyéb beállítások"
 
 #: src/statusicon/statusicon.c:505
 msgid "Disable the popup window"
-msgstr ""
+msgstr "Felugró ablakok tiltása"
 
 #: src/statusicon/statusicon.c:512
 msgid "Close to the notification area (system tray)"
-msgstr ""
+msgstr "Bezáráskor az értesítési területen marad (a tálcán)"
 
-#: src/stereo_plugin/stereo.c:41
+#: src/stereo_plugin/stereo.c:45
 msgid ""
 "Extra Stereo Plugin\n"
 "\n"
@@ -3777,14 +3338,52 @@
 "\n"
 "Írta: Johan Levin 1999."
 
-#: src/stereo_plugin/stereo.c:65
+#: src/stereo_plugin/stereo.c:64
 msgid "About Extra Stereo Plugin"
 msgstr "Extra sztereó bővítmény névjegye"
 
-#: src/stereo_plugin/stereo.c:102
+#: src/stereo_plugin/stereo.c:95
 msgid "Configure Extra Stereo"
 msgstr "Extra sztereó beállítások"
 
+#: src/streambrowser/gui/streambrowser_win.c:78
+msgid "Search:"
+msgstr "Keresés:"
+
+#: src/streambrowser/gui/streambrowser_win.c:97
+#: src/streambrowser/gui/streambrowser_win.c:372
+msgid "Add Bookmark"
+msgstr "Könyvjelző hozzáadása"
+
+#: src/streambrowser/gui/streambrowser_win.c:324
+msgid "Stream name"
+msgstr "Folyam neve"
+
+#: src/streambrowser/gui/streambrowser_win.c:331
+msgid "Now playing"
+msgstr "Most játszott"
+
+#: src/streambrowser/gui/streambrowser_win.c:369
+msgid "Remove Bookmark"
+msgstr "Könyvjelző törlése"
+
+#: src/streambrowser/streambrowser.c:330
+msgid "About Stream Browser"
+msgstr "Folyam böngésző névjegye"
+
+#: src/streambrowser/streambrowser.c:331
+msgid ""
+"Copyright (c) 2008, by Calin Crisan <ccrisan@gmail.com> and The Audacious Team.\n"
+"\n"
+"This is a simple stream browser that includes the most popular streaming directories.\n"
+"Many thanks to the Streamtuner developers <http://www.nongnu.org/streamtuner>,\n"
+"\tand of course to the whole Audacious community.\n"
+"\n"
+"Also thank you Tony Vroon for mentoring & guiding me, again.\n"
+"\n"
+"This was a Google Summer of Code 2008 project."
+msgstr ""
+
 #: src/tonegen/tonegen.c:48
 msgid "About Tone Generator"
 msgstr "Hang generátor névjegye"
@@ -3808,31 +3407,14 @@
 msgstr "Hang generátor:"
 
 #: src/unix-io/gtk.c:34
-#, fuzzy
 msgid "About File I/O Plugin"
-msgstr "OSS4 bővítmény névjegye"
-
-#: src/vorbis/configure.c:31
-msgid "Override generic titles"
-msgstr "általános címek felülírása"
-
-#: src/vorbis/configure.c:32
-msgid "Title format:"
-msgstr "Cím formátum:"
-
-#: src/vorbis/configure.c:36
-msgid "Ogg Vorbis Tags"
-msgstr "Ogg Vorbis címkék"
-
-#: src/vorbis/configure.c:69
-msgid "Ogg Vorbis Audio Plugin Configuration"
-msgstr "Ogg Vorbis Audio bővítmény beállítások"
+msgstr ""
 
-#: src/vorbis/vorbis.c:581
+#: src/vorbis/vorbis.c:572
 msgid "About Ogg Vorbis Audio Plugin"
 msgstr "Ogg Vorbis Audio bővítmény névjegye"
 
-#: src/vorbis/vorbis.c:586
+#: src/vorbis/vorbis.c:577
 msgid ""
 "Ogg Vorbis Plugin by the Xiph.org Foundation\n"
 "\n"
@@ -3858,8 +3440,7 @@
 #: src/vtx/about.c:15
 msgid ""
 "Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
-"Founded on original source in_vtx.dll by Roman Sherbakov <v_soft@microfor."
-"ru>\n"
+"Founded on original source in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
 "\n"
 "Music in vtx format can be found at http://vtx.microfor.ru/music.htm\n"
 "and other AY/YM music sites.\n"
@@ -3884,941 +3465,4 @@
 "Egyéb plugin kódokat írta Miles Egan\n"
 "Nézze meg a Wavpack honlapját: http://www.wavpack.com/\n"
 
-#~ msgid "Use Bitmap fonts if available"
-#~ msgstr "Bitmap betűtípus használata ha elérhető"
-
-#~ msgid ""
-#~ "Use bitmap fonts if they are available. Bitmap fonts do not support "
-#~ "Unicode strings."
-#~ msgstr ""
-#~ "Bitmap betűtípus használata ha elérhető. A Bitmap betűtípusok nem "
-#~ "támogatják az Unicode szövegeket."
-
-#~ msgid "_Miscellaneous"
-#~ msgstr "_Egyebek"
-
-#~ msgid "About "
-#~ msgstr "Névjegy"
-
-#~ msgid "AdPlug :: Configuration"
-#~ msgstr "AdPlug :: Beállítások"
-
-#~ msgid "Sound quality"
-#~ msgstr "Hang minőség"
-
-#~ msgid "Resolution"
-#~ msgstr "Felbontás"
-
-#~ msgid "8bit"
-#~ msgstr "8bit"
-
-#~ msgid "16bit"
-#~ msgstr "16bit"
-
-#~ msgid "Channels"
-#~ msgstr "Csatornák"
-
-#~ msgid "Frequency"
-#~ msgstr "Frekvencia"
-
-#~ msgid "Detect songend"
-#~ msgstr "Dalvég érzékelése"
-
-#~ msgid "Formats"
-#~ msgstr "Formátumok"
-
-#~ msgid "Format selection"
-#~ msgstr "Formátum választás"
-
-#~ msgid "Format"
-#~ msgstr "Formátum"
-
-#~ msgid "Extension"
-#~ msgstr "Kiterjesztés"
-
-#~ msgid "AdPlug :: File Info"
-#~ msgstr "AdPlug :: Fájl infomráció"
-
-#~ msgid "Author: "
-#~ msgstr "Szerző:"
-
-#~ msgid "File Type: "
-#~ msgstr "Fájtípus:"
-
-#~ msgid "Instruments: "
-#~ msgstr "Hangszerek:"
-
-#~ msgid "Orders: "
-#~ msgstr "Sorrend:"
-
-#~ msgid "Patterns: "
-#~ msgstr "Minták:"
-
-#~ msgid "Song"
-#~ msgstr "Dal"
-
-#~ msgid "Instrument name"
-#~ msgstr "Hangszer neve"
-
-#~ msgid "Song message"
-#~ msgstr "Dal üzenet"
-
-#~ msgid "Order: "
-#~ msgstr "Sorrend:"
-
-#~ msgid "Pattern: "
-#~ msgstr "Minta:"
-
-#~ msgid "Row: "
-#~ msgstr "Sor:"
-
-#~ msgid "Speed: "
-#~ msgstr "Sebesség:"
-
-#~ msgid "Timer: "
-#~ msgstr "Időzítő:"
-
-#~ msgid "About XMMS Alarm"
-#~ msgstr "XMMS Ébresztő névjegye"
-
-#~ msgid "XMMS Alarm"
-#~ msgstr "XMMS Ébresztő"
-
-#~ msgid "Alarm"
-#~ msgstr "Ébresztő"
-
-#~ msgid "This is your wakeup call."
-#~ msgstr "Ez egy ébresztő üzenet."
-
-#~ msgid "Select Playlist"
-#~ msgstr "Lejátszólista választása"
-
-#~ msgid "Sorry"
-#~ msgstr "Sajnálom"
-
-#~ msgid "Warning"
-#~ msgstr "Figyelmeztetés"
-
-#~ msgid "Oh Well"
-#~ msgstr "Hát igen"
-
-#~ msgid "Alarm Settings"
-#~ msgstr "Ébresztő beállítások"
-
-#~ msgid "Time"
-#~ msgstr "Idő"
-
-#~ msgid "hours"
-#~ msgstr "óra"
-
-#~ msgid "h"
-#~ msgstr "ó"
-
-#~ msgid "minutes"
-#~ msgstr "perc"
-
-#~ msgid "Quiet after:"
-#~ msgstr "Elnémítás ezután:"
-
-#~ msgid "Alarm at (default):"
-#~ msgstr "Ébresztés ekkor (alapértelmezett):"
-
-#~ msgid "Choose the days for the alarm to come on"
-#~ msgstr "Válassza ki az ébresztés napjait a listáról"
-
-#~ msgid "Day"
-#~ msgstr "Nap"
-
-#~ msgid "Tuesday"
-#~ msgstr "Kedd"
-
-#~ msgid "Wednesday"
-#~ msgstr "Szerda"
-
-#~ msgid "Thursday"
-#~ msgstr "Csütörtök"
-
-#~ msgid "Friday"
-#~ msgstr "Péntek"
-
-#~ msgid "Saturday"
-#~ msgstr "Szombat"
-
-#~ msgid "Sunday"
-#~ msgstr "Vasárnap"
-
-#~ msgid "Monday"
-#~ msgstr "Hétfő"
-
-#~ msgid "Days"
-#~ msgstr "Napok"
-
-#~ msgid "Fading"
-#~ msgstr "Áttűnés"
-
-#~ msgid "Volume"
-#~ msgstr "Hangerő"
-
-#~ msgid "Current"
-#~ msgstr "Jelenlegi"
-
-#~ msgid "reset to current output volume"
-#~ msgstr "a jelenlegi hangerőre állít"
-
-#~ msgid "Start at"
-#~ msgstr "Kezdés ekkor"
-
-#~ msgid "%"
-#~ msgstr "%"
-
-#~ msgid "Final"
-#~ msgstr "Vége"
-
-#~ msgid "Additional Command"
-#~ msgstr "Kiegészító parancs"
-
-#~ msgid "enable"
-#~ msgstr "engedélyezve"
-
-#~ msgid "Playlist (optional)"
-#~ msgstr "Lejátszólista (opcionális)"
-
-#~ msgid "Browse..."
-#~ msgstr "Keresés..."
-
-#~ msgid "Reminder"
-#~ msgstr "Emlékeztető"
-
-#~ msgid "Use reminder"
-#~ msgstr "Emlékeztető használata"
-
-#~ msgid "What do these options mean?"
-#~ msgstr "Mit jelentenek ezek a lehetőségek?"
-
-#~ msgid ""
-#~ "\n"
-#~ "Time\n"
-#~ " Alarm at: \n"
-#~ " The time for the alarm to come on.\n"
-#~ "\n"
-#~ " Quiet After: \n"
-#~ " Stop alarm after this amount of time.\n"
-#~ " (if the wakeup dialog is not closed)\n"
-#~ "\n"
-#~ "\n"
-#~ "Days\n"
-#~ " Day:\n"
-#~ " Select the days for the alarm to activate.\n"
-#~ "\n"
-#~ " Time:\n"
-#~ " Choose the time for the alarm on each day,\n"
-#~ " or select the toggle button to use the default\n"
-#~ " time.\n"
-#~ "\n"
-#~ "\n"
-#~ "Volume\n"
-#~ " Fading: \n"
-#~ " Fade the volume up to the chosen volume \n"
-#~ " for this amount of time.\n"
-#~ "\n"
-#~ " Start at: \n"
-#~ " Start fading from this volume.\n"
-#~ "\n"
-#~ " Final: \n"
-#~ " The volume to stop fading at. If the fading\n"
-#~ " time is 0 then set volume to this and start\n"
-#~ " playing.\n"
-#~ "\n"
-#~ "\n"
-#~ "Options:\n"
-#~ " Additional Command:\n"
-#~ " Run this command at the alarm time.\n"
-#~ "\n"
-#~ " Playlist: \n"
-#~ " Load this playlist for playing songs from \n"
-#~ " (must have .m3u extension). If no playlist\n"
-#~ " is given then the songs which are currently\n"
-#~ " in the list will be used.\n"
-#~ " The URL of an mp3/ogg stream can also be\n"
-#~ " entered here, but loading of playlists from\n"
-#~ " URLs is not currently supported by xmms.\n"
-#~ "\n"
-#~ " Reminder:\n"
-#~ " Display a reminder when the alarm goes off,\n"
-#~ " type the reminder in the box and turn on the\n"
-#~ " toggle button if you want it to be shown.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Idő\n"
-#~ " Ébresztés ekkor: \n"
-#~ " A megadott időben fog ébreszteni.\n"
-#~ "\n"
-#~ " Elhalkul ezután: \n"
-#~ " Megállítja az ébresztőt a megadott idő után.\n"
-#~ " (ha a figyelmeztető ablak nincs bezárva)\n"
-#~ "\n"
-#~ "\n"
-#~ "Napok\n"
-#~ " Nap:\n"
-#~ " Válassza ki az ébresztés napjait.\n"
-#~ "\n"
-#~ " Idő: Válassza ki az ébresztés idejét naponta\n"
-#~ " vagy használja az alapértelmezett idő\n"
-#~ " gombot.\n"
-#~ "\n"
-#~ "\n"
-#~ "Hangerő\n"
-#~ " Áttűnés: \n"
-#~ " A hangerő emelkedését lehet szabályozni\n"
-#~ " az ébresztéskor.\n"
-#~ "\n"
-#~ " Kezdete: \n"
-#~ " A kezdeti hangerő beállítása.\n"
-#~ "\n"
-#~ " Vége: \n"
-#~ " The volume to stop fading at. If the fading\n"
-#~ " time is 0 then set volume to this and start\n"
-#~ " playing.\n"
-#~ "\n"
-#~ "\n"
-#~ "Options:\n"
-#~ " Additional Command:\n"
-#~ " Run this command at the alarm time.\n"
-#~ "\n"
-#~ " Playlist: \n"
-#~ " Load this playlist for playing songs from \n"
-#~ " (must have .m3u extension). If no playlist\n"
-#~ " is given then the songs which are currently\n"
-#~ " in the list will be used.\n"
-#~ " The URL of an mp3/ogg stream can also be\n"
-#~ " entered here, but loading of playlists from\n"
-#~ " URLs is not currently supported by xmms.\n"
-#~ "\n"
-#~ " Reminder:\n"
-#~ " Display a reminder when the alarm goes off,\n"
-#~ " type the reminder in the box and turn on the\n"
-#~ " toggle button if you want it to be shown.\n"
-
-#~ msgid "Thankyou"
-#~ msgstr "Köszönöm"
-
-#~ msgid "Pairing request for '%s'"
-#~ msgstr "Párosításkérés a(z) %s eszköztől"
-
-#~ msgid "Authorization request for %s"
-#~ msgstr "Engedély kérés ehhez %s"
-
-#~ msgid "Created bonding with %s"
-#~ msgstr "Kötés létrehozva: %s"
-
-#~ msgid "Removed bonding with %s"
-#~ msgstr "Kötés eltávolítva: %s"
-
-#~ msgid "Device has been switched off"
-#~ msgstr "Az eszköz kikapcsolva"
-
-#~ msgid "Device has been made non-discoverable"
-#~ msgstr "Az eszköz nem felfedezhető"
-
-#~ msgid "Device has been made connectable"
-#~ msgstr "Az eszköz csatlakoztatható"
-
-#~ msgid "Device has been made discoverable"
-#~ msgstr "Az eszköz felfedezhető"
-
-#~ msgid "Device has been made limited discoverable"
-#~ msgstr "Az eszköz korlátozottan felfedezhető"
-
-#~ msgid "Device has been switched into pairing mode"
-#~ msgstr "Az eszköz párosítás módban"
-
-#~ msgid "Bluetooth headset support plugin"
-#~ msgstr "Bluetooth fejhallgató támogatás bővítmény"
-
-#~ msgid "Producer"
-#~ msgstr "Készítő"
-
-#~ msgid "Available Headsets"
-#~ msgstr "Elérhető fejhallgatók"
-
-#~ msgid "Current Headset"
-#~ msgstr "Aktuális fejhallgató"
-
-#~ msgid "_Connect"
-#~ msgstr "Kap_csolódás"
-
-#~ msgid "Class"
-#~ msgstr "Osztály"
-
-#~ msgid "Address:"
-#~ msgstr "Cím:"
-
-#~ msgid "Bonding finish!"
-#~ msgstr "Kötés sikeres!"
-
-#~ msgid "No devices found!"
-#~ msgstr "Nem találtam eszközt!"
-
-#~ msgid "Scanning..."
-#~ msgstr "Keresés..."
-
-#~ msgid "Pairing..."
-#~ msgstr "Párosítás"
-
-#~ msgid "Rescan"
-#~ msgstr "Újraolvasás"
-
-#~ msgid "Playback->Play"
-#~ msgstr "Lejátszás->Indítás"
-
-#~ msgid "Playback->Stop"
-#~ msgstr "Lejátszás->Megállítás"
-
-#~ msgid "Playback->Pause"
-#~ msgstr "Lejátszás->Szünet"
-
-#~ msgid "Playback->Prev"
-#~ msgstr "Lejátszás->Előző"
-
-#~ msgid "Playback->Next"
-#~ msgstr "Lejátszás->Következő"
-
-#~ msgid "Playback->Eject"
-#~ msgstr "Lejátszás->Kiadás"
-
-#~ msgid "Playlist->Repeat"
-#~ msgstr "Lejátszólista->Ismétlés"
-
-#~ msgid "Playlist->Shuffle"
-#~ msgstr "Lejátszólista->Véletlenszerű"
-
-#~ msgid "Volume->Up_5"
-#~ msgstr "Hangerő ->Fel_5"
-
-#~ msgid "Volume->Down_5"
-#~ msgstr "Hangerő->Le_5"
-
-#~ msgid "Volume->Up_10"
-#~ msgstr "Hangerő->Fel_10"
-
-#~ msgid "Volume->Down_10"
-#~ msgstr "Hangerő->Le_10"
-
-#~ msgid "Volume->Mute"
-#~ msgstr "Hangerő->Némítás"
-
-#~ msgid "Window->Main"
-#~ msgstr "Ablak->Főablak"
-
-#~ msgid "Window->Playlist"
-#~ msgstr "Ablak->Lejátszólista"
-
-#~ msgid "Window->Equalizer"
-#~ msgstr "Ablak->Ekvalízer"
-
-#~ msgid "Window->JumpToFile"
-#~ msgstr "Ablak->FájlhozUgrás"
-
-#~ msgid "Detected"
-#~ msgstr "Detektálva"
-
-#~ msgid "Custom"
-#~ msgstr "Egyéni"
-
-#~ msgid "Not Detected"
-#~ msgstr "Nem talált"
-
-#~ msgid "Information"
-#~ msgstr "Információ"
-
-#~ msgid "EvDev-Plug - Add custom device"
-#~ msgstr "EvDev-Plug - Egyéb eszköz hozzáadása"
-
-#~ msgid "Device name:"
-#~ msgstr "Eszköz neve:"
-
-#~ msgid "Device file:"
-#~ msgstr "Eszköz fájl:"
-
-#~ msgid "(custom)"
-#~ msgstr "(egyéni)"
-
-#~ msgid "EvDev-Plug - Configuration"
-#~ msgstr "EvDev-Plug - beállítások"
-
-#~ msgid "Active"
-#~ msgstr "Aktív"
-
-#~ msgid "Status"
-#~ msgstr "Státusz"
-
-#~ msgid "Device Name"
-#~ msgstr "Eszköz neve"
-
-#~ msgid "Device File"
-#~ msgstr "Eszköz fájl"
-
-#~ msgid "Device Address"
-#~ msgstr "Eszköz cím"
-
-#~ msgid "_Bindings"
-#~ msgstr "_Kötések"
-
-#~ msgid "EvDev-Plug - Bindings Configuration"
-#~ msgstr "EvDev-Plug - Kötések konfiguráció"
-
-#~ msgid "Name: "
-#~ msgstr "Név:"
-
-#~ msgid "Filename: "
-#~ msgstr "Fájlnév:"
-
-#~ msgid "Phys.Address: "
-#~ msgstr "Phys.Cím: "
-
-#~ msgid "EvDev-Plug - about"
-#~ msgstr "EvDev-Plug - névjegy"
-
-#~ msgid "Name"
-#~ msgstr "Név"
-
-#~ msgid "UID"
-#~ msgstr "UID"
-
-#~ msgid "Installed plugins"
-#~ msgstr "Telepített bővímények"
-
-#~ msgid "Running plugins"
-#~ msgstr "Futó bővítmények"
-
-#~ msgid "Add"
-#~ msgstr "Hozzáadás"
-
-#~ msgid "Remove"
-#~ msgstr "Eltávolítás"
-
-#~ msgid "LADSPA Plugin Catalog"
-#~ msgstr "LADSPA bővítmény katalógus"
-
-#~ msgid "About LIRC Audacious Plugin"
-#~ msgstr "LIRC audacious bővítmény névjegye"
-
-#~ msgid "LIRC Plugin "
-#~ msgstr "LIRC bővítmény"
-
-#~ msgid "LIRC plugin settings"
-#~ msgstr "LIRC bővítmény beállítások"
-
-#~ msgid "Reconnect to LIRC server"
-#~ msgstr "Újracsatlakozás a LIRC szerverhez"
-
-#~ msgid "Timeout before reconnecting (seconds): "
-#~ msgstr "Újracsatlakozás a megadott idő után (másodperc):"
-
-#~ msgid "Reconnect"
-#~ msgstr "Újracsatlakozás"
-
-#~ msgid "Connection"
-#~ msgstr "Kapcsolat"
-
-#~ msgid "%s: trying to reconnect...\n"
-#~ msgstr "%s: újrakapcsolódás megkisérlése...\n"
-
-#~ msgid "%s: unknown command \"%s\"\n"
-#~ msgstr "%s: ismeretlen parancs \"%s\"\n"
-
-#~ msgid "%s: disconnected from LIRC\n"
-#~ msgstr "%s: kapcsolat bontva a LIRC-cel\n"
-
-#~ msgid "ModPlug Configuration"
-#~ msgstr "ModPlug beállítások"
-
-#~ msgid "16 bit"
-#~ msgstr "16 bit"
-
-#~ msgid "8 bit"
-#~ msgstr "8 bit"
-
-#~ msgid "Linear (fast)"
-#~ msgstr "Lineáris (gyors)"
-
-#~ msgid "96 kHz"
-#~ msgstr "96 kHz"
-
-#~ msgid "48 kHz"
-#~ msgstr "48 kHz"
-
-#~ msgid "44 kHz"
-#~ msgstr "44 kHz"
-
-#~ msgid "22 kHz"
-#~ msgstr "22 kHz"
-
-#~ msgid "Sampling Rate"
-#~ msgstr "Mintavételi sebesség"
-
-#~ msgid "Enable"
-#~ msgstr "Engedélyez"
-
-#~ msgid "Depth"
-#~ msgstr "Mélység"
-
-#~ msgid "Delay"
-#~ msgstr "Késleltetés"
-
-#~ msgid "Reverb"
-#~ msgstr "Visszhang"
-
-#~ msgid "Amount"
-#~ msgstr "Összeg"
-
-#~ msgid "Range"
-#~ msgstr "Tartomány"
-
-#~ msgid "Bass Boost"
-#~ msgstr "Basszus kiemelés"
-
-#~ msgid "Effects"
-#~ msgstr "Effektek"
-
-#~ msgid "Use Filename as Song Title"
-#~ msgstr "Használja a fáljnevét a dal címének"
-
-#~ msgid "Fast Playlist Info"
-#~ msgstr "Gyors lejátszólista információ"
-
-#~ msgid "Noise Reduction"
-#~ msgstr "Zaj csökkentés"
-
-#~ msgid "Play Amiga MOD"
-#~ msgstr "Amiga MOD lejátszása"
-
-#~ msgid "Don't loop"
-#~ msgstr "Ne ismételjen"
-
-#~ msgid "Loop"
-#~ msgstr "Ismétlés"
-
-#~ msgid "time(s)"
-#~ msgstr "idő"
-
-#~ msgid "Loop forever"
-#~ msgstr "Végtelen ismétlés"
-
-#~ msgid "Looping"
-#~ msgstr "Ismétlés"
-
-#~ msgid "MOD Info"
-#~ msgstr "MOD információ"
-
-#~ msgid ""
-#~ "Filename:\n"
-#~ "Title:\n"
-#~ "Type:\n"
-#~ "Length:\n"
-#~ "Speed:\n"
-#~ "Tempo:\n"
-#~ "Samples:\n"
-#~ "Instruments:\n"
-#~ "Patterns:\n"
-#~ "Channels:"
-#~ msgstr ""
-#~ "Fájlnév:\n"
-#~ "Cím:\n"
-#~ "Típus:\n"
-#~ "Hossz:\n"
-#~ "Sebesség:\n"
-#~ "Tempo:\n"
-#~ "Minták:\n"
-#~ "Hangszerek:\n"
-#~ "Minták:\n"
-#~ "Csatornák:"
-
-#~ msgid ""
-#~ "---\n"
-#~ "---\n"
-#~ "---\n"
-#~ "---\n"
-#~ "---\n"
-#~ "---\n"
-#~ "---\n"
-#~ "---\n"
-#~ "---\n"
-#~ "---"
-#~ msgstr ""
-#~ "---\n"
-#~ "---\n"
-#~ "---\n"
-#~ "---\n"
-#~ "---\n"
-#~ "---\n"
-#~ "---\n"
-#~ "---\n"
-#~ "---\n"
-#~ "---"
-
-#~ msgid "Samples"
-#~ msgstr "Minták"
-
-#~ msgid "Instruments"
-#~ msgstr "Hangszerek"
-
-#~ msgid "Message"
-#~ msgstr "Üzenet"
-
-#~ msgid "Modplug Input Plugin for Audacious ver"
-#~ msgstr "Modplug bemeneti bővítmény az Audacioushoz verzió"
-
-#~ msgid "About Modplug"
-#~ msgstr "Modplug névjegye"
-
-#~ msgid "Show separators in playlist"
-#~ msgstr "Elválasztók mutatása a lejátszólistában"
-
-#~ msgid "Show window manager decoration"
-#~ msgstr "Ablakkezelő dekoráció mutatása"
-
-#~ msgid "This enables the window manager to show decorations for windows."
-#~ msgstr "Engedélyezi az ablakkezelőnek hogy megjelenítse a saját dekorációt."
-
-#~ msgid "Disable inline gtk theme"
-#~ msgstr "A beépített gtk téma tiltása"
-
-#~ msgid "Random skin on play"
-#~ msgstr "Véletlenszerű bőr lejátszáskor"
-
-#~ msgid "Allow loading incomplete skins"
-#~ msgstr "A nem teljesen kész bőrök betöltése mindig"
-
-#~ msgid ""
-#~ "If selected, audacious won't refuse loading broken skins. Use only if "
-#~ "your favourite skin doesn't work"
-#~ msgstr ""
-#~ "Ha kiválasztott az audacious nem dobja el betöltéskor a sérült bőrt. Csak "
-#~ "akkor használja ha a kedvenc bőr nem működne"
-
-#~ msgid "Color Adjustment"
-#~ msgstr "Szín beállítás"
-
-#~ msgid "Blue"
-#~ msgstr "Kék"
-
-#~ msgid "Green"
-#~ msgstr "Zöld"
-
-#~ msgid "Red"
-#~ msgstr "Vörös"
-
-#~ msgid "Color adjustment ..."
-#~ msgstr "Szín beállítás ..."
-
-#~ msgid "Disable 'GUI Scaling'"
-#~ msgstr "'GUI méretezés' tiltása"
-
-#~ msgid "Enable 'GUI Scaling'"
-#~ msgstr "'GUI méretezés' engedélyezése"
-
-#~ msgid "DoubleSize"
-#~ msgstr "KétszeresMéret"
-
-#~ msgid "Easy Move"
-#~ msgstr "Könnyű mozgatás"
-
-#~ msgid "Spectrum Analyzer"
-#~ msgstr "Spektrum ábrázolása"
-
-#~ msgid "Search:"
-#~ msgstr "Keresés:"
-
-#~ msgid "Add Bookmark"
-#~ msgstr "Könyvjelző hozzáadása"
-
-#~ msgid "Stream name"
-#~ msgstr "Folyam neve"
-
-#~ msgid "Now playing"
-#~ msgstr "Éppen szól"
-
-#~ msgid "Remove Bookmark"
-#~ msgstr "Könyvjelző eltávolítása"
-
-#~ msgid "About Stream Browser"
-#~ msgstr "Folyam böngésző névjegye"
-
-#~ msgid "minutes:seconds"
-#~ msgstr "perc:másodperc"
-
-#~ msgid "Track length:"
-#~ msgstr "Szám hossza:"
-
-#~ msgid "Error writing playlist \"%s\": %s"
-#~ msgstr "Hiba a lejátszólista írásakor \"%s\": %s"
-
-#~ msgid "%s already exist. Continue?"
-#~ msgstr "%s már létezik. Folytatja?"
-
-#~ msgid "Show/hide infoarea"
-#~ msgstr "Információs terület megjelenítése/elrejtése"
-
-#~ msgid "Show main menu"
-#~ msgstr "Főmenü megjelenítése"
-
-#~ msgid "Show/hide main menu"
-#~ msgstr "Főmenü megjelenítése/elrejtése"
-
-#~ msgid "Show/hide statusbar"
-#~ msgstr "Az állapotsor megjelenítése/elrejtése"
-
-#~ msgid "Import Playlist ..."
-#~ msgstr "Lejátszólista importálása ..."
-
-#~ msgid "Export Playlist ..."
-#~ msgstr "Lejátszólista exportálása ..."
-
-#~ msgid "Refresh"
-#~ msgstr "Frissítés"
-
-#, fuzzy
-#~ msgid "Refresh Selected"
-#~ msgstr "Kijelölt törlése"
-
-#, fuzzy
-#~ msgid "Refreshes metadata associated with selected entries."
-#~ msgstr "A lejátszólista elemek metaadatainak frissítése."
-
-#, fuzzy
-#~ msgid "Edit the playlist title."
-#~ msgstr "Lista rendezése cím alapján."
-
-#, fuzzy
-#~ msgid "By Formatted Title"
-#~ msgstr "Cím szerint"
-
-#~ msgid "Components"
-#~ msgstr "Komponensek"
-
-#~ msgid "Upload selected track(s)"
-#~ msgstr "Kijelölt szám(ok) feltöltése"
-
-#~ msgid "Show main player window"
-#~ msgstr "Lejátszó főablakának mutatása"
-
-#~ msgid "Ignore"
-#~ msgstr "Mellőzés"
-
-#~ msgid "Audacious - broken GTK engine usage warning"
-#~ msgstr "Audacious - hibás GTK téma megjelenítő használat figyelmeztetés"
-
-#~ msgid "Do not display this warning again"
-#~ msgstr "Ne mutassa ezt a figyelmeztetést ismét"
-
-#~ msgid "Save as Static Playlist"
-#~ msgstr "Mentés statikus lejátszólistaként"
-
-#~ msgid "Use Relative Path"
-#~ msgstr "Relatív útvonal használata"
-
-#~ msgid "Load Playlist"
-#~ msgstr "Lejátszólista betöltése"
-
-#~ msgid "Save Playlist"
-#~ msgstr "Lejátszólista mentése"
-
-#~ msgid "Skinned Interface"
-#~ msgstr "Felhasználói felület"
-
-#~ msgid "%s: %d kbps, %d Hz, %s"
-#~ msgstr "%s: %d kbps, %d Hz, %s"
-
-#~ msgid "Variable bitrate"
-#~ msgstr "Változó bitsebesség"
-
-#~ msgid "Average bitrate"
-#~ msgstr "Átlagos bitsebesség"
-
-#~ msgid ""
-#~ "highest:0;\n"
-#~ "lowest:9;\n"
-#~ "default:4;"
-#~ msgstr ""
-#~ "legnagyobb:0;\n"
-#~ "legkisebb:9;\n"
-#~ "alapértelmezés:4;"
-
-#~ msgid "Show playlists"
-#~ msgstr "Lejátszólisták mutatása"
-
-#~ msgid "Show/hide playlists"
-#~ msgstr "Lejátszólisták megjelenítése/elrejtése"
-
-#~ msgid "About the Sun Driver"
-#~ msgstr "Sun meghajtó névjegye"
-
-#~ msgid "Audio control device:"
-#~ msgstr "Hang szabályzó eszköz:"
-
-#~ msgid "Buffer size (ms):"
-#~ msgstr "Puffer méter (ms):"
-
-#~ msgid "Volume controls device:"
-#~ msgstr "Hangerőszabályzó eszköz:"
-
-#~ msgid "XMMS uses mixer exclusively."
-#~ msgstr "XMMS kizárólagosan használja a keverőt."
-
-#~ msgid "Sun driver configuration"
-#~ msgstr "Sun meghajtó beállítások"
-
-#~ msgid "Target volume:"
-#~ msgstr "Cél hangerő:"
-
-#~ msgid "Effect strength:"
-#~ msgstr "Effekt erőssége:"
-
-#~ msgid "FLAC Audio Plugin "
-#~ msgstr "FLAC audio bővítmény"
-
-#~ msgid "LyricWiki"
-#~ msgstr "LyricWiki"
-
-#~ msgid "Stream browser"
-#~ msgstr "Folyam böngésző"
-
-#~ msgid "Streambrowser"
-#~ msgstr "Folyam böngésző"
-
-#~ msgid "PREAMP"
-#~ msgstr "PREAMP"
-
-#~ msgid "60HZ"
-#~ msgstr "60HZ"
-
-#~ msgid "170HZ"
-#~ msgstr "170HZ"
-
-#~ msgid "310HZ"
-#~ msgstr "310HZ"
-
-#~ msgid "600HZ"
-#~ msgstr "600HZ"
-
-#~ msgid "1KHZ"
-#~ msgstr "1KHZ"
-
-#~ msgid "3KHZ"
-#~ msgstr "3KHZ"
-
-#~ msgid "6KHZ"
-#~ msgstr "6KHZ"
-
-#~ msgid "12KHZ"
-#~ msgstr "12KHZ"
-
-#~ msgid "14KHZ"
-#~ msgstr "14KHZ"
-
-#~ msgid "16KHZ"
-#~ msgstr "16KHZ"
 
-#~ msgid "Audacious standard menu"
-#~ msgstr "Audacious általános menü"

audacious-plugins-3.0.3.tar.bz2/po/ja.po -> audacious-plugins-3.1.tar.bz2/po/ja.po Changed

@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: audacious-plugins HEAD\n"
 "Report-Msgid-Bugs-To: http://jira.atheme.org/\n"
-"POT-Creation-Date: 2011-09-18 14:13-0400\n"
+"POT-Creation-Date: 2011-07-17 18:49-0400\n"
 "PO-Revision-Date: 2008-07-08 13:10+0900\n"
 "Last-Translator: dai <d+po@vdr.jp>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -1050,7 +1050,7 @@
 msgid "Volume: (%)"
 msgstr "音量: (%)"
 
-#: src/ffaudio/ffaudio-core.c:789
+#: src/ffaudio/ffaudio-core.c:763
 #, c-format
 msgid ""
 "Multi-format audio decoding plugin for Audacious based on\n"
@@ -1066,7 +1066,7 @@
 "libavutil %s (%s)\n"
 msgstr ""
 
-#: src/ffaudio/ffaudio-core.c:803
+#: src/ffaudio/ffaudio-core.c:777
 #, fuzzy
 msgid "About FFaudio Plugin"
 msgstr "FLAC オーディオプラグインについて"
@@ -3805,11 +3805,11 @@
 msgid "Delete auto-load preset"
 msgstr "自動読み込みのプリセットの削除"
 
-#: src/skins/ui_playlist.c:245
+#: src/skins/ui_playlist.c:244
 msgid "Search entries in active playlist"
 msgstr "有効になっているプレイリストのエントリを検索"
 
-#: src/skins/ui_playlist.c:253
+#: src/skins/ui_playlist.c:252
 msgid ""
 "Select entries in playlist by filling one or more fields. Fields use regular "
 "expressions syntax, case-insensitive. If you don't know how regular "
@@ -3820,39 +3820,39 @@
 "正規表現が使え, 大文字と小文字を区別しません. 正規表現がどのように動作するか"
 "わからない場合は, 単純に検索しようとしているものの文字を入力します."
 
-#: src/skins/ui_playlist.c:261
+#: src/skins/ui_playlist.c:260
 msgid "Title: "
 msgstr "タイトル: "
 
-#: src/skins/ui_playlist.c:268
+#: src/skins/ui_playlist.c:267
 msgid "Album: "
 msgstr "アルバム名: "
 
-#: src/skins/ui_playlist.c:275
+#: src/skins/ui_playlist.c:274
 msgid "Artist: "
 msgstr "アーティスト: "
 
-#: src/skins/ui_playlist.c:282
+#: src/skins/ui_playlist.c:281
 msgid "Filename: "
 msgstr "ファイル名: "
 
-#: src/skins/ui_playlist.c:290
+#: src/skins/ui_playlist.c:289
 msgid "Clear previous selection before searching"
 msgstr "検索前に以前の選択をクリア"
 
-#: src/skins/ui_playlist.c:293
+#: src/skins/ui_playlist.c:292
 msgid "Automatically toggle queue for matching entries"
 msgstr "マッチしたエントリのキューを自動的にトグル"
 
-#: src/skins/ui_playlist.c:296
+#: src/skins/ui_playlist.c:295
 msgid "Create a new playlist with matching entries"
 msgstr "マッチしたエントリで新しいプレイリストを作成"
 
-#: src/skins/ui_playlist.c:763
+#: src/skins/ui_playlist.c:762
 msgid "Audacious Playlist Editor"
 msgstr "Audacious プレイリストエディタ"
 
-#: src/skins/ui_playlist.c:810
+#: src/skins/ui_playlist.c:809
 #, c-format
 msgid "%s (%d of %d)"
 msgstr ""
@@ -3870,11 +3870,11 @@
 msgid "Could not create directory (%s): %s\n"
 msgstr "ディレクトリ (%s) を作成できませんでした: %s\n"
 
-#: src/sndfile/plugin.c:454
+#: src/sndfile/plugin.c:438
 msgid "About sndfile plugin"
 msgstr "sndfile プラグインについて"
 
-#: src/sndfile/plugin.c:455
+#: src/sndfile/plugin.c:439
 msgid ""
 "Adapted for Audacious usage by Tony Vroon <chainsaw@gentoo.org>\n"
 "from the xmms_sndfile plugin which is:\n"

audacious-plugins-3.0.3.tar.bz2/po/lt.po -> audacious-plugins-3.1.tar.bz2/po/lt.po Changed

@@ -1,20 +1,22 @@
-# Copyright (C) gymka 2011
-# This file is distributed under the same license as the PACKAGE package.
-# gymka <gymka@mail.ru>, 2011.
+# Lithuanian translation for Audacious Plugins
+# Copyright (C) Audacious Translators
+# This file is distributed under the same license as the Audacious Plugins package.
 #
+# Translators:
+# Algimantas Margevičius <gymka@mail.ru>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: audacious plugins 3.0\n"
-"Report-Msgid-Bugs-To: http://jira.atheme.org/\n"
-"POT-Creation-Date: 2011-09-18 14:13-0400\n"
-"PO-Revision-Date: 2011-07-24 19:20+0300\n"
-"Last-Translator: gymka <gymka@mail.ru>\n"
-"Language-Team: Lietuvių <>\n"
-"Language: lt\n"
+"Project-Id-Version: Audacious Plugins\n"
+"Report-Msgid-Bugs-To: http://jira.atheme.org/browse/AUDPLUG\n"
+"POT-Creation-Date: 2011-10-19 21:37-0400\n"
+"PO-Revision-Date: 2011-10-20 10:05+0000\n"
+"Last-Translator: Algimantas Margevičius <gymka@mail.ru>\n"
+"Language-Team: Lithuanian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bits\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lt\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
 #: src/aac/libmp4.c:256
 #, c-format
@@ -31,6 +33,339 @@
 msgid "About MP4 AAC decoder plugin"
 msgstr "Apie MP4 AAC decoder plugin"
 
+#: src/alarm/interface.c:34
+msgid "About XMMS Alarm"
+msgstr "Apie XMMS Alarm"
+
+#: src/alarm/interface.c:41
+msgid "XMMS Alarm"
+msgstr "XMMS Alarm"
+
+#: src/alarm/interface.c:50
+msgid ""
+"An XMMS plugin which can be used\n"
+"to start playing at a certain time.\n"
+"\n"
+"Send all complaints to:\n"
+"Adam Feakin <adamf@snika.uklinux.net>\n"
+"Daniel Stodden <stodden@in.tum.de>\n"
+"\n"
+"http://www.snika.uklinux.net/xmms-alarm/"
+msgstr ""
+"XMMS įskiepis gali būt naudojamas\n"
+"norint priversti groti nuo tam tikros vietos.\n"
+"\n"
+"Visus skundus siųskit:\n"
+"Adam Feakin <adamf@snika.uklinux.net>\n"
+"Daniel Stodden <stodden@in.tum.de>\n"
+"\n"
+"http://www.snika.uklinux.net/xmms-alarm/"
+
+#: src/alarm/interface.c:65
+msgid "Close"
+msgstr "Uždaryti"
+
+#: src/alarm/interface.c:95
+msgid "Alarm"
+msgstr "Žadintuvas"
+
+#: src/alarm/interface.c:102
+msgid "This is your wakeup call."
+msgstr "Tai pabudimo skambutis."
+
+#: src/alarm/interface.c:117 src/alarm/interface.c:1338
+msgid "OK"
+msgstr "Gerai"
+
+#: src/alarm/interface.c:151
+msgid "Sorry"
+msgstr "Deja"
+
+#: src/alarm/interface.c:158
+msgid "Warning"
+msgstr "Įspėjimas"
+
+#: src/alarm/interface.c:167
+msgid ""
+"For safety reasons the \"quiet\" time must be at least 65 seconds longer than the fading time, it must also be more than 10 seconds. This basically means that there is a bug in the code and until I find a way of really fixing it this message will appear :)\n"
+"\n"
+"Your fading settings have NOT been saved\n"
+"\n"
+"--\n"
+"Adam"
+msgstr ""
+"Saugumo sumetimais \"tylu\" laikas turi būt bent 65 sekundėm ilgesnis nei laukimo laikas, taipogi tai turi būt daugiau nei 10 sekundžių. Iš esmės tai reiškia jog yra klaida kode ir kol nerasiu būdo tai pataisyt šis pranešimas galios :)\n"
+"\n"
+"Jūsų nustatymai NEišsaugoti\n"
+"\n"
+"--\n"
+"Adam"
+
+#: src/alarm/interface.c:183
+msgid "Oh Well"
+msgstr "Na ką gi"
+
+#: src/alarm/interface.c:339
+msgid "Alarm Settings"
+msgstr "Žadintuvo nustatymai"
+
+#: src/alarm/interface.c:354 src/alarm/interface.c:526
+#: src/alarm/interface.c:898
+msgid "Time"
+msgstr "Laikas"
+
+#: src/alarm/interface.c:395
+msgid "hours"
+msgstr "valandos"
+
+#: src/alarm/interface.c:456
+msgid "h"
+msgstr "v"
+
+#: src/alarm/interface.c:486
+msgid "minutes"
+msgstr "minutės"
+
+#: src/alarm/interface.c:504
+msgid "Quiet after:"
+msgstr "Nutilti po:"
+
+#: src/alarm/interface.c:514
+msgid "Alarm at (default):"
+msgstr "Žadinti (numatyta):"
+
+#: src/alarm/interface.c:534
+msgid "Choose the days for the alarm to come on"
+msgstr "Pasirinkite dienas kuriomis žadinti"
+
+#: src/alarm/interface.c:562 src/alarm/interface.c:610
+#: src/alarm/interface.c:658 src/alarm/interface.c:706
+#: src/alarm/interface.c:754 src/alarm/interface.c:802
+#: src/alarm/interface.c:850 src/OSS/configure.c:153
+#: src/skins/ui_manager.c:450 src/skins/ui_manager.c:471
+msgid "Default"
+msgstr "Numatytasis"
+
+#: src/alarm/interface.c:888
+msgid "Day"
+msgstr "Diena"
+
+#: src/alarm/interface.c:908
+msgid "Tuesday"
+msgstr "Antradienis"
+
+#: src/alarm/interface.c:919
+msgid "Wednesday"
+msgstr "Trečiadienis"
+
+#: src/alarm/interface.c:930
+msgid "Thursday"
+msgstr "Ketvirtadienis"
+
+#: src/alarm/interface.c:941
+msgid "Friday"
+msgstr "Penktadienis"
+
+#: src/alarm/interface.c:952
+msgid "Saturday"
+msgstr "Šeštadienis"
+
+#: src/alarm/interface.c:963
+msgid "Sunday"
+msgstr "Sekmadienis"
+
+#: src/alarm/interface.c:973
+msgid "Monday"
+msgstr "Pirmadienis"
+
+#: src/alarm/interface.c:984
+msgid "Days"
+msgstr "Dienos"
+
+#: src/alarm/interface.c:1000
+msgid "Fading"
+msgstr "Blukimas"
+
+#: src/alarm/interface.c:1037
+msgid "seconds"
+msgstr "sekundės"
+
+#: src/alarm/interface.c:1045 src/alarm/interface.c:1160
+msgid "Volume"
+msgstr "Garsas"
+
+#: src/alarm/interface.c:1071
+msgid "Current"
+msgstr "Dabartinis"
+
+#: src/alarm/interface.c:1079
+msgid "Start at"
+msgstr "Pradėti nuo"
+
+#: src/alarm/interface.c:1107 src/alarm/interface.c:1151
+msgid "%"
+msgstr "%"
+
+#: src/alarm/interface.c:1123
+msgid "Final"
+msgstr "Baigti"
+
+#: src/alarm/interface.c:1176
+msgid "Additional Command"
+msgstr "Papildoma komanda"
+
+#: src/alarm/interface.c:1202
+msgid "enable"
+msgstr "Įjungti"
+
+#: src/alarm/interface.c:1210
+msgid "Playlist (optional)"
+msgstr "Grojaraštis (nebūtina)"
+
+#: src/alarm/interface.c:1236
+msgid "Browse..."
+msgstr "Naršyti..."
+
+#: src/alarm/interface.c:1244 src/alarm/interface.c:1408
+msgid "Reminder"
+msgstr "Priminimas"
+
+#: src/alarm/interface.c:1261
+msgid "Use reminder"
+msgstr "Naudoti priminimą"
+
+#: src/alarm/interface.c:1277 src/sndstretch/sndstretch_xmms.c:358
+msgid "Options"
+msgstr "Pasirinktys"
+
+#: src/alarm/interface.c:1285
+msgid "What do these options mean?"
+msgstr "Ką šios pasirinktys reiškia?"
+
+#: src/alarm/interface.c:1313
+msgid ""
+"\n"
+"Time\n"
+" Alarm at: \n"
+" The time for the alarm to come on.\n"
+"\n"
+" Quiet After: \n"
+" Stop alarm after this amount of time.\n"
+" (if the wakeup dialog is not closed)\n"
+"\n"
+"\n"
+"Days\n"
+" Day:\n"
+" Select the days for the alarm to activate.\n"
+"\n"
+" Time:\n"
+" Choose the time for the alarm on each day,\n"
+" or select the toggle button to use the default\n"
+" time.\n"
+"\n"
+"\n"
+"Volume\n"
+" Fading: \n"
+" Fade the volume up to the chosen volume \n"
+" for this amount of time.\n"
+"\n"
+" Start at: \n"
+" Start fading from this volume.\n"
+"\n"
+" Final: \n"
+" The volume to stop fading at. If the fading\n"
+" time is 0 then set volume to this and start\n"
+" playing.\n"
+"\n"
+"\n"
+"Options:\n"
+" Additional Command:\n"
+" Run this command at the alarm time.\n"
+"\n"
+" Playlist: \n"
+" Load this playlist for playing songs from \n"
+" (must have .m3u extension). If no playlist\n"
+" is given then the songs which are currently\n"
+" in the list will be used.\n"
+" The URL of an mp3/ogg stream can also be\n"
+" entered here, but loading of playlists from\n"
+" URLs is not currently supported by xmms.\n"
+"\n"
+" Reminder:\n"
+" Display a reminder when the alarm goes off,\n"
+" type the reminder in the box and turn on the\n"
+" toggle button if you want it to be shown.\n"
+msgstr ""
+"\n"
+"Laikas\n"
+" Žadinti laiku: \n"
+" Laikas kada įjungti žadintuvą.\n"
+"\n"
+" Nutilti po: \n"
+" Po šio laiko tarpo išjungti žadintuvą.\n"
+" (jei prikėlimo žadintuvas neuždarytas)\n"
+"\n"
+"\n"
+"Dienos\n"
+" Diena:\n"
+" Pasirink dienas kuriomis įjungti žadintuvą.\n"
+"\n"
+" Laikas:\n"
+" Pasirinkti kiekvienos dienos žadintuvo laiką,\n"
+" arba pasirinkti numatytąjį laiką.\n"
+"\n"
+"\n"
+"\n"
+"Garsas\n"
+" Garsėjimas: \n"
+" Garsinti iki nurodyto garso, \n"
+" šį laiko tarpą.\n"
+"\n"
+" Pradėti nuo: \n"
+" Pradėti garsinti nuo.\n"
+"\n"
+" Baigti: \n"
+" Garsas ties kuriuo baigti garsinti. Jei garsinimo\n"
+" laikas yra 0 tada nustatykit garsą šitą ir\n"
+" pradėkit groti.\n"
+"\n"
+"\n"
+"Pasirinktys:\n"
+" Papildoma komanda:\n"
+" Vykdyti šią komandą žadintuvo laiku.\n"
+"\n"
+" Grojaraštis: \n"
+" Įkelti šį grojaraštį ir groti dainas iš ji \n"
+" (turi turėti .m3u plėtinį). Jei nenurodytas \n"
+" grojaraštis bus naudojamos dainos kurios\n"
+" dabar yra sąraše.\n"
+" mp3/ogg URL taipogi gali būt čia įvestas,\n"
+" bet grojaraščio įkrovimas iš URL šiuo metu\n"
+" nepalaikomas xmms.\n"
+"\n"
+" Priminimas:\n"
+" Parodyti priminimą žadintuvui išsijungus,\n"
+" įveskit priminimą langelyje ir paspauskite patvirtinimo mygtuką\n"
+" jei norit jog būtų rodomas.\n"
+
+#: src/alarm/interface.c:1315 src/skins/ui_manager.c:382
+msgid "Help"
+msgstr "Pagalba"
+
+#: src/alarm/interface.c:1347 src/cdaudio-ng/configure.c:249
+#: src/crystalizer/crystalizer.c:130 src/echo_plugin/gui.c:125
+#: src/jack/configure.c:148 src/null/null.c:108 src/stereo_plugin/stereo.c:125
+msgid "Cancel"
+msgstr "Atšaukti"
+
+#: src/alarm/interface.c:1415
+msgid "Your reminder for today is.."
+msgstr "Šiandien tavo priminimas yra.."
+
+#: src/alarm/interface.c:1440
+msgid "Thankyou"
+msgstr "Dėkui"
+
 #: src/alsa/config.c:210
 msgid "Default PCM device"
 msgstr "Numatytasis PCM įrenginys"
@@ -39,25 +374,25 @@
 msgid "Default mixer device"
 msgstr "Numatytasis mikseris"
 
-#: src/alsa/config.c:447
+#: src/alsa/config.c:438
 msgid "ALSA Output Plugin Preferences"
 msgstr "ALSA išvesties įskiepio nustatymai"
 
-#: src/alsa/config.c:454
+#: src/alsa/config.c:445
 msgid "PCM device:"
 msgstr "PCM įrenginys:"
 
-#: src/alsa/config.c:456 src/OSS/configure.c:246
+#: src/alsa/config.c:447 src/OSS/configure.c:237
 msgid "Mixer device:"
 msgstr "Mikseris:"
 
-#: src/alsa/config.c:458
+#: src/alsa/config.c:449
 msgid "Mixer element:"
 msgstr "Mikserio elementas:"
 
-#: src/alsa/config.c:461
+#: src/alsa/config.c:452
 msgid "Work around drain hangup"
-msgstr "Work around drain hangup"
+msgstr "Apeiti sausą pakibimą"
 
 #: src/alsa/plugin.c:59
 msgid "About ALSA Output Plugin"
@@ -72,7 +407,7 @@
 "You have not selected any sequencer ports for MIDI playback. You can do so "
 "in the MIDI plugin preferences."
 msgstr ""
-"Nepasrinkti joki MIDI atkūrimo prievadai. Pasirinkt gali MIDI įskiepio "
+"Nepasirinkti jokie MIDI atkūrimo prievadai. Pasirinkt gali MIDI įskiepio "
 "nustatymuose."
 
 #: src/amidi-plug/backend-alsa/b-alsa.c:35
@@ -81,43 +416,27 @@
 
 #: src/amidi-plug/backend-alsa/b-alsa.c:37
 msgid ""
-"This backend sends MIDI events to a group of user-chosen ALSA sequencer "
-"ports. The ALSA sequencer interface is very versatile, it can provide ports "
-"for audio cards hardware synthesizers (i.e. emu10k1) but also for software "
-"synths, external devices, etc.\n"
-"This backend does not produce audio, MIDI events are handled directly from "
-"devices/programs behind the ALSA ports; in example, MIDI events sent to the "
-"hardware synth will be directly played.\n"
+"This backend sends MIDI events to a group of user-chosen ALSA sequencer ports. The ALSA sequencer interface is very versatile, it can provide ports for audio cards hardware synthesizers (i.e. emu10k1) but also for software synths, external devices, etc.\n"
+"This backend does not produce audio, MIDI events are handled directly from devices/programs behind the ALSA ports; in example, MIDI events sent to the hardware synth will be directly played.\n"
 "Backend written by Giacomo Lozito."
 msgstr ""
-"This backend sends MIDI events to a group of user-chosen ALSA sequencer "
-"ports. The ALSA sequencer interface is very versatile, it can provide ports "
-"for audio cards hardware synthesizers (i.e. emu10k1) but also for software "
-"synths, external devices, etc.\n"
-"This backend does not produce audio, MIDI events are handled directly from "
-"devices/programs behind the ALSA ports; in example, MIDI events sent to the "
-"hardware synth will be directly played.\n"
-"Backend written by Giacomo Lozito."
+"Ši posistemė siunčia MIDI įvykius naudotojo pasirinktai ALSA eiliškumo prievadų grupei. ALSA sekvencerio sąsaja yra labai universali, ji gali suteikti prievadus audio plokščių sintezatoriams (pvz. emu10k1) beto programiniams sintezatoriams, papildomiems įrenginiams ir t.t.\n"
+"Ši posistemė nekuria garso, MIDI įvykius apdoroja tiesiogiai įrenginiai/programos už ALSA prievadų; pavyzdžiui MIDI įvykiai nusiųsti į sintezatorių bus grojami tiesiogiai.\n"
+"Posistemę sukūrė Giacomo Lozito."
 
 #: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:38
 msgid "FluidSynth Backend "
-msgstr "FluidSynth Backend "
+msgstr "FluidSynth Posistemė"
 
 #: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:40
 msgid ""
-"This backend produces audio by sending MIDI events to FluidSynth, a real-"
-"time software synthesizer based on the SoundFont2 specification (www."
-"fluidsynth.org).\n"
-"Produced audio can be manipulated via player effect plugins and is processed "
-"by chosen ouput plugin.\n"
+"This backend produces audio by sending MIDI events to FluidSynth, a real-time software synthesizer based on the SoundFont2 specification (www.fluidsynth.org).\n"
+"Produced audio can be manipulated via player effect plugins and is processed by chosen ouput plugin.\n"
 "Backend written by Giacomo Lozito."
 msgstr ""
-"This backend produces audio by sending MIDI events to FluidSynth, a real-"
-"time software synthesizer based on the SoundFont2 specification (www."
-"fluidsynth.org).\n"
-"Produced audio can be manipulated via player effect plugins and is processed "
-"by chosen ouput plugin.\n"
-"Backend written by Giacomo Lozito."
+"Ši posistemė atkuria garsą sisųdama MIDI įvykius į FluidSynth, realaus laiko programinį sintezatorių, paremtą SoundFont2 specifika (www.fluidsynth.org).\n"
+"Atkurtu garsu galima manipuliuoti grotuvo efektų įskiepiais ir jis yra apdorojamas išvesties įskiepiu.\n"
+"Posistemę sukūrė Giacomo Lozito."
 
 #: src/amidi-plug/i_configure-alsa.c:228
 msgid "ALSA BACKEND CONFIGURATION"
@@ -165,7 +484,7 @@
 
 #: src/amidi-plug/i_configure-ap.c:59
 msgid "AMIDI-Plug - backend information"
-msgstr "AMIDI-Plug - positemės informacija"
+msgstr "AMIDI-Plug - posistemės informacija"
 
 #: src/amidi-plug/i_configure-ap.c:196
 msgid "AMIDI-PLUG PREFERENCES"
@@ -189,7 +508,7 @@
 
 #: src/amidi-plug/i_configure-ap.c:271
 msgid "Drum shift: "
-msgstr "Drum shift: "
+msgstr "Būgnų poslinkis: "
 
 #: src/amidi-plug/i_configure-ap.c:289
 msgid "Advanced settings"
@@ -229,7 +548,7 @@
 
 #: src/amidi-plug/i_configure-fluidsynth.c:270
 msgid "FLUIDSYNTH BACKEND CONFIGURATION"
-msgstr "FLUIDSYNTH POSISTEMĖS KONFIGURAVIMAS"
+msgstr "FLUIDSYNTH POSISTEMĖS KONFIGŪRAVIMAS"
 
 #: src/amidi-plug/i_configure-fluidsynth.c:313
 msgid "SoundFont settings"
@@ -295,7 +614,7 @@
 
 #: src/amidi-plug/i_configure-fluidsynth.c:544
 msgid "sample rate"
-msgstr "semplo dažnis"
+msgstr "diskretizacijos dažnis"
 
 #: src/amidi-plug/i_configure-fluidsynth.c:550
 msgid "22050 Hz "
@@ -314,9 +633,8 @@
 msgstr "derinta"
 
 #: src/amidi-plug/i_configure-fluidsynth.c:568
-#, fuzzy
 msgid "Hz "
-msgstr " Hz "
+msgstr "Hz "
 
 #: src/amidi-plug/i_configure-fluidsynth.c:621
 msgid "FluidSynth Backend not loaded or not available"
@@ -332,7 +650,7 @@
 
 #: src/amidi-plug/i_configure-timidity.c:39
 msgid "TIMIDITY BACKEND CONFIGURATION"
-msgstr "TIMIDITY POSISTEMĖS KONFIGURACIJA"
+msgstr "TIMIDITY POSISTEMĖS KONFIGŪRACIJA"
 
 #: src/amidi-plug/i_configure-timidity.c:64
 msgid "TiMidity Backend not loaded or not available"
@@ -346,7 +664,7 @@
 "TiMidity\n"
 "posistemė"
 
-#: src/amidi-plug/i_fileinfo.c:169 src/sid/xs_interface.c:1769
+#: src/amidi-plug/i_fileinfo.c:169
 msgid "Name:"
 msgstr "Pavadinimas:"
 
@@ -474,7 +792,7 @@
 
 #: src/aosd/aosd_trigger.c:77
 msgid "Playback Start"
-msgstr "Akūrimo pradžia"
+msgstr "Atkūrimo pradžia"
 
 #: src/aosd/aosd_trigger.c:78
 msgid "Triggers OSD when a playlist entry is played."
@@ -492,11 +810,11 @@
 msgstr ""
 "Sužadina OSD kai, atkūrimo metu, dainos pavadinimas pasikeičia, bet bylos "
 "vardas lieka tas pats. Šita pasirinktis naudingiausia atvaizduojant "
-"interneto srauto dainos pavadinmo pokyčius. "
+"interneto srauto dainos pavadinimo pokyčius. "
 
 #: src/aosd/aosd_trigger.c:89
 msgid "Volume Change"
-msgstr "Garso kitimas"
+msgstr "Garso keitimas"
 
 #: src/aosd/aosd_trigger.c:90
 msgid "Triggers OSD when volume is changed."
@@ -553,7 +871,7 @@
 
 #: src/aosd/aosd_ui.c:323
 msgid "Timing (ms)"
-msgstr "Timing (ms)"
+msgstr "Laiko derinimas (ms)"
 
 #: src/aosd/aosd_ui.c:328
 msgid "Display:"
@@ -594,7 +912,7 @@
 
 #: src/aosd/aosd_ui.c:614
 msgid "Render Style"
-msgstr ""
+msgstr "Atvaizdavimo stilius"
 
 #: src/aosd/aosd_ui.c:630
 msgid "Colors"
@@ -613,8 +931,7 @@
 msgid "Skin file:"
 msgstr "Išvaizdos failas:"
 
-#: src/aosd/aosd_ui.c:672 src/sid/xs_interface.c:1044
-#: src/sid/xs_interface.c:1236 src/sid/xs_interface.c:1292
+#: src/aosd/aosd_ui.c:672
 msgid "Browse"
 msgstr "Naršyti"
 
@@ -628,86 +945,88 @@
 
 #: src/aosd/aosd_ui.c:829
 msgid "Composite manager detected"
-msgstr ""
+msgstr "Composite tvarkytuvas rastas"
 
 #: src/aosd/aosd_ui.c:836
 msgid ""
 "Composite manager not detected;\n"
-"unless you know that you have one running, please activate a composite "
-"manager otherwise the OSD won't work properly"
+"unless you know that you have one running, please activate a composite manager otherwise the OSD won't work properly"
 msgstr ""
+"Composite tvarkyklė nerasta;\n"
+"įjunk composite tvarkyklę, nes OSD neveiks taip kaip priklauso"
 
 #: src/aosd/aosd_ui.c:844
 msgid "Composite manager not required for fake transparency"
-msgstr ""
+msgstr "Netikram permatomumui composite tvarkyklė nereikalinga"
 
 #: src/aosd/aosd_ui.c:882
 msgid "Transparency"
-msgstr ""
+msgstr "Skaidrumas"
 
 #: src/aosd/aosd_ui.c:888
 msgid "Fake transparency"
-msgstr ""
+msgstr "Netikras skaidrumas"
 
 #: src/aosd/aosd_ui.c:890
 msgid "Real transparency (requires X Composite Ext.)"
-msgstr ""
+msgstr "Tikras skaidrumas (reikalinga X composite plėtinys)"
 
 #: src/aosd/aosd_ui.c:932
 msgid "Composite extension not loaded"
-msgstr ""
+msgstr "Composite plėtinys neįkrautas"
 
 #: src/aosd/aosd_ui.c:940
 msgid "Composite extension not available"
-msgstr ""
+msgstr "Composite plėtinys neprieinamas"
 
 #: src/aosd/aosd_ui.c:959
 #, c-format
 msgid "Audacious OSD"
-msgstr ""
+msgstr "Audacious OSD"
 
 #: src/aosd/aosd_ui.c:1040
 msgid "Audacious OSD - configuration"
-msgstr ""
+msgstr "Audacious OSD - konfigūracija"
 
 #: src/aosd/aosd_ui.c:1061
 msgid "Test"
-msgstr ""
+msgstr "Testas"
 
 #: src/aosd/aosd_ui.c:1076
 msgid "Position"
-msgstr ""
+msgstr "Pozicija"
 
 #: src/aosd/aosd_ui.c:1081
 msgid "Animation"
-msgstr ""
+msgstr "Animacija"
 
 #: src/aosd/aosd_ui.c:1086
 msgid "Text"
-msgstr ""
+msgstr "Tekstas"
 
 #: src/aosd/aosd_ui.c:1091
 msgid "Decoration"
-msgstr ""
+msgstr "Dekoracijos"
 
 #: src/aosd/aosd_ui.c:1096
 msgid "Trigger"
-msgstr ""
+msgstr "Sužadintojas"
 
 #: src/aosd/aosd_ui.c:1101 src/cdaudio-ng/configure.c:171
-#: src/sid/xs_interface.c:1302
 msgid "Misc"
-msgstr ""
+msgstr "Kita"
 
 #: src/aosd/aosd_ui.c:1138
 msgid "Audacious OSD - about"
-msgstr ""
+msgstr "Audacious OSD - apie"
 
 #: src/aosd/aosd_ui.c:1168
 msgid ""
 "\n"
 "Audacious OSD "
 msgstr ""
+"\n"
+"Audacious OSD "
 
 #: src/aosd/aosd_ui.c:1169
 msgid ""
@@ -721,23 +1040,31 @@
 "http://neugierig.org/software/ghosd/\n"
 "\n"
 msgstr ""
+"\n"
+"http://www.develia.org/projects.php?p=audacious#aosd\n"
+"sukūrė Giacomo Lozito\n"
+"< james@develia.org >\n"
+"\n"
+"On-Screen-Display paremta Ghosd library\n"
+"kurią sukūrė Evan Martin\n"
+"http://neugierig.org/software/ghosd/\n"
+"\n"
 
 #: src/blur_scope/config.c:73
 msgid "Blur Scope: Color selection"
-msgstr ""
+msgstr "Išsiliejimo sritis: Pagal spalvas"
 
-#: src/blur_scope/config.c:83 src/jack/configure.c:111
+#: src/blur_scope/config.c:83 src/jack/configure.c:106
 msgid "Options:"
-msgstr ""
+msgstr "Pasirinktys:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:264
+#: src/cdaudio-ng/cdaudio-ng.c:241
 msgid "About Audio CD Plugin"
-msgstr ""
+msgstr "Apie Audio CD Plugin"
 
-#: src/cdaudio-ng/cdaudio-ng.c:265
+#: src/cdaudio-ng/cdaudio-ng.c:242
 msgid ""
-"Copyright (c) 2007, by Calin Crisan <ccrisan@gmail.com> and The Audacious "
-"Team.\n"
+"Copyright (c) 2007, by Calin Crisan <ccrisan@gmail.com> and The Audacious Team.\n"
 "\n"
 "Many thanks to libcdio developers <http://www.gnu.org/software/libcdio/>\n"
 "\tand to libcddb developers <http://libcddb.sourceforge.net/>.\n"
@@ -748,74 +1075,78 @@
 "\n"
 "Copyright 2009 John Lindgren"
 msgstr ""
+"Copyright (c) 2007, by Calin Crisan <ccrisan@gmail.com> and The Audacious Team.\n"
+"\n"
+"Didelis dėkui libcdio kūrėjams <http://www.gnu.org/software/libcdio/>\n"
+"\tir libcddb kūrėjams <http://libcddb.sourceforge.net/>.\n"
+"\n"
+"Beto dėkui Tony Vroon už pamokymus ir užvedimą ant kelio.\n"
+"\n"
+"Čia buvo Google Summer Code 2007 projektas.\n"
+"\n"
+"Copyright 2009 John Lindgren"
 
-#: src/cdaudio-ng/cdaudio-ng.c:558
+#: src/cdaudio-ng/cdaudio-ng.c:550
 msgid "Audio CD"
-msgstr ""
+msgstr "Audio CD"
 
-#: src/cdaudio-ng/cdaudio-ng.c:913
+#: src/cdaudio-ng/cdaudio-ng.c:922
 msgid "Drive is empty."
-msgstr ""
+msgstr "Diskasukis tuščias."
 
-#: src/cdaudio-ng/cdaudio-ng.c:915
+#: src/cdaudio-ng/cdaudio-ng.c:924
 msgid "Unsupported disk type."
-msgstr ""
+msgstr "Nepalaikomas disko tipas."
 
 #: src/cdaudio-ng/configure.c:148
 msgid "CD Audio Plugin Configuration"
-msgstr ""
+msgstr "CD Audio Plugin Konfigūracija"
 
 #: src/cdaudio-ng/configure.c:160
 msgid "Digital audio extraction"
-msgstr ""
+msgstr "Skaitmeninio garso išėmimas"
 
 #: src/cdaudio-ng/configure.c:165
 msgid "Title information"
-msgstr ""
+msgstr "Pavadinimo informacija"
 
 #: src/cdaudio-ng/configure.c:176
 msgid "Disc speed:"
-msgstr ""
+msgstr "Disko greitis:"
 
 #: src/cdaudio-ng/configure.c:184
 msgid "Use cd-text if available"
-msgstr ""
+msgstr "Jei įmanoma naudoti cd-tekstą"
 
 #: src/cdaudio-ng/configure.c:191
 msgid "Use CDDB if available"
-msgstr ""
+msgstr "Jei įmanoma naudoti CDDB"
 
 #: src/cdaudio-ng/configure.c:197
 msgid "Server: "
-msgstr ""
+msgstr "Serveris:"
 
 #: src/cdaudio-ng/configure.c:201
 msgid "Path: "
-msgstr ""
+msgstr "Kelias:"
 
 #: src/cdaudio-ng/configure.c:205
 msgid "Port: "
-msgstr ""
+msgstr "Prievadas:"
 
 #: src/cdaudio-ng/configure.c:218
 msgid "Use HTTP instead of CDDBP"
-msgstr ""
+msgstr "Naudoti HTTP vietoj CDDBP"
 
 #: src/cdaudio-ng/configure.c:230
 msgid "Override default device: "
-msgstr ""
+msgstr "Nepaisyti numatytojo prietaiso:"
 
-#: src/cdaudio-ng/configure.c:244 src/crystalizer/crystalizer.c:131
-#: src/echo_plugin/gui.c:123 src/jack/configure.c:146 src/null/null.c:112
-#: src/stereo_plugin/stereo.c:125
+#: src/cdaudio-ng/configure.c:244 src/crystalizer/crystalizer.c:123
+#: src/echo_plugin/gui.c:118 src/jack/configure.c:141 src/null/null.c:107
+#: src/stereo_plugin/stereo.c:118
 msgid "Ok"
-msgstr ""
-
-#: src/cdaudio-ng/configure.c:249 src/crystalizer/crystalizer.c:138
-#: src/echo_plugin/gui.c:130 src/jack/configure.c:153 src/null/null.c:113
-#: src/stereo_plugin/stereo.c:132
-msgid "Cancel"
-msgstr ""
+msgstr "Gerai"
 
 #: src/cd-menu-items/cd-menu-items.c:34
 msgid "Play CD"
@@ -825,89 +1156,90 @@
 msgid "Add CD"
 msgstr "Pridėti CD"
 
-#: src/compressor/plugin.c:67
+#: src/compressor/plugin.c:63
 msgid "About Dynamic Range Compression Plugin"
-msgstr ""
+msgstr "Apie Dynamic Range Compression Plugin"
 
-#: src/compressor/plugin.c:99
+#: src/compressor/plugin.c:95
 msgid "Dynamic Range Compressor Preferences"
-msgstr ""
+msgstr "Dynamic Range Compressor Nustatymai"
 
-#: src/compressor/plugin.c:111
+#: src/compressor/plugin.c:107
 msgid "Center volume:"
-msgstr ""
+msgstr "Centro garsas:"
 
-#: src/compressor/plugin.c:124
+#: src/compressor/plugin.c:120
 msgid "Dynamic range:"
-msgstr ""
+msgstr "Dinaminė sritis:"
 
-#: src/console/configure.c:138
+#: src/console/configure.c:136
 msgid "Game Console Music Decoder"
-msgstr ""
+msgstr "Žaidimų konsolės muzikos dekoderis"
 
-#: src/console/configure.c:155
+#: src/console/configure.c:153
 msgid "General"
-msgstr ""
+msgstr "Pagrindinės"
 
-#: src/console/configure.c:157 src/skins/ui_manager.c:176
+#: src/console/configure.c:155 src/skins/ui_manager.c:176
 msgid "Playback"
 msgstr "Atkūrimas"
 
-#: src/console/configure.c:172
+#: src/console/configure.c:170
 msgid "Bass:"
-msgstr ""
+msgstr "Bosas:"
 
-#: src/console/configure.c:176 src/console/configure.c:187
-#: src/console/configure.c:208
+#: src/console/configure.c:174 src/console/configure.c:185
+#: src/console/configure.c:206
 msgid "secs"
-msgstr ""
+msgstr "sekundės"
 
-#: src/console/configure.c:183
+#: src/console/configure.c:181
 msgid "Treble:"
-msgstr ""
+msgstr "Treble:"
 
-#: src/console/configure.c:204
+#: src/console/configure.c:202
 msgid "Default song length:"
-msgstr ""
+msgstr "Numatyta dainos trukmė:"
 
-#: src/console/configure.c:210 src/sid/xs_interface.c:666
+#: src/console/configure.c:208
 msgid "Resampling"
-msgstr ""
+msgstr "Resampling"
 
-#: src/console/configure.c:216
+#: src/console/configure.c:214
 msgid "Enable audio resampling"
-msgstr ""
+msgstr "Įjungti audio resampling"
 
-#: src/console/configure.c:231
+#: src/console/configure.c:229
 msgid "Resampling rate:"
-msgstr ""
+msgstr "Diskretizacijos dažnis:"
 
-#: src/console/configure.c:235 src/sid/xs_interface.c:354
-#, fuzzy
+#: src/console/configure.c:233
 msgid "Hz"
-msgstr " Hz "
+msgstr "Hz"
 
-#: src/console/configure.c:246
+#: src/console/configure.c:244
 msgid "SPC"
-msgstr ""
+msgstr "SPC"
 
-#: src/console/configure.c:247
+#: src/console/configure.c:245
 msgid "Ignore length from SPC tags"
-msgstr ""
+msgstr "Ignoruoti SPC žymų ilgį"
 
-#: src/console/configure.c:248
+#: src/console/configure.c:246
 msgid "Increase reverb"
-msgstr ""
+msgstr "Padidinti reverb"
 
-#: src/console/configure.c:273
+#: src/console/configure.c:271
 msgid ""
-"The default song length, expressed in seconds, is used for songs that do not "
-"provide length information (i.e. looping tracks)."
+"The default song length, expressed in seconds, is used for songs that do not"
+" provide length information (i.e. looping tracks)."
 msgstr ""
+"Numatyta dainos trukmė, išreikšta sekundėmis, naudojama dainom kurios "
+"nesuteikia trukmės informacijos (pvz. looping tracks)"
 
 #: src/console/plugin.c:33
 msgid "About the Game Console Music Decoder"
-msgstr ""
+msgstr "Apie Game Console Music Decoder"
 
 #: src/console/plugin.c:34
 msgid ""
@@ -916,52 +1248,55 @@
 "Audacious implementation by: William Pitcock <nenolod@dereferenced.org>, \n"
 " Shay Green <gblargg@gmail.com>\n"
 msgstr ""
+"Console music decoder engine paremtas Game_Music_Emu 0.5.2.\n"
+"Palaikomi formatai: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
+"Integravo į Audacious : William Pitcock <nenolod@dereferenced.org>, \n"
+" Shay Green <gblargg@gmail.com>\n"
 
-#: src/crossfade/plugin.c:65
+#: src/crossfade/plugin.c:60
 msgid "About Crossfade"
-msgstr ""
+msgstr "Apie Crossfade"
 
-#: src/crossfade/plugin.c:97
+#: src/crossfade/plugin.c:92
 msgid "Crossfade Preferences"
-msgstr ""
+msgstr "Crossfade Nustatymai"
 
-#: src/crossfade/plugin.c:109
+#: src/crossfade/plugin.c:104
 msgid "Overlap (in seconds):"
-msgstr ""
+msgstr "Perdengimas (sekundėmis):"
 
-#: src/crossfade/plugin.c:140 src/crossfade/plugin.c:146
+#: src/crossfade/plugin.c:135 src/crossfade/plugin.c:141
 msgid "Crossfade Error"
-msgstr ""
+msgstr "Crossfade klaida"
 
-#: src/crossfade/plugin.c:140
+#: src/crossfade/plugin.c:135
 msgid ""
 "Crossfading failed because the songs had a different number of channels."
 msgstr ""
+"Garso perėjimo efektas nepavyko, nes dainos turi skirtingą kanalų skaičių."
 
-#: src/crossfade/plugin.c:148
+#: src/crossfade/plugin.c:143
 msgid ""
 "Crossfading failed because the songs had different sample rates.\n"
 "\n"
-"You can use the Sample Rate Converter effect to resample the songs to the "
-"same rate."
+"You can use the Sample Rate Converter effect to resample the songs to the same rate."
 msgstr ""
+"Garso perėjimo efektas nepavyko, nes dainos turi skirtingus diskretizavimo dažnius.\n"
+"\n"
+"Gali panaudoti Sample Rate Converter efektą padaryti diskretizavimo dažnius tokius pat."
 
-#: src/crystalizer/crystalizer.c:108
+#: src/crystalizer/crystalizer.c:100
 msgid "Configure Crystalizer"
-msgstr ""
+msgstr "Konfigūruoti Crystalizer"
 
-#: src/crystalizer/crystalizer.c:110 src/stereo_plugin/stereo.c:104
+#: src/crystalizer/crystalizer.c:102 src/stereo_plugin/stereo.c:97
 msgid "Effect intensity:"
-msgstr ""
+msgstr "Efekto intensyvumas:"
 
-#: src/crystalizer/crystalizer.c:144 src/echo_plugin/gui.c:136
-#: src/stereo_plugin/stereo.c:138
+#: src/crystalizer/crystalizer.c:136 src/echo_plugin/gui.c:131
+#: src/stereo_plugin/stereo.c:131
 msgid "Apply"
-msgstr ""
-
-#: src/daemon/daemon.c:58
-msgid "Daemon Interface (like old headless mode)"
-msgstr ""
+msgstr "Pritaikyti"
 
 #: src/echo_plugin/gui.c:15
 msgid ""
@@ -970,28 +1305,32 @@
 "\n"
 "Surround echo by Carl van Schaik 1999"
 msgstr ""
+"Echo įskiepis\n"
+"Sukūrė Johan Levin 1999.\n"
+"\n"
+"Surround echo sukūrė Carl van Schaik 1999"
 
 #: src/echo_plugin/gui.c:27
 msgid "About Echo Plugin"
-msgstr ""
+msgstr "Apie Echo įskiepį"
 
-#: src/echo_plugin/gui.c:72
+#: src/echo_plugin/gui.c:67
 msgid "Configure Echo"
-msgstr ""
+msgstr "Konfigūruoti Echo"
 
-#: src/echo_plugin/gui.c:88
+#: src/echo_plugin/gui.c:83
 msgid "Delay: (ms)"
-msgstr ""
+msgstr "Vėlavimas: (ms)"
 
-#: src/echo_plugin/gui.c:93
+#: src/echo_plugin/gui.c:88
 msgid "Feedback: (%)"
-msgstr ""
+msgstr "Aidas: (%)"
 
-#: src/echo_plugin/gui.c:98
+#: src/echo_plugin/gui.c:93
 msgid "Volume: (%)"
-msgstr ""
+msgstr "Garsas: (%)"
 
-#: src/ffaudio/ffaudio-core.c:789
+#: src/ffaudio/ffaudio-core.c:795
 #, c-format
 msgid ""
 "Multi-format audio decoding plugin for Audacious based on\n"
@@ -1006,84 +1345,75 @@
 "libavformat %s (%s)\n"
 "libavutil %s (%s)\n"
 msgstr ""
+"Daugiaformatis audio dekodavimo įskiepis skirtas Audacious paremtas\n"
+"FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
+"Copyright (c) 2000-2009 Fabrice Bellard, et al.\n"
+"\n"
+"Audacious įskiepį kūrė:\n"
+" William Pitcock <nenolod@nenolod.net>,\n"
+" Matti Hämäläinen <ccr@tnsp.org>\n"
+"\n"
+"libavcodec %s (%s)\n"
+"libavformat %s (%s)\n"
+"libavutil %s (%s)\n"
 
-#: src/ffaudio/ffaudio-core.c:803
+#: src/ffaudio/ffaudio-core.c:809
 msgid "About FFaudio Plugin"
-msgstr ""
+msgstr "Apie FFaudio įskiepį"
 
-#: src/filewriter/filewriter.c:155
+#: src/filewriter/filewriter.c:166
 msgid "About FileWriter-Plugin"
-msgstr ""
+msgstr "Apie FileWriter įskiepį"
 
-#: src/filewriter/filewriter.c:156
-msgid ""
-"FileWriter-Plugin\n"
-"\n"
-"This program is free software; you can redistribute it and/or modify\n"
-"it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
-"(at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
-"GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
-msgstr ""
-
-#: src/filewriter/filewriter.c:450
+#: src/filewriter/filewriter.c:455
 msgid "File Writer Configuration"
-msgstr "File Writer konfiguravimas"
+msgstr "File Writer konfigūravimas"
 
-#: src/filewriter/filewriter.c:462
+#: src/filewriter/filewriter.c:467
 msgid "Output file format:"
 msgstr "Išvesties failo formatas:"
 
-#: src/filewriter/filewriter.c:480
+#: src/filewriter/filewriter.c:485
 msgid "Configure"
-msgstr "Konfiguruoti"
+msgstr "Konfigūruoti"
 
-#: src/filewriter/filewriter.c:495
+#: src/filewriter/filewriter.c:500
 msgid "Save into original directory"
-msgstr "Išsaugoti orginalo aplanko"
+msgstr "Išsaugoti originalo aplanke"
 
-#: src/filewriter/filewriter.c:500
+#: src/filewriter/filewriter.c:505
 msgid "Save into custom directory"
 msgstr "Išsaugoti pasirinktame aplanke"
 
-#: src/filewriter/filewriter.c:510
+#: src/filewriter/filewriter.c:515
 msgid "Output file folder:"
 msgstr "Paskirties aplankas:"
 
-#: src/filewriter/filewriter.c:514
+#: src/filewriter/filewriter.c:519
 msgid "Pick a folder"
 msgstr "Rinkis aplanką"
 
-#: src/filewriter/filewriter.c:533
+#: src/filewriter/filewriter.c:538
 msgid "Get filename from:"
 msgstr "Gauti failo vardą iš:"
 
-#: src/filewriter/filewriter.c:536
+#: src/filewriter/filewriter.c:541
 msgid "original file tags"
-msgstr "orginalios failo žymės"
+msgstr "originalios failo žymės"
 
-#: src/filewriter/filewriter.c:542
+#: src/filewriter/filewriter.c:547
 msgid "original filename"
-msgstr "orginalus failo vardas"
+msgstr "originalus failo vardas"
 
-#: src/filewriter/filewriter.c:552
+#: src/filewriter/filewriter.c:557
 msgid "Don't strip file name extension"
 msgstr "Neištrinti failo plėtinio"
 
-#: src/filewriter/filewriter.c:567
+#: src/filewriter/filewriter.c:572
 msgid "Prepend track number to filename"
 msgstr "Įdėti takelio numerį į failo vardą"
 
-#: src/filewriter/mp3.c:38 src/filewriter/mp3.c:783
+#: src/filewriter/mp3.c:38 src/filewriter/mp3.c:771
 msgid "Auto"
 msgstr "Auto"
 
@@ -1091,149 +1421,149 @@
 msgid "Joint Stereo"
 msgstr "Sujungtas stereo"
 
-#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183 src/sid/xs_interface.c:308
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183
 msgid "Stereo"
 msgstr "Stereo"
 
-#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183 src/sid/xs_interface.c:301
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183
 msgid "Mono"
 msgstr "Mono"
 
-#: src/filewriter/mp3.c:724
+#: src/filewriter/mp3.c:712
 msgid "MP3 Configuration"
-msgstr "MP3 konfiguravimas"
+msgstr "MP3 konfigūravimas"
 
-#: src/filewriter/mp3.c:747
+#: src/filewriter/mp3.c:735
 msgid "Algorithm Quality:"
 msgstr "Algoritmo kokybė:"
 
-#: src/filewriter/mp3.c:772
+#: src/filewriter/mp3.c:760
 msgid "Output Samplerate:"
-msgstr "Išvesties samplerate:"
+msgstr "Išvesties diskretizavimo dažnis:"
 
-#: src/filewriter/mp3.c:800
+#: src/filewriter/mp3.c:788
 msgid "(Hz)"
-msgstr ""
+msgstr "(Hz)"
 
-#: src/filewriter/mp3.c:807
+#: src/filewriter/mp3.c:795
 msgid "Bitrate / Compression ratio:"
-msgstr ""
+msgstr "Bitų dažnis / Kompresijos santykis:"
 
-#: src/filewriter/mp3.c:831
+#: src/filewriter/mp3.c:819
 msgid "Bitrate (kbps):"
-msgstr ""
+msgstr "Bitų dažnis(kbps):"
 
-#: src/filewriter/mp3.c:864
+#: src/filewriter/mp3.c:852
 msgid "Compression ratio:"
-msgstr ""
+msgstr "Kompresijos santykis:"
 
-#: src/filewriter/mp3.c:888
+#: src/filewriter/mp3.c:876
 msgid "Audio Mode:"
-msgstr ""
+msgstr "Audio režimas:"
 
-#: src/filewriter/mp3.c:913
+#: src/filewriter/mp3.c:901
 msgid "Misc:"
-msgstr ""
+msgstr "Kita:"
 
-#: src/filewriter/mp3.c:924
+#: src/filewriter/mp3.c:912
 msgid "Enforce strict ISO complience"
-msgstr ""
+msgstr "Priversti griežtai laikytis ISO suderinamumo"
 
-#: src/filewriter/mp3.c:935
+#: src/filewriter/mp3.c:923
 msgid "Error protection"
-msgstr ""
+msgstr "Apsauga nuo klaidų"
 
-#: src/filewriter/mp3.c:947 src/filewriter/vorbis.c:245
+#: src/filewriter/mp3.c:935 src/filewriter/vorbis.c:243
 msgid "Quality"
-msgstr ""
+msgstr "Kokybė"
 
-#: src/filewriter/mp3.c:957
+#: src/filewriter/mp3.c:945
 msgid "Enable VBR/ABR"
-msgstr ""
+msgstr "Įjungti VBR/ABR"
 
-#: src/filewriter/mp3.c:967
+#: src/filewriter/mp3.c:955
 msgid "Type:"
-msgstr ""
+msgstr "Tipas:"
 
-#: src/filewriter/mp3.c:1000
+#: src/filewriter/mp3.c:988
 msgid "VBR Options:"
-msgstr ""
+msgstr "VBR pasirinktys:"
 
-#: src/filewriter/mp3.c:1016
+#: src/filewriter/mp3.c:1004
 msgid "Minimum bitrate (kbps):"
-msgstr ""
+msgstr "Minimalus bitų dažnis (kbps):"
 
-#: src/filewriter/mp3.c:1043
+#: src/filewriter/mp3.c:1031
 msgid "Maximum bitrate (kbps):"
-msgstr ""
+msgstr "Maksimalus bitų dažnis (kbps):"
 
-#: src/filewriter/mp3.c:1066
+#: src/filewriter/mp3.c:1054
 msgid "Strictly enforce minimum bitrate"
-msgstr ""
+msgstr "Griežtai laikytis minimalaus bitų dažnio"
 
-#: src/filewriter/mp3.c:1078
+#: src/filewriter/mp3.c:1066
 msgid "ABR Options:"
-msgstr ""
+msgstr "ABR pasirinktys:"
 
-#: src/filewriter/mp3.c:1088
+#: src/filewriter/mp3.c:1076
 msgid "Average bitrate (kbps):"
-msgstr ""
+msgstr "Vidutinis bitų dažnis (kbps):"
 
-#: src/filewriter/mp3.c:1116
+#: src/filewriter/mp3.c:1104
 msgid "VBR quality level:"
-msgstr ""
+msgstr "VBR kokybės lygis:"
 
-#: src/filewriter/mp3.c:1135
+#: src/filewriter/mp3.c:1123
 msgid "Don't write Xing VBR header"
-msgstr ""
+msgstr "Nerašyti Xing VBR antraštės"
 
-#: src/filewriter/mp3.c:1149
+#: src/filewriter/mp3.c:1137
 msgid "VBR/ABR"
-msgstr ""
+msgstr "VBR/ABR"
 
-#: src/filewriter/mp3.c:1159
+#: src/filewriter/mp3.c:1147
 msgid "Frame params:"
-msgstr ""
+msgstr "Kadro parametrai:"
 
-#: src/filewriter/mp3.c:1171
+#: src/filewriter/mp3.c:1159
 msgid "Mark as copyright"
-msgstr ""
+msgstr "Pažymėti kaip saugomą autorinių teisių"
 
-#: src/filewriter/mp3.c:1182
+#: src/filewriter/mp3.c:1170
 msgid "Mark as original"
-msgstr ""
+msgstr "Pažymėti kaip originalą"
 
-#: src/filewriter/mp3.c:1194
+#: src/filewriter/mp3.c:1182
 msgid "ID3 params:"
-msgstr ""
+msgstr "ID3 parametrai"
 
-#: src/filewriter/mp3.c:1205
+#: src/filewriter/mp3.c:1193
 msgid "Force addition of version 2 tag"
-msgstr ""
+msgstr "Priverstinai pridėti 2 versijos žymą"
 
-#: src/filewriter/mp3.c:1215
+#: src/filewriter/mp3.c:1203
 msgid "Only add v1 tag"
-msgstr ""
+msgstr "Pridėti tik v1 žymą"
 
-#: src/filewriter/mp3.c:1222
+#: src/filewriter/mp3.c:1210
 msgid "Only add v2 tag"
-msgstr ""
+msgstr "Pridėti tik v2 žymą"
 
-#: src/filewriter/mp3.c:1243
+#: src/filewriter/mp3.c:1231
 msgid "Tags"
-msgstr ""
+msgstr "Žymos"
 
-#: src/filewriter/vorbis.c:238
+#: src/filewriter/vorbis.c:236
 msgid "Vorbis Encoder Configuration"
-msgstr ""
+msgstr "Vorbis koduotojo konfigūracija"
 
-#: src/filewriter/vorbis.c:258
+#: src/filewriter/vorbis.c:256
 msgid "Quality level (0 - 10):"
-msgstr ""
+msgstr "Kokybės lygis (0 - 10):"
 
 #: src/flacng/plugin.c:379
 msgid "About FLAC Audio Plugin"
-msgstr ""
+msgstr "Apie FLAC Audio įskiepį"
 
 #: src/flacng/plugin.c:380
 msgid ""
@@ -1244,10 +1574,16 @@
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
 msgstr ""
-
-#: src/gnomeshortcuts/gnomeshortcuts.c:303
+"\n"
+"\n"
+"Originalų kodą parašė\n"
+"Ralf Ertzinger <ralf@skytale.net>\n"
+"\n"
+"http://www.skytale.net/projects/bmp-flac2/"
+
+#: src/gnomeshortcuts/gnomeshortcuts.c:303
 msgid "About Gnome Shortcut Plugin"
-msgstr ""
+msgstr "Apie Gnome Shortcut įskiepį"
 
 #: src/gnomeshortcuts/gnomeshortcuts.c:304
 msgid ""
@@ -1257,6 +1593,11 @@
 "Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
 "\n"
 msgstr ""
+"Gnome Shortcut įskiepis\n"
+"Suteikia galimybę valdyti grotuvą su gnome trumpiniais.\n"
+"\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
 
 #: src/gntui/fileselector.c:75 src/gntui/gntui.c:272
 msgid "Open Files"
@@ -1278,7 +1619,7 @@
 msgid "Entry number"
 msgstr "Įvesties numeris"
 
-#: src/gtkui/columns.c:36 src/sid/xs_interface.c:1103
+#: src/gtkui/columns.c:36
 msgid "Title"
 msgstr "Pavadinimas"
 
@@ -1322,298 +1663,304 @@
 msgid "Bitrate"
 msgstr "Bitų seka"
 
-#: src/gtkui/columns.c:286
+#: src/gtkui/columns.c:278
 msgid "Choose Columns"
 msgstr "Rinktis stulpelius"
 
-#: src/gtkui/columns.c:300
+#: src/gtkui/columns.c:292
 msgid "Available:"
 msgstr "Prieinama:"
 
-#: src/gtkui/columns.c:334
+#: src/gtkui/columns.c:326
 msgid "Chosen:"
 msgstr "Pasirinkta:"
 
 #: src/gtkui/layout.c:122
 msgid "Dock at Left"
-msgstr ""
+msgstr "Sumažinti į kairę"
 
 #: src/gtkui/layout.c:122
 msgid "Dock at Right"
-msgstr ""
+msgstr "Sumažinti į dešinę"
 
 #: src/gtkui/layout.c:123
 msgid "Dock at Top"
-msgstr ""
+msgstr "Sumažinti į viršų"
 
 #: src/gtkui/layout.c:123
 msgid "Dock at Bottom"
-msgstr ""
+msgstr "Sumažinti apačioje"
 
 #: src/gtkui/layout.c:123
 msgid "Undock"
-msgstr ""
+msgstr "Padidinti"
 
-#: src/gtkui/layout.c:123
+#: src/gtkui/layout.c:123 src/ladspa/plugin.c:643
 msgid "Disable"
 msgstr "Išjungti"
 
-#: src/gtkui/menus.c:132
+#: src/gtkui/menus.c:130
 msgid "_Open Files ..."
 msgstr "_Atverti failus ..."
 
-#: src/gtkui/menus.c:133
+#: src/gtkui/menus.c:131
 msgid "Open _URL ..."
 msgstr "Atverti _URL ..."
 
-#: src/gtkui/menus.c:134
+#: src/gtkui/menus.c:132
 msgid "_Add File ..."
 msgstr "_Pridėti failą ..."
 
-#: src/gtkui/menus.c:135
+#: src/gtkui/menus.c:133
 msgid "Add U_RL ..."
-msgstr "Pridėti _URL ..."
+msgstr "Pridėti U_RL ..."
 
-#: src/gtkui/menus.c:137
+#: src/gtkui/menus.c:135
 msgid "A_bout ..."
-msgstr "Apie"
+msgstr "A_pie"
 
-#: src/gtkui/menus.c:138
+#: src/gtkui/menus.c:136
 msgid "_Preferences ..."
 msgstr "_Nustatymai ..."
 
-#: src/gtkui/menus.c:139 src/skins/ui_manager.c:412
+#: src/gtkui/menus.c:137 src/skins/ui_manager.c:406
 msgid "_Quit"
 msgstr "_Išeiti"
 
-#: src/gtkui/menus.c:142
+#: src/gtkui/menus.c:140
 msgid "_Play"
 msgstr "_Groti"
 
-#: src/gtkui/menus.c:143
+#: src/gtkui/menus.c:141
 msgid "Paus_e"
 msgstr "Pauz_ė"
 
-#: src/gtkui/menus.c:144
+#: src/gtkui/menus.c:142
 msgid "_Stop"
 msgstr "_Sustabdyti"
 
-#: src/gtkui/menus.c:145
+#: src/gtkui/menus.c:143
 msgid "Pre_vious"
 msgstr "Ankste_snis"
 
-#: src/gtkui/menus.c:146
+#: src/gtkui/menus.c:144
 msgid "_Next"
 msgstr "_Sekantis"
 
-#: src/gtkui/menus.c:148
+#: src/gtkui/menus.c:146
 msgid "_Repeat"
 msgstr "_Kartoti"
 
-#: src/gtkui/menus.c:149
+#: src/gtkui/menus.c:147
 msgid "S_huffle"
-msgstr "_Sumaišyti"
+msgstr "S_umaišyti"
 
-#: src/gtkui/menus.c:150
+#: src/gtkui/menus.c:148
 msgid "N_o Playlist Advance"
-msgstr "_Nesislinkti grojaraščiu"
+msgstr "N_esislinkti grojaraščiu"
 
-#: src/gtkui/menus.c:151
+#: src/gtkui/menus.c:149
 msgid "Stop _After This Song"
 msgstr "Sustabdyti _po šitos dainos"
 
-#: src/gtkui/menus.c:153 src/gtkui/menus.c:210
+#: src/gtkui/menus.c:151 src/gtkui/menus.c:209
 msgid "Song _Info ..."
 msgstr "Dainos _informacija ..."
 
-#: src/gtkui/menus.c:154
+#: src/gtkui/menus.c:152
 msgid "Jump to _Time ..."
 msgstr "Šokti į _laiką"
 
-#: src/gtkui/menus.c:155
+#: src/gtkui/menus.c:153
 msgid "_Jump to Song ..."
 msgstr "_Pereiti prie dainos ..."
 
-#: src/gtkui/menus.c:158
+#: src/gtkui/menus.c:156
 msgid "By Track _Number"
 msgstr "Pagal takelio _numerį"
 
-#: src/gtkui/menus.c:159
+#: src/gtkui/menus.c:157
 msgid "By _Title"
 msgstr "Pagal _pavadinimą"
 
-#: src/gtkui/menus.c:160
+#: src/gtkui/menus.c:158
 msgid "By _Artist"
-msgstr "Pagal atlikėją"
+msgstr "Pagal _atlikėją"
 
-#: src/gtkui/menus.c:161
+#: src/gtkui/menus.c:159
 msgid "By A_lbum"
-msgstr "Pagal _albumą"
+msgstr "Pagal a_lbumą"
 
-#: src/gtkui/menus.c:162
+#: src/gtkui/menus.c:160
 msgid "By Release _Date"
-msgstr "Pagal išleidimo datą"
+msgstr "Pagal išleidimo _datą"
 
-#: src/gtkui/menus.c:163
+#: src/gtkui/menus.c:161
 msgid "By _File Path"
-msgstr "Pagal failo kelią"
+msgstr "Pagal _failo kelią"
 
-#: src/gtkui/menus.c:164
+#: src/gtkui/menus.c:162
 msgid "By _Custom Title"
-msgstr "Pagal derintą eilutę"
+msgstr "Pagal _derintą eilutę"
 
-#: src/gtkui/menus.c:166
+#: src/gtkui/menus.c:164
 msgid "R_everse Order"
-msgstr "_Atvirkštine tvarka"
+msgstr "A_tvirkštine tvarka"
 
-#: src/gtkui/menus.c:167
+#: src/gtkui/menus.c:165
 msgid "_Random Order"
 msgstr "_Atsitiktine tvarka"
 
-#: src/gtkui/menus.c:170 src/gtkui/menus.c:212
+#: src/gtkui/menus.c:168 src/gtkui/menus.c:211
 msgid "_Refresh"
 msgstr "_Atnaujinti"
 
-#: src/gtkui/menus.c:172
+#: src/gtkui/menus.c:170
 msgid "_Sort"
 msgstr "_Rikiuoti"
 
-#: src/gtkui/menus.c:174
+#: src/gtkui/menus.c:172
 msgid "_New"
 msgstr "_Naujas"
 
-#: src/gtkui/menus.c:175
+#: src/gtkui/menus.c:173 src/gtkui/menus.c:222
 msgid "_Close"
 msgstr "_Uždaryti"
 
-#: src/gtkui/menus.c:177
+#: src/gtkui/menus.c:175
 msgid "_Import ..."
-msgstr "_Įkelti"
+msgstr "_Įkelti ..."
 
-#: src/gtkui/menus.c:178
+#: src/gtkui/menus.c:176
 msgid "_Export ..."
 msgstr "_Eksportuoti ..."
 
-#: src/gtkui/menus.c:180
+#: src/gtkui/menus.c:178
 msgid "_Playlist Manager ..."
 msgstr "_Grojaraščio redaktorius ..."
 
-#: src/gtkui/menus.c:183
+#: src/gtkui/menus.c:179
+msgid "_Queue Manager ..."
+msgstr "_Eilės redaktorius ..."
+
+#: src/gtkui/menus.c:182
 msgid "Volume _Up"
 msgstr "Pagarsi_nti"
 
-#: src/gtkui/menus.c:184
+#: src/gtkui/menus.c:183
 msgid "Volume _Down"
-msgstr "_Patildyti"
+msgstr "Patil_dyti"
 
-#: src/gtkui/menus.c:186
+#: src/gtkui/menus.c:185
 msgid "_Equalizer"
 msgstr "_Ekvalaizeris"
 
-#: src/gtkui/menus.c:188
+#: src/gtkui/menus.c:187
 msgid "E_ffects"
 msgstr "E_fektai"
 
-#: src/gtkui/menus.c:191
+#: src/gtkui/menus.c:190
 msgid "_Interface"
 msgstr "_Vartotojo sąsaja"
 
-#: src/gtkui/menus.c:193
+#: src/gtkui/menus.c:192
 msgid "Show _Menu Bar"
 msgstr "Rodyti _meniu juostą"
 
-#: src/gtkui/menus.c:194
+#: src/gtkui/menus.c:193
 msgid "Show I_nfo Bar"
-msgstr "Rodyti info juostą"
+msgstr "Rodyti i_nfo juostą"
 
-#: src/gtkui/menus.c:195
+#: src/gtkui/menus.c:194
 msgid "Show _Status Bar"
 msgstr "Rodyti _būsenos juostą"
 
-#: src/gtkui/menus.c:197
+#: src/gtkui/menus.c:196
 msgid "Show Column _Headers"
 msgstr "Rodyti stulpelio _antraštes"
 
-#: src/gtkui/menus.c:198
+#: src/gtkui/menus.c:197
 msgid "Choose _Columns ..."
-msgstr "Pasirinkti _stulpelius"
+msgstr "Pasirinkti _stulpelius ..."
 
-#: src/gtkui/menus.c:199
+#: src/gtkui/menus.c:198
 msgid "Scrol_l on Song Change"
-msgstr "Slinktis keičiantis dainai"
+msgstr "Slinkt_is keičiantis dainai"
 
-#: src/gtkui/menus.c:202
+#: src/gtkui/menus.c:201
 msgid "_File"
 msgstr "_Failas"
 
-#: src/gtkui/menus.c:203
+#: src/gtkui/menus.c:202
 msgid "_Playback"
 msgstr "_Atkūrimas"
 
-#: src/gtkui/menus.c:204
+#: src/gtkui/menus.c:203
 msgid "P_laylist"
 msgstr "G_rojaraštis"
 
-#: src/gtkui/menus.c:205 src/gtkui/menus.c:219
+#: src/gtkui/menus.c:204 src/gtkui/menus.c:218
 msgid "_Services"
 msgstr "_Paslaugos"
 
-#: src/gtkui/menus.c:206
+#: src/gtkui/menus.c:205
 msgid "_Output"
 msgstr "_Išvestis"
 
-#: src/gtkui/menus.c:207
+#: src/gtkui/menus.c:206
 msgid "_View"
-msgstr "_Rodinys"
+msgstr "_Rodymas"
 
-#: src/gtkui/menus.c:211
+#: src/gtkui/menus.c:210
 msgid "_Queue/Unqueue"
 msgstr "_Į eilę/Iš eilės"
 
-#: src/gtkui/menus.c:214
+#: src/gtkui/menus.c:213
 msgid "Cu_t"
 msgstr "Iškirpt_i"
 
-#: src/gtkui/menus.c:215
+#: src/gtkui/menus.c:214
 msgid "_Copy"
 msgstr "_Kopijuoti"
 
-#: src/gtkui/menus.c:216
+#: src/gtkui/menus.c:215
 msgid "_Paste"
 msgstr "_Įklijuoti"
 
-#: src/gtkui/menus.c:217
+#: src/gtkui/menus.c:216
 msgid "Select _All"
 msgstr "Pasirinkti _viską"
 
-#: src/gtkui/menus.c:222
+#: src/gtkui/menus.c:221
 msgid "_Rename"
 msgstr "_Pervadinti"
 
-#: src/gtkui/ui_gtk.c:75
+#: src/gtkui/ui_gtk.c:95
 msgid "GTK Interface"
 msgstr "GTK vartotojo sąsaja"
 
-#: src/gtkui/ui_gtk.c:132 src/skins/ui_main.c:303
+#: src/gtkui/ui_gtk.c:156 src/skins/ui_main.c:302
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.c:138 src/skins/ui_main.c:305 src/skins/ui_main.c:1498
+#: src/gtkui/ui_gtk.c:162
+msgid "Buffering ..."
+msgstr "Įkraunama į atmintį ..."
+
+#: src/gtkui/ui_gtk.c:165 src/skins/ui_main.c:304 src/skins/ui_main.c:1499
 msgid "Audacious"
 msgstr "Audacious"
 
-# msgstr[0] "%lu Baitas"
-# msgstr[1] "%lu Baitai"
-#: src/gtkui/ui_gtk.c:177 src/skins/plugin.c:185
+#: src/gtkui/ui_gtk.c:211 src/skins/plugin.c:183
 msgid "Error"
 msgstr "Klaida"
 
-#: src/gtkui/ui_statusbar.c:102 src/skins/ui_main.c:460
+#: src/gtkui/ui_statusbar.c:102 src/skins/ui_main.c:459
 msgid "mono"
 msgstr "mono"
 
-#: src/gtkui/ui_statusbar.c:104 src/skins/ui_main.c:459
+#: src/gtkui/ui_statusbar.c:104 src/skins/ui_main.c:458
 msgid "stereo"
 msgstr "stereo"
 
@@ -1623,6 +1970,7 @@
 msgid_plural "%d channels"
 msgstr[0] "%d kanalas"
 msgstr[1] "%d kanalai"
+msgstr[2] "%d kanalų"
 
 #: src/gtkui/ui_statusbar.c:121
 #, c-format
@@ -1669,7 +2017,7 @@
 msgid "Volume Down"
 msgstr "Patildyti"
 
-#: src/hotkey/gui.c:81 src/skins/ui_manager.c:424 src/skins/ui_manager.c:425
+#: src/hotkey/gui.c:81 src/skins/ui_manager.c:418 src/skins/ui_manager.c:419
 msgid "Jump to File"
 msgstr "Šokti į failą"
 
@@ -1695,8 +2043,7 @@
 
 #: src/hotkey/gui.c:232
 msgid ""
-"It is not recommended to bind the primary mouse buttons without "
-"modificators.\n"
+"It is not recommended to bind the primary mouse buttons without modificators.\n"
 "\n"
 "Do you want to continue?"
 msgstr ""
@@ -1751,32 +2098,44 @@
 "\t\t\tJeremy Tan <nsx@nsx.homeip.net>\n"
 "\n"
 msgstr ""
+"Globalus karštųjų klavišų įskiepis\n"
+"Valdyk grotuvą su globalių klavišų kombinacijomis arba multimedia klavišais.\n"
+"\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Kūrėjai:\n"
+"Copyright (C) 2006-2007 Vladimir Paskov <vlado.paskov@gmail.com>\n"
+"Copyright (C) 2000-2002 Ville Syrjälä <syrjala@sci.fi>\n"
+"\t\t\tBryn Davies <curious@ihug.com.au>\n"
+"\t\t\tJonathan A. Davis <davis@jdhouse.org>\n"
+"\t\t\tJeremy Tan <nsx@nsx.homeip.net>\n"
+"\n"
 
-#: src/jack/configure.c:71
+#: src/jack/configure.c:66
 msgid "Connect to all available jack ports"
 msgstr "Prisijungti prie visų prieinamų jack prievadų"
 
-#: src/jack/configure.c:78
+#: src/jack/configure.c:73
 msgid "Connect only the output ports"
 msgstr "Prisijungti tik prie išvesties prievadų"
 
-#: src/jack/configure.c:85
+#: src/jack/configure.c:80
 msgid "Connect to no ports"
-msgstr ""
+msgstr "Nesijungti prie jokių prievadų"
 
-#: src/jack/configure.c:103
+#: src/jack/configure.c:98
 msgid "jack Plugin configuration"
-msgstr ""
+msgstr "jack įskiepio konfigūracija"
 
-#: src/jack/configure.c:121
+#: src/jack/configure.c:116
 msgid "Connection mode:"
-msgstr ""
+msgstr "Prisijungimo režimas:"
 
-#: src/jack/configure.c:133
+#: src/jack/configure.c:128
 msgid "Enable debug printing"
-msgstr ""
+msgstr "Įjungti derinimo pranešimus"
 
-#: src/jack/jack.c:438
+#: src/jack/jack.c:422
 msgid ""
 "XMMS jack Driver 0.17\n"
 "\n"
@@ -1786,938 +2145,329 @@
 "Audacious port by\n"
 "Giacomo Lozito from develia.org"
 msgstr ""
-
-#: src/jack/jack.c:443
-msgid "About JACK Output Plugin 0.17"
-msgstr ""
-
-#: src/lyricwiki/lyricwiki.c:226
-msgid ""
-"\n"
-"Looking for lyrics..."
-msgstr ""
-
-#: src/lyricwiki/lyricwiki.c:249
-msgid ""
-"\n"
-"Connecting to lyrics.wikia.com..."
-msgstr ""
-
-#: src/lyricwiki/lyricwiki.c:337
-msgid ""
-"\n"
-"No lyrics were found."
-msgstr ""
-
-#: src/metronom/metronom.c:85
-msgid "About Metronom"
-msgstr ""
-
-#: src/metronom/metronom.c:86
-msgid ""
-"A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
-"\n"
-"To use it, add a URL: tact://beats*num/den\n"
-"e.g. tact://77 to play 77 beats per minute\n"
-"or tact://60*3/4 to play 60 bpm in 3/4 tacts"
-msgstr ""
-
-#: src/metronom/metronom.c:143
-#, c-format
-msgid "Tact generator: %d bpm"
-msgstr ""
-
-#: src/metronom/metronom.c:145
-#, c-format
-msgid "Tact generator: %d bpm %d/%d"
-msgstr ""
-
-#: src/mpg123/mpg123.c:183
-msgid "Surround"
-msgstr ""
-
-#: src/mtp_up/mtp.c:298
-msgid "Upload in progress..."
-msgstr ""
-
-#: src/mtp_up/mtp.c:310
-msgid "Upload to MTP Device"
-msgstr ""
-
-#: src/mtp_up/mtp.c:311
-msgid "Disconnect MTP Device"
-msgstr ""
-
-#: src/notify/libnotify-aosd_event.c:47
-msgid "Stopped"
-msgstr ""
-
-#: src/notify/libnotify-aosd_event.c:47
-msgid "Audacious is not playing."
-msgstr ""
-
-#: src/null/null.c:64
-msgid "Null output plugin "
-msgstr ""
-
-#: src/null/null.c:65
-msgid ""
-" by Christian Birchinger <joker@netswarm.net>\n"
-"based on the XMMS plugin by Håvard Kvål <havardk@xmms.org>"
-msgstr ""
-
-#: src/null/null.c:68
-msgid "About Null Output"
-msgstr ""
-
-#: src/null/null.c:94
-msgid "Null output preferences"
-msgstr ""
-
-#: src/null/null.c:105
-msgid "Run in real time"
-msgstr ""
-
-#: src/oss4/configure.c:89
-msgid "1. Default device"
-msgstr ""
-
-#: src/oss4/configure.c:151
-msgid "OSS4 Output Plugin Preferences"
-msgstr ""
-
-#: src/oss4/configure.c:163 src/OSS/configure.c:203
-msgid "Audio device:"
-msgstr ""
-
-#: src/oss4/configure.c:189 src/OSS/configure.c:226 src/OSS/configure.c:269
-msgid "Use alternate device:"
-msgstr ""
-
-#: src/oss4/configure.c:202
-msgid "Save volume between sessions"
-msgstr ""
-
-#: src/oss4/configure.c:206
-msgid "Enable format conversions made by the OSS software."
-msgstr ""
-
-#: src/oss4/plugin.c:51
-msgid "About OSS4 Plugin"
-msgstr ""
-
-#: src/oss4/plugin.c:52
-msgid ""
-"OSS4 Output Plugin for Audacious\n"
-"Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
-"\n"
-"I would like to thank people on #audacious, especially Tony Vroon and John "
-"Lindgren and of course the authors of the previous OSS plugin.\n"
-"\n"
-"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.\n"
-"\n"
-"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.\n"
+"XMMS jack Driver 0.17\n"
 "\n"
-"You should have received a copy of the GNU General Public License along with "
-"this program. If not, see <http://www.gnu.org/licenses/>.\n"
-msgstr ""
-
-#: src/oss4/utils.c:204
-msgid "OSS4 error"
-msgstr ""
-
-#: src/OSS/configure.c:146
-#, c-format
-msgid "Default (%s)"
-msgstr ""
-
-#: src/OSS/configure.c:162 src/skins/ui_manager.c:456
-#: src/skins/ui_manager.c:477
-msgid "Default"
-msgstr ""
-
-#: src/OSS/configure.c:187
-msgid "OSS Driver configuration"
-msgstr ""
-
-#: src/OSS/configure.c:290
-msgid "Devices"
-msgstr ""
-
-#: src/OSS/configure.c:292
-msgid "Buffering:"
-msgstr ""
-
-#: src/OSS/configure.c:305
-msgid "Pre-buffer (percent):"
-msgstr ""
-
-#: src/OSS/configure.c:316
-msgid "Buffering"
-msgstr ""
-
-#: src/OSS/configure.c:317
-msgid "Mixer Settings:"
-msgstr ""
-
-#: src/OSS/configure.c:323
-msgid "Volume controls Master not PCM"
-msgstr ""
-
-#: src/OSS/configure.c:329
-msgid "Mixer"
-msgstr ""
-
-#: src/OSS/OSS.c:40
-msgid "About OSS Driver"
-msgstr ""
-
-#: src/OSS/OSS.c:41
-msgid ""
-"Audacious OSS Driver\n"
-"\n"
-" This program is free software; you can redistribute it and/or modify\n"
-"it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
-"(at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
-"GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
-msgstr ""
-
-#: src/pulse_audio/pulse_audio.c:687
-msgid "About Audacious PulseAudio Output Plugin"
-msgstr ""
-
-#: src/pulse_audio/pulse_audio.c:688
-msgid ""
-"Audacious PulseAudio Output Plugin\n"
-"\n"
-" This program is free software; you can redistribute it and/or modify\n"
-"it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
-"(at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
-"GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
-msgstr ""
-
-#: src/resample/plugin.c:91
-msgid "About Sample Rate Converter Plugin"
-msgstr ""
-
-#: src/resample/plugin.c:146
-msgid "Sample Rate Converter Preferences"
-msgstr ""
-
-#: src/resample/plugin.c:158
-msgid "Rate mappings:"
-msgstr ""
-
-#: src/resample/plugin.c:181
-msgid "All others:"
-msgstr ""
-
-#: src/resample/plugin.c:193
-msgid "Method:"
-msgstr ""
-
-#: src/scrobbler/configure.c:128 src/scrobbler/configure.c:204
-msgid "Change password"
-msgstr ""
-
-#: src/scrobbler/configure.c:150
-msgid "Services"
-msgstr ""
-
-#: src/scrobbler/configure.c:172
-msgid "Username:"
-msgstr ""
-
-#: src/scrobbler/configure.c:178
-msgid "Password:"
-msgstr ""
-
-#: src/scrobbler/configure.c:186
-msgid "Scrobbler URL:"
-msgstr ""
-
-#: src/scrobbler/configure.c:218
-msgid "Last.FM"
-msgstr ""
-
-#: src/scrobbler/configure.c:262
-msgid "Scrobbler"
-msgstr ""
-
-#: src/scrobbler/plugin.c:213
-msgid ""
-"Audacious AudioScrobbler Plugin\n"
+"xmms-jack.sf.net\n"
+"Chris Morgan<cmorgan@alum.wpi.edu>\n"
 "\n"
-"Originally created by Audun Hove <audun@nlc.no> and Pipian <pipian@pipian."
-"com>\n"
-msgstr ""
-
-#: src/scrobbler/plugin.c:215
-msgid "About Scrobbler Plugin"
-msgstr ""
-
-#: src/sdlout/plugin.c:58
-msgid "About SDL Output Plugin"
-msgstr ""
-
-#: src/sdlout/plugin.c:78
-msgid "SDL error"
-msgstr ""
-
-#: src/sid/xs_about.c:84
-#, c-format
-msgid "About %s"
-msgstr ""
-
-#: src/sid/xs_about.c:214 src/sid/xs_interface.c:1825
-msgid "Close"
-msgstr ""
-
-#: src/sid/xs_config.c:326
-msgid " Error"
-msgstr ""
-
-#: src/sid/xs_config.c:326
-msgid "OK"
-msgstr ""
-
-#: src/sid/xs_fileinfo.c:151
-msgid "General info"
-msgstr ""
-
-#: src/sid/xs_fileinfo.c:164
-#, c-format
-msgid "Tune #%i: "
-msgstr ""
-
-#: src/sid/xs_glade.c:90 src/sid/xs_glade.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr ""
-
-#: src/sid/xs_interface.c:234
-msgid "Audacious-SID configuration"
-msgstr ""
-
-#: src/sid/xs_interface.c:270
-msgid "8-bit"
-msgstr ""
-
-#: src/sid/xs_interface.c:277
-msgid "16-bit"
-msgstr "16-bitų"
-
-#: src/sid/xs_interface.c:284
-msgid "Resolution:"
-msgstr ""
-
-#: src/sid/xs_interface.c:315
-msgid "Autopanning"
-msgstr ""
-
-#: src/sid/xs_interface.c:322
-msgid "Channels:"
-msgstr ""
-
-#: src/sid/xs_interface.c:366
-msgid "Samplerate:"
-msgstr ""
-
-#: src/sid/xs_interface.c:383
-msgid "Use oversampling"
-msgstr ""
-
-#: src/sid/xs_interface.c:394
-msgid "Factor:"
-msgstr ""
-
-#: src/sid/xs_interface.c:406
-msgid "Large factors require more CPU-power"
-msgstr ""
-
-#: src/sid/xs_interface.c:412
-msgid "Oversampling:"
-msgstr ""
-
-#: src/sid/xs_interface.c:417
-msgid "Audio"
-msgstr ""
-
-#: src/sid/xs_interface.c:445
-msgid "Force speed"
-msgstr ""
-
-#: src/sid/xs_interface.c:449
-msgid ""
-"If enabled, this option \"forces\" the emulation engine to use the selected "
-"clock speed/frequency. Otherwise the speed is determined from played file "
-"itself."
-msgstr ""
-
-#: src/sid/xs_interface.c:451
-msgid "PAL (50 Hz)"
-msgstr ""
-
-#: src/sid/xs_interface.c:455
-msgid ""
-"PAL is the european TV standard, which uses 50Hz vertical refresh frequency. "
-"Most of SID-tunes have been made for PAL computers."
-msgstr ""
-
-#: src/sid/xs_interface.c:459
-msgid "NTSC (60 Hz)"
-msgstr ""
-
-#: src/sid/xs_interface.c:463
-msgid ""
-"NTSC is the TV standard with 60Hz vertical refresh rate (and other features "
-"that differ from PAL). It is mainly used in United States, Japan and certain "
-"other countries."
-msgstr ""
-
-#: src/sid/xs_interface.c:467
-msgid "Clock speed:"
-msgstr ""
-
-#: src/sid/xs_interface.c:484
-msgid "Force model"
-msgstr ""
-
-#: src/sid/xs_interface.c:488
-msgid ""
-"If enabled, this option \"forces\" the emulation engine to use the selected "
-"SID-chip model. Otherwise the preferred SID model is determined from the "
-"file (if PSIDv2NG type) or if not available, this setting is used."
-msgstr ""
-
-#: src/sid/xs_interface.c:490
-msgid "MOS 6581"
-msgstr ""
-
-#: src/sid/xs_interface.c:494
-msgid ""
-"MOS/CSG 6581 is the earlier major version of SID chip. It differs from 8580 "
-"in few ways, having much fuller filter (which, due to design error, is never "
-"same between two different SID-chips) and has the \"volume adjustment bug\", "
-"which enables playing of digital samples."
-msgstr ""
-
-#: src/sid/xs_interface.c:498
-msgid "MOS 8580"
-msgstr ""
-
-#: src/sid/xs_interface.c:505
-msgid "SID model:"
-msgstr ""
-
-#: src/sid/xs_interface.c:522
-msgid "SIDPlay 1 (frame-based)"
-msgstr ""
-
-#: src/sid/xs_interface.c:526
-msgid ""
-"Use libSIDPlay 1.x emulation, faster but not so accurate. Good in most "
-"cases, though."
-msgstr ""
-
-#: src/sid/xs_interface.c:530
-msgid "SIDPlay 2 (cycle-based)"
-msgstr ""
-
-#: src/sid/xs_interface.c:534
-msgid ""
-"Use libSIDPlay 2.x emulation, which requires powerful CPU due to more exact "
-"emulation."
-msgstr ""
-
-#: src/sid/xs_interface.c:538
-msgid "Emulation library selection:"
-msgstr ""
-
-#: src/sid/xs_interface.c:555
-msgid "Real C64 (SIDPlay 2 only)"
-msgstr ""
-
-#: src/sid/xs_interface.c:562
-msgid "Bank switching"
-msgstr ""
-
-#: src/sid/xs_interface.c:569
-msgid "Transparent ROM"
-msgstr ""
-
-#: src/sid/xs_interface.c:576
-msgid "PlaySID environment"
-msgstr ""
-
-#: src/sid/xs_interface.c:583
-msgid "Memory mode:"
-msgstr ""
-
-#: src/sid/xs_interface.c:588
-msgid "Emu#1"
-msgstr ""
-
-#: src/sid/xs_interface.c:611
-msgid "Optimization mode (faster, inaccurate)"
-msgstr ""
-
-#: src/sid/xs_interface.c:615
-msgid ""
-"This setting can be used to enable libSIDPlay2's \"optimization mode\", "
-"which in downgrades the emulation from cycle-exact to something similar to "
-"frame-exact. The result is lower CPU usage, but worse accuracy."
-msgstr ""
-
-#: src/sid/xs_interface.c:617
-msgid "reSID-emulation"
-msgstr "reSID-imitacija"
-
-#: src/sid/xs_interface.c:621
-msgid ""
-"reSID is the software SID-chip simulator based on SID reverse-engineering, "
-"created by Dag Lem. It is probably the closest thing to real SID available "
-"as software-only emulation."
-msgstr ""
-"reSID yra programinis SID-chip simuliatorius paremtas SID reverse-"
-"engineering, sukurė Dag Lem. Tai turbūt panašiausias daiktas(naudojant tik "
-"programinį imitavimą) į tikrą SID."
-
-#: src/sid/xs_interface.c:625
-msgid "HardSID"
-msgstr "HardSID"
-
-#: src/sid/xs_interface.c:629
-msgid ""
-"HardSID is a EISA/PCI card for PC-compatibles, which can be fitted with a "
-"real SID-chip. Software can be used to control the HardSID and combined with "
-"software emulation of rest of C64 via libSIDPlay2 HardSID can be used to "
-"achieve \"near 100%\" similarity to real C64. For more information, see "
-"http://www.hardsid.com/"
-msgstr ""
-"HardSID is a EISA/PCI card for PC-compatibles, which can be fitted with a "
-"real SID-chip. Software can be used to control the HardSID and combined with "
-"software emulation of rest of C64 via libSIDPlay2 HardSID can be used to "
-"achieve \"near 100%\" similarity to real C64. For more information, see "
-"http://www.hardsid.com/"
-
-#: src/sid/xs_interface.c:633
-msgid "SIDPlay 2 options:"
-msgstr "SIDPlay 2 pasirinktys:"
-
-#: src/sid/xs_interface.c:650
-msgid "Fast (nearest neighbour)"
-msgstr "Greitas (arčiausias kaimynas)"
-
-#: src/sid/xs_interface.c:654
-msgid ""
-"Fastest and also worst sounding sampling method, simply picks nearest "
-"neighbouring sample."
-msgstr ""
-"Fastest and also worst sounding sampling method, simply picks nearest "
-"neighbouring sample."
-
-#: src/sid/xs_interface.c:658
-msgid "Linear interpolation"
-msgstr "Linear interpolation"
+"Pritaikė Audacious programai\n"
+"Giacomo Lozito from develia.org"
 
-#: src/sid/xs_interface.c:662
-msgid ""
-"Uses linear interpolation between samples, yielding higher audio quality "
-"with less sampling noise."
-msgstr ""
-"Uses linear interpolation between samples, yielding higher audio quality "
-"with less sampling noise."
+#: src/jack/jack.c:427
+msgid "About JACK Output Plugin 0.17"
+msgstr "Apie JACK išvesties įskiepį 0.17"
 
-#: src/sid/xs_interface.c:673
-msgid "Resampling (FIR)"
-msgstr "Resampling (FIR)"
+#: src/ladspa/plugin.c:414
+msgid "About LADSPA Host"
+msgstr "Apie LADSPA Hot"
 
-#: src/sid/xs_interface.c:680
-msgid "reSID sampling options:"
-msgstr "reSID sampling pasirinktys:"
+#: src/ladspa/plugin.c:515
+#, c-format
+msgid "%s Settings"
+msgstr "%s nustatymai:"
 
-#: src/sid/xs_interface.c:685
-msgid "Emu#2"
-msgstr "Emu#2"
+#: src/ladspa/plugin.c:583
+msgid "LADSPA Host Settings"
+msgstr "LADSPA Host nustatymai"
 
-#: src/sid/xs_interface.c:697
-msgid "Emulate filters"
-msgstr "Imituoti filtrus"
+#: src/ladspa/plugin.c:592
+msgid "Module paths:"
+msgstr "Modulio kelias:"
 
-#: src/sid/xs_interface.c:701
+#: src/ladspa/plugin.c:597
 msgid ""
-"This option enables emulation of SID filter. The filter is an essential part "
-"of SID's sound capacity, but accurate emulation of it may require quite much "
-"CPU power. However, if filter emulation is disabled, tunes won't sound "
-"authentic at all if they utilize the filter."
+"Separate multiple paths with a colon.\n"
+"These paths are searched in addition to LADSPA_PATH.\n"
+"After adding new paths, press Enter to scan for new plugins."
 msgstr ""
-"Ši pasirinktis leidžia imituoti SID filtrą. Filtras yra esminė SID garso "
-"talpos dalis, bet atidi jos imitacija reikalauja daug CPU pajėgumų. "
-"Nepaisant visko, jei filtro imitacija yra išjungta, tunes nebus atkuriami "
-"autentiškai."
-
-#: src/sid/xs_interface.c:726
-msgid "FS"
-msgstr "FS"
-
-#: src/sid/xs_interface.c:743
-msgid "FM"
-msgstr "FM"
-
-#: src/sid/xs_interface.c:760
-msgid "FT"
-msgstr "FT"
-
-#: src/sid/xs_interface.c:771
-msgid "Reset values"
-msgstr "Iš naujo nustatyti vertes"
-
-#: src/sid/xs_interface.c:776
-msgid "SIDPlay1"
-msgstr "SIDPlay1"
-
-#: src/sid/xs_interface.c:817
-msgid "Export"
-msgstr "Eksportuoti"
-
-#: src/sid/xs_interface.c:825
-msgid "Use"
-msgstr "Naudoti"
-
-#: src/sid/xs_interface.c:833 src/skins/ui_manager.c:447
-msgid "Save"
-msgstr "Išsaugoti"
-
-#: src/sid/xs_interface.c:841 src/skins/ui_manager.c:446
-msgid "Import"
-msgstr "Įkelti"
-
-#: src/sid/xs_interface.c:849 src/skins/ui_manager.c:448
-msgid "Delete"
-msgstr "Ištrinti"
+"Atskirk kelis kelius su dvitaškiu.\n"
+"Šie keliai ieškomi neradus ko reikia LADSPA_PATH kelyje.\n"
+"Kai pridedamai nauji keliai, paspausk ENTER naujų įskiepių paieškai."
 
-#: src/sid/xs_interface.c:863
-msgid "Filter curve:"
-msgstr "Filtro posūkis:"
+#: src/ladspa/plugin.c:613
+msgid "Available plugins:"
+msgstr "Prieinami įskiepiai:"
 
-#: src/sid/xs_interface.c:868
-msgid "SIDPlay2"
-msgstr "SIDPlay2"
+#: src/ladspa/plugin.c:625
+msgid "Enable"
+msgstr "Įjungti"
 
-#: src/sid/xs_interface.c:874
-msgid "Filters"
-msgstr "Filtrai"
+#: src/ladspa/plugin.c:631
+msgid "Enabled plugins:"
+msgstr "Įjungti įskiepiai:"
 
-#: src/sid/xs_interface.c:897
-msgid "Play at least for specified time"
-msgstr "Groti bent jau nurodytą laiką"
+#: src/ladspa/plugin.c:646
+msgid "Settings"
+msgstr "Nustatymai"
 
-#: src/sid/xs_interface.c:901
+#: src/lyricwiki/lyricwiki.c:227
 msgid ""
-"If enabled, the tune is played at least for the specified time, adding "
-"silence to the end if necessary."
+"\n"
+"Looking for lyrics..."
 msgstr ""
-"Jei įjungta, tune grojama bent jau nurodytą laiką, jei reikia pridedant tylą "
-"pabaigoje."
-
-#: src/sid/xs_interface.c:908 src/sid/xs_interface.c:962
-#: src/sid/xs_interface.c:1142
-msgid "Playtime:"
-msgstr "Grojimo laikas:"
-
-#: src/sid/xs_interface.c:921 src/sid/xs_interface.c:975
-#: src/sid/xs_interface.c:1155
-msgid "seconds"
-msgstr "sekundės"
-
-#: src/sid/xs_interface.c:928
-msgid "Minimum playtime:"
-msgstr "Minimalus grojimo laikas:"
+"\n"
+"Ieškoma dainos žodžių..."
 
-#: src/sid/xs_interface.c:945
-msgid "Play for specified time maximum"
-msgstr "Groti numatytą maksimalų laiką"
+#: src/lyricwiki/lyricwiki.c:250
+msgid ""
+"\n"
+"Connecting to lyrics.wikia.com..."
+msgstr ""
+"\n"
+"Jungiamasi prie lyrics.wikia.com..."
 
-#: src/sid/xs_interface.c:949
+#: src/lyricwiki/lyricwiki.c:338
 msgid ""
-"If enabled, tune is played until specified duration is reached (aka maximum "
-"playtime)."
+"\n"
+"No lyrics were found."
 msgstr ""
-"Jei įjungta, tune grojama nustatytą laiką(aka maksimalus grojimo laikas)"
+"\n"
+"Dainų žodžiai nerasti."
 
-#: src/sid/xs_interface.c:951
-msgid "Only when song length is unknown"
-msgstr "Tik kai dainos trukmė nežinoma"
+#: src/metronom/metronom.c:85
+msgid "About Metronom"
+msgstr "Apie Metronom"
 
-#: src/sid/xs_interface.c:955
+#: src/metronom/metronom.c:86
 msgid ""
-"If enabled, the maximum playtime is applied only if song/tune length is not "
-"known."
+"A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
+"\n"
+"To use it, add a URL: tact://beats*num/den\n"
+"e.g. tact://77 to play 77 beats per minute\n"
+"or tact://60*3/4 to play 60 bpm in 3/4 tacts"
 msgstr ""
-"Jei įjungta, maksimalus grojimo laikas taikomas tik tada jei dainos trukmė "
-"nežinoma."
+"Takto generatorius, sukūrė Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
+"\n"
+"Norint naudoti, pridėk URL: tact://beats*num/den\n"
+"pvz. tact://77 groti 77 dūžiai per minutę\n"
+"arba tact://60*3/4 groti 60 bpm 3/4 taktu"
+
+#: src/metronom/metronom.c:143
+#, c-format
+msgid "Tact generator: %d bpm"
+msgstr "Takto generatorius: %d bpm"
 
-#: src/sid/xs_interface.c:982
-msgid "Maximum playtime:"
-msgstr "Ilgiausias grojimo laikas:"
+#: src/metronom/metronom.c:145
+#, c-format
+msgid "Tact generator: %d bpm %d/%d"
+msgstr "Takto generatorius: %d bpm %d/%d"
 
-#: src/sid/xs_interface.c:999
-msgid "Use XSIDPLAY-compatible database"
-msgstr "Naudoti duomenų bazę suderinamą su XSIDPLAY"
+#: src/mixer/plugin.c:64
+msgid "About Channel Mixer"
+msgstr "Apie kanalų mikserį"
 
-#: src/sid/xs_interface.c:1003
-msgid ""
-"This option enables using of XSIDPLAY compatible song length database. "
-"(Refer to Audacious-SID documentation for more information)"
-msgstr ""
-"Ši pasirinktis leidžia naudoti dainos ilgio duomenų bazę(suderinamą su "
-"XSIDPLAY). (Plačiau žiūrėk Audacious-SID dokumentacijoje)"
+#: src/mixer/plugin.c:93
+msgid "Channel Mixer Settings"
+msgstr "Kanalų Mikserio nustatymai"
 
-#: src/sid/xs_interface.c:1010
-msgid "DB-file:"
-msgstr "DB-failas:"
+#: src/mixer/plugin.c:102
+msgid "Output channels:"
+msgstr "Išvesties kanalai:"
 
-#: src/sid/xs_interface.c:1020
-msgid "Database path and filename"
-msgstr "Guomenų bazės kelias ir failo vardas"
+#: src/mixer/plugin.c:112
+msgid "Changes take effect at the next song change."
+msgstr "Pakeitimai įsigalios nuo sekančios dainos."
 
-#: src/sid/xs_interface.c:1027
-msgid "Browse for song length-database file"
-msgstr "Rinktis dainos ilgio duomenų bazės failą"
+#: src/mpg123/mpg123.c:183
+msgid "Surround"
+msgstr "Apsupimas"
 
-#: src/sid/xs_interface.c:1049
-msgid "Song length database:"
-msgstr "Dainos ilgio duomenų bzė"
+#: src/mtp_up/mtp.c:298
+msgid "Upload in progress..."
+msgstr "Išsiunčiama..."
 
-#: src/sid/xs_interface.c:1054
-msgid "Songlength"
-msgstr "Dainos ilgis"
+#: src/mtp_up/mtp.c:310
+msgid "Upload to MTP Device"
+msgstr "Išsiųsti į MTP įrenginį"
 
-#: src/sid/xs_interface.c:1072
-msgid "Override generic Tuplez format string"
-msgstr "Perrašyt bendrinius Tuplez formato įrašus"
+#: src/mtp_up/mtp.c:311
+msgid "Disconnect MTP Device"
+msgstr "Atjungti MTP įrenginį"
 
-#: src/sid/xs_interface.c:1076
-msgid ""
-"By enabling this option you can specify a custom Tuplez formatting string "
-"for SID-files. The SID-plugin specific Tuplez tags are described shortly "
-"below."
-msgstr ""
-"Įjungiant šią pasirinktį galite nustatyti derintą Tuplez formatavimo eilutę. "
-"Specialūs SID įskiepio Tuplez žymos aprašytos žemiau."
+#: src/notify/libnotify-aosd_event.c:47
+msgid "Stopped"
+msgstr "Sustabdyta"
 
-#: src/sid/xs_interface.c:1087
-msgid "Tuplez format string for SID-files"
-msgstr "Tuplez formato eilutė SID failam"
+#: src/notify/libnotify-aosd_event.c:47
+msgid "Audacious is not playing."
+msgstr "Audacious negroja."
+
+#: src/null/null.c:64
+msgid "Null output plugin "
+msgstr "Null išvesties įskiepio"
 
-#: src/sid/xs_interface.c:1090
+#: src/null/null.c:65
 msgid ""
-"SID-specific Tuplez fields:\n"
-"\n"
-"sid-format\t\t- Specific fileformat\n"
-"sid-model\t\t- 6581 or 8580\n"
-"sid-speed\t\t- Timing or speed: PAL/NTSC/etc.\n"
-"\n"
-"Other \"special\" fields set:\n"
-"\n"
-"subsong-num, subsong-id"
+" by Christian Birchinger <joker@netswarm.net>\n"
+"based on the XMMS plugin by Håvard Kvål <havardk@xmms.org>"
 msgstr ""
-"SID-specifiniai Tuplez laukai:\n"
-"\n"
-"sid-format\t\t- Specifinis formatas\n"
-"sid-model\t\t- 6581 arba 8580\n"
-"sid-speed\t\t- Laikas arba greitis: PAL/NTSC/etc.\n"
-"\n"
-"Kiti \"special\" laukai:\n"
-"\n"
-"subsong-num, subsong-id"
+" kūrė Christian Birchinger <joker@netswarm.net>\n"
+"paremta XMMS įskiepiu kurį sukūrė Håvard Kvål <havardk@xmms.org>"
 
-#: src/sid/xs_interface.c:1098
-msgid "Song title format:"
-msgstr "Dainos pavadinimo formatas:"
+#: src/null/null.c:68
+msgid "About Null Output"
+msgstr "Apie Null išvestį"
 
-#: src/sid/xs_interface.c:1125
-msgid "Add sub-tunes to playlist"
-msgstr "Pridėti sub-tunes į grojaraštį"
+#: src/null/null.c:89
+msgid "Null output preferences"
+msgstr "Null išvesties nustatymai"
 
-#: src/sid/xs_interface.c:1129
-msgid ""
-"If enabled, sub-tunes of each file will be added to playlist. If disabled, "
-"only the default sub-tune will be added."
-msgstr ""
-"Jei įjungta, kievieno failo sub-tunes bus pridėti į grojaraštį. Jei "
-"išjungta, tik numtytieji sub-tune bus pridėti."
+#: src/null/null.c:100
+msgid "Run in real time"
+msgstr "Vykdyti realiu laiku"
 
-#: src/sid/xs_interface.c:1131
-msgid "Only tunes with specified minimum duration"
-msgstr "Tik tunes su nurodyta trumpiausia trukme"
+#: src/oss4/configure.c:76
+msgid "1. Default device"
+msgstr "1. Numatytasis įrenginys"
 
-#: src/sid/xs_interface.c:1135
-msgid "Only add sub-tunes that have a duration of at least specified time."
-msgstr "Pridėti tik tuos sub-tunes kurių trukmė ilgesnė nei nurodytas laikas."
+#: src/oss4/configure.c:132
+msgid "OSS4 Output Plugin Preferences"
+msgstr "OSS4 išvesties įskiepio nustatymai"
 
-#: src/sid/xs_interface.c:1162
-msgid "Sub-tune handling:"
-msgstr "Sub-tune valdymas:"
+#: src/oss4/configure.c:144 src/OSS/configure.c:194
+msgid "Audio device:"
+msgstr "Audio įrenginys:"
 
-#: src/sid/xs_interface.c:1179
-msgid "Use STIL database"
-msgstr "Naudoi STIL duomenų bazę"
+#: src/oss4/configure.c:172 src/OSS/configure.c:217 src/OSS/configure.c:260
+msgid "Use alternate device:"
+msgstr "Naudoti alternatyvų įrenginį:"
 
-#: src/sid/xs_interface.c:1183
-msgid ""
-"If this option is enabled (and the database & HVSC settings below are "
-"correctly set), Audacious-SID will use and display additional information "
-"from STIL database when HVSC SIDs are played."
-msgstr ""
-"Jei ši pasirinktis aktyvuota (ir duomenų bazės bei HVSC nustatymai yra "
-"teisingi), kai HVSC SID bus grojama Audacious-SID papildomą informaciją "
-"rodys iš STIL duomenų bazės."
+#: src/oss4/configure.c:187
+msgid "Save volume between sessions"
+msgstr "Išsaugoti garsą tarp sesijų"
 
-#: src/sid/xs_interface.c:1190
-msgid "STIL file:"
-msgstr "STIL failas:"
+#: src/oss4/configure.c:191
+msgid "Enable format conversions made by the OSS software."
+msgstr "Įgalinti formato keitimą kurį padarė OSS programinė įranga."
 
-#: src/sid/xs_interface.c:1206
-msgid ""
-"Path and filename of STIL database file (STIL.txt), usually found from "
-"HVSC's DOCUMENTS-subdirectory."
-msgstr ""
-"STIL duomenų bazės failo (STIL.txt) kelias ir failo vardas, paprastai būna "
-"HVSC DOCUMENTS-poaplankyje."
+#: src/oss4/plugin.c:51
+msgid "About OSS4 Plugin"
+msgstr "Apie OSS4 įskiepį"
 
-#: src/sid/xs_interface.c:1219
-msgid "Browse for STIL-database file"
-msgstr "Rinktis STIL-database failą"
+#: src/oss4/utils.c:211
+msgid "OSS4 error"
+msgstr "OSS4 klaida"
 
-#: src/sid/xs_interface.c:1246
-msgid "HVSC path:"
-msgstr "HVSC kelias:"
+#: src/OSS/configure.c:137
+#, c-format
+msgid "Default (%s)"
+msgstr "Numatytasis (%s)"
 
-#: src/sid/xs_interface.c:1262
-msgid ""
-"Path to base-directory of your High Voltage SID Collection (HVSC), for "
-"example /media/C64Music/"
-msgstr ""
-"Kelias iki bazinio aplanko kuriame yra High Voltage SID Collection (HVSC), "
-"pvz. /media/C64Music"
+#: src/OSS/configure.c:178
+msgid "OSS Driver configuration"
+msgstr "OSS Driver konfigūracija"
+
+#: src/OSS/configure.c:281
+msgid "Devices"
+msgstr "Įrenginiai"
 
-#: src/sid/xs_interface.c:1275
-msgid "Browse for HVSC path"
-msgstr "Naršyti HVSC kelią"
+#: src/OSS/configure.c:283
+msgid "Buffering:"
+msgstr "Buferiavimas:"
+
+#: src/OSS/configure.c:296
+msgid "Pre-buffer (percent):"
+msgstr "Priešlaikinis buferiavimas (procentais):"
 
-#: src/sid/xs_interface.c:1297
-msgid "SID Tune Information List (STIL) database:"
-msgstr "SID Tune informacijos sąrašas (STILL) duomenų bazė:"
+#: src/OSS/configure.c:307
+msgid "Buffering"
+msgstr "Buferiavimas"
 
-#: src/sid/xs_interface.c:1321
-msgid "Cancel any changes"
-msgstr "Atšaukti visus keitimus"
+#: src/OSS/configure.c:308
+msgid "Mixer Settings:"
+msgstr "Mikserio nustatymai:"
 
-#: src/sid/xs_interface.c:1328
-msgid "Accept and update changes"
-msgstr "Priimti ir atnaujinti keitimus"
+#: src/OSS/configure.c:314
+msgid "Volume controls Master not PCM"
+msgstr "Garso valdymas Master ne PCM"
 
-#: src/sid/xs_interface.c:1628
-msgid "Audacious-SID Fileinfo"
-msgstr "Audacious-SID failo informacija"
+#: src/OSS/configure.c:320
+msgid "Mixer"
+msgstr "Mikseris"
 
-#: src/sid/xs_interface.c:1649
-msgid "Filename:"
-msgstr "Failo vardas:"
+#: src/OSS/OSS.c:40
+msgid "About OSS Driver"
+msgstr "Apie OSS Driver"
+
+#: src/pulse_audio/pulse_audio.c:687
+msgid "About Audacious PulseAudio Output Plugin"
+msgstr "Apie Audacious PulseAudio išvesties įskiepį"
+
+#: src/resample/plugin.c:89
+msgid "About Sample Rate Converter Plugin"
+msgstr "Apie diskretizavimo dažnio keitėjo įskiepį"
 
-#: src/sid/xs_interface.c:1657
-msgid "Songname:"
-msgstr "Dainos pavadinimas:"
+#: src/resample/plugin.c:144
+msgid "Sample Rate Converter Preferences"
+msgstr "Diskretizavimo dažnio keitėjo nustatymai"
 
-#: src/sid/xs_interface.c:1665
-msgid "Composer:"
-msgstr "Kompozitorius:"
+#: src/resample/plugin.c:156
+msgid "Rate mappings:"
+msgstr "Dažnio parodymai:"
 
-#: src/sid/xs_interface.c:1673
-msgid "Copyright:"
-msgstr "Autorinės teisės:"
+#: src/resample/plugin.c:179
+msgid "All others:"
+msgstr "Visi kiti:"
 
-#: src/sid/xs_interface.c:1717
-msgid "Song Information:"
-msgstr "Dainos informacija:"
+#: src/resample/plugin.c:191
+msgid "Method:"
+msgstr "Metodas:"
 
-#: src/sid/xs_interface.c:1752
-msgid "Author:"
-msgstr "Autorius:"
+#: src/scrobbler/configure.c:122 src/scrobbler/configure.c:197
+msgid "Change password"
+msgstr "Keisti slaptažodį"
 
-#: src/sid/xs_interface.c:1786
-msgid "Duration:"
-msgstr "Trukmė:"
+#: src/scrobbler/configure.c:143
+msgid "Services"
+msgstr "Tarnyba"
 
-#: src/sid/xs_interface.c:1820
-msgid "Sub-tune Information:"
-msgstr "Sub-tune Informacija:"
+#: src/scrobbler/configure.c:165
+msgid "Username:"
+msgstr "Naudotojo vardas:"
 
-#: src/sid/xs_interface.c:1881
-msgid "Select HVSC song length database"
-msgstr "Pasirinkti HVSC dainos ilgio duomenų bazę"
+#: src/scrobbler/configure.c:171
+msgid "Password:"
+msgstr "Slaptažodis:"
 
-#: src/sid/xs_interface.c:1922
-msgid "Select STIL-database"
-msgstr "Pasirinkti STIL-duomenų bazę"
+#: src/scrobbler/configure.c:179
+msgid "Scrobbler URL:"
+msgstr "Scrobbler URL:"
 
-#: src/sid/xs_interface.c:1963
-msgid "Select HVSC location prefix"
-msgstr "Pasirinkti HVSC vietos priedėlį"
+#: src/scrobbler/configure.c:211
+msgid "Last.FM"
+msgstr "Last.FM"
 
-#: src/sid/xs_interface.c:2004
-msgid "Select SIDPlay2 filters file for importing"
-msgstr "Pasirinkti SID2Play filtro failą importavimui"
+#: src/scrobbler/configure.c:238
+msgid "Scrobbler"
+msgstr "Scrobbler"
 
-#: src/sid/xs_interface.c:2045
-msgid "Select SIDPlay2 filters file for exporting"
-msgstr "Pasirinkti SIDPlay2 filtrų failą eksportavimui"
+#: src/scrobbler/plugin.c:194
+msgid ""
+"Audacious AudioScrobbler Plugin\n"
+"\n"
+"Originally created by Audun Hove <audun@nlc.no> and Pipian <pipian@pipian.com>\n"
+msgstr ""
+"Audacious AudioScrobbler įskiepis\n"
+"\n"
+"Originaliai sukūrė Audun Hove <audun@nlc.no> ir Pipian <pipian@pipian.com>\n"
 
-#: src/sid/xs_interface.c:2093 src/sid/xs_interface.c:2106
-msgid "Confirm selected action"
-msgstr "Patvirtinti pasirinktą veiksmą"
+#: src/scrobbler/plugin.c:196
+msgid "About Scrobbler Plugin"
+msgstr "Apie Scrobbler įskiepį"
 
-#: src/sid/xs_interface.c:2123
-msgid "Yes"
-msgstr "Taip"
+#: src/sdlout/plugin.c:58
+msgid "About SDL Output Plugin"
+msgstr "Apie SDL išvesties įskiepį"
 
-#: src/sid/xs_interface.c:2129
-msgid "No"
-msgstr "Ne"
+#: src/sdlout/plugin.c:78
+msgid "SDL error"
+msgstr "SDL klaida"
 
-#: src/skins/plugin.c:167
+#: src/skins/plugin.c:165
 msgid "About Skinned GUI"
 msgstr "Apie Skinned GUI"
 
-#: src/skins/plugin.c:168
+#: src/skins/plugin.c:166
 msgid ""
 "Copyright (c) 2008, by Tomasz Moń <desowin@gmail.com>\n"
 "\n"
@@ -2725,39 +2475,39 @@
 "Copyright (c) 2008, by Tomasz Moń <desowin@gmail.com>\n"
 "\n"
 
-#: src/skins/skins_cfg.c:254
+#: src/skins/skins_cfg.c:207
 msgid "_Player:"
 msgstr "_Grotuvas:"
 
-#: src/skins/skins_cfg.c:254
+#: src/skins/skins_cfg.c:208
 msgid "Select main player window font:"
 msgstr "Pasirinkti pagrindinį lango šriftą:"
 
-#: src/skins/skins_cfg.c:255
+#: src/skins/skins_cfg.c:210
 msgid "_Playlist:"
 msgstr "_Grojaraštis:"
 
-#: src/skins/skins_cfg.c:255
+#: src/skins/skins_cfg.c:211
 msgid "Select playlist font:"
 msgstr "Pasirinkti grojaraščio šriftą:"
 
-#: src/skins/skins_cfg.c:259
+#: src/skins/skins_cfg.c:215
 msgid "_Fonts"
 msgstr "_Šriftai"
 
-#: src/skins/skins_cfg.c:261
+#: src/skins/skins_cfg.c:218
 msgid "Use bitmap fonts (supports ASCII only)"
 msgstr "Naudoti bitmap šriftus (palaiko tik ASCII)"
 
-#: src/skins/skins_cfg.c:263
+#: src/skins/skins_cfg.c:220
 msgid "Scroll song title in both directions"
 msgstr "Slinkti pavadinimą į abi puses"
 
-#: src/skins/skins_cfg.c:346
+#: src/skins/skins_cfg.c:298
 msgid "_Skin"
 msgstr "_Išvaizda"
 
-#: src/skins/skins_cfg.c:393
+#: src/skins/skins_cfg.c:345
 msgid "Interface Preferences"
 msgstr "Sąsajos nustatymai"
 
@@ -2805,84 +2555,83 @@
 msgid "16 kHz"
 msgstr "16 kHz"
 
-#: src/skins/ui_equalizer.c:378
+#: src/skins/ui_equalizer.c:379
 msgid "Audacious Equalizer"
 msgstr "Audacious ekvalaizeris"
 
-#: src/skins/ui_equalizer.c:884
+#: src/skins/ui_equalizer.c:896
 msgid "Presets"
 msgstr "Šablonai"
 
-#: src/skins/ui_main.c:444
+#: src/skins/ui_main.c:443
 msgid "kbps"
 msgstr "kbps"
 
-#: src/skins/ui_main.c:452
-#, fuzzy
+#: src/skins/ui_main.c:451
 msgid "kHz"
-msgstr " kHz"
+msgstr "kHz"
 
-#: src/skins/ui_main.c:459
+#: src/skins/ui_main.c:458
 msgid "surround"
 msgstr "surround"
 
-#: src/skins/ui_main.c:807
+#: src/skins/ui_main.c:806
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr "Eiti į %d:%-2.2d / %d:%-2.2d"
 
-#: src/skins/ui_main.c:828
+#: src/skins/ui_main.c:827
 #, c-format
 msgid "Volume: %d%%"
 msgstr "Garsumas: %d%%"
 
-#: src/skins/ui_main.c:851
+#: src/skins/ui_main.c:850
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "Balansas: %d%% kairė"
 
-#: src/skins/ui_main.c:853
+#: src/skins/ui_main.c:852
 msgid "Balance: center"
 msgstr "Balansas: centras"
 
-#: src/skins/ui_main.c:855
+#: src/skins/ui_main.c:854
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "Balansas: %d%% dešinė"
 
-#: src/skins/ui_main.c:981
+#: src/skins/ui_main.c:980
 msgid "Options Menu"
 msgstr "Pasirinkčių meniu"
 
-#: src/skins/ui_main.c:985
+#: src/skins/ui_main.c:984
 msgid "Disable 'Always On Top'"
-msgstr "Išjungti 'Always On Top'"
+msgstr "Išjungti 'Visada viršuje'"
 
-#: src/skins/ui_main.c:987
+#: src/skins/ui_main.c:986
 msgid "Enable 'Always On Top'"
-msgstr "Įjungti 'Always On Top'"
+msgstr "Įjungti 'Visada viršuje'"
 
-#: src/skins/ui_main.c:990
+#: src/skins/ui_main.c:989
 msgid "File Info Box"
 msgstr "Failo informacijos langas"
 
-#: src/skins/ui_main.c:995
+#: src/skins/ui_main.c:994
 msgid "Visualization Menu"
 msgstr "Vizualizacijos meniu"
 
-#: src/skins/ui_main.c:1645
+#: src/skins/ui_main.c:1648
 msgid "Single mode."
 msgstr "Vieno režimas."
 
-#: src/skins/ui_main.c:1647
+#: src/skins/ui_main.c:1650
 msgid "Playlist mode."
 msgstr "Grojaraščio režimas."
 
-#: src/skins/ui_main.c:1669
+#: src/skins/ui_main.c:1672
 msgid "Stopping after song."
 msgstr "Sustabdymas po dainos."
 
-#: src/skins/ui_main.c:1671
+#: src/skins/ui_main.c:1674
 msgid "Not stopping after song."
 msgstr "Nesustabdyti po dainos."
 
@@ -3097,7 +2846,7 @@
 
 #: src/skins/ui_manager.c:223
 msgid "Loads a playlist file into the selected playlist."
-msgstr "Įkrauna grojaraštį į pasirnktą grojaraštį."
+msgstr "Įkrauna grojaraštį į pasirinktą grojaraštį."
 
 #: src/skins/ui_manager.c:226
 msgid "Export Playlist"
@@ -3108,474 +2857,468 @@
 msgstr "Išsaugo pasirinktą grojaraštį."
 
 #: src/skins/ui_manager.c:229
-msgid "Save All Playlists"
-msgstr "Išsaugoti visus grojaraščius"
-
-#: src/skins/ui_manager.c:230
-msgid ""
-"Saves all the playlists that are open. Note that this is done automatically "
-"when Audacious quits."
-msgstr ""
-"Išsaugo visus atidarytus grojaraščius. Tai tapogi padaroma uždarant "
-"Audacious. "
-
-#: src/skins/ui_manager.c:234
 msgid "Refresh List"
 msgstr "Atnaujinti sąrašą"
 
-#: src/skins/ui_manager.c:235
+#: src/skins/ui_manager.c:230
 msgid "Refreshes metadata associated with a playlist entry."
-msgstr "Atnaujina metaduomenis susietus su grojarščio elementu."
+msgstr "Atnaujina meta duomenis susietus su grojaraščio elementu."
 
-#: src/skins/ui_manager.c:238
-msgid "List Manager"
-msgstr "Sąrašo redaktorius"
+#: src/skins/ui_manager.c:233
+msgid "Playlist Manager"
+msgstr "Grojaraščio redaktorius"
 
-#: src/skins/ui_manager.c:239
-msgid "Opens the playlist manager."
-msgstr "Atveria grojaraščio redaktorių."
+#: src/skins/ui_manager.c:234
+msgid "Queue Manager"
+msgstr "Eilės redaktorius"
 
-#: src/skins/ui_manager.c:243
+#: src/skins/ui_manager.c:237
 msgid "View"
-msgstr "Rodinys"
+msgstr "Rodymas"
 
-#: src/skins/ui_manager.c:244
+#: src/skins/ui_manager.c:238
 msgid "Interface"
 msgstr "Vartotojo sąsaja"
 
-#: src/skins/ui_manager.c:245
+#: src/skins/ui_manager.c:239
 msgid "Interface Preferences ..."
 msgstr "Vartotojo sąsajos nustatymai..."
 
-#: src/skins/ui_manager.c:249
+#: src/skins/ui_manager.c:243
 msgid "Add Internet Address..."
 msgstr "Pridėti interneto adresą..."
 
-#: src/skins/ui_manager.c:250
+#: src/skins/ui_manager.c:244
 msgid "Adds a remote track to the playlist."
 msgstr "Pridėti nutolusį takelį į grojaraštį."
 
-#: src/skins/ui_manager.c:253
+#: src/skins/ui_manager.c:247
 msgid "Add Files..."
 msgstr "Pridėti failus..."
 
-#: src/skins/ui_manager.c:254
+#: src/skins/ui_manager.c:248
 msgid "Adds files to the playlist."
 msgstr "Prideda failus į grojaraštį."
 
-#: src/skins/ui_manager.c:259
+#: src/skins/ui_manager.c:253
 msgid "Search and Select"
 msgstr "Ieškoti ir pasirinkti"
 
-#: src/skins/ui_manager.c:260
+#: src/skins/ui_manager.c:254
 msgid ""
 "Searches the playlist and selects playlist entries based on specific "
 "criteria."
 msgstr "Ieško ir pasirenka grojaraščio elementus pagal nurodytą kriterijų."
 
-#: src/skins/ui_manager.c:263
+#: src/skins/ui_manager.c:257
 msgid "Invert Selection"
 msgstr "Apversti pasirinktus"
 
-#: src/skins/ui_manager.c:264
+#: src/skins/ui_manager.c:258
 msgid "Inverts the selected and unselected entries."
 msgstr "Apverčia visus elementus."
 
-#: src/skins/ui_manager.c:267
+#: src/skins/ui_manager.c:261
 msgid "Select All"
 msgstr "Pasirinkti viską"
 
-#: src/skins/ui_manager.c:268
+#: src/skins/ui_manager.c:262
 msgid "Selects all of the playlist entries."
 msgstr "Pasirenka visus grojaraščio įrašus."
 
-#: src/skins/ui_manager.c:271
+#: src/skins/ui_manager.c:265
 msgid "Select None"
 msgstr "Nieko nepasirinkti"
 
-#: src/skins/ui_manager.c:272
+#: src/skins/ui_manager.c:266
 msgid "Deselects all of the playlist entries."
 msgstr "Atžymi visus grojaraščio įrašus."
 
-#: src/skins/ui_manager.c:277
+#: src/skins/ui_manager.c:271
 msgid "Remove All"
-msgstr "Pašallinti visus"
+msgstr "Pašalinti visus"
 
-#: src/skins/ui_manager.c:278
+#: src/skins/ui_manager.c:272
 msgid "Removes all entries from the playlist."
 msgstr "Pašalina visus įrašus iš grojaraščio."
 
-#: src/skins/ui_manager.c:281
+#: src/skins/ui_manager.c:275
 msgid "Clear Queue"
 msgstr "Išvalyti eilę"
 
-#: src/skins/ui_manager.c:282
+#: src/skins/ui_manager.c:276
 msgid "Clears the queue associated with this playlist."
 msgstr "Išvalo eilę susietą su šiuo grojaraščiu."
 
-#: src/skins/ui_manager.c:285
+#: src/skins/ui_manager.c:279
 msgid "Remove Unavailable Files"
 msgstr "Pašalina neprieinamus failus"
 
-#: src/skins/ui_manager.c:286
+#: src/skins/ui_manager.c:280
 msgid "Removes unavailable files from the playlist."
 msgstr "Pašalina neprieinamus failus iš grojaraščio."
 
-#: src/skins/ui_manager.c:289
+#: src/skins/ui_manager.c:283
 msgid "Remove Duplicates"
 msgstr "Pašalinti dubliuotus"
 
-#: src/skins/ui_manager.c:291 src/skins/ui_manager.c:323
-#: src/skins/ui_manager.c:353
+#: src/skins/ui_manager.c:285 src/skins/ui_manager.c:317
+#: src/skins/ui_manager.c:347
 msgid "By Title"
 msgstr "Pagal pavadinimą"
 
-#: src/skins/ui_manager.c:292
+#: src/skins/ui_manager.c:286
 msgid "Removes duplicate entries from the playlist by title."
 msgstr "Pašalina dubliuotus įrašus iš grojaraščio pagal pavadinimą."
 
-# msgstr[0] "Įtrauktas %d elementas."
-# msgstr[1] "Įtraukti %d elementai."
-#: src/skins/ui_manager.c:295 src/skins/ui_manager.c:335
-#: src/skins/ui_manager.c:365
+#: src/skins/ui_manager.c:289 src/skins/ui_manager.c:329
+#: src/skins/ui_manager.c:359
 msgid "By Filename"
 msgstr "Pagal failo vardą"
 
-#: src/skins/ui_manager.c:296
+#: src/skins/ui_manager.c:290
 msgid "Removes duplicate entries from the playlist by filename."
 msgstr "Pašalina dubliuotus įrašus iš grojaraščio pagal failo vardą."
 
-#: src/skins/ui_manager.c:299 src/skins/ui_manager.c:339
-#: src/skins/ui_manager.c:369
+#: src/skins/ui_manager.c:293 src/skins/ui_manager.c:333
+#: src/skins/ui_manager.c:363
 msgid "By Path + Filename"
 msgstr "Pagal kelią + failo vardą"
 
-#: src/skins/ui_manager.c:300
+#: src/skins/ui_manager.c:294
 msgid "Removes duplicate entries from the playlist by their full path."
 msgstr "Pašalina dubliuotus įrašus iš grojaraščio pagal pilną jų kelią."
 
-#: src/skins/ui_manager.c:303
+#: src/skins/ui_manager.c:297
 msgid "Remove Unselected"
 msgstr "Pašalint nepažymėtus"
 
-#: src/skins/ui_manager.c:304
+#: src/skins/ui_manager.c:298
 msgid "Remove unselected entries from the playlist."
 msgstr "Pašalina nepažymėtus."
 
-#: src/skins/ui_manager.c:307
+#: src/skins/ui_manager.c:301
 msgid "Remove Selected"
 msgstr "Pašalint pažymėtus"
 
-#: src/skins/ui_manager.c:308
+#: src/skins/ui_manager.c:302
 msgid "Remove selected entries from the playlist."
 msgstr "Pašalina pažymėtus elementus iš grojaraščio."
 
-#: src/skins/ui_manager.c:313
+#: src/skins/ui_manager.c:307
 msgid "Randomize List"
 msgstr "Sumaišyti sąrašą"
 
-#: src/skins/ui_manager.c:314
+#: src/skins/ui_manager.c:308
 msgid "Randomizes the playlist."
 msgstr "Sumaišo sąrašą."
 
-#: src/skins/ui_manager.c:317
+#: src/skins/ui_manager.c:311
 msgid "Reverse List"
 msgstr "Apverčia sąrašą"
 
-#: src/skins/ui_manager.c:318
+#: src/skins/ui_manager.c:312
 msgid "Reverses the playlist."
 msgstr "Apverčia grojaraštį."
 
-#: src/skins/ui_manager.c:321
+#: src/skins/ui_manager.c:315
 msgid "Sort List"
 msgstr "Rikiuoti sąrašą"
 
-#: src/skins/ui_manager.c:324 src/skins/ui_manager.c:354
+#: src/skins/ui_manager.c:318 src/skins/ui_manager.c:348
 msgid "Sorts the list by title."
 msgstr "Rikiuoja sąrašą pagal pavadinimą."
 
-#: src/skins/ui_manager.c:327 src/skins/ui_manager.c:357
+#: src/skins/ui_manager.c:321 src/skins/ui_manager.c:351
 msgid "By Album"
 msgstr "Pagal albumą"
 
-#: src/skins/ui_manager.c:328 src/skins/ui_manager.c:358
+#: src/skins/ui_manager.c:322 src/skins/ui_manager.c:352
 msgid "Sorts the list by album."
 msgstr "Rikiuoja sąrašą pagal albumą."
 
-#: src/skins/ui_manager.c:331 src/skins/ui_manager.c:361
+#: src/skins/ui_manager.c:325 src/skins/ui_manager.c:355
 msgid "By Artist"
 msgstr "Pagal atlikėją"
 
-#: src/skins/ui_manager.c:332 src/skins/ui_manager.c:362
+#: src/skins/ui_manager.c:326 src/skins/ui_manager.c:356
 msgid "Sorts the list by artist."
 msgstr "Rikiuoja sąrašą pagal atlikėją."
 
-#: src/skins/ui_manager.c:336 src/skins/ui_manager.c:366
+#: src/skins/ui_manager.c:330 src/skins/ui_manager.c:360
 msgid "Sorts the list by filename."
 msgstr "Rikiuoja sąrašą pagal failo vardą."
 
-#: src/skins/ui_manager.c:340 src/skins/ui_manager.c:370
+#: src/skins/ui_manager.c:334 src/skins/ui_manager.c:364
 msgid "Sorts the list by full pathname."
 msgstr "Rikiuoja sąrašą pagal pilną kelią."
 
-#: src/skins/ui_manager.c:343 src/skins/ui_manager.c:373
+#: src/skins/ui_manager.c:337 src/skins/ui_manager.c:367
 msgid "By Date"
 msgstr "Pagal datą"
 
-#: src/skins/ui_manager.c:344 src/skins/ui_manager.c:374
+#: src/skins/ui_manager.c:338 src/skins/ui_manager.c:368
 msgid "Sorts the list by modification time."
 msgstr "Rikiuoja sąrašą pagal keitimo laiką."
 
-#: src/skins/ui_manager.c:347 src/skins/ui_manager.c:377
+#: src/skins/ui_manager.c:341 src/skins/ui_manager.c:371
 msgid "By Track Number"
 msgstr "Pagal takelio numerį"
 
-#: src/skins/ui_manager.c:348 src/skins/ui_manager.c:378
+#: src/skins/ui_manager.c:342 src/skins/ui_manager.c:372
 msgid "Sorts the list by track number."
 msgstr "Rikiuoja sąrašą pagal takelio numerį."
 
-#: src/skins/ui_manager.c:351
+#: src/skins/ui_manager.c:345
 msgid "Sort Selected"
 msgstr "Rikuoti pasirinktus"
 
-#: src/skins/ui_manager.c:387
+#: src/skins/ui_manager.c:381
 msgid "File"
 msgstr "Failas"
 
-#: src/skins/ui_manager.c:388
-msgid "Help"
-msgstr "Pagalba"
-
-#: src/skins/ui_manager.c:390
+#: src/skins/ui_manager.c:384
 msgid "Plugin Services"
 msgstr "Įskiepių paslaugos"
 
-#: src/skins/ui_manager.c:392 src/skins/ui_manager.c:395
+#: src/skins/ui_manager.c:386 src/skins/ui_manager.c:389
 msgid "View Track Details"
 msgstr "Pažiūrėti takelio detales"
 
-#: src/skins/ui_manager.c:393 src/skins/ui_manager.c:396
+#: src/skins/ui_manager.c:387 src/skins/ui_manager.c:390
 msgid "View track details"
 msgstr "Pažiūrėti takelio detales"
 
-#: src/skins/ui_manager.c:398 src/skins/ui_manager.c:399
+#: src/skins/ui_manager.c:392 src/skins/ui_manager.c:393
 msgid "About Audacious"
 msgstr "Apie Audacious"
 
-#: src/skins/ui_manager.c:401
+#: src/skins/ui_manager.c:395
 msgid "Play File"
 msgstr "Groti failą"
 
-#: src/skins/ui_manager.c:402
+#: src/skins/ui_manager.c:396
 msgid "Load and play a file"
 msgstr "Įkrauti ir groti failą"
 
-#: src/skins/ui_manager.c:404
+#: src/skins/ui_manager.c:398
 msgid "Play Location"
 msgstr "Groti vietą"
 
-#: src/skins/ui_manager.c:405
+#: src/skins/ui_manager.c:399
 msgid "Play media from the selected location"
 msgstr "Groti failą iš pasirinktos vietos"
 
-#: src/skins/ui_manager.c:407
+#: src/skins/ui_manager.c:401
 msgid "Plugin services"
 msgstr "Įskiepių paslaugos"
 
-#: src/skins/ui_manager.c:409
+#: src/skins/ui_manager.c:403
 msgid "Preferences"
 msgstr "Nustatymai"
 
-#: src/skins/ui_manager.c:410
+#: src/skins/ui_manager.c:404
 msgid "Open preferences window"
 msgstr "Atverti nustatymų langą"
 
-#: src/skins/ui_manager.c:413
+#: src/skins/ui_manager.c:407
 msgid "Quit Audacious"
 msgstr "Užverti Audacious"
 
-#: src/skins/ui_manager.c:415 src/skins/ui_manager.c:416
+#: src/skins/ui_manager.c:409 src/skins/ui_manager.c:410
 msgid "Set A-B"
 msgstr "Nustatyti A-B"
 
-#: src/skins/ui_manager.c:418 src/skins/ui_manager.c:419
+#: src/skins/ui_manager.c:412 src/skins/ui_manager.c:413
 msgid "Clear A-B"
 msgstr "Išvalyti A-B"
 
-#: src/skins/ui_manager.c:421 src/skins/ui_manager.c:422
+#: src/skins/ui_manager.c:415 src/skins/ui_manager.c:416
 msgid "Jump to Playlist Start"
 msgstr "Šokti į grojaraščio pradžią"
 
-#: src/skins/ui_manager.c:427 src/skins/ui_manager.c:428
+#: src/skins/ui_manager.c:421 src/skins/ui_manager.c:422
 msgid "Jump to Time"
 msgstr "Šokti į laiką"
 
-#: src/skins/ui_manager.c:430
+#: src/skins/ui_manager.c:424
 msgid "Queue Toggle"
 msgstr "Perjungti eilę"
 
-#: src/skins/ui_manager.c:431
+#: src/skins/ui_manager.c:425
 msgid "Enables/disables the entry in the playlist's queue."
 msgstr "Įjungia/Išjungia įrašą grojaraščio eilėje."
 
-#: src/skins/ui_manager.c:434
+#: src/skins/ui_manager.c:428
 msgid "Copy"
 msgstr "Kopijuoti"
 
-#: src/skins/ui_manager.c:436
+#: src/skins/ui_manager.c:430
 msgid "Cut"
 msgstr "Iškirpti"
 
-#: src/skins/ui_manager.c:438
+#: src/skins/ui_manager.c:432
 msgid "Paste"
 msgstr "Įklijuoti"
 
-#: src/skins/ui_manager.c:445
+#: src/skins/ui_manager.c:439
 msgid "Load"
 msgstr "Įkrauti"
 
-#: src/skins/ui_manager.c:450 src/skins/ui_manager.c:471
-#: src/skins/ui_manager.c:486
+#: src/skins/ui_manager.c:440
+msgid "Import"
+msgstr "Įkelti"
+
+#: src/skins/ui_manager.c:441
+msgid "Save"
+msgstr "Išsaugoti"
+
+#: src/skins/ui_manager.c:442
+msgid "Delete"
+msgstr "Ištrinti"
+
+#: src/skins/ui_manager.c:444 src/skins/ui_manager.c:465
+#: src/skins/ui_manager.c:480
 msgid "Preset"
 msgstr "Šablonas"
 
-#: src/skins/ui_manager.c:451
+#: src/skins/ui_manager.c:445
 msgid "Load preset"
 msgstr "Įkrauti šabloną"
 
-#: src/skins/ui_manager.c:453 src/skins/ui_manager.c:474
-#: src/skins/ui_manager.c:489
+#: src/skins/ui_manager.c:447 src/skins/ui_manager.c:468
+#: src/skins/ui_manager.c:483
 msgid "Auto-load preset"
 msgstr "Savaime įsikraunantis šablonas"
 
-#: src/skins/ui_manager.c:454
+#: src/skins/ui_manager.c:448
 msgid "Load auto-load preset"
 msgstr "Įkrauti savaime įsikraunantį šabloną"
 
-#: src/skins/ui_manager.c:457
+#: src/skins/ui_manager.c:451
 msgid "Load default preset into equalizer"
-msgstr "Įkrauti numtytąjį šabloną į ekvalaizerį"
+msgstr "Įkrauti numatytąjį šabloną į ekvalaizerį"
 
-#: src/skins/ui_manager.c:459
+#: src/skins/ui_manager.c:453
 msgid "Zero"
 msgstr "Nulis"
 
-#: src/skins/ui_manager.c:460
+#: src/skins/ui_manager.c:454
 msgid "Set equalizer preset levels to zero"
 msgstr "Nustatyti ekvalaizerio šablono lygius į nulius"
 
-#: src/skins/ui_manager.c:462
+#: src/skins/ui_manager.c:456
 msgid "From file"
 msgstr "Iš failo"
 
-#: src/skins/ui_manager.c:463
+#: src/skins/ui_manager.c:457
 msgid "Load preset from file"
 msgstr "Įkrauti šabloną iš failo"
 
-#: src/skins/ui_manager.c:465
+#: src/skins/ui_manager.c:459
 msgid "From WinAMP EQF file"
 msgstr "Iš WinAMP EQF failo"
 
-#: src/skins/ui_manager.c:466
+#: src/skins/ui_manager.c:460
 msgid "Load preset from WinAMP EQF file"
 msgstr "Įkrauti šabloną iš WinAMP EQF failo"
 
-#: src/skins/ui_manager.c:468
+#: src/skins/ui_manager.c:462
 msgid "WinAMP Presets"
 msgstr "WinAMP šablonai"
 
-#: src/skins/ui_manager.c:469
+#: src/skins/ui_manager.c:463
 msgid "Import WinAMP presets"
 msgstr "Importuoti WinAMP šablonus"
 
-#: src/skins/ui_manager.c:472
+#: src/skins/ui_manager.c:466
 msgid "Save preset"
 msgstr "Išsaugoti šablonus"
 
-#: src/skins/ui_manager.c:475
+#: src/skins/ui_manager.c:469
 msgid "Save auto-load preset"
 msgstr "Išsaugoti savaime įsikraunantį šabloną"
 
-#: src/skins/ui_manager.c:478
+#: src/skins/ui_manager.c:472
 msgid "Save default preset"
 msgstr "Išsaugoti numatytąjį šabloną"
 
-#: src/skins/ui_manager.c:480
+#: src/skins/ui_manager.c:474
 msgid "To file"
 msgstr "Į failą"
 
-#: src/skins/ui_manager.c:481
+#: src/skins/ui_manager.c:475
 msgid "Save preset to file"
 msgstr "Išsaugoti šabloną į failą"
 
-#: src/skins/ui_manager.c:483
+#: src/skins/ui_manager.c:477
 msgid "To WinAMP EQF file"
 msgstr "Į WinAMP EQF failą"
 
-#: src/skins/ui_manager.c:484
+#: src/skins/ui_manager.c:478
 msgid "Save preset to WinAMP EQF file"
 msgstr "Išsaugoti šabloną į WinAMP EQF failą"
 
-#: src/skins/ui_manager.c:487
+#: src/skins/ui_manager.c:481
 msgid "Delete preset"
 msgstr "Ištrinti šabloną"
 
-#: src/skins/ui_manager.c:490
+#: src/skins/ui_manager.c:484
 msgid "Delete auto-load preset"
 msgstr "Ištrinti savaime įsikraunantį šabloną"
 
-#: src/skins/ui_playlist.c:245
+#: src/skins/ui_playlist.c:244
 msgid "Search entries in active playlist"
 msgstr "Ieškoti įrašų aktyviame grojaraštyje"
 
-#: src/skins/ui_playlist.c:253
+#: src/skins/ui_playlist.c:252
 msgid ""
-"Select entries in playlist by filling one or more fields. Fields use regular "
-"expressions syntax, case-insensitive. If you don't know how regular "
+"Select entries in playlist by filling one or more fields. Fields use regular"
+" expressions syntax, case-insensitive. If you don't know how regular "
 "expressions work, simply insert a literal portion of what you're searching "
 "for."
 msgstr ""
 "Pasirink įrašus grojaraštyje užpildydamas vieną ar kelis langelius. "
-"Langeliai naudoja regular expressions sintaksę, raidžių lygis nesvarbus. Jei "
-"nežinai kaip veikia regular expressions, paprasčiausiai įrašyk paraidžiui "
+"Langeliai naudoja regular expressions sintaksę, raidžių lygis nesvarbus. Jei"
+" nežinai kaip veikia regular expressions, paprasčiausiai įrašyk paraidžiui "
 "tai ko ieškai."
 
-#: src/skins/ui_playlist.c:261
+#: src/skins/ui_playlist.c:260
 msgid "Title: "
 msgstr "Pavadinimas:"
 
-#: src/skins/ui_playlist.c:268
+#: src/skins/ui_playlist.c:267
 msgid "Album: "
 msgstr "Albumas:"
 
-#: src/skins/ui_playlist.c:275
+#: src/skins/ui_playlist.c:274
 msgid "Artist: "
 msgstr "Atlikėjas:"
 
-#: src/skins/ui_playlist.c:282
+#: src/skins/ui_playlist.c:281
 msgid "Filename: "
 msgstr "Failo vardas:"
 
-#: src/skins/ui_playlist.c:290
+#: src/skins/ui_playlist.c:289
 msgid "Clear previous selection before searching"
 msgstr "Išvalyti buvusius pasirinkimus prieš ieškant"
 
-#: src/skins/ui_playlist.c:293
+#: src/skins/ui_playlist.c:292
 msgid "Automatically toggle queue for matching entries"
-msgstr "Automatiškai perjungti eilę atitinkantiem įrašam"
+msgstr "Automatiškai perjungti eilę atitinkantiems įrašam"
 
-#: src/skins/ui_playlist.c:296
+#: src/skins/ui_playlist.c:295
 msgid "Create a new playlist with matching entries"
 msgstr "Sukuria naują grojaraštį iš surastų įrašų"
 
-#: src/skins/ui_playlist.c:763
+#: src/skins/ui_playlist.c:762
 msgid "Audacious Playlist Editor"
 msgstr "Audacious grojaraščio redaktorius"
 
-#: src/skins/ui_playlist.c:810
+#: src/skins/ui_playlist.c:809
 #, c-format
 msgid "%s (%d of %d)"
-msgstr "%s (%d of %d)"
+msgstr "%s (%d iš %d)"
 
 #: src/skins/ui_skinselector.c:162
 msgid "Archived Winamp 2.x skin"
@@ -3594,105 +3337,59 @@
 msgid "About sndfile plugin"
 msgstr "Apie sndfile įsiepį"
 
-#: src/sndfile/plugin.c:455
-msgid ""
-"Adapted for Audacious usage by Tony Vroon <chainsaw@gentoo.org>\n"
-"from the xmms_sndfile plugin which is:\n"
-"Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
-"\n"
-"This program is free software ; you can redistribute it and/or modify \n"
-"it under the terms of the GNU General Public License as published by \n"
-"the Free Software Foundation ; either version 2 of the License, or \n"
-"(at your option) any later version. \n"
-" \n"
-"This program is distributed in the hope that it will be useful, \n"
-"but WITHOUT ANY WARRANTY ; without even the implied warranty of \n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. \n"
-"See the GNU General Public License for more details. \n"
-"\n"
-"You should have received a copy of the GNU General Public \n"
-"License along with this program ; if not, write to \n"
-"the Free Software Foundation, Inc., \n"
-"51 Franklin Street, Fifth Floor, \n"
-"Boston, MA 02110-1301 USA"
-msgstr ""
-"Adapted for Audacious usage by Tony Vroon <chainsaw@gentoo.org>\n"
-"from the xmms_sndfile plugin which is:\n"
-"Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
-"\n"
-"This program is free software ; you can redistribute it and/or modify \n"
-"it under the terms of the GNU General Public License as published by \n"
-"the Free Software Foundation ; either version 2 of the License, or \n"
-"(at your option) any later version. \n"
-" \n"
-"This program is distributed in the hope that it will be useful, \n"
-"but WITHOUT ANY WARRANTY ; without even the implied warranty of \n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. \n"
-"See the GNU General Public License for more details. \n"
-"\n"
-"You should have received a copy of the GNU General Public \n"
-"License along with this program ; if not, write to \n"
-"the Free Software Foundation, Inc., \n"
-"51 Franklin Street, Fifth Floor, \n"
-"Boston, MA 02110-1301 USA"
-
 #: src/sndstretch/sndstretch_xmms.c:155
 msgid "About SndStretch"
 msgstr "Apie SndStretch"
 
-#: src/sndstretch/sndstretch_xmms.c:313
+#: src/sndstretch/sndstretch_xmms.c:308
 msgid "Volume corr."
 msgstr "Garso taisymas"
 
-#: src/sndstretch/sndstretch_xmms.c:314
+#: src/sndstretch/sndstretch_xmms.c:309
 msgid "Short Overlap"
 msgstr "Trumpas užklojimas"
 
-#: src/sndstretch/sndstretch_xmms.c:360
+#: src/sndstretch/sndstretch_xmms.c:355
 msgid "Speed"
 msgstr "Greitis"
 
-#: src/sndstretch/sndstretch_xmms.c:361
+#: src/sndstretch/sndstretch_xmms.c:356
 msgid "Pitch"
 msgstr "Pikai"
 
-#: src/sndstretch/sndstretch_xmms.c:362
+#: src/sndstretch/sndstretch_xmms.c:357
 msgid "Scale"
 msgstr "Mastas"
 
-#: src/sndstretch/sndstretch_xmms.c:363
-msgid "Options"
-msgstr "Pasirinktys"
-
-#: src/sndstretch/sndstretch_xmms.c:382
+#: src/sndstretch/sndstretch_xmms.c:377
 msgid "SndStretch - Configuration"
 msgstr "SndStretch - Konfiguravimas"
 
-#: src/song_change/song_change.c:464
+#: src/song_change/song_change.c:447
 msgid "Command to run when Audacious starts a new song."
 msgstr "Komanda kurią paleisti kai Audacious paleidžia naują dainą."
 
-#: src/song_change/song_change.c:465 src/song_change/song_change.c:469
-#: src/song_change/song_change.c:473 src/song_change/song_change.c:477
+#: src/song_change/song_change.c:449 src/song_change/song_change.c:455
+#: src/song_change/song_change.c:461 src/song_change/song_change.c:467
 msgid "Command:"
 msgstr "Komanda:"
 
-#: src/song_change/song_change.c:468
+#: src/song_change/song_change.c:453
 msgid "Command to run toward the end of a song."
 msgstr "Komanda kurią paleisti prieš pasibaigiant dainai."
 
-#: src/song_change/song_change.c:472
+#: src/song_change/song_change.c:459
 msgid "Command to run when Audacious reaches the end of the playlist."
 msgstr "Komanda kurią paleisti kai Audacious pasiekia grojaraščio pabaigą."
 
-#: src/song_change/song_change.c:476
+#: src/song_change/song_change.c:465
 msgid ""
 "Command to run when title changes for a song (i.e. network streams titles)."
 msgstr ""
 "Komanda kurią paleisti kai dainos pavadinimas pasikeičia (t.y. interneto "
 "srautų pavadinimai)"
 
-#: src/song_change/song_change.c:480
+#: src/song_change/song_change.c:471
 msgid ""
 "You can use the following format strings which\n"
 "will be substituted before calling the command\n"
@@ -3726,19 +3423,19 @@
 "%b: Albumas\n"
 "%T: Takelio pavadinimas"
 
-#: src/song_change/song_change.c:507
+#: src/song_change/song_change.c:498
 msgid ""
 "Parameters passed to the shell should be encapsulated in "
 "quotes. Doing otherwise is a security risk."
 msgstr ""
-"Parametrai pateikti shell'ui turi būt kabutėse. Darant "
-"kitaip rizikuojate savo saugumu."
+"Parametrai pateikti komandų interpretatoriui turi būt "
+"kabutėse. Darant kitaip rizikuojate savo saugumu."
 
-#: src/song_change/song_change.c:518
+#: src/song_change/song_change.c:509
 msgid "Commands"
 msgstr "Komandos"
 
-#: src/song_change/song_change.c:555
+#: src/song_change/song_change.c:539
 msgid "Song Change"
 msgstr "Dainos keitimas"
 
@@ -3761,7 +3458,7 @@
 "Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
 "Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
 "\n"
-"Šis įskiepis system tray'uje sukuria piktogramą.\n"
+"Šis įskiepis sistemos dėkle sukuria piktogramą.\n"
 
 #: src/statusicon/statusicon.c:447
 msgid "Status Icon Plugin - Preferences"
@@ -3801,9 +3498,9 @@
 
 #: src/statusicon/statusicon.c:512
 msgid "Close to the notification area (system tray)"
-msgstr "Uždaryti į notification area (system tray)"
+msgstr "Uždaryti į pranešimų srity (sistemos dėklą)"
 
-#: src/stereo_plugin/stereo.c:41
+#: src/stereo_plugin/stereo.c:45
 msgid ""
 "Extra Stereo Plugin\n"
 "\n"
@@ -3813,20 +3510,66 @@
 "\n"
 "Kūrė Johan Levin 1999."
 
-#: src/stereo_plugin/stereo.c:65
+#: src/stereo_plugin/stereo.c:64
 msgid "About Extra Stereo Plugin"
 msgstr "Apie Extra Stereo įskiepį"
 
-#: src/stereo_plugin/stereo.c:102
+#: src/stereo_plugin/stereo.c:95
 msgid "Configure Extra Stereo"
-msgstr "Konfiguruoti Extra Stereo"
+msgstr "Konfigūruoti Extra Stereo"
+
+#: src/streambrowser/gui/streambrowser_win.c:78
+msgid "Search:"
+msgstr "Ieškoti:"
+
+#: src/streambrowser/gui/streambrowser_win.c:97
+#: src/streambrowser/gui/streambrowser_win.c:372
+msgid "Add Bookmark"
+msgstr "Pridėti žymą"
+
+#: src/streambrowser/gui/streambrowser_win.c:324
+msgid "Stream name"
+msgstr "Srauto pavadinimas"
+
+#: src/streambrowser/gui/streambrowser_win.c:331
+msgid "Now playing"
+msgstr "Dabar grojama"
+
+#: src/streambrowser/gui/streambrowser_win.c:369
+msgid "Remove Bookmark"
+msgstr "Ištrinti žymą"
+
+#: src/streambrowser/streambrowser.c:330
+msgid "About Stream Browser"
+msgstr "Apie Stream browser"
+
+#: src/streambrowser/streambrowser.c:331
+msgid ""
+"Copyright (c) 2008, by Calin Crisan <ccrisan@gmail.com> and The Audacious Team.\n"
+"\n"
+"This is a simple stream browser that includes the most popular streaming directories.\n"
+"Many thanks to the Streamtuner developers <http://www.nongnu.org/streamtuner>,\n"
+"\tand of course to the whole Audacious community.\n"
+"\n"
+"Also thank you Tony Vroon for mentoring & guiding me, again.\n"
+"\n"
+"This was a Google Summer of Code 2008 project."
+msgstr ""
+"Copyright (c) 2008, by Calin Crisan <ccrisan@gmail.com> and The Audacious Team.\n"
+"\n"
+"This is a simple stream browser that includes the most popular streaming directories.\n"
+"Many thanks to the Streamtuner developers <http://www.nongnu.org/streamtuner>,\n"
+"\tand of course to the whole Audacious community.\n"
+"\n"
+"Also thank you Tony Vroon for mentoring & guiding me, again.\n"
+"\n"
+"This was a Google Summer of Code 2008 project."
 
 #: src/tonegen/tonegen.c:48
 msgid "About Tone Generator"
 msgstr "Apie Tonų Generatorių"
 
 #: src/tonegen/tonegen.c:50
-#, fuzzy
 msgid ""
 "Sinus tone generator by Haavard Kvaalen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
@@ -3838,7 +3581,7 @@
 "Patobulino Daniel J. Peng <danielpeng@bigfoot.com>\n"
 "\n"
 "Norint naudot pridėk URL: tone://frequency1;frequency2;frequency3;...\n"
-"pvz. tone://2000;2005 norint grot 2000 Hz toną ir 2005 Hz toną"
+"pvz. tone://2000;2005 norint grot 2000Hz toną ir 2005Hz toną"
 
 #: src/tonegen/tonegen.c:100
 #, c-format
@@ -3853,27 +3596,11 @@
 msgid "About File I/O Plugin"
 msgstr "Apie File I/O įskiepį"
 
-#: src/vorbis/configure.c:31
-msgid "Override generic titles"
-msgstr "Perrašyt bendrus pavadinimus"
-
-#: src/vorbis/configure.c:32
-msgid "Title format:"
-msgstr "Pavadinimo formatas:"
-
-#: src/vorbis/configure.c:36
-msgid "Ogg Vorbis Tags"
-msgstr "Ogg Vorbis žymos"
-
-#: src/vorbis/configure.c:69
-msgid "Ogg Vorbis Audio Plugin Configuration"
-msgstr "Ogg Vorbis Audio įskiepio konfiguracija"
-
-#: src/vorbis/vorbis.c:581
+#: src/vorbis/vorbis.c:572
 msgid "About Ogg Vorbis Audio Plugin"
 msgstr "Apie Ogg Vorbis Audio įskiepį"
 
-#: src/vorbis/vorbis.c:586
+#: src/vorbis/vorbis.c:577
 msgid ""
 "Ogg Vorbis Plugin by the Xiph.org Foundation\n"
 "\n"
@@ -3914,8 +3641,7 @@
 #: src/vtx/about.c:15
 msgid ""
 "Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
-"Founded on original source in_vtx.dll by Roman Sherbakov <v_soft@microfor."
-"ru>\n"
+"Founded on original source in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
 "\n"
 "Music in vtx format can be found at http://vtx.microfor.ru/music.htm\n"
 "and other AY/YM music sites.\n"
@@ -3923,8 +3649,7 @@
 "Audacious implementation by Pavel Vymetalek <pvymetalek@seznam.cz>"
 msgstr ""
 "Vortex formato grotuvą kūrė Sashnov Alexander <sashnov@ngs.ru>\n"
-"Sukurtas remiantis kodu rastu _vtx.dll kurį kūrė Roman Sherbakov "
-"<v_soft@microfor.ru>\n"
+"Sukurtas remiantis kodu rastu _vtx.dll kurį kūrė Roman Sherbakov <v_soft@microfor.ru>\n"
 "\n"
 "Muzikos vtx formatu galim rast http://vtx.microfor.ru/music.htm\n"
 "ir kitose AY/YM muzikos svetainėse.\n"
@@ -3948,5 +3673,4 @@
 "Dalį įskiepio sukūrė Miles Egan\n"
 "Aplankykite Wavpack puslapį http://www.wavpack.com/\n"
 
-#~ msgid "( Hz)"
-#~ msgstr "( Hz)"
+

audacious-plugins-3.0.3.tar.bz2/po/lv.po -> audacious-plugins-3.1.tar.bz2/po/lv.po Changed

@@ -6,8 +6,8 @@
 msgstr ""
 "Project-Id-Version: audacious-plugins2_22062009\n"
 "Report-Msgid-Bugs-To: http://jira.atheme.org/\n"
-"POT-Creation-Date: 2011-09-18 14:13-0400\n"
-"PO-Revision-Date: 2011-06-27 04:01+0300\n"
+"POT-Creation-Date: 2011-07-17 18:49-0400\n"
+"PO-Revision-Date: 2011-10-30 16:53+0200\n"
 "Last-Translator: Einars Sprugis <einars8@gmail.com>\n"
 "Language-Team: Latvian <kde-i18n-doc@kde.org>\n"
 "Language: lv\n"
@@ -1029,8 +1029,8 @@
 msgid "Volume: (%)"
 msgstr "Skaļums: (%)"
 
-#: src/ffaudio/ffaudio-core.c:789
-#, fuzzy, c-format
+#: src/ffaudio/ffaudio-core.c:763
+#, c-format
 msgid ""
 "Multi-format audio decoding plugin for Audacious based on\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1048,13 +1048,15 @@
 "FFmpeg multivides karkasu (http://www.ffmpeg.org/)\n"
 "Autortiesības (c) 2000-2009 Fabrice Bellard, u.c.\n"
 "\n"
-"FFmpeg libavformat %d.%d.%d, libavcodec %d.%d.%d\n"
-"\n"
 "Audacious spraudņa autori:\n"
 " William Pitcock <nenolod@nenolod.net>,\n"
 " Matti Hämäläinen <ccr@tnsp.org>\n"
+"\n"
+"libavcodec %s (%s)\n"
+"libavformat %s (%s)\n"
+"libavutil %s (%s)\n"
 
-#: src/ffaudio/ffaudio-core.c:803
+#: src/ffaudio/ffaudio-core.c:777
 msgid "About FFaudio Plugin"
 msgstr "Par FFaudio spraudni"
 
@@ -1753,14 +1755,12 @@
 msgstr "Parādīt uz-ekrāna-attēlu"
 
 #: src/hotkey/gui.c:84
-#, fuzzy
 msgid "Toggle Repeat"
-msgstr "Atkārtot"
+msgstr "Pārslēgt atkārtošanu"
 
 #: src/hotkey/gui.c:85
-#, fuzzy
 msgid "Toggle Shuffle"
-msgstr "Jaukt"
+msgstr "Pārslēgt jaukšanu"
 
 #: src/hotkey/gui.c:95
 msgid "(none)"
@@ -1889,12 +1889,16 @@
 "\n"
 "Looking for lyrics..."
 msgstr ""
+"\n"
+"Meklē dziesmas vārdus..."
 
 #: src/lyricwiki/lyricwiki.c:249
 msgid ""
 "\n"
 "Connecting to lyrics.wikia.com..."
 msgstr ""
+"\n"
+"Pieslēdzas lyrics.wikia.com..."
 
 #: src/lyricwiki/lyricwiki.c:337
 msgid ""
@@ -1949,14 +1953,12 @@
 msgstr "Atvienot MTP ierīci"
 
 #: src/notify/libnotify-aosd_event.c:47
-#, fuzzy
 msgid "Stopped"
-msgstr "Stop"
+msgstr "Apturēts"
 
 #: src/notify/libnotify-aosd_event.c:47
-#, fuzzy
 msgid "Audacious is not playing."
-msgstr "Audacious - redzamības brīdinājums"
+msgstr "Audacious pašreiz neatskaņo."
 
 #: src/null/null.c:64
 msgid "Null output plugin "
@@ -2925,11 +2927,11 @@
 
 #: src/skins/skins_cfg.c:261
 msgid "Use bitmap fonts (supports ASCII only)"
-msgstr ""
+msgstr "Lietot bitmap fontus (atbalsta tikai ASCII)"
 
 #: src/skins/skins_cfg.c:263
 msgid "Scroll song title in both directions"
-msgstr ""
+msgstr "Ritināt dziesmas nosaukumu abos virzienos"
 
 #: src/skins/skins_cfg.c:346
 msgid "_Skin"
@@ -3700,11 +3702,11 @@
 msgid "Delete auto-load preset"
 msgstr "Dzēst auto-ielādes sākumuzstādījumu"
 
-#: src/skins/ui_playlist.c:245
+#: src/skins/ui_playlist.c:244
 msgid "Search entries in active playlist"
 msgstr "Meklēt ierakstus aktīvajā repertuārā"
 
-#: src/skins/ui_playlist.c:253
+#: src/skins/ui_playlist.c:252
 msgid ""
 "Select entries in playlist by filling one or more fields. Fields use regular "
 "expressions syntax, case-insensitive. If you don't know how regular "
@@ -3715,39 +3717,39 @@
 "jāizmanto regulāro izteiksmju sintakse, reģistrnejutīga. Ja neziniet, kā "
 "regulārās izteiksmes darbojas, vienkārši nosaukuma daļu tam, ko meklējat."
 
-#: src/skins/ui_playlist.c:261
+#: src/skins/ui_playlist.c:260
 msgid "Title: "
 msgstr "Nosaukums: "
 
-#: src/skins/ui_playlist.c:268
+#: src/skins/ui_playlist.c:267
 msgid "Album: "
 msgstr "Albums: "
 
-#: src/skins/ui_playlist.c:275
+#: src/skins/ui_playlist.c:274
 msgid "Artist: "
 msgstr "Izpildītājs: "
 
-#: src/skins/ui_playlist.c:282
+#: src/skins/ui_playlist.c:281
 msgid "Filename: "
 msgstr "Faila nosaukums: "
 
-#: src/skins/ui_playlist.c:290
+#: src/skins/ui_playlist.c:289
 msgid "Clear previous selection before searching"
 msgstr "Notīrīt iepriekšējo iezīmējumu pirms meklēšanas"
 
-#: src/skins/ui_playlist.c:293
+#: src/skins/ui_playlist.c:292
 msgid "Automatically toggle queue for matching entries"
 msgstr "Automātiski pārslēgt ierindošanu atbilstošajiem ierakstiem"
 
-#: src/skins/ui_playlist.c:296
+#: src/skins/ui_playlist.c:295
 msgid "Create a new playlist with matching entries"
 msgstr "Izveidot jaunu repertuāru no atbilstošajiem ierakstiem"
 
-#: src/skins/ui_playlist.c:763
+#: src/skins/ui_playlist.c:762
 msgid "Audacious Playlist Editor"
 msgstr "Audacious repertuāra redaktors"
 
-#: src/skins/ui_playlist.c:810
+#: src/skins/ui_playlist.c:809
 #, c-format
 msgid "%s (%d of %d)"
 msgstr "%s (%d of %d)"
@@ -3765,11 +3767,11 @@
 msgid "Could not create directory (%s): %s\n"
 msgstr "Neizdevās izveidot mapi (%s): %s\n"
 
-#: src/sndfile/plugin.c:454
+#: src/sndfile/plugin.c:438
 msgid "About sndfile plugin"
 msgstr "Par sndfile spraudni"
 
-#: src/sndfile/plugin.c:455
+#: src/sndfile/plugin.c:439
 msgid ""
 "Adapted for Audacious usage by Tony Vroon <chainsaw@gentoo.org>\n"
 "from the xmms_sndfile plugin which is:\n"

audacious-plugins-3.0.3.tar.bz2/po/pl.po -> audacious-plugins-3.1.tar.bz2/po/pl.po Changed

@@ -8,14 +8,15 @@
 msgstr ""
 "Project-Id-Version: Audacious Plugins\n"
 "Report-Msgid-Bugs-To: http://jira.atheme.org/\n"
-"POT-Creation-Date: 2011-09-18 14:13-0400\n"
-"PO-Revision-Date: 2011-05-22 12:08+0200\n"
+"POT-Creation-Date: 2011-07-17 18:49-0400\n"
+"PO-Revision-Date: 2011-09-20 00:54+0200\n"
 "Last-Translator: Szymon Weihs <sz.weihs@gmail.com>\n"
 "Language-Team: \n"
-"Language: \n"
+"Language: Polish/Polski\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #: src/aac/libmp4.c:256
 #, c-format
@@ -1028,8 +1029,8 @@
 msgid "Volume: (%)"
 msgstr "Głośność: (%)"
 
-#: src/ffaudio/ffaudio-core.c:789
-#, fuzzy, c-format
+#: src/ffaudio/ffaudio-core.c:763
+#, c-format
 msgid ""
 "Multi-format audio decoding plugin for Audacious based on\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1047,13 +1048,15 @@
 "Oparta na framework'u multimedialnym FFmpeg (http://www.ffmpeg.org/)\n"
 "Copyright (c) 2000-2009 Fabrice Bellard, et al.\n"
 "\n"
-"FFmpeg libavformat %d.%d.%d, libavcodec %d.%d.%d\n"
-"\n"
 "Wtyczka dla Audacious napisana prez:\n"
 " William Pitcock <nenolod@nenolod.net>,\n"
 " Matti Hämäläinen <ccr@tnsp.org>\n"
+"\n"
+"libavcodec %s (%s)\n"
+"libavformat %s (%s)\n"
+"libavutil %s (%s)\n"
 
-#: src/ffaudio/ffaudio-core.c:803
+#: src/ffaudio/ffaudio-core.c:777
 msgid "About FFaudio Plugin"
 msgstr "O wtyczce FFaudio"
 
@@ -1432,285 +1435,236 @@
 msgstr "Wyłącz"
 
 #: src/gtkui/menus.c:132
-#, fuzzy
 msgid "_Open Files ..."
-msgstr "Otwórz pliki ..."
+msgstr "_Otwórz pliki ..."
 
 #: src/gtkui/menus.c:133
-#, fuzzy
 msgid "Open _URL ..."
-msgstr "Otwórz URL ..."
+msgstr "Otwórz _URL ..."
 
 #: src/gtkui/menus.c:134
-#, fuzzy
 msgid "_Add File ..."
-msgstr "Dodaj pliki ..."
+msgstr "_Dodaj pliki ..."
 
 #: src/gtkui/menus.c:135
-#, fuzzy
 msgid "Add U_RL ..."
-msgstr "Dodaj URL ..."
+msgstr "Dodaj U_RL ..."
 
 #: src/gtkui/menus.c:137
-#, fuzzy
 msgid "A_bout ..."
-msgstr "O programie"
+msgstr "O _programie ..."
 
 #: src/gtkui/menus.c:138
-#, fuzzy
 msgid "_Preferences ..."
-msgstr "Ustawienia"
+msgstr "U_stawienia ..."
 
 #: src/gtkui/menus.c:139 src/skins/ui_manager.c:412
 msgid "_Quit"
 msgstr "_Zamknij"
 
 #: src/gtkui/menus.c:142
-#, fuzzy
 msgid "_Play"
-msgstr "Odtwarzaj"
+msgstr "_Odtwarzaj"
 
 #: src/gtkui/menus.c:143
-#, fuzzy
 msgid "Paus_e"
-msgstr "Pauza"
+msgstr "_Pauza"
 
 #: src/gtkui/menus.c:144
-#, fuzzy
 msgid "_Stop"
-msgstr "Stop"
+msgstr "_Stop"
 
 #: src/gtkui/menus.c:145
-#, fuzzy
 msgid "Pre_vious"
-msgstr "Poprzedni"
+msgstr "Pop_rzedni"
 
 #: src/gtkui/menus.c:146
-#, fuzzy
 msgid "_Next"
-msgstr "Następny"
+msgstr "_Następny"
 
 #: src/gtkui/menus.c:148
-#, fuzzy
 msgid "_Repeat"
-msgstr "Powtarzaj"
+msgstr "Po_wtarzaj"
 
 #: src/gtkui/menus.c:149
-#, fuzzy
 msgid "S_huffle"
-msgstr "Losuj"
+msgstr "_Losuj"
 
 #: src/gtkui/menus.c:150
-#, fuzzy
 msgid "N_o Playlist Advance"
-msgstr "Odtwarzaj pojedynczo"
+msgstr "O_dtwarzaj pojedynczo"
 
 #: src/gtkui/menus.c:151
-#, fuzzy
 msgid "Stop _After This Song"
-msgstr "Zatrzymaj po tym utworze."
+msgstr "_Zatrzymaj po tym utworze."
 
 #: src/gtkui/menus.c:153 src/gtkui/menus.c:210
 msgid "Song _Info ..."
-msgstr ""
+msgstr "_Info o utworze ..."
 
 #: src/gtkui/menus.c:154
-#, fuzzy
 msgid "Jump to _Time ..."
-msgstr "Przeskocz do czasu"
+msgstr "Przeskocz do _czasu ..."
 
 #: src/gtkui/menus.c:155
 msgid "_Jump to Song ..."
-msgstr ""
+msgstr "Przeskocz do _utworu ..."
 
 #: src/gtkui/menus.c:158
-#, fuzzy
 msgid "By Track _Number"
-msgstr "Numer utworu"
+msgstr "_Numer utworu"
 
 #: src/gtkui/menus.c:159
-#, fuzzy
 msgid "By _Title"
-msgstr "Tytuł"
+msgstr "_Tytuł"
 
 #: src/gtkui/menus.c:160
-#, fuzzy
 msgid "By _Artist"
-msgstr "Wykonawca"
+msgstr "_Wykonawca"
 
 #: src/gtkui/menus.c:161
-#, fuzzy
 msgid "By A_lbum"
-msgstr "Album"
+msgstr "_Album"
 
 #: src/gtkui/menus.c:162
-#, fuzzy
 msgid "By Release _Date"
-msgstr "Data premiery"
+msgstr "_Data premiery"
 
 #: src/gtkui/menus.c:163
-#, fuzzy
 msgid "By _File Path"
-msgstr "Położenie pliku"
+msgstr "_Położenie pliku"
 
 #: src/gtkui/menus.c:164
-#, fuzzy
 msgid "By _Custom Title"
-msgstr "Własny tytuł (z ustawień)"
+msgstr "Wła_sny tytuł"
 
 #: src/gtkui/menus.c:166
-#, fuzzy
 msgid "R_everse Order"
-msgstr "Odwróć kolejność"
+msgstr "_Odwróć kolejność"
 
 #: src/gtkui/menus.c:167
-#, fuzzy
 msgid "_Random Order"
-msgstr "Losowa kolejność"
+msgstr "_Losowa kolejność"
 
 #: src/gtkui/menus.c:170 src/gtkui/menus.c:212
 msgid "_Refresh"
 msgstr "_Odśwież"
 
 #: src/gtkui/menus.c:172
-#, fuzzy
 msgid "_Sort"
-msgstr "Sortuj"
+msgstr "_Sortuj"
 
 #: src/gtkui/menus.c:174
 msgid "_New"
-msgstr ""
+msgstr "_Nowa"
 
 #: src/gtkui/menus.c:175
 msgid "_Close"
 msgstr "_Zamknij"
 
 #: src/gtkui/menus.c:177
-#, fuzzy
 msgid "_Import ..."
-msgstr "Importuj"
+msgstr "_Importuj"
 
 #: src/gtkui/menus.c:178
-#, fuzzy
 msgid "_Export ..."
-msgstr "Eksportuj"
+msgstr "_Eksportuj"
 
 #: src/gtkui/menus.c:180
-#, fuzzy
 msgid "_Playlist Manager ..."
-msgstr "Menedżer playlist"
+msgstr "_Menedżer playlist ..."
 
 #: src/gtkui/menus.c:183
-#, fuzzy
 msgid "Volume _Up"
-msgstr "Zwiększ głośność"
+msgstr "_Zwiększ głośność"
 
 #: src/gtkui/menus.c:184
-#, fuzzy
 msgid "Volume _Down"
-msgstr "Zmniejsz głośność"
+msgstr "Z_mniejsz głośność"
 
 #: src/gtkui/menus.c:186
-#, fuzzy
 msgid "_Equalizer"
-msgstr "Korektor graficzny"
+msgstr "_Korektor graficzny"
 
 #: src/gtkui/menus.c:188
-#, fuzzy
 msgid "E_ffects"
-msgstr "Efekty"
+msgstr "_Efekty"
 
 #: src/gtkui/menus.c:191
-#, fuzzy
 msgid "_Interface"
-msgstr "Interfejs"
+msgstr "_Interfejs"
 
 #: src/gtkui/menus.c:193
 msgid "Show _Menu Bar"
-msgstr ""
+msgstr "Pokaż pasek _menu"
 
 #: src/gtkui/menus.c:194
-#, fuzzy
 msgid "Show I_nfo Bar"
-msgstr "Pokaż obszar informacji"
+msgstr "Pokaż _obszar informacji"
 
 #: src/gtkui/menus.c:195
-#, fuzzy
 msgid "Show _Status Bar"
-msgstr "Pokaż pasek stanu"
+msgstr "Pokaż pasek _stanu"
 
 #: src/gtkui/menus.c:197
-#, fuzzy
 msgid "Show Column _Headers"
-msgstr "Pokaż nagłówki kolumn"
+msgstr "Pokaż _nagłówki kolumn"
 
 #: src/gtkui/menus.c:198
-#, fuzzy
 msgid "Choose _Columns ..."
-msgstr "Wybierz kolumny ..."
+msgstr "Wybierz _kolumny ..."
 
 #: src/gtkui/menus.c:199
-#, fuzzy
 msgid "Scrol_l on Song Change"
-msgstr "Przewijaj przy zmianie utworu"
+msgstr "_Przewijaj przy zmianie utworu"
 
 #: src/gtkui/menus.c:202
-#, fuzzy
 msgid "_File"
-msgstr "Plik"
+msgstr "_Plik"
 
 #: src/gtkui/menus.c:203
-#, fuzzy
 msgid "_Playback"
-msgstr "Odtwarzanie"
+msgstr "_Odtwarzanie"
 
 #: src/gtkui/menus.c:204
-#, fuzzy
 msgid "P_laylist"
-msgstr "Playlista"
+msgstr "P_laylista"
 
 #: src/gtkui/menus.c:205 src/gtkui/menus.c:219
-#, fuzzy
 msgid "_Services"
-msgstr "Urządzenia"
+msgstr "W_tyczki"
 
 #: src/gtkui/menus.c:206
-#, fuzzy
 msgid "_Output"
-msgstr "Dźwięk"
+msgstr "_Dźwięk"
 
 #: src/gtkui/menus.c:207
-#, fuzzy
 msgid "_View"
-msgstr "Widok"
+msgstr "_Widok"
 
 #: src/gtkui/menus.c:211
 msgid "_Queue/Unqueue"
-msgstr ""
+msgstr "_Przełącz kolejkę"
 
 #: src/gtkui/menus.c:214
 msgid "Cu_t"
-msgstr ""
+msgstr "_Wytnij"
 
 #: src/gtkui/menus.c:215
-#, fuzzy
 msgid "_Copy"
-msgstr "Kopiuj"
+msgstr "_Kopiuj"
 
 #: src/gtkui/menus.c:216
-#, fuzzy
 msgid "_Paste"
-msgstr "Wklej"
+msgstr "Wk_lej"
 
 #: src/gtkui/menus.c:217
-#, fuzzy
 msgid "Select _All"
-msgstr "Zaznacz wszystko"
+msgstr "_Zaznacz wszystko"
 
 #: src/gtkui/menus.c:222
-#, fuzzy
 msgid "_Rename"
-msgstr "Nazwa pliku"
+msgstr "_Zmień nazwę"
 
 #: src/gtkui/ui_gtk.c:75
 msgid "GTK Interface"
@@ -1738,16 +1692,17 @@
 msgstr "stereo"
 
 #: src/gtkui/ui_statusbar.c:106
-#, fuzzy, c-format
+#, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
-msgstr[0] "%d kanały"
+msgstr[0] "%d kanał"
 msgstr[1] "%d kanały"
+msgstr[2] "%d kanałów"
 
 #: src/gtkui/ui_statusbar.c:121
-#, fuzzy, c-format
+#, c-format
 msgid "%d kbps"
-msgstr "kbps"
+msgstr "%d kbps"
 
 #: src/hotkey/gui.c:71
 msgid "Previous Track"
@@ -1802,14 +1757,12 @@
 msgstr "Pokaż OSD"
 
 #: src/hotkey/gui.c:84
-#, fuzzy
 msgid "Toggle Repeat"
-msgstr "Powtarzaj"
+msgstr "Przełącz powtarzanie"
 
 #: src/hotkey/gui.c:85
-#, fuzzy
 msgid "Toggle Shuffle"
-msgstr "Losuj"
+msgstr "Przełącz losowanie"
 
 #: src/hotkey/gui.c:95
 msgid "(none)"
@@ -1939,12 +1892,16 @@
 "\n"
 "Looking for lyrics..."
 msgstr ""
+"\n"
+"Szukanie tekstu..."
 
 #: src/lyricwiki/lyricwiki.c:249
 msgid ""
 "\n"
 "Connecting to lyrics.wikia.com..."
 msgstr ""
+"\n"
+"Łączenie z lyrics.wikia.com..."
 
 #: src/lyricwiki/lyricwiki.c:337
 msgid ""
@@ -1992,22 +1949,19 @@
 
 #: src/mtp_up/mtp.c:310
 msgid "Upload to MTP Device"
-msgstr ""
+msgstr "Wgraj do urządzenia MTP"
 
 #: src/mtp_up/mtp.c:311
-#, fuzzy
 msgid "Disconnect MTP Device"
-msgstr "Rozłącz urządzenie"
+msgstr "Rozłącz urządzenie MTP"
 
 #: src/notify/libnotify-aosd_event.c:47
-#, fuzzy
 msgid "Stopped"
-msgstr "Stop"
+msgstr "Zatrzymany"
 
 #: src/notify/libnotify-aosd_event.c:47
-#, fuzzy
 msgid "Audacious is not playing."
-msgstr "Audacious - ostrzeżenie o widoczności"
+msgstr "Audacious nie odtwarza."
 
 #: src/null/null.c:64
 msgid "Null output plugin "
@@ -2985,20 +2939,19 @@
 
 #: src/skins/skins_cfg.c:261
 msgid "Use bitmap fonts (supports ASCII only)"
-msgstr ""
+msgstr "Użyj bitmapowych czcionek (tylko dla ASCII)"
 
 #: src/skins/skins_cfg.c:263
 msgid "Scroll song title in both directions"
-msgstr ""
+msgstr "Przewijaj tytuł piosenki w obydwu kierunkach"
 
 #: src/skins/skins_cfg.c:346
 msgid "_Skin"
 msgstr "_Skórka"
 
 #: src/skins/skins_cfg.c:393
-#, fuzzy
 msgid "Interface Preferences"
-msgstr "Konfiguracja Crossfade"
+msgstr "Preferencje interfejsu"
 
 #: src/skins/ui_equalizer.c:330
 msgid "Preamp"
@@ -3065,9 +3018,9 @@
 msgstr "surround"
 
 #: src/skins/ui_main.c:807
-#, fuzzy, c-format
+#, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
-msgstr "Skocz do: %d:%-2.2d/%d:%-2.2d (%d%%)"
+msgstr "Skocz do: %d:%-2.2d / %d:%-2.2d"
 
 #: src/skins/ui_main.c:828
 #, c-format
@@ -3382,9 +3335,8 @@
 msgstr "Interfejs"
 
 #: src/skins/ui_manager.c:245
-#, fuzzy
 msgid "Interface Preferences ..."
-msgstr "Konfiguracja Crossfade"
+msgstr "Preferencje interfejsu ..."
 
 #: src/skins/ui_manager.c:249
 msgid "Add Internet Address..."
@@ -3762,11 +3714,11 @@
 msgid "Delete auto-load preset"
 msgstr "Usuń auto-ładowane ustawienia"
 
-#: src/skins/ui_playlist.c:245
+#: src/skins/ui_playlist.c:244
 msgid "Search entries in active playlist"
 msgstr "Wyszukaj wpisy w aktywnej playliście"
 
-#: src/skins/ui_playlist.c:253
+#: src/skins/ui_playlist.c:252
 msgid ""
 "Select entries in playlist by filling one or more fields. Fields use regular "
 "expressions syntax, case-insensitive. If you don't know how regular "
@@ -3778,39 +3730,39 @@
 "Jeśli nie wiesz, jak działają wyrażenia regularne, po prostu wstawiaj części "
 "wyrazów tego, czego szukasz."
 
-#: src/skins/ui_playlist.c:261
+#: src/skins/ui_playlist.c:260
 msgid "Title: "
 msgstr "Tytuł: "
 
-#: src/skins/ui_playlist.c:268
+#: src/skins/ui_playlist.c:267
 msgid "Album: "
 msgstr "Album:"
 
-#: src/skins/ui_playlist.c:275
+#: src/skins/ui_playlist.c:274
 msgid "Artist: "
 msgstr "Artysta:"
 
-#: src/skins/ui_playlist.c:282
+#: src/skins/ui_playlist.c:281
 msgid "Filename: "
 msgstr "Nazwa pliku:"
 
-#: src/skins/ui_playlist.c:290
+#: src/skins/ui_playlist.c:289
 msgid "Clear previous selection before searching"
 msgstr "Wyczyść poprzednie zaznaczenie przed szukaniem"
 
-#: src/skins/ui_playlist.c:293
+#: src/skins/ui_playlist.c:292
 msgid "Automatically toggle queue for matching entries"
 msgstr "Automatycznie przełącz kolejkę dla pasujących wpisów"
 
-#: src/skins/ui_playlist.c:296
+#: src/skins/ui_playlist.c:295
 msgid "Create a new playlist with matching entries"
 msgstr "Utwórz nową playlistę z pasującymi wpisami"
 
-#: src/skins/ui_playlist.c:763
+#: src/skins/ui_playlist.c:762
 msgid "Audacious Playlist Editor"
 msgstr "Edytor playlisty Audacious"
 
-#: src/skins/ui_playlist.c:810
+#: src/skins/ui_playlist.c:809
 #, c-format
 msgid "%s (%d of %d)"
 msgstr "%s (%d z %d)"
@@ -3828,11 +3780,11 @@
 msgid "Could not create directory (%s): %s\n"
 msgstr "Nie można utworzyć katalogu (%s): %s\n"
 
-#: src/sndfile/plugin.c:454
+#: src/sndfile/plugin.c:438
 msgid "About sndfile plugin"
 msgstr "O wtyczce sndfile"
 
-#: src/sndfile/plugin.c:455
+#: src/sndfile/plugin.c:439
 msgid ""
 "Adapted for Audacious usage by Tony Vroon <chainsaw@gentoo.org>\n"
 "from the xmms_sndfile plugin which is:\n"
@@ -4089,9 +4041,8 @@
 msgstr "Generator sygnałów: "
 
 #: src/unix-io/gtk.c:34
-#, fuzzy
 msgid "About File I/O Plugin"
-msgstr "O wtyczce OSS4"
+msgstr "O wtyczce File I/O"
 
 #: src/vorbis/configure.c:31
 msgid "Override generic titles"

audacious-plugins-3.0.3.tar.bz2/po/ro.po -> audacious-plugins-3.1.tar.bz2/po/ro.po Changed

@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: audacious-plugins 1.4.0\n"
 "Report-Msgid-Bugs-To: http://jira.atheme.org/\n"
-"POT-Creation-Date: 2011-09-18 14:13-0400\n"
+"POT-Creation-Date: 2011-07-17 18:49-0400\n"
 "PO-Revision-Date: 2007-08-28 20:44+0200\n"
 "Last-Translator: Daniel Patriche <m4st3rth0r@gmail.com>\n"
 "Language-Team: Romanian <audacious@atheme.org>\n"
@@ -1038,7 +1038,7 @@
 msgid "Volume: (%)"
 msgstr "Volum: %d%%"
 
-#: src/ffaudio/ffaudio-core.c:789
+#: src/ffaudio/ffaudio-core.c:763
 #, c-format
 msgid ""
 "Multi-format audio decoding plugin for Audacious based on\n"
@@ -1054,7 +1054,7 @@
 "libavutil %s (%s)\n"
 msgstr ""
 
-#: src/ffaudio/ffaudio-core.c:803
+#: src/ffaudio/ffaudio-core.c:777
 #, fuzzy
 msgid "About FFaudio Plugin"
 msgstr "Despre plugin-ul·Apple·Lossless·Audio"
@@ -3801,11 +3801,11 @@
 msgid "Delete auto-load preset"
 msgstr ""
 
-#: src/skins/ui_playlist.c:245
+#: src/skins/ui_playlist.c:244
 msgid "Search entries in active playlist"
 msgstr ""
 
-#: src/skins/ui_playlist.c:253
+#: src/skins/ui_playlist.c:252
 msgid ""
 "Select entries in playlist by filling one or more fields. Fields use regular "
 "expressions syntax, case-insensitive. If you don't know how regular "
@@ -3813,43 +3813,43 @@
 "for."
 msgstr ""
 
-#: src/skins/ui_playlist.c:261
+#: src/skins/ui_playlist.c:260
 msgid "Title: "
 msgstr "Titlu: "
 
-#: src/skins/ui_playlist.c:268
+#: src/skins/ui_playlist.c:267
 #, fuzzy
 msgid "Album: "
 msgstr "Album"
 
-#: src/skins/ui_playlist.c:275
+#: src/skins/ui_playlist.c:274
 #, fuzzy
 msgid "Artist: "
 msgstr "Artist"
 
-#: src/skins/ui_playlist.c:282
+#: src/skins/ui_playlist.c:281
 #, fuzzy
 msgid "Filename: "
 msgstr "Fișier:"
 
-#: src/skins/ui_playlist.c:290
+#: src/skins/ui_playlist.c:289
 msgid "Clear previous selection before searching"
 msgstr ""
 
-#: src/skins/ui_playlist.c:293
+#: src/skins/ui_playlist.c:292
 msgid "Automatically toggle queue for matching entries"
 msgstr ""
 
-#: src/skins/ui_playlist.c:296
+#: src/skins/ui_playlist.c:295
 msgid "Create a new playlist with matching entries"
 msgstr ""
 
-#: src/skins/ui_playlist.c:763
+#: src/skins/ui_playlist.c:762
 #, fuzzy
 msgid "Audacious Playlist Editor"
 msgstr "AdPlug·::·Informații despre fișier"
 
-#: src/skins/ui_playlist.c:810
+#: src/skins/ui_playlist.c:809
 #, c-format
 msgid "%s (%d of %d)"
 msgstr ""
@@ -3867,12 +3867,12 @@
 msgid "Could not create directory (%s): %s\n"
 msgstr "Nu s-a putut crea directorul (%s): %s\n"
 
-#: src/sndfile/plugin.c:454
+#: src/sndfile/plugin.c:438
 #, fuzzy
 msgid "About sndfile plugin"
 msgstr "Lista plugin-urilor _Generale"
 
-#: src/sndfile/plugin.c:455
+#: src/sndfile/plugin.c:439
 msgid ""
 "Adapted for Audacious usage by Tony Vroon <chainsaw@gentoo.org>\n"
 "from the xmms_sndfile plugin which is:\n"

audacious-plugins-3.0.3.tar.bz2/po/ru.po -> audacious-plugins-3.1.tar.bz2/po/ru.po Changed

@@ -12,7 +12,7 @@
 msgstr ""
 "Project-Id-Version: audacious-plugins 1.5\n"
 "Report-Msgid-Bugs-To: http://jira.atheme.org/\n"
-"POT-Creation-Date: 2011-09-18 14:13-0400\n"
+"POT-Creation-Date: 2011-07-17 18:49-0400\n"
 "PO-Revision-Date: 2010-08-22 22:00+0400\n"
 "Last-Translator: Sergey V. Mironov <sergo@bk.ru>\n"
 "Language-Team: Russian <kde-russian@lists.kde.ru>\n"
@@ -1047,7 +1047,7 @@
 msgid "Volume: (%)"
 msgstr "Громкость (%):"
 
-#: src/ffaudio/ffaudio-core.c:789
+#: src/ffaudio/ffaudio-core.c:763
 #, fuzzy, c-format
 msgid ""
 "Multi-format audio decoding plugin for Audacious based on\n"
@@ -1072,7 +1072,7 @@
 " William Pitcock <nenolod@nenolod.net>,\n"
 " Matti Hämäläinen <ccr@tnsp.org>\n"
 
-#: src/ffaudio/ffaudio-core.c:803
+#: src/ffaudio/ffaudio-core.c:777
 msgid "About FFaudio Plugin"
 msgstr "О модуле FFaudio"
 
@@ -3819,11 +3819,11 @@
 msgid "Delete auto-load preset"
 msgstr "Удалить автозагружаемую предустановку"
 
-#: src/skins/ui_playlist.c:245
+#: src/skins/ui_playlist.c:244
 msgid "Search entries in active playlist"
 msgstr "Поиск записей в активном списке воспроизведения"
 
-#: src/skins/ui_playlist.c:253
+#: src/skins/ui_playlist.c:252
 msgid ""
 "Select entries in playlist by filling one or more fields. Fields use regular "
 "expressions syntax, case-insensitive. If you don't know how regular "
@@ -3835,39 +3835,39 @@
 "чувствительное к регистру. Если вы не знаете, как работают регулярные "
 "выражения, просто вставьте часть букв из слова, которые хотите найти."
 
-#: src/skins/ui_playlist.c:261
+#: src/skins/ui_playlist.c:260
 msgid "Title: "
 msgstr "Название: "
 
-#: src/skins/ui_playlist.c:268
+#: src/skins/ui_playlist.c:267
 msgid "Album: "
 msgstr "Альбом: "
 
-#: src/skins/ui_playlist.c:275
+#: src/skins/ui_playlist.c:274
 msgid "Artist: "
 msgstr "Исполнитель: "
 
-#: src/skins/ui_playlist.c:282
+#: src/skins/ui_playlist.c:281
 msgid "Filename: "
 msgstr "Имя файла: "
 
-#: src/skins/ui_playlist.c:290
+#: src/skins/ui_playlist.c:289
 msgid "Clear previous selection before searching"
 msgstr "Очистить предыдущий выбор до начала поиска"
 
-#: src/skins/ui_playlist.c:293
+#: src/skins/ui_playlist.c:292
 msgid "Automatically toggle queue for matching entries"
 msgstr "Автоматически переключать поочерёдно на соответствующим записям"
 
-#: src/skins/ui_playlist.c:296
+#: src/skins/ui_playlist.c:295
 msgid "Create a new playlist with matching entries"
 msgstr "Создать новый список воспроизведения с соответствующими записями"
 
-#: src/skins/ui_playlist.c:763
+#: src/skins/ui_playlist.c:762
 msgid "Audacious Playlist Editor"
 msgstr "Редактор списков воспроизведения Audacious"
 
-#: src/skins/ui_playlist.c:810
+#: src/skins/ui_playlist.c:809
 #, c-format
 msgid "%s (%d of %d)"
 msgstr "%s (%d из %d)"
@@ -3885,11 +3885,11 @@
 msgid "Could not create directory (%s): %s\n"
 msgstr "Невозможно создать каталог (%s): %s\n"
 
-#: src/sndfile/plugin.c:454
+#: src/sndfile/plugin.c:438
 msgid "About sndfile plugin"
 msgstr "О модуле sndfile"
 
-#: src/sndfile/plugin.c:455
+#: src/sndfile/plugin.c:439
 msgid ""
 "Adapted for Audacious usage by Tony Vroon <chainsaw@gentoo.org>\n"
 "from the xmms_sndfile plugin which is:\n"

audacious-plugins-3.0.3.tar.bz2/po/sk.po -> audacious-plugins-3.1.tar.bz2/po/sk.po Changed

@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: sk\n"
 "Report-Msgid-Bugs-To: http://jira.atheme.org/\n"
-"POT-Creation-Date: 2011-09-18 14:13-0400\n"
+"POT-Creation-Date: 2011-07-17 18:49-0400\n"
 "PO-Revision-Date: 2011-03-13 20:35+0100\n"
 "Last-Translator: Andrej Herceg <herceg.andrej@zoznam.sk>\n"
 "Language-Team: Slovak <Slovak <sk-i18n@lists.linux.sk>>\n"
@@ -1034,7 +1034,7 @@
 msgid "Volume: (%)"
 msgstr "Hlasitosť: (%)"
 
-#: src/ffaudio/ffaudio-core.c:789
+#: src/ffaudio/ffaudio-core.c:763
 #, fuzzy, c-format
 msgid ""
 "Multi-format audio decoding plugin for Audacious based on\n"
@@ -1059,7 +1059,7 @@
 " William Pitcock <nenolod@nenolod.net>,\n"
 " Matti Hämäläinen <ccr@tnsp.org>\n"
 
-#: src/ffaudio/ffaudio-core.c:803
+#: src/ffaudio/ffaudio-core.c:777
 msgid "About FFaudio Plugin"
 msgstr "O module FFaudio"
 
@@ -3757,11 +3757,11 @@
 msgid "Delete auto-load preset"
 msgstr "Vymaže automaticky načítavané prednastavenia"
 
-#: src/skins/ui_playlist.c:245
+#: src/skins/ui_playlist.c:244
 msgid "Search entries in active playlist"
 msgstr "Vyhľadať skladby v aktívnom zozname skladieb"
 
-#: src/skins/ui_playlist.c:253
+#: src/skins/ui_playlist.c:252
 msgid ""
 "Select entries in playlist by filling one or more fields. Fields use regular "
 "expressions syntax, case-insensitive. If you don't know how regular "
@@ -3773,39 +3773,39 @@
 "regulárnym výrazom nerozumiete, jednoducho zadajte časť textu, ktorý chcete "
 "vyhľadať."
 
-#: src/skins/ui_playlist.c:261
+#: src/skins/ui_playlist.c:260
 msgid "Title: "
 msgstr "Názov: "
 
-#: src/skins/ui_playlist.c:268
+#: src/skins/ui_playlist.c:267
 msgid "Album: "
 msgstr "Album: "
 
-#: src/skins/ui_playlist.c:275
+#: src/skins/ui_playlist.c:274
 msgid "Artist: "
 msgstr "Umelec: "
 
-#: src/skins/ui_playlist.c:282
+#: src/skins/ui_playlist.c:281
 msgid "Filename: "
 msgstr "Názov súboru: "
 
-#: src/skins/ui_playlist.c:290
+#: src/skins/ui_playlist.c:289
 msgid "Clear previous selection before searching"
 msgstr "Pred hľadaním vymazať predchádzajúci výber"
 
-#: src/skins/ui_playlist.c:293
+#: src/skins/ui_playlist.c:292
 msgid "Automatically toggle queue for matching entries"
 msgstr "Zhodujúce sa položky pridať do (odstrániť z) frontu"
 
-#: src/skins/ui_playlist.c:296
+#: src/skins/ui_playlist.c:295
 msgid "Create a new playlist with matching entries"
 msgstr "Zo zhodujúcich sa položiek vytvoriť nový zoznam skladieb"
 
-#: src/skins/ui_playlist.c:763
+#: src/skins/ui_playlist.c:762
 msgid "Audacious Playlist Editor"
 msgstr "Editor zoznamu skladieb"
 
-#: src/skins/ui_playlist.c:810
+#: src/skins/ui_playlist.c:809
 #, c-format
 msgid "%s (%d of %d)"
 msgstr "%s (%d z %d)"
@@ -3823,11 +3823,11 @@
 msgid "Could not create directory (%s): %s\n"
 msgstr "Nepodarilo sa vytvoriť adresár (%s): %s\n"
 
-#: src/sndfile/plugin.c:454
+#: src/sndfile/plugin.c:438
 msgid "About sndfile plugin"
 msgstr "Modul sndfile (WAV)"
 
-#: src/sndfile/plugin.c:455
+#: src/sndfile/plugin.c:439
 msgid ""
 "Adapted for Audacious usage by Tony Vroon <chainsaw@gentoo.org>\n"
 "from the xmms_sndfile plugin which is:\n"

audacious-plugins-3.0.3.tar.bz2/po/tr.po -> audacious-plugins-3.1.tar.bz2/po/tr.po Changed

@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: audacious-plugins\n"
 "Report-Msgid-Bugs-To: http://jira.atheme.org/\n"
-"POT-Creation-Date: 2011-09-18 14:13-0400\n"
+"POT-Creation-Date: 2011-07-17 18:49-0400\n"
 "PO-Revision-Date: 2007-12-22 23:09+0200\n"
 "Last-Translator: Onur Küçük <onur@pardus.org.tr>\n"
 "Language-Team: Turkish\n"
@@ -1054,7 +1054,7 @@
 msgid "Volume: (%)"
 msgstr "Ses: (%)"
 
-#: src/ffaudio/ffaudio-core.c:789
+#: src/ffaudio/ffaudio-core.c:763
 #, c-format
 msgid ""
 "Multi-format audio decoding plugin for Audacious based on\n"
@@ -1070,7 +1070,7 @@
 "libavutil %s (%s)\n"
 msgstr ""
 
-#: src/ffaudio/ffaudio-core.c:803
+#: src/ffaudio/ffaudio-core.c:777
 #, fuzzy
 msgid "About FFaudio Plugin"
 msgstr "FLAC Ses Eklentisi Hakkında"
@@ -3874,11 +3874,11 @@
 msgid "Delete auto-load preset"
 msgstr ""
 
-#: src/skins/ui_playlist.c:245
+#: src/skins/ui_playlist.c:244
 msgid "Search entries in active playlist"
 msgstr ""
 
-#: src/skins/ui_playlist.c:253
+#: src/skins/ui_playlist.c:252
 msgid ""
 "Select entries in playlist by filling one or more fields. Fields use regular "
 "expressions syntax, case-insensitive. If you don't know how regular "
@@ -3886,43 +3886,43 @@
 "for."
 msgstr ""
 
-#: src/skins/ui_playlist.c:261
+#: src/skins/ui_playlist.c:260
 msgid "Title: "
 msgstr "Başlık: "
 
-#: src/skins/ui_playlist.c:268
+#: src/skins/ui_playlist.c:267
 #, fuzzy
 msgid "Album: "
 msgstr "Albüm:"
 
-#: src/skins/ui_playlist.c:275
+#: src/skins/ui_playlist.c:274
 #, fuzzy
 msgid "Artist: "
 msgstr "Sanatçı:"
 
-#: src/skins/ui_playlist.c:282
+#: src/skins/ui_playlist.c:281
 #, fuzzy
 msgid "Filename: "
 msgstr "Dosya adı:"
 
-#: src/skins/ui_playlist.c:290
+#: src/skins/ui_playlist.c:289
 msgid "Clear previous selection before searching"
 msgstr ""
 
-#: src/skins/ui_playlist.c:293
+#: src/skins/ui_playlist.c:292
 msgid "Automatically toggle queue for matching entries"
 msgstr ""
 
-#: src/skins/ui_playlist.c:296
+#: src/skins/ui_playlist.c:295
 msgid "Create a new playlist with matching entries"
 msgstr ""
 
-#: src/skins/ui_playlist.c:763
+#: src/skins/ui_playlist.c:762
 #, fuzzy
 msgid "Audacious Playlist Editor"
 msgstr "Hızlı Parça Listesi Bilgisi"
 
-#: src/skins/ui_playlist.c:810
+#: src/skins/ui_playlist.c:809
 #, c-format
 msgid "%s (%d of %d)"
 msgstr ""
@@ -3940,12 +3940,12 @@
 msgid "Could not create directory (%s): %s\n"
 msgstr "sidFilename ('%s') ayrılamadı\n"
 
-#: src/sndfile/plugin.c:454
+#: src/sndfile/plugin.c:438
 #, fuzzy
 msgid "About sndfile plugin"
 msgstr "sndfile WAV eklentisi"
 
-#: src/sndfile/plugin.c:455
+#: src/sndfile/plugin.c:439
 msgid ""
 "Adapted for Audacious usage by Tony Vroon <chainsaw@gentoo.org>\n"
 "from the xmms_sndfile plugin which is:\n"

audacious-plugins-3.0.3.tar.bz2/po/zh_CN.po -> audacious-plugins-3.1.tar.bz2/po/zh_CN.po Changed

@@ -6,16 +6,17 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Audacious-plugins 2.4\n"
+"Project-Id-Version: Audacious-plugins\n"
 "Report-Msgid-Bugs-To: http://jira.atheme.org/\n"
-"POT-Creation-Date: 2011-09-18 14:13-0400\n"
-"PO-Revision-Date: 2011-04-11 21:58+0800\n"
+"POT-Creation-Date: 2011-10-10 13:39-0400\n"
+"PO-Revision-Date: 2011-10-16 18:53+0800\n"
 "Last-Translator: Chasye <chasye@gmail.com>\n"
 "Language-Team: Chinese (simplified)\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: src/aac/libmp4.c:256
 #, c-format
@@ -32,6 +33,335 @@
 msgid "About MP4 AAC decoder plugin"
 msgstr "关于MP4 ACC解码插件"
 
+#: src/alarm/interface.c:33
+msgid "About XMMS Alarm"
+msgstr "关于XMMS闹钟"
+
+#: src/alarm/interface.c:40
+msgid "XMMS Alarm"
+msgstr "XMMS闹钟"
+
+#: src/alarm/interface.c:49
+msgid ""
+"An XMMS plugin which can be used\n"
+"to start playing at a certain time.\n"
+"\n"
+"Send all complaints to:\n"
+"Adam Feakin <adamf@snika.uklinux.net>\n"
+"Daniel Stodden <stodden@in.tum.de>\n"
+"\n"
+"http://www.snika.uklinux.net/xmms-alarm/"
+msgstr ""
+"用于在设定时间启动播放的XMMS插件\n"
+"\n"
+"问题反馈:\n"
+"Adam Feakin <adamf@snika.uklinux.net>\n"
+"Daniel Stodden <stodden@in.tum.de>\n"
+"\n"
+"http://www.snika.uklinux.net/xmms-alarm/"
+
+#: src/alarm/interface.c:64
+msgid "Close"
+msgstr "关闭"
+
+#: src/alarm/interface.c:94
+msgid "Alarm"
+msgstr "闹钟"
+
+#: src/alarm/interface.c:101
+msgid "This is your wakeup call."
+msgstr "此为起床闹钟"
+
+#: src/alarm/interface.c:116 src/alarm/interface.c:1337
+msgid "OK"
+msgstr "确定"
+
+#: src/alarm/interface.c:150
+msgid "Sorry"
+msgstr "抱歉"
+
+#: src/alarm/interface.c:157
+msgid "Warning"
+msgstr "警告"
+
+#: src/alarm/interface.c:166
+msgid ""
+"For safety reasons the \"quiet\" time must be at least 65 seconds longer "
+"than the fading time, it must also be more than 10 seconds. This basically "
+"means that there is a bug in the code and until I find a way of really "
+"fixing it this message will appear :)\n"
+"\n"
+"Your fading settings have NOT been saved\n"
+"\n"
+"--\n"
+"Adam"
+msgstr ""
+"鉴于安全理由，\"静音\"时间至少要比渐退时间长65秒，其本身亦至少大于10秒。\n"
+"这基本上是代码的问题，同时在我找到解决方法前此信息还会出现的 :)\n"
+"\n"
+"你的渐退设置未保存\n"
+"\n"
+"--\n"
+"Adam"
+
+#: src/alarm/interface.c:182
+msgid "Oh Well"
+msgstr "不错嘛"
+
+#: src/alarm/interface.c:338
+msgid "Alarm Settings"
+msgstr "闹钟设置"
+
+#: src/alarm/interface.c:353 src/alarm/interface.c:525
+#: src/alarm/interface.c:897
+msgid "Time"
+msgstr "时间"
+
+#: src/alarm/interface.c:394
+msgid "hours"
+msgstr "小时"
+
+#: src/alarm/interface.c:455
+msgid "h"
+msgstr "点"
+
+#: src/alarm/interface.c:485
+msgid "minutes"
+msgstr "分"
+
+#: src/alarm/interface.c:503
+msgid "Quiet after:"
+msgstr "静音时间："
+
+#: src/alarm/interface.c:513
+msgid "Alarm at (default):"
+msgstr "响闹钟(默认)："
+
+#: src/alarm/interface.c:533
+msgid "Choose the days for the alarm to come on"
+msgstr "选择响闹钟的日期"
+
+#: src/alarm/interface.c:561 src/alarm/interface.c:609
+#: src/alarm/interface.c:657 src/alarm/interface.c:705
+#: src/alarm/interface.c:753 src/alarm/interface.c:801
+#: src/alarm/interface.c:849 src/OSS/configure.c:153
+#: src/skins/ui_manager.c:450 src/skins/ui_manager.c:471
+msgid "Default"
+msgstr "默认"
+
+#: src/alarm/interface.c:887
+msgid "Day"
+msgstr "日期"
+
+#: src/alarm/interface.c:907
+msgid "Tuesday"
+msgstr "週二"
+
+#: src/alarm/interface.c:918
+msgid "Wednesday"
+msgstr "週三"
+
+#: src/alarm/interface.c:929
+msgid "Thursday"
+msgstr "週四"
+
+#: src/alarm/interface.c:940
+msgid "Friday"
+msgstr "週五"
+
+#: src/alarm/interface.c:951
+msgid "Saturday"
+msgstr "週末"
+
+#: src/alarm/interface.c:962
+msgid "Sunday"
+msgstr "週日"
+
+#: src/alarm/interface.c:972
+msgid "Monday"
+msgstr "週一"
+
+#: src/alarm/interface.c:983
+msgid "Days"
+msgstr "日期"
+
+#: src/alarm/interface.c:999
+msgid "Fading"
+msgstr "渐退"
+
+#: src/alarm/interface.c:1036
+msgid "seconds"
+msgstr "秒"
+
+#: src/alarm/interface.c:1044 src/alarm/interface.c:1159
+msgid "Volume"
+msgstr "音量"
+
+#: src/alarm/interface.c:1070
+msgid "Current"
+msgstr "当前"
+
+#: src/alarm/interface.c:1078
+msgid "Start at"
+msgstr "开始于"
+
+#: src/alarm/interface.c:1106 src/alarm/interface.c:1150
+msgid "%"
+msgstr "%"
+
+#: src/alarm/interface.c:1122
+msgid "Final"
+msgstr "完成于"
+
+#: src/alarm/interface.c:1175
+msgid "Additional Command"
+msgstr "附加指令"
+
+#: src/alarm/interface.c:1201
+msgid "enable"
+msgstr "启用"
+
+#: src/alarm/interface.c:1209
+msgid "Playlist (optional)"
+msgstr "播放列表(可选)"
+
+#: src/alarm/interface.c:1235
+msgid "Browse..."
+msgstr "浏览..."
+
+#: src/alarm/interface.c:1243 src/alarm/interface.c:1407
+msgid "Reminder"
+msgstr "提醒器"
+
+#: src/alarm/interface.c:1260
+msgid "Use reminder"
+msgstr "使用提醒器"
+
+#: src/alarm/interface.c:1276 src/sndstretch/sndstretch_xmms.c:358
+msgid "Options"
+msgstr "选项"
+
+#: src/alarm/interface.c:1284
+msgid "What do these options mean?"
+msgstr "这些选项有什么用？"
+
+#: src/alarm/interface.c:1312
+msgid ""
+"\n"
+"Time\n"
+" Alarm at: \n"
+" The time for the alarm to come on.\n"
+"\n"
+" Quiet After: \n"
+" Stop alarm after this amount of time.\n"
+" (if the wakeup dialog is not closed)\n"
+"\n"
+"\n"
+"Days\n"
+" Day:\n"
+" Select the days for the alarm to activate.\n"
+"\n"
+" Time:\n"
+" Choose the time for the alarm on each day,\n"
+" or select the toggle button to use the default\n"
+" time.\n"
+"\n"
+"\n"
+"Volume\n"
+" Fading: \n"
+" Fade the volume up to the chosen volume \n"
+" for this amount of time.\n"
+"\n"
+" Start at: \n"
+" Start fading from this volume.\n"
+"\n"
+" Final: \n"
+" The volume to stop fading at. If the fading\n"
+" time is 0 then set volume to this and start\n"
+" playing.\n"
+"\n"
+"\n"
+"Options:\n"
+" Additional Command:\n"
+" Run this command at the alarm time.\n"
+"\n"
+" Playlist: \n"
+" Load this playlist for playing songs from \n"
+" (must have .m3u extension). If no playlist\n"
+" is given then the songs which are currently\n"
+" in the list will be used.\n"
+" The URL of an mp3/ogg stream can also be\n"
+" entered here, but loading of playlists from\n"
+" URLs is not currently supported by xmms.\n"
+"\n"
+" Reminder:\n"
+" Display a reminder when the alarm goes off,\n"
+" type the reminder in the box and turn on the\n"
+" toggle button if you want it to be shown.\n"
+msgstr ""
+"\n"
+"时间\n"
+" 响闹钟: \n"
+" 闹钟启动时间。\n"
+"\n"
+" 静音时间: \n"
+" 在此时间之后停止播放。\n"
+" (如果起床对话框未关闭)\n"
+"\n"
+"\n"
+"日期\n"
+" 日期:\n"
+" 选择启用闹钟的日期\n"
+"\n"
+" 时间:\n"
+" 选择每天闹钟响的时间,\n"
+" 或者点击开关按钮使用默认时间\n"
+"\n"
+"\n"
+"音量\n"
+" 渐退: \n"
+" 在指定时间要把音量消退到指定音量。\n"
+"\n"
+" 开始于: \n"
+" 从此音量开始消退\n"
+"\n"
+" 完成于: \n"
+" 到达此音量时停止。\n"
+" 如果渐退时间为0，则直接设置为此音量后开始播放。\n"
+"\n"
+"\n"
+"选项:\n"
+" 附加指令:\n"
+" 在闹钟时间执行此指令。\n"
+"\n"
+" 播放列表:\n"
+" 从播放列表加载要播放的文件(仅支持.m3u文件) \n"
+" 如果未指定播放列表则使用当前的列表。\n"
+" 此处亦可使用远程的mp3/ogg流URL地址，\n"
+" 但现时暂未支持从播放列表中加载URL地址\n"
+"\n"
+" 提醒器:\n"
+" 当闹钟停止后显示提醒器，\n"
+" 如果你想显示提醒器，输出要用的提醒器并打开相应的开关按钮\n"
+
+#: src/alarm/interface.c:1314 src/skins/ui_manager.c:382
+msgid "Help"
+msgstr "帮助"
+
+#: src/alarm/interface.c:1346 src/cdaudio-ng/configure.c:249
+#: src/crystalizer/crystalizer.c:130 src/echo_plugin/gui.c:125
+#: src/jack/configure.c:148 src/null/null.c:108 src/stereo_plugin/stereo.c:125
+msgid "Cancel"
+msgstr "取消"
+
+#: src/alarm/interface.c:1414
+msgid "Your reminder for today is.."
+msgstr "你今天的提醒器是.."
+
+#: src/alarm/interface.c:1439
+msgid "Thankyou"
+msgstr "谢谢"
+
 #: src/alsa/config.c:210
 msgid "Default PCM device"
 msgstr "默认PCM设备"
@@ -40,23 +370,23 @@
 msgid "Default mixer device"
 msgstr "默认混音设备"
 
-#: src/alsa/config.c:447
+#: src/alsa/config.c:438
 msgid "ALSA Output Plugin Preferences"
 msgstr "ALSA输出插件首选项"
 
-#: src/alsa/config.c:454
+#: src/alsa/config.c:445
 msgid "PCM device:"
 msgstr "PCM设备："
 
-#: src/alsa/config.c:456 src/OSS/configure.c:246
+#: src/alsa/config.c:447 src/OSS/configure.c:237
 msgid "Mixer device:"
 msgstr "混音设备"
 
-#: src/alsa/config.c:458
+#: src/alsa/config.c:449
 msgid "Mixer element:"
 msgstr "混音单元："
 
-#: src/alsa/config.c:461
+#: src/alsa/config.c:452
 msgid "Work around drain hangup"
 msgstr ""
 
@@ -205,8 +535,6 @@
 "AMIDI\n"
 "Plug"
 msgstr ""
-"AMIDI\n"
-"Plug"
 
 #: src/amidi-plug/i_configure.c:76
 msgid "AMIDI-Plug - select file"
@@ -270,7 +598,7 @@
 
 #: src/amidi-plug/i_configure-fluidsynth.c:482
 msgid "reverb"
-msgstr "余响"
+msgstr "回音"
 
 #: src/amidi-plug/i_configure-fluidsynth.c:491
 #: src/amidi-plug/i_configure-fluidsynth.c:522
@@ -304,7 +632,7 @@
 
 #: src/amidi-plug/i_configure-fluidsynth.c:559
 msgid "custom "
-msgstr "定制"
+msgstr "自定"
 
 #: src/amidi-plug/i_configure-fluidsynth.c:568
 msgid "Hz "
@@ -334,7 +662,7 @@
 "backend"
 msgstr "TiMidity后端"
 
-#: src/amidi-plug/i_fileinfo.c:169 src/sid/xs_interface.c:1769
+#: src/amidi-plug/i_fileinfo.c:169
 msgid "Name:"
 msgstr "名称："
 
@@ -395,8 +723,6 @@
 "\n"
 "AMIDI-Plug "
 msgstr ""
-"\n"
-"AMIDI-Plug "
 
 #: src/amidi-plug/i_utils.c:69
 msgid ""
@@ -446,7 +772,7 @@
 
 #: src/aosd/aosd_style.c:75
 msgid "Rectangle"
-msgstr "矩形"
+msgstr "方角矩形"
 
 #: src/aosd/aosd_style.c:79
 msgid "Rounded Rectangle"
@@ -600,8 +926,7 @@
 msgid "Skin file:"
 msgstr "主题文件："
 
-#: src/aosd/aosd_ui.c:672 src/sid/xs_interface.c:1044
-#: src/sid/xs_interface.c:1236 src/sid/xs_interface.c:1292
+#: src/aosd/aosd_ui.c:672
 msgid "Browse"
 msgstr "浏览"
 
@@ -684,7 +1009,6 @@
 msgstr "触发器"
 
 #: src/aosd/aosd_ui.c:1101 src/cdaudio-ng/configure.c:171
-#: src/sid/xs_interface.c:1302
 msgid "Misc"
 msgstr "其它"
 
@@ -697,8 +1021,6 @@
 "\n"
 "Audacious OSD "
 msgstr ""
-"\n"
-"Audacious OSD "
 
 #: src/aosd/aosd_ui.c:1169
 msgid ""
@@ -725,15 +1047,15 @@
 msgid "Blur Scope: Color selection"
 msgstr ""
 
-#: src/blur_scope/config.c:83 src/jack/configure.c:111
+#: src/blur_scope/config.c:83 src/jack/configure.c:106
 msgid "Options:"
 msgstr "选项"
 
-#: src/cdaudio-ng/cdaudio-ng.c:264
+#: src/cdaudio-ng/cdaudio-ng.c:241
 msgid "About Audio CD Plugin"
 msgstr "关于音频CD插件"
 
-#: src/cdaudio-ng/cdaudio-ng.c:265
+#: src/cdaudio-ng/cdaudio-ng.c:242
 msgid ""
 "Copyright (c) 2007, by Calin Crisan <ccrisan@gmail.com> and The Audacious "
 "Team.\n"
@@ -747,25 +1069,24 @@
 "\n"
 "Copyright 2009 John Lindgren"
 msgstr ""
-"版权所有 (c) 2007, Calin Crisan <ccrisan@gmail.com> 及Audacious小组\n"
-"在此非常感谢libcdio <http://www.gnu.org/software/libcdio/>\n"
-"\t及libcddb<http://libcddb.sourceforge.net/>的开发者\n"
+"版权所有 (c)\n"
+"2009 John Lindgren\n"
+"2007 Calin Crisan <ccrisan@gmail.com> 及Audacious小组\n"
 "\n"
+"在此非常感谢libcdio <http://www.gnu.org/software/libcdio/>\n"
+"及libcddb<http://libcddb.sourceforge.net/>的开发者\n"
 "同时亦非常感谢Tony Vroon对我的帮助和指导.\n"
-"\n"
-"Google Summer of Code 2007 project.\n"
-"\n"
-"版权所有 (c) 2009 John Lindgren"
+"Google Summer of Code 2007 project."
 
-#: src/cdaudio-ng/cdaudio-ng.c:558
+#: src/cdaudio-ng/cdaudio-ng.c:550
 msgid "Audio CD"
 msgstr "音频CD"
 
-#: src/cdaudio-ng/cdaudio-ng.c:913
+#: src/cdaudio-ng/cdaudio-ng.c:922
 msgid "Drive is empty."
 msgstr "设备为空"
 
-#: src/cdaudio-ng/cdaudio-ng.c:915
+#: src/cdaudio-ng/cdaudio-ng.c:924
 msgid "Unsupported disk type."
 msgstr "未支持光盘类型"
 
@@ -813,18 +1134,12 @@
 msgid "Override default device: "
 msgstr "覆蓋默设备："
 
-#: src/cdaudio-ng/configure.c:244 src/crystalizer/crystalizer.c:131
-#: src/echo_plugin/gui.c:123 src/jack/configure.c:146 src/null/null.c:112
-#: src/stereo_plugin/stereo.c:125
+#: src/cdaudio-ng/configure.c:244 src/crystalizer/crystalizer.c:123
+#: src/echo_plugin/gui.c:118 src/jack/configure.c:141 src/null/null.c:107
+#: src/stereo_plugin/stereo.c:118
 msgid "Ok"
 msgstr "确定"
 
-#: src/cdaudio-ng/configure.c:249 src/crystalizer/crystalizer.c:138
-#: src/echo_plugin/gui.c:130 src/jack/configure.c:153 src/null/null.c:113
-#: src/stereo_plugin/stereo.c:132
-msgid "Cancel"
-msgstr "取消"
-
 #: src/cd-menu-items/cd-menu-items.c:34
 msgid "Play CD"
 msgstr "播放CD"
@@ -833,80 +1148,80 @@
 msgid "Add CD"
 msgstr "添加CD"
 
-#: src/compressor/plugin.c:67
+#: src/compressor/plugin.c:63
 msgid "About Dynamic Range Compression Plugin"
 msgstr "关于Dynamic Range Compression插件"
 
-#: src/compressor/plugin.c:99
+#: src/compressor/plugin.c:95
 msgid "Dynamic Range Compressor Preferences"
 msgstr "Dynamic Range Compressor设置"
 
-#: src/compressor/plugin.c:111
+#: src/compressor/plugin.c:107
 msgid "Center volume:"
 msgstr "中间音量："
 
-#: src/compressor/plugin.c:124
+#: src/compressor/plugin.c:120
 msgid "Dynamic range:"
 msgstr "动态范围："
 
-#: src/console/configure.c:138
+#: src/console/configure.c:136
 msgid "Game Console Music Decoder"
 msgstr "游戏机音乐解码器"
 
-#: src/console/configure.c:155
+#: src/console/configure.c:153
 msgid "General"
 msgstr "常规"
 
-#: src/console/configure.c:157 src/skins/ui_manager.c:176
+#: src/console/configure.c:155 src/skins/ui_manager.c:176
 msgid "Playback"
 msgstr "回放"
 
-#: src/console/configure.c:172
+#: src/console/configure.c:170
 msgid "Bass:"
 msgstr "低音："
 
-#: src/console/configure.c:176 src/console/configure.c:187
-#: src/console/configure.c:208
+#: src/console/configure.c:174 src/console/configure.c:185
+#: src/console/configure.c:206
 msgid "secs"
 msgstr "秒"
 
-#: src/console/configure.c:183
+#: src/console/configure.c:181
 msgid "Treble:"
 msgstr "高音："
 
-#: src/console/configure.c:204
+#: src/console/configure.c:202
 msgid "Default song length:"
 msgstr "默认歌曲长度："
 
-#: src/console/configure.c:210 src/sid/xs_interface.c:666
+#: src/console/configure.c:208
 msgid "Resampling"
 msgstr "重采样"
 
-#: src/console/configure.c:216
+#: src/console/configure.c:214
 msgid "Enable audio resampling"
 msgstr "启用音频重采样"
 
-#: src/console/configure.c:231
+#: src/console/configure.c:229
 msgid "Resampling rate:"
 msgstr "采样率："
 
-#: src/console/configure.c:235 src/sid/xs_interface.c:354
+#: src/console/configure.c:233
 msgid "Hz"
 msgstr ""
 
-#: src/console/configure.c:246
+#: src/console/configure.c:244
 msgid "SPC"
 msgstr ""
 
-#: src/console/configure.c:247
+#: src/console/configure.c:245
 msgid "Ignore length from SPC tags"
 msgstr "忽略SPC标签显示的长度"
 
-#: src/console/configure.c:248
+#: src/console/configure.c:246
 msgid "Increase reverb"
 msgstr "延长余响"
 
-#: src/console/configure.c:273
+#: src/console/configure.c:271
 msgid ""
 "The default song length, expressed in seconds, is used for songs that do not "
 "provide length information (i.e. looping tracks)."
@@ -926,32 +1241,32 @@
 "游戏机音乐解码引擎基本于Game_Music_Emu 0.5.2.\n"
 "支持格式： AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
 "Audacious上的实现由：\n"
-"\tWilliam Pitcock <nenolod@dereferenced.org>, \n"
-"\tShay Green <gblargg@gmail.com>\n"
+"William Pitcock <nenolod@dereferenced.org>, \n"
+"Shay Green <gblargg@gmail.com>\n"
 "完成。\n"
 
-#: src/crossfade/plugin.c:65
+#: src/crossfade/plugin.c:60
 msgid "About Crossfade"
 msgstr "关于淡出音效"
 
-#: src/crossfade/plugin.c:97
+#: src/crossfade/plugin.c:92
 msgid "Crossfade Preferences"
 msgstr "淡出设置"
 
-#: src/crossfade/plugin.c:109
+#: src/crossfade/plugin.c:104
 msgid "Overlap (in seconds):"
 msgstr "重叠时间(单位：秒)："
 
-#: src/crossfade/plugin.c:140 src/crossfade/plugin.c:146
+#: src/crossfade/plugin.c:135 src/crossfade/plugin.c:141
 msgid "Crossfade Error"
 msgstr "淡出错误"
 
-#: src/crossfade/plugin.c:140
+#: src/crossfade/plugin.c:135
 msgid ""
 "Crossfading failed because the songs had a different number of channels."
 msgstr "淡出失败， 原因：歌曲的声道数不一样"
 
-#: src/crossfade/plugin.c:148
+#: src/crossfade/plugin.c:143
 msgid ""
 "Crossfading failed because the songs had different sample rates.\n"
 "\n"
@@ -962,23 +1277,19 @@
 "\n"
 "你可以尝试使用”采样率转换器“使歌曲的采样一致。"
 
-#: src/crystalizer/crystalizer.c:108
+#: src/crystalizer/crystalizer.c:100
 msgid "Configure Crystalizer"
 msgstr "设置Crystalizer"
 
-#: src/crystalizer/crystalizer.c:110 src/stereo_plugin/stereo.c:104
+#: src/crystalizer/crystalizer.c:102 src/stereo_plugin/stereo.c:97
 msgid "Effect intensity:"
 msgstr "效果强度："
 
-#: src/crystalizer/crystalizer.c:144 src/echo_plugin/gui.c:136
-#: src/stereo_plugin/stereo.c:138
+#: src/crystalizer/crystalizer.c:136 src/echo_plugin/gui.c:131
+#: src/stereo_plugin/stereo.c:131
 msgid "Apply"
 msgstr "应用"
 
-#: src/daemon/daemon.c:58
-msgid "Daemon Interface (like old headless mode)"
-msgstr "Daemon模式"
-
 #: src/echo_plugin/gui.c:15
 msgid ""
 "Echo Plugin\n"
@@ -996,24 +1307,24 @@
 msgid "About Echo Plugin"
 msgstr "关于回音插件"
 
-#: src/echo_plugin/gui.c:72
+#: src/echo_plugin/gui.c:67
 msgid "Configure Echo"
 msgstr "回音设置"
 
-#: src/echo_plugin/gui.c:88
+#: src/echo_plugin/gui.c:83
 msgid "Delay: (ms)"
 msgstr "延迟：(ms)"
 
-#: src/echo_plugin/gui.c:93
+#: src/echo_plugin/gui.c:88
 msgid "Feedback: (%)"
 msgstr "反馈：(%)"
 
-#: src/echo_plugin/gui.c:98
+#: src/echo_plugin/gui.c:93
 msgid "Volume: (%)"
 msgstr "音量：(%)"
 
-#: src/ffaudio/ffaudio-core.c:789
-#, fuzzy, c-format
+#: src/ffaudio/ffaudio-core.c:795
+#, c-format
 msgid ""
 "Multi-format audio decoding plugin for Audacious based on\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1029,91 +1340,74 @@
 msgstr ""
 "基于FFmepg多媒体框架(http://www.ffmpeg.org/)\n"
 "的Audacious音频解码插件\n"
-"版权所有 (c) 2000-2009 Fabrice Bellard, et al.\n"
-"\n"
-"FFmpeg libavformat %d.%d.%d, libavcodec %d.%d.%d\n"
+"版权所有 (c)\n"
+"2000-2009 Fabrice Bellard, et al.\n"
 "\n"
 "Audacious插件作者：\n"
-" William Pitcock <nenolod@nenolod.net>,\n"
-" Matti Hämäläinen <ccr@tnsp.org>\n"
+"\tWilliam Pitcock <nenolod@nenolod.net>,\n"
+"\tMatti Hämäläinen <ccr@tnsp.org>\n"
+"\n"
+"libavcodec %s (%s)\n"
+"libavformat %s (%s)\n"
+"libavutil %s (%s)\n"
 
-#: src/ffaudio/ffaudio-core.c:803
+#: src/ffaudio/ffaudio-core.c:809
 msgid "About FFaudio Plugin"
 msgstr "关于FFaudio插件"
 
-#: src/filewriter/filewriter.c:155
+#: src/filewriter/filewriter.c:166
 msgid "About FileWriter-Plugin"
 msgstr "关于FileWriter插件"
 
-#: src/filewriter/filewriter.c:156
-msgid ""
-"FileWriter-Plugin\n"
-"\n"
-"This program is free software; you can redistribute it and/or modify\n"
-"it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
-"(at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
-"GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
-msgstr ""
-
-#: src/filewriter/filewriter.c:450
+#: src/filewriter/filewriter.c:455
 msgid "File Writer Configuration"
 msgstr "FileWriter设置"
 
-#: src/filewriter/filewriter.c:462
+#: src/filewriter/filewriter.c:467
 msgid "Output file format:"
 msgstr "输出文件格式："
 
-#: src/filewriter/filewriter.c:480
+#: src/filewriter/filewriter.c:485
 msgid "Configure"
 msgstr "设置"
 
-#: src/filewriter/filewriter.c:495
+#: src/filewriter/filewriter.c:500
 msgid "Save into original directory"
 msgstr "保存到原来的目录"
 
-#: src/filewriter/filewriter.c:500
+#: src/filewriter/filewriter.c:505
 msgid "Save into custom directory"
 msgstr "保存到自定义目录"
 
-#: src/filewriter/filewriter.c:510
+#: src/filewriter/filewriter.c:515
 msgid "Output file folder:"
 msgstr "输出文件目录："
 
-#: src/filewriter/filewriter.c:514
+#: src/filewriter/filewriter.c:519
 msgid "Pick a folder"
 msgstr "选择目录"
 
-#: src/filewriter/filewriter.c:533
+#: src/filewriter/filewriter.c:538
 msgid "Get filename from:"
 msgstr "文件名来自："
 
-#: src/filewriter/filewriter.c:536
+#: src/filewriter/filewriter.c:541
 msgid "original file tags"
 msgstr "原始文件标签"
 
-#: src/filewriter/filewriter.c:542
+#: src/filewriter/filewriter.c:547
 msgid "original filename"
 msgstr "原始文件名"
 
-#: src/filewriter/filewriter.c:552
+#: src/filewriter/filewriter.c:557
 msgid "Don't strip file name extension"
 msgstr "保留文件后缀"
 
-#: src/filewriter/filewriter.c:567
+#: src/filewriter/filewriter.c:572
 msgid "Prepend track number to filename"
 msgstr "文件名前加上音轨号"
 
-#: src/filewriter/mp3.c:38 src/filewriter/mp3.c:783
+#: src/filewriter/mp3.c:38 src/filewriter/mp3.c:771
 msgid "Auto"
 msgstr "自动"
 
@@ -1121,145 +1415,145 @@
 msgid "Joint Stereo"
 msgstr "联合立体声"
 
-#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183 src/sid/xs_interface.c:308
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183
 msgid "Stereo"
-msgstr "立体音"
+msgstr "立体声"
 
-#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183 src/sid/xs_interface.c:301
+#: src/filewriter/mp3.c:39 src/mpg123/mpg123.c:183
 msgid "Mono"
 msgstr "单声道"
 
-#: src/filewriter/mp3.c:724
+#: src/filewriter/mp3.c:712
 msgid "MP3 Configuration"
 msgstr "MP3设置"
 
-#: src/filewriter/mp3.c:747
+#: src/filewriter/mp3.c:735
 msgid "Algorithm Quality:"
 msgstr "音质"
 
-#: src/filewriter/mp3.c:772
+#: src/filewriter/mp3.c:760
 msgid "Output Samplerate:"
 msgstr "输出取样："
 
-#: src/filewriter/mp3.c:800
+#: src/filewriter/mp3.c:788
 msgid "(Hz)"
 msgstr ""
 
-#: src/filewriter/mp3.c:807
+#: src/filewriter/mp3.c:795
 msgid "Bitrate / Compression ratio:"
 msgstr "码率/压缩率："
 
-#: src/filewriter/mp3.c:831
+#: src/filewriter/mp3.c:819
 msgid "Bitrate (kbps):"
 msgstr "码率(kbps)："
 
-#: src/filewriter/mp3.c:864
+#: src/filewriter/mp3.c:852
 msgid "Compression ratio:"
 msgstr "压缩率："
 
-#: src/filewriter/mp3.c:888
+#: src/filewriter/mp3.c:876
 msgid "Audio Mode:"
 msgstr "音频模式："
 
-#: src/filewriter/mp3.c:913
+#: src/filewriter/mp3.c:901
 msgid "Misc:"
 msgstr "其它："
 
-#: src/filewriter/mp3.c:924
+#: src/filewriter/mp3.c:912
 msgid "Enforce strict ISO complience"
 msgstr "强制严格遵从ISO"
 
-#: src/filewriter/mp3.c:935
+#: src/filewriter/mp3.c:923
 msgid "Error protection"
 msgstr "错误保护"
 
-#: src/filewriter/mp3.c:947 src/filewriter/vorbis.c:245
+#: src/filewriter/mp3.c:935 src/filewriter/vorbis.c:243
 msgid "Quality"
 msgstr "质量"
 
-#: src/filewriter/mp3.c:957
+#: src/filewriter/mp3.c:945
 msgid "Enable VBR/ABR"
 msgstr "启用VBR/ABR"
 
-#: src/filewriter/mp3.c:967
+#: src/filewriter/mp3.c:955
 msgid "Type:"
 msgstr "类型："
 
-#: src/filewriter/mp3.c:1000
+#: src/filewriter/mp3.c:988
 msgid "VBR Options:"
 msgstr "VBR选项："
 
-#: src/filewriter/mp3.c:1016
+#: src/filewriter/mp3.c:1004
 msgid "Minimum bitrate (kbps):"
 msgstr "最小码率(kbps)："
 
-#: src/filewriter/mp3.c:1043
+#: src/filewriter/mp3.c:1031
 msgid "Maximum bitrate (kbps):"
 msgstr "最大码率(kbps)："
 
-#: src/filewriter/mp3.c:1066
+#: src/filewriter/mp3.c:1054
 msgid "Strictly enforce minimum bitrate"
 msgstr "严格执行最小码率"
 
-#: src/filewriter/mp3.c:1078
+#: src/filewriter/mp3.c:1066
 msgid "ABR Options:"
 msgstr "ABR选项："
 
-#: src/filewriter/mp3.c:1088
+#: src/filewriter/mp3.c:1076
 msgid "Average bitrate (kbps):"
 msgstr "平均码率(kbps)："
 
-#: src/filewriter/mp3.c:1116
+#: src/filewriter/mp3.c:1104
 msgid "VBR quality level:"
 msgstr "VBR质量等级："
 
-#: src/filewriter/mp3.c:1135
+#: src/filewriter/mp3.c:1123
 msgid "Don't write Xing VBR header"
 msgstr "不要写入Xing VBR头"
 
-#: src/filewriter/mp3.c:1149
+#: src/filewriter/mp3.c:1137
 msgid "VBR/ABR"
 msgstr "VBR/ABR"
 
-#: src/filewriter/mp3.c:1159
+#: src/filewriter/mp3.c:1147
 msgid "Frame params:"
 msgstr "帧参数："
 
-#: src/filewriter/mp3.c:1171
+#: src/filewriter/mp3.c:1159
 msgid "Mark as copyright"
 msgstr "标记为版权"
 
-#: src/filewriter/mp3.c:1182
+#: src/filewriter/mp3.c:1170
 msgid "Mark as original"
 msgstr "标记为原始文件"
 
-#: src/filewriter/mp3.c:1194
+#: src/filewriter/mp3.c:1182
 msgid "ID3 params:"
 msgstr "ID3参数："
 
-#: src/filewriter/mp3.c:1205
+#: src/filewriter/mp3.c:1193
 msgid "Force addition of version 2 tag"
 msgstr "强制添加V2标签"
 
-#: src/filewriter/mp3.c:1215
+#: src/filewriter/mp3.c:1203
 msgid "Only add v1 tag"
 msgstr "仅添加v1标签"
 
-#: src/filewriter/mp3.c:1222
+#: src/filewriter/mp3.c:1210
 msgid "Only add v2 tag"
 msgstr "仅添加v2标签"
 
-#: src/filewriter/mp3.c:1243
+#: src/filewriter/mp3.c:1231
 msgid "Tags"
 msgstr "标签"
 
-#: src/filewriter/vorbis.c:238
+#: src/filewriter/vorbis.c:236
 msgid "Vorbis Encoder Configuration"
 msgstr "Vorbis编码器设置"
 
-#: src/filewriter/vorbis.c:258
+#: src/filewriter/vorbis.c:256
 msgid "Quality level (0 - 10):"
-msgstr "质量等级(0-10):"
+msgstr "质量等级(0-10)："
 
 #: src/flacng/plugin.c:379
 msgid "About FLAC Audio Plugin"
@@ -1295,7 +1589,8 @@
 "Gnome快捷键插件\n"
 "通过快捷键控制播放器.\n"
 "\n"
-"版权所有 (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"版权所有 (C)\n"
+"2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
 "\n"
 
 #: src/gntui/fileselector.c:75 src/gntui/gntui.c:272
@@ -1318,7 +1613,7 @@
 msgid "Entry number"
 msgstr "序号"
 
-#: src/gtkui/columns.c:36 src/sid/xs_interface.c:1103
+#: src/gtkui/columns.c:36
 msgid "Title"
 msgstr "标题"
 
@@ -1356,21 +1651,21 @@
 
 #: src/gtkui/columns.c:38
 msgid "Custom title"
-msgstr "定制标题"
+msgstr "自定标题"
 
 #: src/gtkui/columns.c:39
 msgid "Bitrate"
 msgstr "比率"
 
-#: src/gtkui/columns.c:286
+#: src/gtkui/columns.c:278
 msgid "Choose Columns"
 msgstr "揀选列"
 
-#: src/gtkui/columns.c:300
+#: src/gtkui/columns.c:292
 msgid "Available:"
 msgstr "可用："
 
-#: src/gtkui/columns.c:334
+#: src/gtkui/columns.c:326
 msgid "Chosen:"
 msgstr "选项："
 
@@ -1394,322 +1689,276 @@
 msgid "Undock"
 msgstr "无面板"
 
-#: src/gtkui/layout.c:123
+#: src/gtkui/layout.c:123 src/ladspa/plugin.c:639
 msgid "Disable"
 msgstr "禁用"
 
-#: src/gtkui/menus.c:132
-#, fuzzy
+#: src/gtkui/menus.c:130
 msgid "_Open Files ..."
-msgstr "打开文件..."
+msgstr "打开文件(_O) ..."
 
-#: src/gtkui/menus.c:133
-#, fuzzy
+#: src/gtkui/menus.c:131
 msgid "Open _URL ..."
-msgstr "打开URL..."
+msgstr "打开URL(_U)..."
 
-#: src/gtkui/menus.c:134
-#, fuzzy
+#: src/gtkui/menus.c:132
 msgid "_Add File ..."
-msgstr "添加文件..."
+msgstr "添加文件(_A)..."
 
-#: src/gtkui/menus.c:135
-#, fuzzy
+#: src/gtkui/menus.c:133
 msgid "Add U_RL ..."
-msgstr "添加URL..."
+msgstr "添加URL(_R)..."
 
-#: src/gtkui/menus.c:137
-#, fuzzy
+#: src/gtkui/menus.c:135
 msgid "A_bout ..."
-msgstr "关于"
+msgstr "关于(_b)"
 
-#: src/gtkui/menus.c:138
-#, fuzzy
+#: src/gtkui/menus.c:136
 msgid "_Preferences ..."
-msgstr "首选项"
+msgstr "首选项(_P)..."
 
-#: src/gtkui/menus.c:139 src/skins/ui_manager.c:412
+#: src/gtkui/menus.c:137 src/skins/ui_manager.c:406
 msgid "_Quit"
 msgstr "退出(_Q)"
 
-#: src/gtkui/menus.c:142
-#, fuzzy
+#: src/gtkui/menus.c:140
 msgid "_Play"
-msgstr "播放"
+msgstr "播放(_P)"
 
-#: src/gtkui/menus.c:143
-#, fuzzy
+#: src/gtkui/menus.c:141
 msgid "Paus_e"
-msgstr "暂停"
+msgstr "暂停(_e)"
 
-#: src/gtkui/menus.c:144
-#, fuzzy
+#: src/gtkui/menus.c:142
 msgid "_Stop"
-msgstr "停止"
+msgstr "停止(_S)"
 
-#: src/gtkui/menus.c:145
-#, fuzzy
+#: src/gtkui/menus.c:143
 msgid "Pre_vious"
-msgstr "上一首"
+msgstr "上一首(_v)"
 
-#: src/gtkui/menus.c:146
-#, fuzzy
+#: src/gtkui/menus.c:144
 msgid "_Next"
-msgstr "下一首"
+msgstr "下一首(_N)"
 
-#: src/gtkui/menus.c:148
-#, fuzzy
+#: src/gtkui/menus.c:146
 msgid "_Repeat"
-msgstr "重复"
+msgstr "重复(_R)"
 
-#: src/gtkui/menus.c:149
-#, fuzzy
+#: src/gtkui/menus.c:147
 msgid "S_huffle"
-msgstr "随机"
+msgstr "随机(_h)"
 
-#: src/gtkui/menus.c:150
-#, fuzzy
+#: src/gtkui/menus.c:148
 msgid "N_o Playlist Advance"
-msgstr "禁止自动播放下一首"
+msgstr "禁止自动播放下一首(_o)"
 
-#: src/gtkui/menus.c:151
-#, fuzzy
+#: src/gtkui/menus.c:149
 msgid "Stop _After This Song"
-msgstr "完成后停止"
+msgstr "完成后停止(_A)"
 
-#: src/gtkui/menus.c:153 src/gtkui/menus.c:210
+#: src/gtkui/menus.c:151 src/gtkui/menus.c:209
 msgid "Song _Info ..."
-msgstr ""
+msgstr "歌曲信息(_I)..."
 
-#: src/gtkui/menus.c:154
-#, fuzzy
+#: src/gtkui/menus.c:152
 msgid "Jump to _Time ..."
-msgstr "跳到时间"
+msgstr "跳到时间(_T)..."
 
-#: src/gtkui/menus.c:155
+#: src/gtkui/menus.c:153
 msgid "_Jump to Song ..."
-msgstr ""
+msgstr "跳到歌曲(_J)..."
 
-#: src/gtkui/menus.c:158
-#, fuzzy
+#: src/gtkui/menus.c:156
 msgid "By Track _Number"
-msgstr "按音轨号码"
+msgstr "按音轨序号(_N)"
 
-#: src/gtkui/menus.c:159
-#, fuzzy
+#: src/gtkui/menus.c:157
 msgid "By _Title"
-msgstr "按标题"
+msgstr "按标题(_T)"
 
-#: src/gtkui/menus.c:160
-#, fuzzy
+#: src/gtkui/menus.c:158
 msgid "By _Artist"
-msgstr "按艺术家"
+msgstr "按艺术家(_A)"
 
-#: src/gtkui/menus.c:161
-#, fuzzy
+#: src/gtkui/menus.c:159
 msgid "By A_lbum"
-msgstr "按专辑"
+msgstr "按专辑(_l)"
 
-#: src/gtkui/menus.c:162
-#, fuzzy
+#: src/gtkui/menus.c:160
 msgid "By Release _Date"
-msgstr "按发表日期"
+msgstr "按发表日期(_D)"
 
-#: src/gtkui/menus.c:163
-#, fuzzy
+#: src/gtkui/menus.c:161
 msgid "By _File Path"
-msgstr "按文件路径"
+msgstr "按文件路径(_F)"
 
-#: src/gtkui/menus.c:164
-#, fuzzy
+#: src/gtkui/menus.c:162
 msgid "By _Custom Title"
-msgstr "定制标题"
+msgstr "按自定义标题(_C)"
 
-#: src/gtkui/menus.c:166
-#, fuzzy
+#: src/gtkui/menus.c:164
 msgid "R_everse Order"
-msgstr "反转"
+msgstr "反转(_e)"
 
-#: src/gtkui/menus.c:167
-#, fuzzy
+#: src/gtkui/menus.c:165
 msgid "_Random Order"
-msgstr "随机"
+msgstr "随机(_R)"
 
-#: src/gtkui/menus.c:170 src/gtkui/menus.c:212
+#: src/gtkui/menus.c:168 src/gtkui/menus.c:211
 msgid "_Refresh"
 msgstr "刷新(_R)"
 
-#: src/gtkui/menus.c:172
-#, fuzzy
+#: src/gtkui/menus.c:170
 msgid "_Sort"
-msgstr "排序"
+msgstr "排序(_S)"
 
-#: src/gtkui/menus.c:174
+#: src/gtkui/menus.c:172
 msgid "_New"
-msgstr ""
+msgstr "新建(_N)"
 
-#: src/gtkui/menus.c:175
+#: src/gtkui/menus.c:173 src/gtkui/menus.c:222
 msgid "_Close"
 msgstr "关闭(_C)"
 
-#: src/gtkui/menus.c:177
-#, fuzzy
+#: src/gtkui/menus.c:175
 msgid "_Import ..."
-msgstr "导入"
+msgstr "导入(_I)..."
 
-#: src/gtkui/menus.c:178
-#, fuzzy
+#: src/gtkui/menus.c:176
 msgid "_Export ..."
-msgstr "导出"
+msgstr "导出(_E)..."
 
-#: src/gtkui/menus.c:180
-#, fuzzy
+#: src/gtkui/menus.c:178
 msgid "_Playlist Manager ..."
-msgstr "播放列表管理器"
+msgstr "播放列表管理器(_P)..."
 
-#: src/gtkui/menus.c:183
-#, fuzzy
+#: src/gtkui/menus.c:179
+msgid "_Queue Manager ..."
+msgstr "队列管理器(_Q)..."
+
+#: src/gtkui/menus.c:182
 msgid "Volume _Up"
-msgstr "调高音量"
+msgstr "调高音量(_U)"
 
-#: src/gtkui/menus.c:184
-#, fuzzy
+#: src/gtkui/menus.c:183
 msgid "Volume _Down"
-msgstr "调低音量"
+msgstr "调低音量(_D)"
 
-#: src/gtkui/menus.c:186
-#, fuzzy
+#: src/gtkui/menus.c:185
 msgid "_Equalizer"
-msgstr "均衡器"
+msgstr "均衡器(_E)"
 
-#: src/gtkui/menus.c:188
-#, fuzzy
+#: src/gtkui/menus.c:187
 msgid "E_ffects"
-msgstr "音效"
+msgstr "音效(_f)"
 
-#: src/gtkui/menus.c:191
-#, fuzzy
+#: src/gtkui/menus.c:190
 msgid "_Interface"
-msgstr "界面"
+msgstr "界面(_I)"
 
-#: src/gtkui/menus.c:193
+#: src/gtkui/menus.c:192
 msgid "Show _Menu Bar"
-msgstr ""
+msgstr "显示菜单(_M)"
 
-#: src/gtkui/menus.c:194
-#, fuzzy
+#: src/gtkui/menus.c:193
 msgid "Show I_nfo Bar"
-msgstr "显示信息区域"
+msgstr "显示信息区域(_n)"
 
-#: src/gtkui/menus.c:195
-#, fuzzy
+#: src/gtkui/menus.c:194
 msgid "Show _Status Bar"
-msgstr "显示状态栏"
+msgstr "显示状态栏(_S)"
 
-#: src/gtkui/menus.c:197
-#, fuzzy
+#: src/gtkui/menus.c:196
 msgid "Show Column _Headers"
-msgstr "显示表头"
+msgstr "显示表头(_H)"
 
-#: src/gtkui/menus.c:198
-#, fuzzy
+#: src/gtkui/menus.c:197
 msgid "Choose _Columns ..."
-msgstr "揀选列..."
+msgstr "揀选列(_C)..."
 
-#: src/gtkui/menus.c:199
-#, fuzzy
+#: src/gtkui/menus.c:198
 msgid "Scrol_l on Song Change"
-msgstr "歌曲改变时滚动"
+msgstr "歌曲改变时滚动(_l)"
 
-#: src/gtkui/menus.c:202
-#, fuzzy
+#: src/gtkui/menus.c:201
 msgid "_File"
-msgstr "文件"
+msgstr "文件(_F)"
 
-#: src/gtkui/menus.c:203
-#, fuzzy
+#: src/gtkui/menus.c:202
 msgid "_Playback"
-msgstr "回放"
+msgstr "回放(_P)"
 
-#: src/gtkui/menus.c:204
-#, fuzzy
+#: src/gtkui/menus.c:203
 msgid "P_laylist"
-msgstr "播放列表"
+msgstr "播放列表(_l)"
 
-#: src/gtkui/menus.c:205 src/gtkui/menus.c:219
-#, fuzzy
+#: src/gtkui/menus.c:204 src/gtkui/menus.c:218
 msgid "_Services"
-msgstr "设备"
+msgstr "服务(_S)"
 
-#: src/gtkui/menus.c:206
-#, fuzzy
+#: src/gtkui/menus.c:205
 msgid "_Output"
-msgstr "输出"
+msgstr "输出(_O)"
 
-#: src/gtkui/menus.c:207
-#, fuzzy
+#: src/gtkui/menus.c:206
 msgid "_View"
-msgstr "外观"
+msgstr "外观(_V)"
 
-#: src/gtkui/menus.c:211
+#: src/gtkui/menus.c:210
 msgid "_Queue/Unqueue"
-msgstr ""
+msgstr "入队／出列(_Q)"
 
-#: src/gtkui/menus.c:214
+#: src/gtkui/menus.c:213
 msgid "Cu_t"
-msgstr ""
+msgstr "剪切(_t)"
 
-#: src/gtkui/menus.c:215
-#, fuzzy
+#: src/gtkui/menus.c:214
 msgid "_Copy"
-msgstr "复制"
+msgstr "复制(_C)"
 
-#: src/gtkui/menus.c:216
-#, fuzzy
+#: src/gtkui/menus.c:215
 msgid "_Paste"
-msgstr "粘贴"
+msgstr "粘贴(_P)"
 
-#: src/gtkui/menus.c:217
-#, fuzzy
+#: src/gtkui/menus.c:216
 msgid "Select _All"
-msgstr "选中全部"
+msgstr "选中全部(_A)"
 
-#: src/gtkui/menus.c:222
-#, fuzzy
+#: src/gtkui/menus.c:221
 msgid "_Rename"
-msgstr "文件名"
+msgstr "重命名(_R)"
 
-#: src/gtkui/ui_gtk.c:75
+#: src/gtkui/ui_gtk.c:95
 msgid "GTK Interface"
 msgstr "GTK界面"
 
-#: src/gtkui/ui_gtk.c:132 src/skins/ui_main.c:303
+#: src/gtkui/ui_gtk.c:154 src/skins/ui_main.c:302
 #, c-format
 msgid "%s - Audacious"
 msgstr ""
 
-#: src/gtkui/ui_gtk.c:138 src/skins/ui_main.c:305 src/skins/ui_main.c:1498
+#: src/gtkui/ui_gtk.c:160 src/skins/ui_main.c:304 src/skins/ui_main.c:1499
 msgid "Audacious"
 msgstr ""
 
-#: src/gtkui/ui_gtk.c:177 src/skins/plugin.c:185
+#: src/gtkui/ui_gtk.c:206 src/skins/plugin.c:185
 msgid "Error"
 msgstr "错误"
 
-#: src/gtkui/ui_statusbar.c:102 src/skins/ui_main.c:460
+#: src/gtkui/ui_statusbar.c:102 src/skins/ui_main.c:459
 msgid "mono"
 msgstr "单声道"
 
-#: src/gtkui/ui_statusbar.c:104 src/skins/ui_main.c:459
+#: src/gtkui/ui_statusbar.c:104 src/skins/ui_main.c:458
 msgid "stereo"
-msgstr "单体声"
+msgstr "立体声"
 
 #: src/gtkui/ui_statusbar.c:106
-#, fuzzy, c-format
+#, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr[0] "%d声道"
-msgstr[1] "%d声道"
 
 #: src/gtkui/ui_statusbar.c:121
 #, c-format
@@ -1756,7 +2005,7 @@
 msgid "Volume Down"
 msgstr "调低音量"
 
-#: src/hotkey/gui.c:81 src/skins/ui_manager.c:424 src/skins/ui_manager.c:425
+#: src/hotkey/gui.c:81 src/skins/ui_manager.c:418 src/skins/ui_manager.c:419
 msgid "Jump to File"
 msgstr "跳到文件"
 
@@ -1769,12 +2018,10 @@
 msgstr "显示On-Screen-Display"
 
 #: src/hotkey/gui.c:84
-#, fuzzy
 msgid "Toggle Repeat"
 msgstr "重复"
 
 #: src/hotkey/gui.c:85
-#, fuzzy
 msgid "Toggle Shuffle"
 msgstr "随机"
 
@@ -1814,7 +2061,7 @@
 
 #: src/hotkey/gui.c:432
 msgid "Key Binding:"
-msgstr "键位绑定:"
+msgstr "键位绑定："
 
 #: src/hotkey/gui.c:663
 msgid "About Global Hotkey Plugin"
@@ -1837,41 +2084,46 @@
 msgstr ""
 "全局热键插件\n"
 "通过组合键或多媒体键控制播放器。\n"
-"版权所有 (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"版权所有 (C)\n"
+"2007-2008\n"
+"Sascha Hlusiak <contact@saschahlusiak.de>\n"
 "\n"
 "其它贡献者:\n"
-"版权所有 (C) 2006-2007 Vladimir Paskov <vlado.paskov@gmail.com>\n"
-"版权所有 (C) 2000-2002 Ville Syrjälä <syrjala@sci.fi>\n"
-"\t\t\tBryn Davies <curious@ihug.com.au>\n"
-"\t\t\tJonathan A. Davis <davis@jdhouse.org>\n"
-"\t\t\tJeremy Tan <nsx@nsx.homeip.net>\n"
+"版权所有 (C)\n"
+"2006-2007\n"
+"Vladimir Paskov <vlado.paskov@gmail.com>\n"
+"2000-2002\n"
+"Ville Syrjälä <syrjala@sci.fi>\n"
+"Bryn Davies <curious@ihug.com.au>\n"
+"Jonathan A. Davis <davis@jdhouse.org>\n"
+"Jeremy Tan <nsx@nsx.homeip.net>\n"
 "\n"
 
-#: src/jack/configure.c:71
+#: src/jack/configure.c:66
 msgid "Connect to all available jack ports"
 msgstr "连接到所有可用的Jack端口"
 
-#: src/jack/configure.c:78
+#: src/jack/configure.c:73
 msgid "Connect only the output ports"
 msgstr "仅连接到输出端口"
 
-#: src/jack/configure.c:85
+#: src/jack/configure.c:80
 msgid "Connect to no ports"
 msgstr "不连接到任何端口"
 
-#: src/jack/configure.c:103
+#: src/jack/configure.c:98
 msgid "jack Plugin configuration"
 msgstr "Jack插件设置"
 
-#: src/jack/configure.c:121
+#: src/jack/configure.c:116
 msgid "Connection mode:"
 msgstr "连接模式："
 
-#: src/jack/configure.c:133
+#: src/jack/configure.c:128
 msgid "Enable debug printing"
 msgstr "启用调试输出"
 
-#: src/jack/jack.c:438
+#: src/jack/jack.c:422
 msgid ""
 "XMMS jack Driver 0.17\n"
 "\n"
@@ -1888,23 +2140,67 @@
 "\n"
 "Audacious版由Giacomo Lozito(develia.org)移植"
 
-#: src/jack/jack.c:443
+#: src/jack/jack.c:427
 msgid "About JACK Output Plugin 0.17"
 msgstr "关于JACK输出插件0.17"
 
-#: src/lyricwiki/lyricwiki.c:226
+#: src/ladspa/plugin.c:410
+msgid "About LADSPA Host"
+msgstr ""
+
+#: src/ladspa/plugin.c:511
+#, c-format
+msgid "%s Settings"
+msgstr "%s 设置"
+
+#: src/ladspa/plugin.c:579
+msgid "LADSPA Host Settings"
+msgstr "LADSPA主机设置"
+
+#: src/ladspa/plugin.c:588
+msgid "Module paths:"
+msgstr "模块路径："
+
+#: src/ladspa/plugin.c:593
+msgid ""
+"Separate multiple paths with a colon.\n"
+"These paths are searched in addition to LADSPA_PATH.\n"
+"After adding new paths, press Enter to scan for new plugins."
+msgstr ""
+
+#: src/ladspa/plugin.c:609
+msgid "Available plugins:"
+msgstr "可用插件："
+
+#: src/ladspa/plugin.c:621
+msgid "Enable"
+msgstr "启用"
+
+#: src/ladspa/plugin.c:627
+msgid "Enabled plugins:"
+msgstr "已启用插件："
+
+#: src/ladspa/plugin.c:642
+msgid "Settings"
+msgstr "设置"
+
+#: src/lyricwiki/lyricwiki.c:227
 msgid ""
 "\n"
 "Looking for lyrics..."
 msgstr ""
+"\n"
+"正在搜索歌词..."
 
-#: src/lyricwiki/lyricwiki.c:249
+#: src/lyricwiki/lyricwiki.c:250
 msgid ""
 "\n"
 "Connecting to lyrics.wikia.com..."
 msgstr ""
+"\n"
+"正在连接到lyrics.wikia.com..."
 
-#: src/lyricwiki/lyricwiki.c:337
+#: src/lyricwiki/lyricwiki.c:338
 msgid ""
 "\n"
 "No lyrics were found."
@@ -1935,9 +2231,25 @@
 msgid "Tact generator: %d bpm %d/%d"
 msgstr ""
 
+#: src/mixer/plugin.c:63
+msgid "About Channel Mixer"
+msgstr "关于通道混合器"
+
+#: src/mixer/plugin.c:92
+msgid "Channel Mixer Settings"
+msgstr "通道混合器设置"
+
+#: src/mixer/plugin.c:101
+msgid "Output channels:"
+msgstr "输出通道："
+
+#: src/mixer/plugin.c:111
+msgid "Changes take effect at the next song change."
+msgstr "修改将在下一首歌生效。"
+
 #: src/mpg123/mpg123.c:183
 msgid "Surround"
-msgstr "围绕音"
+msgstr "环绕音"
 
 #: src/mtp_up/mtp.c:298
 msgid "Upload in progress..."
@@ -1945,22 +2257,19 @@
 
 #: src/mtp_up/mtp.c:310
 msgid "Upload to MTP Device"
-msgstr ""
+msgstr "正上传到MTP设备　"
 
 #: src/mtp_up/mtp.c:311
-#, fuzzy
 msgid "Disconnect MTP Device"
-msgstr "断开与设备的连接"
+msgstr "断开与MTP设备的连接"
 
 #: src/notify/libnotify-aosd_event.c:47
-#, fuzzy
 msgid "Stopped"
-msgstr "停止"
+msgstr "已停止"
 
 #: src/notify/libnotify-aosd_event.c:47
-#, fuzzy
 msgid "Audacious is not playing."
-msgstr "Audacious - 可见性警告"
+msgstr "Audacious未开始播放"
 
 #: src/null/null.c:64
 msgid "Null output plugin "
@@ -1978,35 +2287,35 @@
 msgid "About Null Output"
 msgstr "关于Null Output"
 
-#: src/null/null.c:94
+#: src/null/null.c:89
 msgid "Null output preferences"
 msgstr "Null输出设置"
 
-#: src/null/null.c:105
+#: src/null/null.c:100
 msgid "Run in real time"
-msgstr "以实时方式运行"
+msgstr "以实时模式运行"
 
-#: src/oss4/configure.c:89
+#: src/oss4/configure.c:84
 msgid "1. Default device"
 msgstr "1. 默认设备"
 
-#: src/oss4/configure.c:151
+#: src/oss4/configure.c:142
 msgid "OSS4 Output Plugin Preferences"
 msgstr "OSS4输出插件首选项"
 
-#: src/oss4/configure.c:163 src/OSS/configure.c:203
+#: src/oss4/configure.c:154 src/OSS/configure.c:194
 msgid "Audio device:"
 msgstr "音频设备："
 
-#: src/oss4/configure.c:189 src/OSS/configure.c:226 src/OSS/configure.c:269
+#: src/oss4/configure.c:182 src/OSS/configure.c:217 src/OSS/configure.c:260
 msgid "Use alternate device:"
 msgstr "使用其它设备"
 
-#: src/oss4/configure.c:202
+#: src/oss4/configure.c:197
 msgid "Save volume between sessions"
 msgstr "会话中保存音量"
 
-#: src/oss4/configure.c:206
+#: src/oss4/configure.c:201
 msgid "Enable format conversions made by the OSS software."
 msgstr "使用OSS的格式转换。"
 
@@ -2014,71 +2323,44 @@
 msgid "About OSS4 Plugin"
 msgstr "关于OSS4插件"
 
-#: src/oss4/plugin.c:52
-msgid ""
-"OSS4 Output Plugin for Audacious\n"
-"Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
-"\n"
-"I would like to thank people on #audacious, especially Tony Vroon and John "
-"Lindgren and of course the authors of the previous OSS plugin.\n"
-"\n"
-"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.\n"
-"\n"
-"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.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with "
-"this program. If not, see <http://www.gnu.org/licenses/>.\n"
-msgstr ""
-
 #: src/oss4/utils.c:204
 msgid "OSS4 error"
 msgstr "OSS4错误"
 
-#: src/OSS/configure.c:146
+#: src/OSS/configure.c:137
 #, c-format
 msgid "Default (%s)"
 msgstr "默认(%s)"
 
-#: src/OSS/configure.c:162 src/skins/ui_manager.c:456
-#: src/skins/ui_manager.c:477
-msgid "Default"
-msgstr "默认"
-
-#: src/OSS/configure.c:187
+#: src/OSS/configure.c:178
 msgid "OSS Driver configuration"
 msgstr "OSS驱动设置"
 
-#: src/OSS/configure.c:290
+#: src/OSS/configure.c:281
 msgid "Devices"
 msgstr "设备"
 
-#: src/OSS/configure.c:292
+#: src/OSS/configure.c:283
 msgid "Buffering:"
 msgstr "缓存："
 
-#: src/OSS/configure.c:305
+#: src/OSS/configure.c:296
 msgid "Pre-buffer (percent):"
 msgstr "预缓存(百分之)："
 
-#: src/OSS/configure.c:316
+#: src/OSS/configure.c:307
 msgid "Buffering"
 msgstr "缓存"
 
-#: src/OSS/configure.c:317
+#: src/OSS/configure.c:308
 msgid "Mixer Settings:"
 msgstr "混音设置"
 
-#: src/OSS/configure.c:323
+#: src/OSS/configure.c:314
 msgid "Volume controls Master not PCM"
 msgstr "音量控制的是Master，而非PCM"
 
-#: src/OSS/configure.c:329
+#: src/OSS/configure.c:320
 msgid "Mixer"
 msgstr "混音器"
 
@@ -2086,99 +2368,59 @@
 msgid "About OSS Driver"
 msgstr "关于OSS驱动"
 
-#: src/OSS/OSS.c:41
-msgid ""
-"Audacious OSS Driver\n"
-"\n"
-" This program is free software; you can redistribute it and/or modify\n"
-"it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
-"(at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
-"GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
-msgstr ""
-
 #: src/pulse_audio/pulse_audio.c:687
 msgid "About Audacious PulseAudio Output Plugin"
 msgstr "关于Audacious PulseAudio输出插件"
 
-#: src/pulse_audio/pulse_audio.c:688
-msgid ""
-"Audacious PulseAudio Output Plugin\n"
-"\n"
-" This program is free software; you can redistribute it and/or modify\n"
-"it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
-"(at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
-"GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
-msgstr ""
-
-#: src/resample/plugin.c:91
+#: src/resample/plugin.c:89
 msgid "About Sample Rate Converter Plugin"
-msgstr "关于Sample Rate转换插件"
+msgstr "关于取样率转换插件"
 
-#: src/resample/plugin.c:146
+#: src/resample/plugin.c:144
 msgid "Sample Rate Converter Preferences"
-msgstr "Sample Rate转换器首选项"
+msgstr "取样转换设置"
 
-#: src/resample/plugin.c:158
+#: src/resample/plugin.c:156
 msgid "Rate mappings:"
 msgstr "比率映射："
 
-#: src/resample/plugin.c:181
+#: src/resample/plugin.c:179
 msgid "All others:"
 msgstr "其它："
 
-#: src/resample/plugin.c:193
+#: src/resample/plugin.c:191
 msgid "Method:"
 msgstr "方法："
 
-#: src/scrobbler/configure.c:128 src/scrobbler/configure.c:204
+#: src/scrobbler/configure.c:122 src/scrobbler/configure.c:197
 msgid "Change password"
 msgstr "修改密码"
 
-#: src/scrobbler/configure.c:150
+#: src/scrobbler/configure.c:143
 msgid "Services"
 msgstr "服务"
 
-#: src/scrobbler/configure.c:172
+#: src/scrobbler/configure.c:165
 msgid "Username:"
 msgstr "用户名："
 
-#: src/scrobbler/configure.c:178
+#: src/scrobbler/configure.c:171
 msgid "Password:"
 msgstr "密码："
 
-#: src/scrobbler/configure.c:186
+#: src/scrobbler/configure.c:179
 msgid "Scrobbler URL:"
 msgstr ""
 
-#: src/scrobbler/configure.c:218
+#: src/scrobbler/configure.c:211
 msgid "Last.FM"
 msgstr ""
 
-#: src/scrobbler/configure.c:262
+#: src/scrobbler/configure.c:238
 msgid "Scrobbler"
 msgstr ""
 
-#: src/scrobbler/plugin.c:213
+#: src/scrobbler/plugin.c:194
 msgid ""
 "Audacious AudioScrobbler Plugin\n"
 "\n"
@@ -2187,9 +2429,11 @@
 msgstr ""
 "Audacious AudioScrobbler插件\n"
 "\n"
-"原作者：Audun Hove <audun@nlc.no>和Pipian <pipian@pipian.com>。\n"
+"原作者：\n"
+"Audun Hove <audun@nlc.no>\n"
+"Pipian <pipian@pipian.com>\n"
 
-#: src/scrobbler/plugin.c:215
+#: src/scrobbler/plugin.c:196
 msgid "About Scrobbler Plugin"
 msgstr "关于Scorbbler插件"
 
@@ -2201,591 +2445,6 @@
 msgid "SDL error"
 msgstr "SDL错误"
 
-#: src/sid/xs_about.c:84
-#, c-format
-msgid "About %s"
-msgstr "关于 %s"
-
-#: src/sid/xs_about.c:214 src/sid/xs_interface.c:1825
-msgid "Close"
-msgstr "关闭"
-
-#: src/sid/xs_config.c:326
-msgid " Error"
-msgstr "错误"
-
-#: src/sid/xs_config.c:326
-msgid "OK"
-msgstr "确定"
-
-#: src/sid/xs_fileinfo.c:151
-msgid "General info"
-msgstr "一般信息"
-
-#: src/sid/xs_fileinfo.c:164
-#, c-format
-msgid "Tune #%i: "
-msgstr ""
-
-#: src/sid/xs_glade.c:90 src/sid/xs_glade.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "无法找到pixmap文件: %s"
-
-#: src/sid/xs_interface.c:234
-msgid "Audacious-SID configuration"
-msgstr "Audacious-SID设置"
-
-#: src/sid/xs_interface.c:270
-msgid "8-bit"
-msgstr ""
-
-#: src/sid/xs_interface.c:277
-msgid "16-bit"
-msgstr ""
-
-#: src/sid/xs_interface.c:284
-msgid "Resolution:"
-msgstr "分辨率："
-
-#: src/sid/xs_interface.c:315
-msgid "Autopanning"
-msgstr ""
-
-#: src/sid/xs_interface.c:322
-msgid "Channels:"
-msgstr "声道："
-
-#: src/sid/xs_interface.c:366
-msgid "Samplerate:"
-msgstr "取样率："
-
-#: src/sid/xs_interface.c:383
-msgid "Use oversampling"
-msgstr "使用超取样"
-
-#: src/sid/xs_interface.c:394
-msgid "Factor:"
-msgstr "系数："
-
-#: src/sid/xs_interface.c:406
-msgid "Large factors require more CPU-power"
-msgstr "系数越大使用的CPU越多"
-
-#: src/sid/xs_interface.c:412
-msgid "Oversampling:"
-msgstr "超取样"
-
-#: src/sid/xs_interface.c:417
-msgid "Audio"
-msgstr "音频"
-
-#: src/sid/xs_interface.c:445
-msgid "Force speed"
-msgstr "强制速度"
-
-#: src/sid/xs_interface.c:449
-msgid ""
-"If enabled, this option \"forces\" the emulation engine to use the selected "
-"clock speed/frequency. Otherwise the speed is determined from played file "
-"itself."
-msgstr "如果启用，将强制模拟器引擎使用指定的时频速度。否则则自己检测。"
-
-#: src/sid/xs_interface.c:451
-msgid "PAL (50 Hz)"
-msgstr ""
-
-#: src/sid/xs_interface.c:455
-msgid ""
-"PAL is the european TV standard, which uses 50Hz vertical refresh frequency. "
-"Most of SID-tunes have been made for PAL computers."
-msgstr ""
-"PAL是欧洲的电视标准，它使用的垂直刷新率是50Hz。大部分的SID-tunes都是为PAL电脑"
-"制作的。"
-
-#: src/sid/xs_interface.c:459
-msgid "NTSC (60 Hz)"
-msgstr ""
-
-#: src/sid/xs_interface.c:463
-msgid ""
-"NTSC is the TV standard with 60Hz vertical refresh rate (and other features "
-"that differ from PAL). It is mainly used in United States, Japan and certain "
-"other countries."
-msgstr ""
-"NTSC则是使用垂直刷新率为50Hz的电视标准（除此以外，还包含其它不同于PAL的特"
-"性)。主要在美国，日本还其它的部分国家使用。"
-
-#: src/sid/xs_interface.c:467
-msgid "Clock speed:"
-msgstr "时频速度："
-
-#: src/sid/xs_interface.c:484
-msgid "Force model"
-msgstr "强制型号"
-
-#: src/sid/xs_interface.c:488
-msgid ""
-"If enabled, this option \"forces\" the emulation engine to use the selected "
-"SID-chip model. Otherwise the preferred SID model is determined from the "
-"file (if PSIDv2NG type) or if not available, this setting is used."
-msgstr ""
-
-#: src/sid/xs_interface.c:490
-msgid "MOS 6581"
-msgstr ""
-
-#: src/sid/xs_interface.c:494
-msgid ""
-"MOS/CSG 6581 is the earlier major version of SID chip. It differs from 8580 "
-"in few ways, having much fuller filter (which, due to design error, is never "
-"same between two different SID-chips) and has the \"volume adjustment bug\", "
-"which enables playing of digital samples."
-msgstr ""
-
-#: src/sid/xs_interface.c:498
-msgid "MOS 8580"
-msgstr ""
-
-#: src/sid/xs_interface.c:505
-msgid "SID model:"
-msgstr "SID型号："
-
-#: src/sid/xs_interface.c:522
-msgid "SIDPlay 1 (frame-based)"
-msgstr "SIDPlay 1（基于帧）"
-
-#: src/sid/xs_interface.c:526
-msgid ""
-"Use libSIDPlay 1.x emulation, faster but not so accurate. Good in most "
-"cases, though."
-msgstr "使用libSIDPlay 1.x模拟器，速度更快，但并不准确。大部分情况都工作良好。"
-
-#: src/sid/xs_interface.c:530
-msgid "SIDPlay 2 (cycle-based)"
-msgstr "SIDPlay 2（基于周期）"
-
-#: src/sid/xs_interface.c:534
-msgid ""
-"Use libSIDPlay 2.x emulation, which requires powerful CPU due to more exact "
-"emulation."
-msgstr "使用libSIDPlay 2.x模拟器，将使用更多CPU以获得更准确的模拟。"
-
-#: src/sid/xs_interface.c:538
-msgid "Emulation library selection:"
-msgstr "选择模拟器使用的库："
-
-#: src/sid/xs_interface.c:555
-msgid "Real C64 (SIDPlay 2 only)"
-msgstr "Real C64 （仅SIDPlay 2可用）"
-
-#: src/sid/xs_interface.c:562
-msgid "Bank switching"
-msgstr "Bank切换"
-
-#: src/sid/xs_interface.c:569
-msgid "Transparent ROM"
-msgstr "透明ROM"
-
-#: src/sid/xs_interface.c:576
-msgid "PlaySID environment"
-msgstr "PlaySID环境"
-
-#: src/sid/xs_interface.c:583
-msgid "Memory mode:"
-msgstr "内存模式："
-
-#: src/sid/xs_interface.c:588
-msgid "Emu#1"
-msgstr ""
-
-#: src/sid/xs_interface.c:611
-msgid "Optimization mode (faster, inaccurate)"
-msgstr "优化模式（更快，不准确）"
-
-#: src/sid/xs_interface.c:615
-msgid ""
-"This setting can be used to enable libSIDPlay2's \"optimization mode\", "
-"which in downgrades the emulation from cycle-exact to something similar to "
-"frame-exact. The result is lower CPU usage, but worse accuracy."
-msgstr ""
-
-#: src/sid/xs_interface.c:617
-msgid "reSID-emulation"
-msgstr "reSID模拟"
-
-#: src/sid/xs_interface.c:621
-msgid ""
-"reSID is the software SID-chip simulator based on SID reverse-engineering, "
-"created by Dag Lem. It is probably the closest thing to real SID available "
-"as software-only emulation."
-msgstr ""
-
-#: src/sid/xs_interface.c:625
-msgid "HardSID"
-msgstr ""
-
-#: src/sid/xs_interface.c:629
-msgid ""
-"HardSID is a EISA/PCI card for PC-compatibles, which can be fitted with a "
-"real SID-chip. Software can be used to control the HardSID and combined with "
-"software emulation of rest of C64 via libSIDPlay2 HardSID can be used to "
-"achieve \"near 100%\" similarity to real C64. For more information, see "
-"http://www.hardsid.com/"
-msgstr ""
-
-#: src/sid/xs_interface.c:633
-msgid "SIDPlay 2 options:"
-msgstr "SIDPlay2 选项："
-
-#: src/sid/xs_interface.c:650
-msgid "Fast (nearest neighbour)"
-msgstr ""
-
-#: src/sid/xs_interface.c:654
-msgid ""
-"Fastest and also worst sounding sampling method, simply picks nearest "
-"neighbouring sample."
-msgstr ""
-
-#: src/sid/xs_interface.c:658
-msgid "Linear interpolation"
-msgstr ""
-
-#: src/sid/xs_interface.c:662
-msgid ""
-"Uses linear interpolation between samples, yielding higher audio quality "
-"with less sampling noise."
-msgstr ""
-
-#: src/sid/xs_interface.c:673
-msgid "Resampling (FIR)"
-msgstr "取样(FIR)"
-
-#: src/sid/xs_interface.c:680
-msgid "reSID sampling options:"
-msgstr "reSID取样选项："
-
-#: src/sid/xs_interface.c:685
-msgid "Emu#2"
-msgstr ""
-
-#: src/sid/xs_interface.c:697
-msgid "Emulate filters"
-msgstr "模拟过滤器"
-
-#: src/sid/xs_interface.c:701
-msgid ""
-"This option enables emulation of SID filter. The filter is an essential part "
-"of SID's sound capacity, but accurate emulation of it may require quite much "
-"CPU power. However, if filter emulation is disabled, tunes won't sound "
-"authentic at all if they utilize the filter."
-msgstr ""
-
-#: src/sid/xs_interface.c:726
-msgid "FS"
-msgstr ""
-
-#: src/sid/xs_interface.c:743
-msgid "FM"
-msgstr ""
-
-#: src/sid/xs_interface.c:760
-msgid "FT"
-msgstr ""
-
-#: src/sid/xs_interface.c:771
-msgid "Reset values"
-msgstr "重置"
-
-#: src/sid/xs_interface.c:776
-msgid "SIDPlay1"
-msgstr ""
-
-#: src/sid/xs_interface.c:817
-msgid "Export"
-msgstr "导出"
-
-#: src/sid/xs_interface.c:825
-msgid "Use"
-msgstr "使用"
-
-#: src/sid/xs_interface.c:833 src/skins/ui_manager.c:447
-msgid "Save"
-msgstr "保存"
-
-#: src/sid/xs_interface.c:841 src/skins/ui_manager.c:446
-msgid "Import"
-msgstr "导入"
-
-#: src/sid/xs_interface.c:849 src/skins/ui_manager.c:448
-msgid "Delete"
-msgstr "删除"
-
-#: src/sid/xs_interface.c:863
-msgid "Filter curve:"
-msgstr "过滤器曲线："
-
-#: src/sid/xs_interface.c:868
-msgid "SIDPlay2"
-msgstr ""
-
-#: src/sid/xs_interface.c:874
-msgid "Filters"
-msgstr "过滤器"
-
-#: src/sid/xs_interface.c:897
-msgid "Play at least for specified time"
-msgstr "至少播放指定的时间"
-
-#: src/sid/xs_interface.c:901
-msgid ""
-"If enabled, the tune is played at least for the specified time, adding "
-"silence to the end if necessary."
-msgstr ""
-
-#: src/sid/xs_interface.c:908 src/sid/xs_interface.c:962
-#: src/sid/xs_interface.c:1142
-msgid "Playtime:"
-msgstr "播放时间:"
-
-#: src/sid/xs_interface.c:921 src/sid/xs_interface.c:975
-#: src/sid/xs_interface.c:1155
-msgid "seconds"
-msgstr "秒"
-
-#: src/sid/xs_interface.c:928
-msgid "Minimum playtime:"
-msgstr "最小播放时间："
-
-#: src/sid/xs_interface.c:945
-msgid "Play for specified time maximum"
-msgstr "最长播放指定时间"
-
-#: src/sid/xs_interface.c:949
-msgid ""
-"If enabled, tune is played until specified duration is reached (aka maximum "
-"playtime)."
-msgstr ""
-
-#: src/sid/xs_interface.c:951
-msgid "Only when song length is unknown"
-msgstr "仅当歌曲长度未知"
-
-#: src/sid/xs_interface.c:955
-msgid ""
-"If enabled, the maximum playtime is applied only if song/tune length is not "
-"known."
-msgstr "如果启用，最长播放时间仅当歌曲长度未知时使用"
-
-#: src/sid/xs_interface.c:982
-msgid "Maximum playtime:"
-msgstr "最长播放时间："
-
-#: src/sid/xs_interface.c:999
-msgid "Use XSIDPLAY-compatible database"
-msgstr "使用XSIDPLAY兼容的数据库"
-
-#: src/sid/xs_interface.c:1003
-msgid ""
-"This option enables using of XSIDPLAY compatible song length database. "
-"(Refer to Audacious-SID documentation for more information)"
-msgstr ""
-
-#: src/sid/xs_interface.c:1010
-msgid "DB-file:"
-msgstr "数据库文件："
-
-#: src/sid/xs_interface.c:1020
-msgid "Database path and filename"
-msgstr "数据库文件路径及名称"
-
-#: src/sid/xs_interface.c:1027
-msgid "Browse for song length-database file"
-msgstr "浏览"
-
-#: src/sid/xs_interface.c:1049
-msgid "Song length database:"
-msgstr "歌曲长度数据库："
-
-#: src/sid/xs_interface.c:1054
-msgid "Songlength"
-msgstr "歌曲长度"
-
-#: src/sid/xs_interface.c:1072
-msgid "Override generic Tuplez format string"
-msgstr "覆盖常规Tuplez格式字串"
-
-#: src/sid/xs_interface.c:1076
-msgid ""
-"By enabling this option you can specify a custom Tuplez formatting string "
-"for SID-files. The SID-plugin specific Tuplez tags are described shortly "
-"below."
-msgstr ""
-
-#: src/sid/xs_interface.c:1087
-msgid "Tuplez format string for SID-files"
-msgstr "SID文件Tuplez格式字串"
-
-#: src/sid/xs_interface.c:1090
-msgid ""
-"SID-specific Tuplez fields:\n"
-"\n"
-"sid-format\t\t- Specific fileformat\n"
-"sid-model\t\t- 6581 or 8580\n"
-"sid-speed\t\t- Timing or speed: PAL/NTSC/etc.\n"
-"\n"
-"Other \"special\" fields set:\n"
-"\n"
-"subsong-num, subsong-id"
-msgstr ""
-
-#: src/sid/xs_interface.c:1098
-msgid "Song title format:"
-msgstr "歌曲标题格式："
-
-#: src/sid/xs_interface.c:1125
-msgid "Add sub-tunes to playlist"
-msgstr ""
-
-#: src/sid/xs_interface.c:1129
-msgid ""
-"If enabled, sub-tunes of each file will be added to playlist. If disabled, "
-"only the default sub-tune will be added."
-msgstr ""
-
-#: src/sid/xs_interface.c:1131
-msgid "Only tunes with specified minimum duration"
-msgstr ""
-
-#: src/sid/xs_interface.c:1135
-msgid "Only add sub-tunes that have a duration of at least specified time."
-msgstr ""
-
-#: src/sid/xs_interface.c:1162
-msgid "Sub-tune handling:"
-msgstr ""
-
-#: src/sid/xs_interface.c:1179
-msgid "Use STIL database"
-msgstr "使用STIL数据库"
-
-#: src/sid/xs_interface.c:1183
-msgid ""
-"If this option is enabled (and the database & HVSC settings below are "
-"correctly set), Audacious-SID will use and display additional information "
-"from STIL database when HVSC SIDs are played."
-msgstr ""
-
-#: src/sid/xs_interface.c:1190
-msgid "STIL file:"
-msgstr "STIL文件："
-
-#: src/sid/xs_interface.c:1206
-msgid ""
-"Path and filename of STIL database file (STIL.txt), usually found from "
-"HVSC's DOCUMENTS-subdirectory."
-msgstr ""
-"STIL数据库文件的路径及名称（STIL.txt）。通常可以在HVSC文档子目录下找到。"
-
-#: src/sid/xs_interface.c:1219
-msgid "Browse for STIL-database file"
-msgstr "浏览STIL数据库文件"
-
-#: src/sid/xs_interface.c:1246
-msgid "HVSC path:"
-msgstr "HVSC路径："
-
-#: src/sid/xs_interface.c:1262
-msgid ""
-"Path to base-directory of your High Voltage SID Collection (HVSC), for "
-"example /media/C64Music/"
-msgstr ""
-
-#: src/sid/xs_interface.c:1275
-msgid "Browse for HVSC path"
-msgstr "浏览HVSC路径"
-
-#: src/sid/xs_interface.c:1297
-msgid "SID Tune Information List (STIL) database:"
-msgstr "SID音调信息列表（STIL）数据库"
-
-#: src/sid/xs_interface.c:1321
-msgid "Cancel any changes"
-msgstr "取消所有变更"
-
-#: src/sid/xs_interface.c:1328
-msgid "Accept and update changes"
-msgstr "同意并更新"
-
-#: src/sid/xs_interface.c:1628
-msgid "Audacious-SID Fileinfo"
-msgstr "Audacious-SID文件信息"
-
-#: src/sid/xs_interface.c:1649
-msgid "Filename:"
-msgstr "文件名："
-
-#: src/sid/xs_interface.c:1657
-msgid "Songname:"
-msgstr "歌曲名："
-
-#: src/sid/xs_interface.c:1665
-msgid "Composer:"
-msgstr "作曲家："
-
-#: src/sid/xs_interface.c:1673
-msgid "Copyright:"
-msgstr "版权："
-
-#: src/sid/xs_interface.c:1717
-msgid "Song Information:"
-msgstr "歌曲信息："
-
-#: src/sid/xs_interface.c:1752
-msgid "Author:"
-msgstr "作者："
-
-#: src/sid/xs_interface.c:1786
-msgid "Duration:"
-msgstr "持续时间："
-
-#: src/sid/xs_interface.c:1820
-msgid "Sub-tune Information:"
-msgstr "Sub-tune信息："
-
-#: src/sid/xs_interface.c:1881
-msgid "Select HVSC song length database"
-msgstr "选择HVSC歌曲长度数据库"
-
-#: src/sid/xs_interface.c:1922
-msgid "Select STIL-database"
-msgstr "选择STIL数据库"
-
-#: src/sid/xs_interface.c:1963
-msgid "Select HVSC location prefix"
-msgstr "选择HVSC路径前缀"
-
-#: src/sid/xs_interface.c:2004
-msgid "Select SIDPlay2 filters file for importing"
-msgstr "选择要导入的SIDPlay2过滤文件"
-
-#: src/sid/xs_interface.c:2045
-msgid "Select SIDPlay2 filters file for exporting"
-msgstr "选择要导出的SIDplay2过滤文件"
-
-#: src/sid/xs_interface.c:2093 src/sid/xs_interface.c:2106
-msgid "Confirm selected action"
-msgstr "确认选中的动作"
-
-#: src/sid/xs_interface.c:2123
-msgid "Yes"
-msgstr "是"
-
-#: src/sid/xs_interface.c:2129
-msgid "No"
-msgstr "否"
-
 #: src/skins/plugin.c:167
 msgid "About Skinned GUI"
 msgstr "关于主题化界面"
@@ -2795,45 +2454,45 @@
 "Copyright (c) 2008, by Tomasz Moń <desowin@gmail.com>\n"
 "\n"
 msgstr ""
-"版权所有 (c) 2008, Tomasz Moń <desowin@gmail.com>\n"
+"版权所有 (c)\n"
+"2008, Tomasz Moń <desowin@gmail.com>\n"
 "\n"
 
-#: src/skins/skins_cfg.c:254
+#: src/skins/skins_cfg.c:207
 msgid "_Player:"
-msgstr "播放器(_P):"
+msgstr "播放器(_P)："
 
-#: src/skins/skins_cfg.c:254
+#: src/skins/skins_cfg.c:208
 msgid "Select main player window font:"
 msgstr "选择主界面字体"
 
-#: src/skins/skins_cfg.c:255
+#: src/skins/skins_cfg.c:210
 msgid "_Playlist:"
 msgstr "播放列表(_P)："
 
-#: src/skins/skins_cfg.c:255
+#: src/skins/skins_cfg.c:211
 msgid "Select playlist font:"
 msgstr "选择播放列表字体："
 
-#: src/skins/skins_cfg.c:259
+#: src/skins/skins_cfg.c:215
 msgid "_Fonts"
 msgstr "字体(_F)"
 
-#: src/skins/skins_cfg.c:261
+#: src/skins/skins_cfg.c:218
 msgid "Use bitmap fonts (supports ASCII only)"
-msgstr ""
+msgstr "使用点阵字体（仅支持ASCII字符）"
 
-#: src/skins/skins_cfg.c:263
+#: src/skins/skins_cfg.c:220
 msgid "Scroll song title in both directions"
-msgstr ""
+msgstr "来回滚动歌曲标题"
 
-#: src/skins/skins_cfg.c:346
+#: src/skins/skins_cfg.c:298
 msgid "_Skin"
 msgstr "主题(_S)"
 
-#: src/skins/skins_cfg.c:393
-#, fuzzy
+#: src/skins/skins_cfg.c:345
 msgid "Interface Preferences"
-msgstr "淡出设置"
+msgstr "界面设置"
 
 #: src/skins/ui_equalizer.c:330
 msgid "Preamp"
@@ -2879,83 +2538,83 @@
 msgid "16 kHz"
 msgstr ""
 
-#: src/skins/ui_equalizer.c:378
+#: src/skins/ui_equalizer.c:379
 msgid "Audacious Equalizer"
 msgstr "Audacious均衡器"
 
-#: src/skins/ui_equalizer.c:884
+#: src/skins/ui_equalizer.c:896
 msgid "Presets"
 msgstr "预设"
 
-#: src/skins/ui_main.c:444
+#: src/skins/ui_main.c:443
 msgid "kbps"
 msgstr ""
 
-#: src/skins/ui_main.c:452
+#: src/skins/ui_main.c:451
 msgid "kHz"
 msgstr ""
 
-#: src/skins/ui_main.c:459
+#: src/skins/ui_main.c:458
 msgid "surround"
 msgstr "环绕声"
 
-#: src/skins/ui_main.c:807
-#, fuzzy, c-format
+#: src/skins/ui_main.c:806
+#, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
-msgstr "查找： %d:%-2.2d/%d:%-2.2d (%d%%)"
+msgstr "查找： %d:%-2.2d/%d:%-2.2d"
 
-#: src/skins/ui_main.c:828
+#: src/skins/ui_main.c:827
 #, c-format
 msgid "Volume: %d%%"
-msgstr "音量: %d%%"
+msgstr "音量：%d%%"
 
-#: src/skins/ui_main.c:851
+#: src/skins/ui_main.c:850
 #, c-format
 msgid "Balance: %d%% left"
-msgstr "平衡: %d%% 左"
+msgstr "平衡：%d%% 左"
 
-#: src/skins/ui_main.c:853
+#: src/skins/ui_main.c:852
 msgid "Balance: center"
-msgstr "平衡: 中间"
+msgstr "平衡：中间"
 
-#: src/skins/ui_main.c:855
+#: src/skins/ui_main.c:854
 #, c-format
 msgid "Balance: %d%% right"
-msgstr "平衡: %d%% 右"
+msgstr "平衡：%d%% 右"
 
-#: src/skins/ui_main.c:981
+#: src/skins/ui_main.c:980
 msgid "Options Menu"
 msgstr "选项菜单"
 
-#: src/skins/ui_main.c:985
+#: src/skins/ui_main.c:984
 msgid "Disable 'Always On Top'"
 msgstr "禁用“顶置窗口”"
 
-#: src/skins/ui_main.c:987
+#: src/skins/ui_main.c:986
 msgid "Enable 'Always On Top'"
 msgstr "启用“顶置窗口”"
 
-#: src/skins/ui_main.c:990
+#: src/skins/ui_main.c:989
 msgid "File Info Box"
 msgstr "文件信息"
 
-#: src/skins/ui_main.c:995
+#: src/skins/ui_main.c:994
 msgid "Visualization Menu"
 msgstr "可视化菜单"
 
-#: src/skins/ui_main.c:1645
+#: src/skins/ui_main.c:1646
 msgid "Single mode."
 msgstr "单一窗口模式"
 
-#: src/skins/ui_main.c:1647
+#: src/skins/ui_main.c:1648
 msgid "Playlist mode."
 msgstr "播放列表模式"
 
-#: src/skins/ui_main.c:1669
+#: src/skins/ui_main.c:1670
 msgid "Stopping after song."
 msgstr "完成后停止"
 
-#: src/skins/ui_main.c:1671
+#: src/skins/ui_main.c:1672
 msgid "Not stopping after song."
 msgstr "完成后不停止"
 
@@ -3021,7 +2680,7 @@
 
 #: src/skins/ui_manager.c:116
 msgid "Scope"
-msgstr "范围"
+msgstr "示波器"
 
 #: src/skins/ui_manager.c:117
 msgid "Voiceprint"
@@ -3054,15 +2713,15 @@
 
 #: src/skins/ui_manager.c:133
 msgid "Dot Scope"
-msgstr ""
+msgstr "点状"
 
 #: src/skins/ui_manager.c:134
 msgid "Line Scope"
-msgstr ""
+msgstr "线状"
 
 #: src/skins/ui_manager.c:135
 msgid "Solid Scope"
-msgstr ""
+msgstr "块状"
 
 #: src/skins/ui_manager.c:141
 msgid "Ice"
@@ -3126,7 +2785,7 @@
 
 #: src/skins/ui_manager.c:199
 msgid "Scope Mode"
-msgstr "范围模式"
+msgstr "示波器模式"
 
 #: src/skins/ui_manager.c:200
 msgid "Voiceprint Mode"
@@ -3181,424 +2840,421 @@
 msgstr "保存被选中的播放列表"
 
 #: src/skins/ui_manager.c:229
-msgid "Save All Playlists"
-msgstr "保存所有播放列表"
-
-#: src/skins/ui_manager.c:230
-msgid ""
-"Saves all the playlists that are open. Note that this is done automatically "
-"when Audacious quits."
-msgstr "保存所有已打开的播放列表（其实Audacious退出时是会自动保存的）。"
-
-#: src/skins/ui_manager.c:234
 msgid "Refresh List"
 msgstr "刷新列表"
 
-#: src/skins/ui_manager.c:235
+#: src/skins/ui_manager.c:230
 msgid "Refreshes metadata associated with a playlist entry."
 msgstr "刷新播放列表的歌曲信息"
 
-#: src/skins/ui_manager.c:238
-msgid "List Manager"
-msgstr "列表管理器"
+#: src/skins/ui_manager.c:233
+msgid "Playlist Manager"
+msgstr "播放列表管理器"
 
-#: src/skins/ui_manager.c:239
-msgid "Opens the playlist manager."
-msgstr "打开播放列表管理器"
+#: src/skins/ui_manager.c:234
+msgid "Queue Manager"
+msgstr "列表管理器"
 
-#: src/skins/ui_manager.c:243
+#: src/skins/ui_manager.c:237
 msgid "View"
 msgstr "外观"
 
-#: src/skins/ui_manager.c:244
+#: src/skins/ui_manager.c:238
 msgid "Interface"
 msgstr "界面"
 
-#: src/skins/ui_manager.c:245
-#, fuzzy
+#: src/skins/ui_manager.c:239
 msgid "Interface Preferences ..."
-msgstr "淡出设置"
+msgstr "界面设置..."
 
-#: src/skins/ui_manager.c:249
+#: src/skins/ui_manager.c:243
 msgid "Add Internet Address..."
 msgstr "添加网络地址..."
 
-#: src/skins/ui_manager.c:250
+#: src/skins/ui_manager.c:244
 msgid "Adds a remote track to the playlist."
 msgstr "添加远程文件到播放列表"
 
-#: src/skins/ui_manager.c:253
+#: src/skins/ui_manager.c:247
 msgid "Add Files..."
 msgstr "添加文件..."
 
-#: src/skins/ui_manager.c:254
+#: src/skins/ui_manager.c:248
 msgid "Adds files to the playlist."
 msgstr "添加文件到播放列表。"
 
-#: src/skins/ui_manager.c:259
+#: src/skins/ui_manager.c:253
 msgid "Search and Select"
 msgstr "搜索/选择"
 
-#: src/skins/ui_manager.c:260
+#: src/skins/ui_manager.c:254
 msgid ""
 "Searches the playlist and selects playlist entries based on specific "
 "criteria."
 msgstr "在列表中搜索并选择符合条件的条目"
 
-#: src/skins/ui_manager.c:263
+#: src/skins/ui_manager.c:257
 msgid "Invert Selection"
 msgstr "反选"
 
-#: src/skins/ui_manager.c:264
+#: src/skins/ui_manager.c:258
 msgid "Inverts the selected and unselected entries."
 msgstr "反转被选中与未被选中的条目"
 
-#: src/skins/ui_manager.c:267
+#: src/skins/ui_manager.c:261
 msgid "Select All"
 msgstr "选中全部"
 
-#: src/skins/ui_manager.c:268
+#: src/skins/ui_manager.c:262
 msgid "Selects all of the playlist entries."
 msgstr "选中播放列表中的所有条目。"
 
-#: src/skins/ui_manager.c:271
+#: src/skins/ui_manager.c:265
 msgid "Select None"
 msgstr "取消选中"
 
-#: src/skins/ui_manager.c:272
+#: src/skins/ui_manager.c:266
 msgid "Deselects all of the playlist entries."
 msgstr "取消对播放列表的选择"
 
-#: src/skins/ui_manager.c:277
+#: src/skins/ui_manager.c:271
 msgid "Remove All"
 msgstr "清空"
 
-#: src/skins/ui_manager.c:278
+#: src/skins/ui_manager.c:272
 msgid "Removes all entries from the playlist."
 msgstr "清空播放列表中的所有条目。"
 
-#: src/skins/ui_manager.c:281
+#: src/skins/ui_manager.c:275
 msgid "Clear Queue"
 msgstr "清空队列"
 
-#: src/skins/ui_manager.c:282
+#: src/skins/ui_manager.c:276
 msgid "Clears the queue associated with this playlist."
 msgstr "清空此列表中的队列"
 
-#: src/skins/ui_manager.c:285
+#: src/skins/ui_manager.c:279
 msgid "Remove Unavailable Files"
 msgstr "删除不可用文件"
 
-#: src/skins/ui_manager.c:286
+#: src/skins/ui_manager.c:280
 msgid "Removes unavailable files from the playlist."
 msgstr "从播放列表中删除不可用文件"
 
-#: src/skins/ui_manager.c:289
+#: src/skins/ui_manager.c:283
 msgid "Remove Duplicates"
 msgstr "删除重复的条目"
 
-#: src/skins/ui_manager.c:291 src/skins/ui_manager.c:323
-#: src/skins/ui_manager.c:353
+#: src/skins/ui_manager.c:285 src/skins/ui_manager.c:317
+#: src/skins/ui_manager.c:347
 msgid "By Title"
 msgstr "按标题"
 
-#: src/skins/ui_manager.c:292
+#: src/skins/ui_manager.c:286
 msgid "Removes duplicate entries from the playlist by title."
 msgstr "根据标题删除重复的条目"
 
-#: src/skins/ui_manager.c:295 src/skins/ui_manager.c:335
-#: src/skins/ui_manager.c:365
+#: src/skins/ui_manager.c:289 src/skins/ui_manager.c:329
+#: src/skins/ui_manager.c:359
 msgid "By Filename"
 msgstr "根据文件名"
 
-#: src/skins/ui_manager.c:296
+#: src/skins/ui_manager.c:290
 msgid "Removes duplicate entries from the playlist by filename."
 msgstr "根据文件名删除重复的条目"
 
-#: src/skins/ui_manager.c:299 src/skins/ui_manager.c:339
-#: src/skins/ui_manager.c:369
+#: src/skins/ui_manager.c:293 src/skins/ui_manager.c:333
+#: src/skins/ui_manager.c:363
 msgid "By Path + Filename"
 msgstr "根据路径和文件名"
 
-#: src/skins/ui_manager.c:300
+#: src/skins/ui_manager.c:294
 msgid "Removes duplicate entries from the playlist by their full path."
 msgstr "根据文件的完整路径删除重复条目"
 
-#: src/skins/ui_manager.c:303
+#: src/skins/ui_manager.c:297
 msgid "Remove Unselected"
 msgstr "删除未被选中的"
 
-#: src/skins/ui_manager.c:304
+#: src/skins/ui_manager.c:298
 msgid "Remove unselected entries from the playlist."
 msgstr "删除播放列表中未被选中的条目。"
 
-#: src/skins/ui_manager.c:307
+#: src/skins/ui_manager.c:301
 msgid "Remove Selected"
 msgstr "删除已选中的"
 
-#: src/skins/ui_manager.c:308
+#: src/skins/ui_manager.c:302
 msgid "Remove selected entries from the playlist."
 msgstr "删除播放列表中已选中的条目。"
 
-#: src/skins/ui_manager.c:313
+#: src/skins/ui_manager.c:307
 msgid "Randomize List"
 msgstr "打乱列表"
 
-#: src/skins/ui_manager.c:314
+#: src/skins/ui_manager.c:308
 msgid "Randomizes the playlist."
 msgstr "播放列表随机"
 
-#: src/skins/ui_manager.c:317
+#: src/skins/ui_manager.c:311
 msgid "Reverse List"
 msgstr "反转列表"
 
-#: src/skins/ui_manager.c:318
+#: src/skins/ui_manager.c:312
 msgid "Reverses the playlist."
 msgstr "反转播放列表"
 
-#: src/skins/ui_manager.c:321
+#: src/skins/ui_manager.c:315
 msgid "Sort List"
 msgstr "排序列表"
 
-#: src/skins/ui_manager.c:324 src/skins/ui_manager.c:354
+#: src/skins/ui_manager.c:318 src/skins/ui_manager.c:348
 msgid "Sorts the list by title."
 msgstr "按标题"
 
-#: src/skins/ui_manager.c:327 src/skins/ui_manager.c:357
+#: src/skins/ui_manager.c:321 src/skins/ui_manager.c:351
 msgid "By Album"
 msgstr "按专辑"
 
-#: src/skins/ui_manager.c:328 src/skins/ui_manager.c:358
+#: src/skins/ui_manager.c:322 src/skins/ui_manager.c:352
 msgid "Sorts the list by album."
 msgstr "按专辑"
 
-#: src/skins/ui_manager.c:331 src/skins/ui_manager.c:361
+#: src/skins/ui_manager.c:325 src/skins/ui_manager.c:355
 msgid "By Artist"
 msgstr "按艺术家"
 
-#: src/skins/ui_manager.c:332 src/skins/ui_manager.c:362
+#: src/skins/ui_manager.c:326 src/skins/ui_manager.c:356
 msgid "Sorts the list by artist."
 msgstr "按艺术家"
 
-#: src/skins/ui_manager.c:336 src/skins/ui_manager.c:366
+#: src/skins/ui_manager.c:330 src/skins/ui_manager.c:360
 msgid "Sorts the list by filename."
 msgstr "按文件名"
 
-#: src/skins/ui_manager.c:340 src/skins/ui_manager.c:370
+#: src/skins/ui_manager.c:334 src/skins/ui_manager.c:364
 msgid "Sorts the list by full pathname."
 msgstr "按完整路径"
 
-#: src/skins/ui_manager.c:343 src/skins/ui_manager.c:373
+#: src/skins/ui_manager.c:337 src/skins/ui_manager.c:367
 msgid "By Date"
 msgstr "按日期"
 
-#: src/skins/ui_manager.c:344 src/skins/ui_manager.c:374
+#: src/skins/ui_manager.c:338 src/skins/ui_manager.c:368
 msgid "Sorts the list by modification time."
 msgstr "按修改时间"
 
-#: src/skins/ui_manager.c:347 src/skins/ui_manager.c:377
+#: src/skins/ui_manager.c:341 src/skins/ui_manager.c:371
 msgid "By Track Number"
 msgstr "按音轨号码"
 
-#: src/skins/ui_manager.c:348 src/skins/ui_manager.c:378
+#: src/skins/ui_manager.c:342 src/skins/ui_manager.c:372
 msgid "Sorts the list by track number."
 msgstr "按音轨序号"
 
-#: src/skins/ui_manager.c:351
+#: src/skins/ui_manager.c:345
 msgid "Sort Selected"
 msgstr "排序已选中的"
 
-#: src/skins/ui_manager.c:387
+#: src/skins/ui_manager.c:381
 msgid "File"
 msgstr "文件"
 
-#: src/skins/ui_manager.c:388
-msgid "Help"
-msgstr "帮助"
-
-#: src/skins/ui_manager.c:390
+#: src/skins/ui_manager.c:384
 msgid "Plugin Services"
 msgstr "插件服务"
 
-#: src/skins/ui_manager.c:392 src/skins/ui_manager.c:395
+#: src/skins/ui_manager.c:386 src/skins/ui_manager.c:389
 msgid "View Track Details"
 msgstr "查看音轨信息"
 
-#: src/skins/ui_manager.c:393 src/skins/ui_manager.c:396
+#: src/skins/ui_manager.c:387 src/skins/ui_manager.c:390
 msgid "View track details"
 msgstr "查看音轨信息"
 
-#: src/skins/ui_manager.c:398 src/skins/ui_manager.c:399
+#: src/skins/ui_manager.c:392 src/skins/ui_manager.c:393
 msgid "About Audacious"
 msgstr "关于Audacious"
 
-#: src/skins/ui_manager.c:401
+#: src/skins/ui_manager.c:395
 msgid "Play File"
 msgstr "播放文件"
 
-#: src/skins/ui_manager.c:402
+#: src/skins/ui_manager.c:396
 msgid "Load and play a file"
 msgstr "加载并播放文件"
 
-#: src/skins/ui_manager.c:404
+#: src/skins/ui_manager.c:398
 msgid "Play Location"
 msgstr "播放位置"
 
-#: src/skins/ui_manager.c:405
+#: src/skins/ui_manager.c:399
 msgid "Play media from the selected location"
 msgstr "播放被选中位置的文件"
 
-#: src/skins/ui_manager.c:407
+#: src/skins/ui_manager.c:401
 msgid "Plugin services"
 msgstr "插件服务"
 
-#: src/skins/ui_manager.c:409
+#: src/skins/ui_manager.c:403
 msgid "Preferences"
 msgstr "首选项"
 
-#: src/skins/ui_manager.c:410
+#: src/skins/ui_manager.c:404
 msgid "Open preferences window"
 msgstr "打开首选项窗口"
 
-#: src/skins/ui_manager.c:413
+#: src/skins/ui_manager.c:407
 msgid "Quit Audacious"
 msgstr "退出Audacious"
 
-#: src/skins/ui_manager.c:415 src/skins/ui_manager.c:416
+#: src/skins/ui_manager.c:409 src/skins/ui_manager.c:410
 msgid "Set A-B"
 msgstr "设置A-B"
 
-#: src/skins/ui_manager.c:418 src/skins/ui_manager.c:419
+#: src/skins/ui_manager.c:412 src/skins/ui_manager.c:413
 msgid "Clear A-B"
 msgstr "清空A-B"
 
-#: src/skins/ui_manager.c:421 src/skins/ui_manager.c:422
+#: src/skins/ui_manager.c:415 src/skins/ui_manager.c:416
 msgid "Jump to Playlist Start"
 msgstr "跳到被选中列表并播放"
 
-#: src/skins/ui_manager.c:427 src/skins/ui_manager.c:428
+#: src/skins/ui_manager.c:421 src/skins/ui_manager.c:422
 msgid "Jump to Time"
 msgstr "跳到时间"
 
-#: src/skins/ui_manager.c:430
+#: src/skins/ui_manager.c:424
 msgid "Queue Toggle"
 msgstr "队列切换"
 
-#: src/skins/ui_manager.c:431
+#: src/skins/ui_manager.c:425
 msgid "Enables/disables the entry in the playlist's queue."
 msgstr "启用/禁用播放队列的条目"
 
-#: src/skins/ui_manager.c:434
+#: src/skins/ui_manager.c:428
 msgid "Copy"
 msgstr "复制"
 
-#: src/skins/ui_manager.c:436
+#: src/skins/ui_manager.c:430
 msgid "Cut"
 msgstr "剪切"
 
-#: src/skins/ui_manager.c:438
+#: src/skins/ui_manager.c:432
 msgid "Paste"
 msgstr "粘贴"
 
-#: src/skins/ui_manager.c:445
+#: src/skins/ui_manager.c:439
 msgid "Load"
 msgstr "载入"
 
-#: src/skins/ui_manager.c:450 src/skins/ui_manager.c:471
-#: src/skins/ui_manager.c:486
+#: src/skins/ui_manager.c:440
+msgid "Import"
+msgstr "导入"
+
+#: src/skins/ui_manager.c:441
+msgid "Save"
+msgstr "保存"
+
+#: src/skins/ui_manager.c:442
+msgid "Delete"
+msgstr "删除"
+
+#: src/skins/ui_manager.c:444 src/skins/ui_manager.c:465
+#: src/skins/ui_manager.c:480
 msgid "Preset"
 msgstr "预设"
 
-#: src/skins/ui_manager.c:451
+#: src/skins/ui_manager.c:445
 msgid "Load preset"
 msgstr "载入预设"
 
-#: src/skins/ui_manager.c:453 src/skins/ui_manager.c:474
-#: src/skins/ui_manager.c:489
+#: src/skins/ui_manager.c:447 src/skins/ui_manager.c:468
+#: src/skins/ui_manager.c:483
 msgid "Auto-load preset"
 msgstr "自动载入预设"
 
-#: src/skins/ui_manager.c:454
+#: src/skins/ui_manager.c:448
 msgid "Load auto-load preset"
 msgstr "载入自动载入预设"
 
-#: src/skins/ui_manager.c:457
+#: src/skins/ui_manager.c:451
 msgid "Load default preset into equalizer"
 msgstr "将默认预设载入到均衡器"
 
-#: src/skins/ui_manager.c:459
+#: src/skins/ui_manager.c:453
 msgid "Zero"
 msgstr "零"
 
-#: src/skins/ui_manager.c:460
+#: src/skins/ui_manager.c:454
 msgid "Set equalizer preset levels to zero"
 msgstr "将均衡器的预设等级设置为零"
 
-#: src/skins/ui_manager.c:462
+#: src/skins/ui_manager.c:456
 msgid "From file"
 msgstr "从文件加载"
 
-#: src/skins/ui_manager.c:463
+#: src/skins/ui_manager.c:457
 msgid "Load preset from file"
 msgstr "从文件加载预设"
 
-#: src/skins/ui_manager.c:465
+#: src/skins/ui_manager.c:459
 msgid "From WinAMP EQF file"
 msgstr "从WinAMP EQF文件加载"
 
-#: src/skins/ui_manager.c:466
+#: src/skins/ui_manager.c:460
 msgid "Load preset from WinAMP EQF file"
 msgstr "从WinAMP EQF文件加载预设"
 
-#: src/skins/ui_manager.c:468
+#: src/skins/ui_manager.c:462
 msgid "WinAMP Presets"
 msgstr "WinAMP 预设"
 
-#: src/skins/ui_manager.c:469
+#: src/skins/ui_manager.c:463
 msgid "Import WinAMP presets"
 msgstr "导入WinAMP预设"
 
-#: src/skins/ui_manager.c:472
+#: src/skins/ui_manager.c:466
 msgid "Save preset"
 msgstr "保存预设"
 
-#: src/skins/ui_manager.c:475
+#: src/skins/ui_manager.c:469
 msgid "Save auto-load preset"
 msgstr "保存自动加载预设"
 
-#: src/skins/ui_manager.c:478
+#: src/skins/ui_manager.c:472
 msgid "Save default preset"
 msgstr "保存默认预设"
 
-#: src/skins/ui_manager.c:480
+#: src/skins/ui_manager.c:474
 msgid "To file"
 msgstr "保存到文件"
 
-#: src/skins/ui_manager.c:481
+#: src/skins/ui_manager.c:475
 msgid "Save preset to file"
 msgstr "保存预设到文件"
 
-#: src/skins/ui_manager.c:483
+#: src/skins/ui_manager.c:477
 msgid "To WinAMP EQF file"
 msgstr "保存到WinAMP EQF文件"
 
-#: src/skins/ui_manager.c:484
+#: src/skins/ui_manager.c:478
 msgid "Save preset to WinAMP EQF file"
 msgstr "保存预设到WinAMP EQF文件"
 
-#: src/skins/ui_manager.c:487
+#: src/skins/ui_manager.c:481
 msgid "Delete preset"
 msgstr "删除预设"
 
-#: src/skins/ui_manager.c:490
+#: src/skins/ui_manager.c:484
 msgid "Delete auto-load preset"
 msgstr "删除自动加载预设"
 
-#: src/skins/ui_playlist.c:245
+#: src/skins/ui_playlist.c:244
 msgid "Search entries in active playlist"
 msgstr "从当前播放列表中搜索条目"
 
-#: src/skins/ui_playlist.c:253
+#: src/skins/ui_playlist.c:252
 msgid ""
 "Select entries in playlist by filling one or more fields. Fields use regular "
 "expressions syntax, case-insensitive. If you don't know how regular "
@@ -3608,39 +3264,39 @@
 "按部分字段搜索播放列表中的条目。各个字段都可以使用正则表达式，而且是不分大小"
 "字的。如果你不知道何为正则表达式，简单的输入部分你想搜索的文字亦可。"
 
-#: src/skins/ui_playlist.c:261
+#: src/skins/ui_playlist.c:260
 msgid "Title: "
 msgstr "标题："
 
-#: src/skins/ui_playlist.c:268
+#: src/skins/ui_playlist.c:267
 msgid "Album: "
 msgstr "专辑："
 
-#: src/skins/ui_playlist.c:275
+#: src/skins/ui_playlist.c:274
 msgid "Artist: "
 msgstr "艺术家："
 
-#: src/skins/ui_playlist.c:282
+#: src/skins/ui_playlist.c:281
 msgid "Filename: "
 msgstr "文件名"
 
-#: src/skins/ui_playlist.c:290
+#: src/skins/ui_playlist.c:289
 msgid "Clear previous selection before searching"
 msgstr "搜索前清空之前的结果"
 
-#: src/skins/ui_playlist.c:293
+#: src/skins/ui_playlist.c:292
 msgid "Automatically toggle queue for matching entries"
 msgstr "自动为区配条目切换队列"
 
-#: src/skins/ui_playlist.c:296
+#: src/skins/ui_playlist.c:295
 msgid "Create a new playlist with matching entries"
 msgstr "用匹配的条目创建新的播放列表"
 
-#: src/skins/ui_playlist.c:763
+#: src/skins/ui_playlist.c:762
 msgid "Audacious Playlist Editor"
 msgstr "Audacious播放列表编辑器"
 
-#: src/skins/ui_playlist.c:810
+#: src/skins/ui_playlist.c:809
 #, c-format
 msgid "%s (%d of %d)"
 msgstr ""
@@ -3656,90 +3312,63 @@
 #: src/skins/util.c:773
 #, c-format
 msgid "Could not create directory (%s): %s\n"
-msgstr "无法创建目录(%s): %s\n"
+msgstr "无法创建目录(%s)：%s\n"
 
 #: src/sndfile/plugin.c:454
 msgid "About sndfile plugin"
 msgstr "关于sndfile插件"
 
-#: src/sndfile/plugin.c:455
-msgid ""
-"Adapted for Audacious usage by Tony Vroon <chainsaw@gentoo.org>\n"
-"from the xmms_sndfile plugin which is:\n"
-"Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
-"\n"
-"This program is free software ; you can redistribute it and/or modify \n"
-"it under the terms of the GNU General Public License as published by \n"
-"the Free Software Foundation ; either version 2 of the License, or \n"
-"(at your option) any later version. \n"
-" \n"
-"This program is distributed in the hope that it will be useful, \n"
-"but WITHOUT ANY WARRANTY ; without even the implied warranty of \n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. \n"
-"See the GNU General Public License for more details. \n"
-"\n"
-"You should have received a copy of the GNU General Public \n"
-"License along with this program ; if not, write to \n"
-"the Free Software Foundation, Inc., \n"
-"51 Franklin Street, Fifth Floor, \n"
-"Boston, MA 02110-1301 USA"
-msgstr ""
-
 #: src/sndstretch/sndstretch_xmms.c:155
 msgid "About SndStretch"
 msgstr "关于SndStretch"
 
-#: src/sndstretch/sndstretch_xmms.c:313
+#: src/sndstretch/sndstretch_xmms.c:308
 msgid "Volume corr."
 msgstr ""
 
-#: src/sndstretch/sndstretch_xmms.c:314
+#: src/sndstretch/sndstretch_xmms.c:309
 msgid "Short Overlap"
 msgstr ""
 
-#: src/sndstretch/sndstretch_xmms.c:360
+#: src/sndstretch/sndstretch_xmms.c:355
 msgid "Speed"
 msgstr "速度"
 
-#: src/sndstretch/sndstretch_xmms.c:361
+#: src/sndstretch/sndstretch_xmms.c:356
 msgid "Pitch"
 msgstr "音调"
 
-#: src/sndstretch/sndstretch_xmms.c:362
+#: src/sndstretch/sndstretch_xmms.c:357
 msgid "Scale"
 msgstr "缩放"
 
-#: src/sndstretch/sndstretch_xmms.c:363
-msgid "Options"
-msgstr "选项"
-
-#: src/sndstretch/sndstretch_xmms.c:382
+#: src/sndstretch/sndstretch_xmms.c:377
 msgid "SndStretch - Configuration"
 msgstr "SndStretch - 设置"
 
-#: src/song_change/song_change.c:464
+#: src/song_change/song_change.c:447
 msgid "Command to run when Audacious starts a new song."
 msgstr "歌曲开始播放时执行指令。"
 
-#: src/song_change/song_change.c:465 src/song_change/song_change.c:469
-#: src/song_change/song_change.c:473 src/song_change/song_change.c:477
+#: src/song_change/song_change.c:449 src/song_change/song_change.c:455
+#: src/song_change/song_change.c:461 src/song_change/song_change.c:467
 msgid "Command:"
 msgstr "指令："
 
-#: src/song_change/song_change.c:468
+#: src/song_change/song_change.c:453
 msgid "Command to run toward the end of a song."
 msgstr "歌曲即将完成时执行指令。"
 
-#: src/song_change/song_change.c:472
+#: src/song_change/song_change.c:459
 msgid "Command to run when Audacious reaches the end of the playlist."
 msgstr "当Audacious播放到列表结尾时执行指令。"
 
-#: src/song_change/song_change.c:476
+#: src/song_change/song_change.c:465
 msgid ""
 "Command to run when title changes for a song (i.e. network streams titles)."
-msgstr "歌曲的标题改变时执行指令(如: 网络媒体的标题)。"
+msgstr "歌曲的标题改变时执行指令(如：网络媒体的标题)。"
 
-#: src/song_change/song_change.c:480
+#: src/song_change/song_change.c:471
 msgid ""
 "You can use the following format strings which\n"
 "will be substituted before calling the command\n"
@@ -3773,7 +3402,7 @@
 "%b: 专辑\n"
 "%T: 音轨标题"
 
-#: src/song_change/song_change.c:507
+#: src/song_change/song_change.c:498
 msgid ""
 "Parameters passed to the shell should be encapsulated in "
 "quotes. Doing otherwise is a security risk."
@@ -3781,11 +3410,11 @@
 "传递到Shell的参数一定要用引号包围，否则会是一件相当危险的"
 "事。"
 
-#: src/song_change/song_change.c:518
+#: src/song_change/song_change.c:509
 msgid "Commands"
 msgstr "指令"
 
-#: src/song_change/song_change.c:555
+#: src/song_change/song_change.c:539
 msgid "Song Change"
 msgstr "歌曲改变"
 
@@ -3805,8 +3434,9 @@
 msgstr ""
 "状态图标插件\n"
 "\n"
-"版权所有 (c) 2005-2007 Giacomo Lozito <james@develia.org>\n"
-"版权所有 (c) 2010 Michał Lipski <tallica@o2.pl>\n"
+"版权所有 (c)\n"
+"2005-2007 Giacomo Lozito <james@develia.org>\n"
+"2010 Michał Lipski <tallica@o2.pl>\n"
 "\n"
 "此插件会在系统托盘上生成状态图标。\n"
 
@@ -3832,11 +3462,11 @@
 
 #: src/statusicon/statusicon.c:485
 msgid "Change volume"
-msgstr "改变音量"
+msgstr "调整音量"
 
 #: src/statusicon/statusicon.c:487
 msgid "Change playing song"
-msgstr "改变播放中歌曲"
+msgstr "改变歌曲"
 
 #: src/statusicon/statusicon.c:500
 msgid "Other settings"
@@ -3850,7 +3480,7 @@
 msgid "Close to the notification area (system tray)"
 msgstr "关闭提示区域（系统托盘）"
 
-#: src/stereo_plugin/stereo.c:41
+#: src/stereo_plugin/stereo.c:45
 msgid ""
 "Extra Stereo Plugin\n"
 "\n"
@@ -3860,14 +3490,65 @@
 "\n"
 "作者: Johan Levin 1999."
 
-#: src/stereo_plugin/stereo.c:65
+#: src/stereo_plugin/stereo.c:64
 msgid "About Extra Stereo Plugin"
 msgstr "About Extra Stereo插件"
 
-#: src/stereo_plugin/stereo.c:102
+#: src/stereo_plugin/stereo.c:95
 msgid "Configure Extra Stereo"
 msgstr "设置Extra Stereo"
 
+#: src/streambrowser/gui/streambrowser_win.c:78
+msgid "Search:"
+msgstr "搜索："
+
+#: src/streambrowser/gui/streambrowser_win.c:97
+#: src/streambrowser/gui/streambrowser_win.c:372
+msgid "Add Bookmark"
+msgstr "添加书签"
+
+#: src/streambrowser/gui/streambrowser_win.c:324
+msgid "Stream name"
+msgstr "流名称"
+
+#: src/streambrowser/gui/streambrowser_win.c:331
+msgid "Now playing"
+msgstr "正在播放"
+
+#: src/streambrowser/gui/streambrowser_win.c:369
+msgid "Remove Bookmark"
+msgstr "删除书签"
+
+#: src/streambrowser/streambrowser.c:330
+msgid "About Stream Browser"
+msgstr "关于流查看器"
+
+#: src/streambrowser/streambrowser.c:331
+msgid ""
+"Copyright (c) 2008, by Calin Crisan <ccrisan@gmail.com> and The Audacious "
+"Team.\n"
+"\n"
+"This is a simple stream browser that includes the most popular streaming "
+"directories.\n"
+"Many thanks to the Streamtuner developers <http://www.nongnu.org/"
+"streamtuner>,\n"
+"\tand of course to the whole Audacious community.\n"
+"\n"
+"Also thank you Tony Vroon for mentoring & guiding me, again.\n"
+"\n"
+"This was a Google Summer of Code 2008 project."
+msgstr ""
+"版权所有 (c)\n"
+"2008, Calin Crisan <ccrisan@gmail.com>及Audacious开发小组。\n"
+"\n"
+"This is a simple stream browser that includes the most popular streaming "
+"directories.\n"
+"非常感谢Streamtuner的开发者<http://www.nongnu.org/streamtuner>，\n"
+"及Audacious社区全体。\n"
+"同时亦非常感谢Tony Vroon对我的帮助和指导。\n"
+"\n"
+"Google Summer of Code 2008 project."
+
 #: src/tonegen/tonegen.c:48
 msgid "About Tone Generator"
 msgstr "关于Tone Generator"
@@ -3891,31 +3572,14 @@
 msgstr ""
 
 #: src/unix-io/gtk.c:34
-#, fuzzy
 msgid "About File I/O Plugin"
-msgstr "关于OSS4插件"
-
-#: src/vorbis/configure.c:31
-msgid "Override generic titles"
-msgstr "覆蓋常规标题"
-
-#: src/vorbis/configure.c:32
-msgid "Title format:"
-msgstr "标题格式"
-
-#: src/vorbis/configure.c:36
-msgid "Ogg Vorbis Tags"
-msgstr "Ogg Vorbis标签"
-
-#: src/vorbis/configure.c:69
-msgid "Ogg Vorbis Audio Plugin Configuration"
-msgstr "Ogg Vorbis音频播放设置"
+msgstr "关于文件I/O插件"
 
-#: src/vorbis/vorbis.c:581
+#: src/vorbis/vorbis.c:572
 msgid "About Ogg Vorbis Audio Plugin"
 msgstr "关于Ogg Vorbis音频插件"
 
-#: src/vorbis/vorbis.c:586
+#: src/vorbis/vorbis.c:577
 msgid ""
 "Ogg Vorbis Plugin by the Xiph.org Foundation\n"
 "\n"
@@ -3982,11 +3646,306 @@
 "Some of the plugin code was by Miles Egan\n"
 "Visit the Wavpack site at http://www.wavpack.com/\n"
 msgstr ""
-"版权所有 (c) 2006 William Pitcock <nenolod -at- nenolod.net>\n"
+"版权所有 (c)\n"
+"2006 William Pitcock <nenolod -at- nenolod.net>\n"
 "\n"
 "插件部分代码来自Miles Egan\n"
 "登录Wavpack网站http://www.wavpack.com/\n"
 
+#~ msgid "Daemon Interface (like old headless mode)"
+#~ msgstr "Daemon模式"
+
+#~ msgid "About %s"
+#~ msgstr "关于 %s"
+
+#~ msgid " Error"
+#~ msgstr "错误"
+
+#~ msgid "General info"
+#~ msgstr "一般信息"
+
+#~ msgid "Couldn't find pixmap file: %s"
+#~ msgstr "无法找到pixmap文件: %s"
+
+#~ msgid "Audacious-SID configuration"
+#~ msgstr "Audacious-SID设置"
+
+#~ msgid "Resolution:"
+#~ msgstr "分辨率："
+
+#~ msgid "Samplerate:"
+#~ msgstr "取样率："
+
+#~ msgid "Use oversampling"
+#~ msgstr "使用超取样"
+
+#~ msgid "Factor:"
+#~ msgstr "系数："
+
+#~ msgid "Large factors require more CPU-power"
+#~ msgstr "系数越大使用的CPU越多"
+
+#~ msgid "Oversampling:"
+#~ msgstr "超取样"
+
+#~ msgid "Audio"
+#~ msgstr "音频"
+
+#~ msgid "Force speed"
+#~ msgstr "强制速度"
+
+#~ msgid ""
+#~ "If enabled, this option \"forces\" the emulation engine to use the "
+#~ "selected clock speed/frequency. Otherwise the speed is determined from "
+#~ "played file itself."
+#~ msgstr "如果启用，将强制模拟器引擎使用指定的时频速度。否则则自己检测。"
+
+#~ msgid ""
+#~ "PAL is the european TV standard, which uses 50Hz vertical refresh "
+#~ "frequency. Most of SID-tunes have been made for PAL computers."
+#~ msgstr ""
+#~ "PAL是欧洲的电视标准，它使用的垂直刷新率是50Hz。大部分的SID-tunes都是为PAL"
+#~ "电脑制作的。"
+
+#~ msgid ""
+#~ "NTSC is the TV standard with 60Hz vertical refresh rate (and other "
+#~ "features that differ from PAL). It is mainly used in United States, Japan "
+#~ "and certain other countries."
+#~ msgstr ""
+#~ "NTSC则是使用垂直刷新率为50Hz的电视标准（除此以外，还包含其它不同于PAL的特"
+#~ "性)。主要在美国，日本还其它的部分国家使用。"
+
+#~ msgid "Clock speed:"
+#~ msgstr "时频速度："
+
+#~ msgid "Force model"
+#~ msgstr "强制型号"
+
+#~ msgid "SID model:"
+#~ msgstr "SID型号："
+
+#~ msgid "SIDPlay 1 (frame-based)"
+#~ msgstr "SIDPlay 1（基于帧）"
+
+#~ msgid ""
+#~ "Use libSIDPlay 1.x emulation, faster but not so accurate. Good in most "
+#~ "cases, though."
+#~ msgstr ""
+#~ "使用libSIDPlay 1.x模拟器，速度更快，但并不准确。大部分情况都工作良好。"
+
+#~ msgid "SIDPlay 2 (cycle-based)"
+#~ msgstr "SIDPlay 2（基于周期）"
+
+#~ msgid ""
+#~ "Use libSIDPlay 2.x emulation, which requires powerful CPU due to more "
+#~ "exact emulation."
+#~ msgstr "使用libSIDPlay 2.x模拟器，将使用更多CPU以获得更准确的模拟。"
+
+#~ msgid "Emulation library selection:"
+#~ msgstr "选择模拟器使用的库："
+
+#~ msgid "Real C64 (SIDPlay 2 only)"
+#~ msgstr "Real C64 （仅SIDPlay 2可用）"
+
+#~ msgid "Bank switching"
+#~ msgstr "Bank切换"
+
+#~ msgid "Transparent ROM"
+#~ msgstr "透明ROM"
+
+#~ msgid "PlaySID environment"
+#~ msgstr "PlaySID环境"
+
+#~ msgid "Memory mode:"
+#~ msgstr "内存模式："
+
+#~ msgid "Optimization mode (faster, inaccurate)"
+#~ msgstr "优化模式（更快，不准确）"
+
+#~ msgid "reSID-emulation"
+#~ msgstr "reSID模拟"
+
+#~ msgid "SIDPlay 2 options:"
+#~ msgstr "SIDPlay2 选项："
+
+#~ msgid "Resampling (FIR)"
+#~ msgstr "取样(FIR)"
+
+#~ msgid "reSID sampling options:"
+#~ msgstr "reSID取样选项："
+
+#~ msgid "Emulate filters"
+#~ msgstr "模拟过滤器"
+
+#~ msgid "Reset values"
+#~ msgstr "重置"
+
+#~ msgid "Export"
+#~ msgstr "导出"
+
+#~ msgid "Use"
+#~ msgstr "使用"
+
+#~ msgid "Filter curve:"
+#~ msgstr "过滤器曲线："
+
+#~ msgid "Filters"
+#~ msgstr "过滤器"
+
+#~ msgid "Play at least for specified time"
+#~ msgstr "至少播放指定的时间"
+
+#~ msgid "Playtime:"
+#~ msgstr "播放时间:"
+
+#~ msgid "Minimum playtime:"
+#~ msgstr "最小播放时间："
+
+#~ msgid "Play for specified time maximum"
+#~ msgstr "最长播放指定时间"
+
+#~ msgid "Only when song length is unknown"
+#~ msgstr "仅当歌曲长度未知"
+
+#~ msgid ""
+#~ "If enabled, the maximum playtime is applied only if song/tune length is "
+#~ "not known."
+#~ msgstr "如果启用，最长播放时间仅当歌曲长度未知时使用"
+
+#~ msgid "Maximum playtime:"
+#~ msgstr "最长播放时间："
+
+#~ msgid "Use XSIDPLAY-compatible database"
+#~ msgstr "使用XSIDPLAY兼容的数据库"
+
+#~ msgid "DB-file:"
+#~ msgstr "数据库文件："
+
+#~ msgid "Database path and filename"
+#~ msgstr "数据库文件路径及名称"
+
+#~ msgid "Browse for song length-database file"
+#~ msgstr "浏览"
+
+#~ msgid "Song length database:"
+#~ msgstr "歌曲长度数据库："
+
+#~ msgid "Songlength"
+#~ msgstr "歌曲长度"
+
+#~ msgid "Override generic Tuplez format string"
+#~ msgstr "覆盖常规Tuplez格式字串"
+
+#~ msgid "Tuplez format string for SID-files"
+#~ msgstr "SID文件Tuplez格式字串"
+
+#~ msgid "Song title format:"
+#~ msgstr "歌曲标题格式："
+
+#~ msgid "Use STIL database"
+#~ msgstr "使用STIL数据库"
+
+#~ msgid "STIL file:"
+#~ msgstr "STIL文件："
+
+#~ msgid ""
+#~ "Path and filename of STIL database file (STIL.txt), usually found from "
+#~ "HVSC's DOCUMENTS-subdirectory."
+#~ msgstr ""
+#~ "STIL数据库文件的路径及名称（STIL.txt）。通常可以在HVSC文档子目录下找到。"
+
+#~ msgid "Browse for STIL-database file"
+#~ msgstr "浏览STIL数据库文件"
+
+#~ msgid "HVSC path:"
+#~ msgstr "HVSC路径："
+
+#~ msgid "Browse for HVSC path"
+#~ msgstr "浏览HVSC路径"
+
+#~ msgid "SID Tune Information List (STIL) database:"
+#~ msgstr "SID音调信息列表（STIL）数据库"
+
+#~ msgid "Cancel any changes"
+#~ msgstr "取消所有变更"
+
+#~ msgid "Accept and update changes"
+#~ msgstr "同意并更新"
+
+#~ msgid "Audacious-SID Fileinfo"
+#~ msgstr "Audacious-SID文件信息"
+
+#~ msgid "Filename:"
+#~ msgstr "文件名："
+
+#~ msgid "Songname:"
+#~ msgstr "歌曲名："
+
+#~ msgid "Composer:"
+#~ msgstr "作曲家："
+
+#~ msgid "Copyright:"
+#~ msgstr "版权："
+
+#~ msgid "Song Information:"
+#~ msgstr "歌曲信息："
+
+#~ msgid "Author:"
+#~ msgstr "作者："
+
+#~ msgid "Duration:"
+#~ msgstr "持续时间："
+
+#~ msgid "Sub-tune Information:"
+#~ msgstr "Sub-tune信息："
+
+#~ msgid "Select HVSC song length database"
+#~ msgstr "选择HVSC歌曲长度数据库"
+
+#~ msgid "Select STIL-database"
+#~ msgstr "选择STIL数据库"
+
+#~ msgid "Select HVSC location prefix"
+#~ msgstr "选择HVSC路径前缀"
+
+#~ msgid "Select SIDPlay2 filters file for importing"
+#~ msgstr "选择要导入的SIDPlay2过滤文件"
+
+#~ msgid "Select SIDPlay2 filters file for exporting"
+#~ msgstr "选择要导出的SIDplay2过滤文件"
+
+#~ msgid "Confirm selected action"
+#~ msgstr "确认选中的动作"
+
+#~ msgid "Yes"
+#~ msgstr "是"
+
+#~ msgid "No"
+#~ msgstr "否"
+
+#~ msgid "Save All Playlists"
+#~ msgstr "保存所有播放列表"
+
+#~ msgid ""
+#~ "Saves all the playlists that are open. Note that this is done "
+#~ "automatically when Audacious quits."
+#~ msgstr "保存所有已打开的播放列表（其实Audacious退出时是会自动保存的）。"
+
+#~ msgid "Opens the playlist manager."
+#~ msgstr "打开播放列表管理器"
+
+#~ msgid "Override generic titles"
+#~ msgstr "覆蓋常规标题"
+
+#~ msgid "Title format:"
+#~ msgstr "标题格式"
+
+#~ msgid "Ogg Vorbis Tags"
+#~ msgstr "Ogg Vorbis标签"
+
+#~ msgid "Ogg Vorbis Audio Plugin Configuration"
+#~ msgstr "Ogg Vorbis音频播放设置"
+
 #~ msgid "Use Bitmap fonts if available"
 #~ msgstr "尽可能使用点阵字体"
 
@@ -4127,264 +4086,12 @@
 #~ msgid "Timer: "
 #~ msgstr "计时："
 
-#~ msgid "About XMMS Alarm"
-#~ msgstr "关于XMMS闹钟"
-
-#~ msgid "XMMS Alarm"
-#~ msgstr "XMMS闹钟"
-
-#~ msgid ""
-#~ "An XMMS plugin which can be used\n"
-#~ "to start playing at a certain time.\n"
-#~ "\n"
-#~ "Send all complaints to:\n"
-#~ "Adam Feakin <adamf@snika.uklinux.net>\n"
-#~ "Daniel Stodden <stodden@in.tum.de>\n"
-#~ "\n"
-#~ "http://www.snika.uklinux.net/xmms-alarm/"
-#~ msgstr ""
-#~ "用于在设定时间启动播放的XMMS插件\n"
-#~ "\n"
-#~ "问题反馈:\n"
-#~ "Adam Feakin <adamf@snika.uklinux.net>\n"
-#~ "Daniel Stodden <stodden@in.tum.de>\n"
-#~ "\n"
-#~ "http://www.snika.uklinux.net/xmms-alarm/"
-
-#~ msgid "Alarm"
-#~ msgstr "闹钟"
-
-#~ msgid "This is your wakeup call."
-#~ msgstr "此为起床闹钟"
-
 #~ msgid "Select Playlist"
 #~ msgstr "选择播放列表"
 
-#~ msgid "Sorry"
-#~ msgstr "抱歉"
-
-#~ msgid "Warning"
-#~ msgstr "警告"
-
-#~ msgid ""
-#~ "For safety reasons the \"quiet\" time must be at least 65 seconds longer "
-#~ "than the fading time, it must also be more than 10 seconds. This "
-#~ "basically means that there is a bug in the code and until I find a way of "
-#~ "really fixing it this message will appear :)\n"
-#~ "\n"
-#~ "Your fading settings have NOT been saved\n"
-#~ "\n"
-#~ "--\n"
-#~ "Adam"
-#~ msgstr ""
-#~ "鉴于安全理由，\"静音\"时间至少要比渐退时间长65秒，其本身亦至少大于10秒。\n"
-#~ "这基本上是代码的问题，同时在我找到解决方法前此信息还会出现的 :)\n"
-#~ "\n"
-#~ "你的渐退设置未保存\n"
-#~ "\n"
-#~ "--\n"
-#~ "Adam"
-
-#~ msgid "Oh Well"
-#~ msgstr "不错嘛"
-
-#~ msgid "Alarm Settings"
-#~ msgstr "闹钟设置"
-
-#~ msgid "Time"
-#~ msgstr "时间"
-
-#~ msgid "hours"
-#~ msgstr "小时"
-
-#~ msgid "h"
-#~ msgstr "点"
-
-#~ msgid "minutes"
-#~ msgstr "分"
-
-#~ msgid "Quiet after:"
-#~ msgstr "静音时间："
-
-#~ msgid "Alarm at (default):"
-#~ msgstr "响闹钟(默认)："
-
-#~ msgid "Choose the days for the alarm to come on"
-#~ msgstr "选择响闹钟的日期"
-
-#~ msgid "Day"
-#~ msgstr "日期"
-
-#~ msgid "Tuesday"
-#~ msgstr "週二"
-
-#~ msgid "Wednesday"
-#~ msgstr "週三"
-
-#~ msgid "Thursday"
-#~ msgstr "週四"
-
-#~ msgid "Friday"
-#~ msgstr "週五"
-
-#~ msgid "Saturday"
-#~ msgstr "週末"
-
-#~ msgid "Sunday"
-#~ msgstr "週日"
-
-#~ msgid "Monday"
-#~ msgstr "週一"
-
-#~ msgid "Days"
-#~ msgstr "日期"
-
-#~ msgid "Fading"
-#~ msgstr "渐退"
-
-#~ msgid "Volume"
-#~ msgstr "音量"
-
-#~ msgid "Current"
-#~ msgstr "当前"
-
 #~ msgid "reset to current output volume"
 #~ msgstr "重置当前输出音量"
 
-#~ msgid "Start at"
-#~ msgstr "开始于"
-
-#~ msgid "%"
-#~ msgstr "%"
-
-#~ msgid "Final"
-#~ msgstr "完成于"
-
-#~ msgid "Additional Command"
-#~ msgstr "附加指令"
-
-#~ msgid "enable"
-#~ msgstr "启用"
-
-#~ msgid "Playlist (optional)"
-#~ msgstr "播放列表(可选)"
-
-#~ msgid "Browse..."
-#~ msgstr "浏览..."
-
-#~ msgid "Reminder"
-#~ msgstr "提醒器"
-
-#~ msgid "Use reminder"
-#~ msgstr "使用提醒器"
-
-#~ msgid "What do these options mean?"
-#~ msgstr "这些选项有什么用？"
-
-#~ msgid ""
-#~ "\n"
-#~ "Time\n"
-#~ " Alarm at: \n"
-#~ " The time for the alarm to come on.\n"
-#~ "\n"
-#~ " Quiet After: \n"
-#~ " Stop alarm after this amount of time.\n"
-#~ " (if the wakeup dialog is not closed)\n"
-#~ "\n"
-#~ "\n"
-#~ "Days\n"
-#~ " Day:\n"
-#~ " Select the days for the alarm to activate.\n"
-#~ "\n"
-#~ " Time:\n"
-#~ " Choose the time for the alarm on each day,\n"
-#~ " or select the toggle button to use the default\n"
-#~ " time.\n"
-#~ "\n"
-#~ "\n"
-#~ "Volume\n"
-#~ " Fading: \n"
-#~ " Fade the volume up to the chosen volume \n"
-#~ " for this amount of time.\n"
-#~ "\n"
-#~ " Start at: \n"
-#~ " Start fading from this volume.\n"
-#~ "\n"
-#~ " Final: \n"
-#~ " The volume to stop fading at. If the fading\n"
-#~ " time is 0 then set volume to this and start\n"
-#~ " playing.\n"
-#~ "\n"
-#~ "\n"
-#~ "Options:\n"
-#~ " Additional Command:\n"
-#~ " Run this command at the alarm time.\n"
-#~ "\n"
-#~ " Playlist: \n"
-#~ " Load this playlist for playing songs from \n"
-#~ " (must have .m3u extension). If no playlist\n"
-#~ " is given then the songs which are currently\n"
-#~ " in the list will be used.\n"
-#~ " The URL of an mp3/ogg stream can also be\n"
-#~ " entered here, but loading of playlists from\n"
-#~ " URLs is not currently supported by xmms.\n"
-#~ "\n"
-#~ " Reminder:\n"
-#~ " Display a reminder when the alarm goes off,\n"
-#~ " type the reminder in the box and turn on the\n"
-#~ " toggle button if you want it to be shown.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "时间\n"
-#~ " 响闹钟: \n"
-#~ " 闹钟启动时间。\n"
-#~ "\n"
-#~ " 静音时间: \n"
-#~ " 在此时间之后停止播放。\n"
-#~ " (如果起床对话框未关闭)\n"
-#~ "\n"
-#~ "\n"
-#~ "日期\n"
-#~ " 日期:\n"
-#~ " 选择启用闹钟的日期\n"
-#~ "\n"
-#~ " 时间:\n"
-#~ " 选择每天闹钟响的时间,\n"
-#~ " 或者点击开关按钮使用默认时间\n"
-#~ "\n"
-#~ "\n"
-#~ "音量\n"
-#~ " 渐退: \n"
-#~ " 在指定时间要把音量消退到指定音量。\n"
-#~ "\n"
-#~ " 开始于: \n"
-#~ " 从此音量开始消退\n"
-#~ "\n"
-#~ " 完成于: \n"
-#~ " 到达此音量时停止。\n"
-#~ " 如果渐退时间为0，则直接设置为此音量后开始播放。\n"
-#~ "\n"
-#~ "\n"
-#~ "选项:\n"
-#~ " 附加指令:\n"
-#~ " 在闹钟时间执行此指令。\n"
-#~ "\n"
-#~ " 播放列表:\n"
-#~ " 从播放列表加载要播放的文件(仅支持.m3u文件) \n"
-#~ " 如果未指定播放列表则使用当前的列表。\n"
-#~ " 此处亦可使用远程的mp3/ogg流URL地址，\n"
-#~ " 但现时暂未支持从播放列表中加载URL地址\n"
-#~ "\n"
-#~ " 提醒器:\n"
-#~ " 当闹钟停止后显示提醒器，\n"
-#~ " 如果你想显示提醒器，输出要用的提醒器并打开相应的开关按钮\n"
-
-#~ msgid "Your reminder for today is.."
-#~ msgstr "你今天的提醒器是.."
-
-#~ msgid "Thankyou"
-#~ msgstr "谢谢"
-
 #~ msgid "Pairing request for '%s'"
 #~ msgstr "正在为'%s'配对请求"
 
@@ -4609,7 +4316,7 @@
 #~ msgstr "检测到"
 
 #~ msgid "Custom"
-#~ msgstr "定制"
+#~ msgstr "自定"
 
 #~ msgid "Not Detected"
 #~ msgstr "未检测到"
@@ -4736,9 +4443,6 @@
 #~ msgid "UID"
 #~ msgstr "UID"
 
-#~ msgid "Installed plugins"
-#~ msgstr "已安装插件"
-
 #~ msgid "Running plugins"
 #~ msgstr "运行中的插件"
 
@@ -4839,9 +4543,6 @@
 #~ msgid "Sampling Rate"
 #~ msgstr "取样率"
 
-#~ msgid "Enable"
-#~ msgstr "启用"
-
 #~ msgid "Depth"
 #~ msgstr "深度"
 
@@ -5018,49 +4719,6 @@
 #~ msgid "Spectrum Analyzer"
 #~ msgstr "光谱分析器"
 
-#~ msgid "Search:"
-#~ msgstr "搜索："
-
-#~ msgid "Add Bookmark"
-#~ msgstr "添加书签"
-
-#~ msgid "Stream name"
-#~ msgstr "流名称"
-
-#~ msgid "Now playing"
-#~ msgstr "正在播放"
-
-#~ msgid "Remove Bookmark"
-#~ msgstr "删除书签"
-
-#~ msgid "About Stream Browser"
-#~ msgstr "关于流查看器"
-
-#~ msgid ""
-#~ "Copyright (c) 2008, by Calin Crisan <ccrisan@gmail.com> and The Audacious "
-#~ "Team.\n"
-#~ "\n"
-#~ "This is a simple stream browser that includes the most popular streaming "
-#~ "directories.\n"
-#~ "Many thanks to the Streamtuner developers <http://www.nongnu.org/"
-#~ "streamtuner>,\n"
-#~ "\tand of course to the whole Audacious community.\n"
-#~ "\n"
-#~ "Also thank you Tony Vroon for mentoring & guiding me, again.\n"
-#~ "\n"
-#~ "This was a Google Summer of Code 2008 project."
-#~ msgstr ""
-#~ "版权所有 (c) 2008, Calin Crisan <ccrisan@gmail.com>及Audacious开发小组。\n"
-#~ "\n"
-#~ "This is a simple stream browser that includes the most popular streaming "
-#~ "directories.\n"
-#~ "非常感谢Streamtuner的开发者<http://www.nongnu.org/streamtuner>,\n"
-#~ "还Audacious社区全体\n"
-#~ "\n"
-#~ "同时亦非常感谢Tony Vroon对我的帮助和指导。\n"
-#~ "\n"
-#~ "Google Summer of Code 2008 project."
-
 #~ msgid "Can't jump to time when no track is being played.\n"
 #~ msgstr "未开始插放时无法跳到时间。\n"

audacious-plugins-3.0.3.tar.bz2/po/zh_TW.po -> audacious-plugins-3.1.tar.bz2/po/zh_TW.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: audacious-plugins 3.0\n"
 "Report-Msgid-Bugs-To: http://jira.atheme.org/\n"
-"POT-Creation-Date: 2011-09-18 14:13-0400\n"
+"POT-Creation-Date: 2011-07-17 18:49-0400\n"
 "PO-Revision-Date: 2011-07-27 10:39+0800\n"
 "Last-Translator: Ruei-Yuan Lu <RueiYuan.Lu@gmail.com>\n"
 "Language-Team: Chinese (traditional)\n"
@@ -15,8 +15,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+#"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-# "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 #: src/aac/libmp4.c:256
 #, c-format
 msgid ""
@@ -28,6 +28,7 @@
 "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com\n"
 "Copyright (c) 2005-2006 Audacious team"
 
+
 #: src/aac/libmp4.c:261
 msgid "About MP4 AAC decoder plugin"
 msgstr "關於 MP4 AAC 解碼器外掛"
@@ -72,8 +73,7 @@
 msgid ""
 "You have not selected any sequencer ports for MIDI playback. You can do so "
 "in the MIDI plugin preferences."
-msgstr ""
-"您尚未選擇任何用於播放 MIDI 的編曲機連接埠。請到 MIDI 外掛偏好設定中設定。"
+msgstr "您尚未選擇任何用於播放 MIDI 的編曲機連接埠。請到 MIDI 外掛偏好設定中設定。"
 
 #: src/amidi-plug/backend-alsa/b-alsa.c:35
 msgid "ALSA Backend "
@@ -90,13 +90,11 @@
 "hardware synth will be directly played.\n"
 "Backend written by Giacomo Lozito."
 msgstr ""
-"這個後端會傳送 MIDI 事件到一組由使用者指定的 ALSA 編曲機連接埠。ALSA 編曲機介"
-"面有很多功能，它不但可以提供連接埠給音效卡上的硬體編曲機 (如 emu10k1) 還可以"
-"給軟體合成器與外接裝置等。\n"
-"\n"
-"這個後端本身並不產生音效，MIDI 事件直接由 ALSA 連接埠後的裝置或程式來處理；舉"
-"例來說，MIDI 事件被送到硬體合成器以後將會被直接播放。\n"
-"\n"
+"這個後端會傳送 MIDI 事件到一組由使用者指定的 ALSA 編曲機連接埠。"
+"ALSA 編曲機介面有很多功能，它不但可以提供連接埠給音效卡上的硬體編曲機 (如"
+" emu10k1) 還可以給軟體合成器與外接裝置等。\n\n"
+"這個後端本身並不產生音效，MIDI 事件直接由 ALSA 連接埠後的裝置或程式來處理；"
+"舉例來說，MIDI 事件被送到硬體合成器以後將會被直接播放。\n\n"
 "作者：Giacomo Lozito"
 
 #: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:38
@@ -112,11 +110,9 @@
 "by chosen ouput plugin.\n"
 "Backend written by Giacomo Lozito."
 msgstr ""
-"這個後端會將 MIDI 事件傳送給 FluidSynth 並產生音效，FluidSynth 是一個基於 "
-"SoundFont2 規格 (www.fluidsynth.org) 的即時軟體合成器。\n"
-"\n"
-"產生的音效會被播放器的特效外掛與輸出外掛影響。\n"
-"\n"
+"這個後端會將 MIDI 事件傳送給 FluidSynth 並產生音效，FluidSynth 是一個基於 SoundFont2"
+" 規格 (www.fluidsynth.org) 的即時軟體合成器。\n\n"
+"產生的音效會被播放器的特效外掛與輸出外掛影響。\n\n"
 "作者：Giacomo Lozito"
 
 #: src/amidi-plug/i_configure-alsa.c:228
@@ -163,6 +159,7 @@
 "ALSA\n"
 "後端"
 
+
 #: src/amidi-plug/i_configure-ap.c:59
 msgid "AMIDI-Plug - backend information"
 msgstr "AMIDI-Plug - 後端資訊"
@@ -903,7 +900,8 @@
 #: src/crossfade/plugin.c:140
 msgid ""
 "Crossfading failed because the songs had a different number of channels."
-msgstr "因為歌曲間的聲道數不同，無法使用 Crossfade。"
+msgstr ""
+"因為歌曲間的聲道數不同，無法使用 Crossfade。"
 
 #: src/crossfade/plugin.c:148
 msgid ""
@@ -958,7 +956,7 @@
 msgid "Volume: (%)"
 msgstr "音量: (%)"
 
-#: src/ffaudio/ffaudio-core.c:789
+#: src/ffaudio/ffaudio-core.c:763
 #, c-format
 msgid ""
 "Multi-format audio decoding plugin for Audacious based on\n"
@@ -974,7 +972,7 @@
 "libavutil %s (%s)\n"
 msgstr ""
 
-#: src/ffaudio/ffaudio-core.c:803
+#: src/ffaudio/ffaudio-core.c:777
 msgid "About FFaudio Plugin"
 msgstr ""
 
@@ -1761,6 +1759,7 @@
 "\n"
 "尋找歌詞中 ..."
 
+
 #: src/lyricwiki/lyricwiki.c:249
 msgid ""
 "\n"
@@ -1769,6 +1768,7 @@
 "\n"
 "連線到 lyrics.wikia.com..."
 
+
 #: src/lyricwiki/lyricwiki.c:337
 msgid ""
 "\n"
@@ -3037,7 +3037,8 @@
 msgid ""
 "Saves all the playlists that are open. Note that this is done automatically "
 "when Audacious quits."
-msgstr "儲存所有已開啟的播放清單。請注意，每當 Audacious 離開時會自動儲存。"
+msgstr ""
+"儲存所有已開啟的播放清單。請注意，每當 Audacious 離開時會自動儲存。"
 
 #: src/skins/ui_manager.c:234
 msgid "Refresh List"
@@ -3442,11 +3443,11 @@
 msgid "Delete auto-load preset"
 msgstr ""
 
-#: src/skins/ui_playlist.c:245
+#: src/skins/ui_playlist.c:244
 msgid "Search entries in active playlist"
 msgstr ""
 
-#: src/skins/ui_playlist.c:253
+#: src/skins/ui_playlist.c:252
 msgid ""
 "Select entries in playlist by filling one or more fields. Fields use regular "
 "expressions syntax, case-insensitive. If you don't know how regular "
@@ -3454,39 +3455,39 @@
 "for."
 msgstr ""
 
-#: src/skins/ui_playlist.c:261
+#: src/skins/ui_playlist.c:260
 msgid "Title: "
 msgstr "標題: "
 
-#: src/skins/ui_playlist.c:268
+#: src/skins/ui_playlist.c:267
 msgid "Album: "
 msgstr "專輯: "
 
-#: src/skins/ui_playlist.c:275
+#: src/skins/ui_playlist.c:274
 msgid "Artist: "
 msgstr "藝人: "
 
-#: src/skins/ui_playlist.c:282
+#: src/skins/ui_playlist.c:281
 msgid "Filename: "
 msgstr "檔名: "
 
-#: src/skins/ui_playlist.c:290
+#: src/skins/ui_playlist.c:289
 msgid "Clear previous selection before searching"
 msgstr ""
 
-#: src/skins/ui_playlist.c:293
+#: src/skins/ui_playlist.c:292
 msgid "Automatically toggle queue for matching entries"
 msgstr ""
 
-#: src/skins/ui_playlist.c:296
+#: src/skins/ui_playlist.c:295
 msgid "Create a new playlist with matching entries"
 msgstr ""
 
-#: src/skins/ui_playlist.c:763
+#: src/skins/ui_playlist.c:762
 msgid "Audacious Playlist Editor"
 msgstr ""
 
-#: src/skins/ui_playlist.c:810
+#: src/skins/ui_playlist.c:809
 #, c-format
 msgid "%s (%d of %d)"
 msgstr ""
@@ -3504,11 +3505,11 @@
 msgid "Could not create directory (%s): %s\n"
 msgstr "無法建立資料夾 (%s): %s\n"
 
-#: src/sndfile/plugin.c:454
+#: src/sndfile/plugin.c:438
 msgid "About sndfile plugin"
 msgstr ""
 
-#: src/sndfile/plugin.c:455
+#: src/sndfile/plugin.c:439
 msgid ""
 "Adapted for Audacious usage by Tony Vroon <chainsaw@gentoo.org>\n"
 "from the xmms_sndfile plugin which is:\n"

audacious-plugins-3.0.3.tar.bz2/src/OSS/OSS.c -> audacious-plugins-3.1.tar.bz2/src/OSS/OSS.c Changed

@@ -23,8 +23,8 @@
 
 #include <glib.h>
 
-#include <audacious/configdb.h>
 #include <audacious/i18n.h>
+#include <audacious/misc.h>
 #include <libaudgui/libaudgui.h>
 #include <libaudgui/libaudgui-gtk.h>
 
@@ -38,7 +38,7 @@
 
 audgui_simple_message (& about_dialog, GTK_MESSAGE_INFO,
 _("About OSS Driver"),
- _("Audacious OSS Driver\n\n "
+ "Audacious OSS Driver\n\n "
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
 "the Free Software Foundation; either version 2 of the License, or\n"
@@ -52,37 +52,32 @@
 "You should have received a copy of the GNU General Public License\n"
 "along with this program; if not, write to the Free Software\n"
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
- "USA."));
+ "USA.");
 }
 
+static const gchar * const oss_defaults[] = {
+ "audio_device", "0",
+ "mixer_device", "0",
+ "prebuffer", "50",
+ "use_master", "FALSE",
+ "use_alt_audio_device", "FALSE",
+ "use_alt_mixer_device", "FALSE",
+ NULL};
+
 static gboolean oss_init (void)
 {
- mcs_handle_t *db;
+ aud_config_set_defaults ("OSS", oss_defaults);
 
 memset(&oss_cfg, 0, sizeof(OSSConfig));
 
- oss_cfg.audio_device = 0;
- oss_cfg.mixer_device = 0;
- oss_cfg.prebuffer = 50;
- oss_cfg.use_alt_audio_device = FALSE;
- oss_cfg.alt_audio_device = NULL;
- oss_cfg.use_master = 0;
-
- if ((db = aud_cfg_db_open())) {
- aud_cfg_db_get_int(db, "OSS", "audio_device", &oss_cfg.audio_device);
- aud_cfg_db_get_int(db, "OSS", "mixer_device", &oss_cfg.mixer_device);
- aud_cfg_db_get_int(db, "OSS", "prebuffer", &oss_cfg.prebuffer);
- aud_cfg_db_get_bool(db, "OSS", "use_master", &oss_cfg.use_master);
- aud_cfg_db_get_bool(db, "OSS", "use_alt_audio_device",
- &oss_cfg.use_alt_audio_device);
- aud_cfg_db_get_string(db, "OSS", "alt_audio_device",
- &oss_cfg.alt_audio_device);
- aud_cfg_db_get_bool(db, "OSS", "use_alt_mixer_device",
- &oss_cfg.use_alt_mixer_device);
- aud_cfg_db_get_string(db, "OSS", "alt_mixer_device",
- &oss_cfg.alt_mixer_device);
- aud_cfg_db_close(db);
- }
+ oss_cfg.audio_device = aud_get_int ("OSS", "audio_device");
+ oss_cfg.mixer_device = aud_get_int ("OSS", "mixer_device");
+ oss_cfg.prebuffer = aud_get_int ("OSS", "prebuffer");
+ oss_cfg.use_master = aud_get_bool ("OSS", "use_master");
+ oss_cfg.use_alt_audio_device = aud_get_bool ("OSS", "use_alt_audio_device");
+ oss_cfg.alt_audio_device = aud_get_string ("OSS", "alt_audio_device");
+ oss_cfg.use_alt_mixer_device = aud_get_bool ("OSS", "use_alt_mixer_device");
+ oss_cfg.alt_mixer_device = aud_get_string ("OSS", "alt_mixer_device");
 
 return TRUE;
 }

audacious-plugins-3.0.3.tar.bz2/src/OSS/OSS.h -> audacious-plugins-3.1.tar.bz2/src/OSS/OSS.h Changed

audacious-plugins-3.0.3.tar.bz2/src/OSS/audio.c -> audacious-plugins-3.1.tar.bz2/src/OSS/audio.c Changed

audacious-plugins-3.0.3.tar.bz2/src/OSS/configure.c -> audacious-plugins-3.1.tar.bz2/src/OSS/configure.c Changed

@@ -26,9 +26,9 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <audacious/configdb.h>
-#include <audacious/i18n.h>
 #include <audacious/gtk-compat.h>
+#include <audacious/i18n.h>
+#include <audacious/misc.h>
 
 static GtkWidget *configure_win = NULL;
 static GtkWidget *mixer_usemaster_check, *buffer_pre_spin;
@@ -39,8 +39,6 @@
 static void
 configure_win_ok_cb(GtkWidget * w, gpointer data)
 {
- mcs_handle_t *db;
-
 oss_cfg.audio_device = audio_device;
 oss_cfg.mixer_device = mixer_device;
 oss_cfg.prebuffer =
@@ -72,21 +70,14 @@
 oss_cfg.use_alt_mixer_device = FALSE;
 
 /* Save configuration */
- db = aud_cfg_db_open();
-
- aud_cfg_db_set_int(db, "OSS", "audio_device", oss_cfg.audio_device);
- aud_cfg_db_set_int(db, "OSS", "mixer_device", oss_cfg.mixer_device);
- aud_cfg_db_set_int(db, "OSS", "prebuffer", oss_cfg.prebuffer);
- aud_cfg_db_set_bool(db, "OSS", "use_master", oss_cfg.use_master);
- aud_cfg_db_set_bool(db, "OSS", "use_alt_audio_device",
- oss_cfg.use_alt_audio_device);
- aud_cfg_db_set_string(db, "OSS", "alt_audio_device",
- oss_cfg.alt_audio_device);
- aud_cfg_db_set_bool(db, "OSS", "use_alt_mixer_device",
- oss_cfg.use_alt_mixer_device);
- aud_cfg_db_set_string(db, "OSS", "alt_mixer_device",
- oss_cfg.alt_mixer_device);
- aud_cfg_db_close(db);
+ aud_set_int ("OSS", "audio_device", oss_cfg.audio_device);
+ aud_set_int ("OSS", "mixer_device", oss_cfg.mixer_device);
+ aud_set_int ("OSS", "prebuffer", oss_cfg.prebuffer);
+ aud_set_bool ("OSS", "use_master", oss_cfg.use_master);
+ aud_set_bool ("OSS", "use_alt_audio_device", oss_cfg.use_alt_audio_device);
+ aud_set_string ("OSS", "alt_audio_device", oss_cfg.alt_audio_device);
+ aud_set_bool ("OSS", "use_alt_mixer_device", oss_cfg.use_alt_mixer_device);
+ aud_set_string ("OSS", "alt_mixer_device", oss_cfg.alt_mixer_device);
 }
 
 static void

audacious-plugins-3.0.3.tar.bz2/src/adplug/adplug-xmms.cc -> audacious-plugins-3.1.tar.bz2/src/adplug/adplug-xmms.cc Changed

@@ -31,7 +31,6 @@
 #include "players.h"
 
 extern "C" {
-#include <audacious/configdb.h>
 #include <audacious/i18n.h>
 #include <audacious/misc.h>
 #include <audacious/plugin.h>
@@ -64,7 +63,6 @@
 
 /***** Global variables *****/
 
-extern "C" InputPlugin adplug_ip;
 static gboolean audio_error = FALSE;
 GtkWidget *about_win = NULL;
 static GMutex * control_mutex;
@@ -88,10 +86,10 @@
 CAdPlugDatabase *db;
 unsigned int subsong, songlength;
 int seek;
- char filename[PATH_MAX];
+ char * filename;
 GtkLabel *infobox;
 GtkDialog *infodlg;
-} plr = {0, 0, 0, 0, -1, "", NULL, NULL};
+} plr = {0, 0, 0, 0, -1, NULL, NULL, NULL};
 
 static InputPlayback *playback;
 
@@ -198,9 +196,10 @@
 
 // reset to first subsong on new file
 dbg_printf ("subsong, ");
- if (strcmp (filename, plr.filename))
+ if (! plr.filename || strcmp (filename, plr.filename))
 {
- strcpy (plr.filename, filename);
+ g_free (plr.filename);
+ plr.filename = g_strdup (filename);
 plr.subsong = 0;
 }
 
@@ -331,7 +330,7 @@
 
 // On new song, re-open "Song info" dialog, if open
 dbg_printf ("dialog, ");
- if (plr.infobox && strcmp (filename, plr.filename))
+ if (plr.infobox && (! plr.filename || strcmp (filename, plr.filename)))
 gtk_widget_destroy (GTK_WIDGET (plr.infodlg));
 
 // open output plugin
@@ -393,37 +392,40 @@
 
 #define CFG_VERSION "AdPlug"
 
+static const gchar * const adplug_defaults[] = {
+ "16bit", "TRUE",
+ "Stereo", "FALSE",
+ "Frequency", "44100",
+ "Endless", "FALSE",
+ NULL};
+
 extern "C" gboolean adplug_init (void)
 {
- dbg_printf ("adplug_init(): open, ");
- mcs_handle_t *db = aud_cfg_db_open ();
+ aud_config_set_defaults (CFG_VERSION, adplug_defaults);
 
- // Read configuration
- dbg_printf ("read, ");
- aud_cfg_db_get_bool (db, CFG_VERSION, "16bit", (gboolean *) & conf.bit16);
- aud_cfg_db_get_bool (db, CFG_VERSION, "Stereo", (gboolean *) & conf.stereo);
- aud_cfg_db_get_int (db, CFG_VERSION, "Frequency", (gint *) & conf.freq);
- aud_cfg_db_get_bool (db, CFG_VERSION, "Endless",
- (gboolean *) & conf.endless);
+ conf.bit16 = aud_get_bool (CFG_VERSION, "16bit");
+ conf.stereo = aud_get_bool (CFG_VERSION, "Stereo");
+ conf.freq = aud_get_int (CFG_VERSION, "Frequency");
+ conf.endless = aud_get_bool (CFG_VERSION, "Endless");
 
 // Read file type exclusion list
 dbg_printf ("exclusion, ");
 {
- gchar *cfgstr = NULL, *exclude = NULL;
- gboolean cfgread;
+ gchar * cfgstr = aud_get_string (CFG_VERSION, "Exclude");
 
- cfgread = aud_cfg_db_get_string (db, CFG_VERSION, "Exclude", &cfgstr);
- if (cfgread) {
- exclude = (char *) malloc (strlen (cfgstr) + 2);
+ if (cfgstr[0])
+ {
+ gchar * exclude = (gchar *) malloc (strlen (cfgstr) + 2);
 strcpy (exclude, cfgstr);
 exclude[strlen (exclude) + 1] = '\0';
 g_strdelimit (exclude, ":", '\0');
 for (gchar * p = exclude; *p; p += strlen (p) + 1)
 conf.players.remove (conf.players.lookup_filetype (p));
- free (exclude); free (cfgstr);
+ free (exclude);
 }
+
+ g_free (cfgstr);
 }
- aud_cfg_db_close (db);
 
 // Load database from disk and hand it to AdPlug
 dbg_printf ("database");
@@ -453,20 +455,18 @@
 extern "C" void
 adplug_quit (void)
 {
- dbg_printf ("adplug_quit(): open, ");
- mcs_handle_t *db = aud_cfg_db_open ();
-
 // Close database
 dbg_printf ("db, ");
 if (plr.db)
 delete plr.db;
 
- // Write configuration
- dbg_printf ("write, ");
- aud_cfg_db_set_bool (db, CFG_VERSION, "16bit", conf.bit16);
- aud_cfg_db_set_bool (db, CFG_VERSION, "Stereo", conf.stereo);
- aud_cfg_db_set_int (db, CFG_VERSION, "Frequency", conf.freq);
- aud_cfg_db_set_bool (db, CFG_VERSION, "Endless", conf.endless);
+ g_free (plr.filename);
+ plr.filename = NULL;
+
+ aud_set_bool (CFG_VERSION, "16bit", conf.bit16);
+ aud_set_bool (CFG_VERSION, "Stereo", conf.stereo);
+ aud_set_int (CFG_VERSION, "Frequency", conf.freq);
+ aud_set_bool (CFG_VERSION, "Endless", conf.endless);
 
 dbg_printf ("exclude, ");
 std::string exclude;
@@ -479,13 +479,8 @@
 exclude += ":";
 exclude += (*i)->filetype;
 }
- gchar *cfgval = g_strdup (exclude.c_str ());
- aud_cfg_db_set_string (db, CFG_VERSION, "Exclude", cfgval);
- free (cfgval);
 
- dbg_printf ("close");
- aud_cfg_db_close (db);
- dbg_printf (".\n");
+ aud_set_string (CFG_VERSION, "Exclude", exclude.c_str ());
 
 g_mutex_free (control_mutex);
 g_cond_free (control_cond);

audacious-plugins-3.1.tar.bz2/src/alarm Added

audacious-plugins-3.1.tar.bz2/src/alarm/Makefile Added

audacious-plugins-3.1.tar.bz2/src/alarm/alarm.c Added

@@ -0,0 +1,933 @@
+/*
+ * Copyright (C) Adam Feakin <adamf@snika.uklinux.net>
+ *
+ * modified by Daniel Stodden <stodden@in.tum.de>
+ *
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+/*
+ * xmms-alarm.c - a XMMS plugin which allows you to set a time for it to
+ * start playing a playlist with the volume fading up and more things
+ * the next time I get bored
+ */
+
+#if STDC_HEADERS
+# include <stdlib.h>
+#endif
+
+#include <time.h>
+#if TM_IN_SYS_TIME
+# include <sys/time.h>
+#endif
+
+#include <string.h>
+#include <stdio.h>
+
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
+#include <pthread.h>
+#include <assert.h>
+#include <math.h>
+
+#include <audacious/debug.h>
+#include <audacious/drct.h>
+#include <audacious/misc.h>
+#include <audacious/plugin.h>
+
+#include "alarm.h"
+#include "interface.h"
+#include "callbacks.h"
+
+static const gchar * const alarm_defaults[] = {
+ /* general */
+ "alarm_h", "6",
+ "alarm_m", "30",
+ "cmd_on", "FALSE",
+ "fading", "60",
+ "quietvol", "25",
+ "reminder_on", "FALSE",
+ "stop_h", "1",
+ "stop_m", "0",
+ "stop_on", "TRUE",
+ "volume", "80",
+
+ /* days */
+ "sun_flags", "3",
+ "sun_h", "6",
+ "sun_m", "30",
+ "mon_flags", "2",
+ "mon_h", "6",
+ "mon_m", "30",
+ "tue_flags", "2",
+ "tue_h", "6",
+ "tue_m", "30",
+ "wed_flags", "2",
+ "wed_h", "6",
+ "wed_m", "30",
+ "thu_flags", "2",
+ "thu_h", "6",
+ "thu_m", "30",
+ "fri_flags", "2",
+ "fri_h", "6",
+ "fri_m", "30",
+ "sat_flags", "2",
+ "sat_h", "6",
+ "sat_m", "30",
+ NULL};
+
+typedef struct {
+ pthread_t tid;
+ volatile gboolean is_valid;
+} alarm_thread_t;
+
+static alarm_thread_t start; /* thread id of alarm loop */
+static alarm_thread_t stop; /* thread id of stop loop */
+static pthread_mutex_t fader_lock = PTHREAD_MUTEX_INITIALIZER;
+
+static GeneralPlugin alarm_plugin;
+
+/* string tokens to allow loops and shorten code */
+static char day_cb[7][7] = {"sun_cb", "mon_cb", "tue_cb",
+ "wed_cb", "thu_cb", "fri_cb", "sat_cb"};
+
+static char day_flags[7][10] = {"sun_flags", "mon_flags", "tue_flags",
+ "wed_flags", "thu_flags", "fri_flags", "sat_flags"};
+
+static char day_h[7][6] = {"sun_h", "mon_h", "tue_h",
+ "wed_h", "thu_h", "fri_h", "sat_h"};
+
+static char day_m[7][6] = {"sun_m", "mon_m", "tue_m",
+ "wed_m", "thu_m", "fri_m", "sat_m"};
+
+static char day_def[7][8] = {"sun_def", "mon_def", "tue_def",
+ "wed_def", "thu_def", "fri_def", "sat_def"};
+
+static struct
+{
+ GtkSpinButton *alarm_h;
+ GtkSpinButton *alarm_m;
+
+ GtkToggleButton *stop_on;
+ GtkSpinButton *stop_h;
+ GtkSpinButton *stop_m;
+
+ GtkRange *volume;
+ GtkRange *quietvol;
+
+ GtkSpinButton *fading;
+
+ GtkEntry *cmdstr;
+ GtkToggleButton *cmd_on;
+
+ GtkEntry *playlist;
+
+ int default_hour;
+ int default_min;
+
+ // array allows looping of days
+ alarmday day[7];
+
+
+ GtkEntry *reminder;
+ GtkToggleButton *reminder_cb;
+ gchar *reminder_msg;
+ gboolean reminder_on;
+}
+alarm_conf;
+
+static gint alarm_h, alarm_m;
+
+static gboolean stop_on;
+static gint stop_h, stop_m;
+
+static gint volume, quietvol;
+
+static gint fading;
+
+static gchar *cmdstr = NULL;
+static gboolean cmd_on;
+
+static gchar *playlist = NULL;
+
+static GtkWidget *config_dialog = NULL;
+static GtkWidget *alarm_dialog = NULL;
+
+static GtkWidget *lookup_widget(GtkWidget *w, const gchar *name)
+{
+ GtkWidget * widget = g_object_get_data ((GObject *) w, name);
+ g_return_val_if_fail(widget != NULL, NULL);
+
+ return widget;
+}
+
+/*
+ * tell the user about that bug
+ */
+static void alarm_warning(void)
+{
+
+ static GtkWidget *warning_dialog = NULL;
+
+ if (warning_dialog)
+ return;
+
+ warning_dialog = create_warning_dialog();
+
+ g_signal_connect (warning_dialog, "destroy", (GCallback)
+ gtk_widget_destroyed, & warning_dialog);
+
+ gtk_widget_show_all(warning_dialog);
+
+ return;
+}
+
+/*
+ * the callback function that is called when the save button is
+ * pressed saves configuration to ~/.bmp/alarmconfig
+ */
+void alarm_save(GtkButton *w, gpointer data)
+{
+ int daynum = 0; // used to identify day number
+
+ /*
+ * update the live values and write them out
+ */
+ alarm_h = alarm_conf.default_hour = gtk_spin_button_get_value_as_int (alarm_conf.alarm_h);
+ aud_set_int ("alarm", "alarm_h", alarm_h);
+
+ alarm_m = alarm_conf.default_min = gtk_spin_button_get_value_as_int (alarm_conf.alarm_m);
+ aud_set_int ("alarm", "alarm_m", alarm_m);
+
+ stop_h = gtk_spin_button_get_value_as_int (alarm_conf.stop_h);
+ stop_m = gtk_spin_button_get_value_as_int (alarm_conf.stop_m);
+ stop_on = gtk_toggle_button_get_active (alarm_conf.stop_on);
+
+ /* days of the week */
+ for(; daynum < 7; daynum++)
+ {
+ if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(alarm_conf.day[daynum].cb)))
+ alarm_conf.day[daynum].flags = 0;
+ else
+ alarm_conf.day[daynum].flags = ALARM_OFF;
+
+ if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(alarm_conf.day[daynum].cb_def)))
+ alarm_conf.day[daynum].flags |= ALARM_DEFAULT;
+
+ alarm_conf.day[daynum].hour =
+ gtk_spin_button_get_value_as_int(alarm_conf.day[daynum].spin_hr);
+ alarm_conf.day[daynum].min =
+ gtk_spin_button_get_value_as_int(alarm_conf.day[daynum].spin_min);
+
+ aud_set_int ("alarm", day_flags[daynum], alarm_conf.day[daynum].flags);
+ aud_set_int ("alarm", day_h[daynum], alarm_conf.day[daynum].hour);
+ aud_set_int ("alarm", day_m[daynum], alarm_conf.day[daynum].min);
+ }
+
+ /* END: days of week */
+
+ volume = gtk_range_get_value (alarm_conf.volume);
+ aud_set_int ("alarm", "volume", volume);
+
+ quietvol = gtk_range_get_value (alarm_conf.quietvol);
+ aud_set_int ("alarm", "quietvol", quietvol);
+
+ fading = gtk_spin_button_get_value_as_int (alarm_conf.fading);
+
+ /* lets check to see if we need to show the bug warning */
+ if((stop_on == TRUE) &&
+ ((((stop_h * 60) + stop_m) * 60) < (fading + 65)))
+ {
+ AUDDBG("Displaying bug warning, stop %dh %dm, fade %d\n",
+ stop_h, stop_m, fading);
+ alarm_warning();
+ }
+ else if((stop_on == TRUE) && (fading < 10))
+ {
+ AUDDBG("Displaying bug warning, stop %dh %dm, fade %d\n",
+ stop_h, stop_m, fading);
+ alarm_warning();
+ }
+ else
+ {
+ /* write the new values */
+ aud_set_int ("alarm", "stop_h", stop_h);
+ aud_set_int ("alarm", "stop_m", stop_m);
+ aud_set_int ("alarm", "fading", fading);
+ aud_set_bool ("alarm", "stop_on", stop_on);
+ }
+
+ g_free (cmdstr);
+ cmdstr = gtk_editable_get_chars ((GtkEditable *) alarm_conf.cmdstr, 0, -1);
+ aud_set_string ("alarm", "cmdstr", cmdstr);
+
+ cmd_on = gtk_toggle_button_get_active (alarm_conf.cmd_on);
+ aud_set_bool ("alarm", "cmd_on", cmd_on);
+
+ g_free (playlist);
+ playlist = gtk_editable_get_chars ((GtkEditable *) alarm_conf.playlist, 0, -1);
+ aud_set_string ("alarm", "playlist", playlist);
+
+ /* reminder */
+ g_free (alarm_conf.reminder_msg);
+ alarm_conf.reminder_msg = gtk_editable_get_chars ((GtkEditable *) alarm_conf.reminder, 0, -1);
+ aud_set_string ("alarm", "reminder_msg", alarm_conf.reminder_msg);
+
+ alarm_conf.reminder_on = gtk_toggle_button_get_active (alarm_conf.reminder_cb);
+ aud_set_bool ("alarm", "reminder_on", alarm_conf.reminder_on);
+}
+
+/*
+ * read the current configuration from the file
+ */
+static void alarm_read_config(void)
+{
+ int daynum = 0; // used for day number
+
+ aud_config_set_defaults ("alarm", alarm_defaults);
+
+ alarm_h = aud_get_int ("alarm", "alarm_h");
+ alarm_m = aud_get_int ("alarm", "alarm_m");
+
+ /* save them here too */
+ alarm_conf.default_hour = alarm_h;
+ alarm_conf.default_min = alarm_m;
+
+ stop_h = aud_get_int ("alarm", "stop_h");
+ stop_m = aud_get_int ("alarm", "stop_m");
+ stop_on = aud_get_bool ("alarm", "stop_on");
+
+ volume = aud_get_int ("alarm", "volume");
+ quietvol = aud_get_int ("alarm", "quietvol");
+
+ fading = aud_get_int ("alarm", "fading");
+
+ g_free (cmdstr);
+ cmdstr = aud_get_string ("alarm", "cmdstr");
+ cmd_on = aud_get_bool ("alarm", "cmd_on");
+
+ g_free (playlist);
+ playlist = aud_get_string ("alarm", "playlist");
+
+ g_free (alarm_conf.reminder_msg);
+ alarm_conf.reminder_msg = aud_get_string ("alarm", "reminder_msg");
+ alarm_conf.reminder_on = aud_get_bool ("alarm", "reminder_on");
+
+ /* day flags and times */
+ for(; daynum < 7; daynum++)
+ {
+ /* read the flags */
+ alarm_conf.day[daynum].flags = aud_get_int ("alarm", day_flags[daynum]);
+
+ /* read the times */
+ alarm_conf.day[daynum].hour = aud_get_int ("alarm", day_h[daynum]);
+ alarm_conf.day[daynum].min = aud_get_int ("alarm", day_m[daynum]);
+ }
+}
+
+/*
+ * display an about box
+ */
+static void alarm_about(void)
+{
+ static GtkWidget *about_dialog = NULL;
+
+ if (about_dialog)
+ return;
+
+ about_dialog = create_about_dialog();
+
+ g_signal_connect (about_dialog, "destroy", (GCallback) gtk_widget_destroyed,
+ & about_dialog);
+
+ gtk_widget_show_all(about_dialog);
+
+ return;
+}
+
+/*
+ * displays the configuration window and opens the config file.
+ */
+static void alarm_configure(void)
+{
+ int daynum = 0; // used to loop days
+ GtkWidget *w;
+
+ if (config_dialog)
+ return;
+
+ alarm_read_config();
+
+ /*
+ * Create the widgets
+ */
+ config_dialog = create_config_dialog();
+
+ w = lookup_widget(config_dialog, "alarm_h_spin");
+ alarm_conf.alarm_h = GTK_SPIN_BUTTON(w);
+ gtk_spin_button_set_value(alarm_conf.alarm_h, alarm_h);
+
+ w = lookup_widget(config_dialog, "alarm_m_spin");
+ alarm_conf.alarm_m = GTK_SPIN_BUTTON(w);
+ gtk_spin_button_set_value(alarm_conf.alarm_m, alarm_m);
+
+ w = lookup_widget(config_dialog, "stop_h_spin");
+ alarm_conf.stop_h = GTK_SPIN_BUTTON(w);
+ gtk_spin_button_set_value(alarm_conf.stop_h, stop_h);
+
+ w = lookup_widget(config_dialog, "stop_m_spin");
+ alarm_conf.stop_m = GTK_SPIN_BUTTON(w);
+ gtk_spin_button_set_value(alarm_conf.stop_m, stop_m);
+
+ w = lookup_widget(config_dialog, "stop_checkb");
+ alarm_conf.stop_on = GTK_TOGGLE_BUTTON(w);
+ gtk_toggle_button_set_active(alarm_conf.stop_on, stop_on);
+
+ w = lookup_widget(config_dialog, "vol_scale");
+ alarm_conf.volume = GTK_RANGE(w);
+ gtk_range_set_adjustment(alarm_conf.volume,
+ GTK_ADJUSTMENT(gtk_adjustment_new(volume,
+ 0,
+ 100, 1,
+ 5, 0)));
+
+ w = lookup_widget(config_dialog, "quiet_vol_scale");
+ alarm_conf.quietvol = GTK_RANGE(w);
+ gtk_range_set_adjustment(alarm_conf.quietvol,
+ GTK_ADJUSTMENT(gtk_adjustment_new(quietvol,
+ 0,
+ 100, 1,
+ 5, 0)));
+
+ /* days of week */
+ for(; daynum < 7; daynum++)
+ {
+ w = lookup_widget(config_dialog, day_cb[daynum]);
+ alarm_conf.day[daynum].cb = GTK_CHECK_BUTTON(w);
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(alarm_conf.day[daynum].cb),
+ !(alarm_conf.day[daynum].flags & ALARM_OFF));
+
+ w = lookup_widget(config_dialog, day_def[daynum]);
+ alarm_conf.day[daynum].cb_def = GTK_CHECK_BUTTON(w);
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(alarm_conf.day[daynum].cb_def),
+ alarm_conf.day[daynum].flags & ALARM_DEFAULT);
+
+
+ /* Changed to show default time instead of set time when ALARM_DEFAULT set,
+ * as suggested by Mark Brown
+ */
+/* w = lookup_widget(config_dialog, day_h[daynum]);
+ alarm_conf.day[daynum].spin_hr = GTK_SPIN_BUTTON(w);
+ gtk_spin_button_set_value(alarm_conf.day[daynum].spin_hr, alarm_conf.day[daynum].hour);
+
+ w = lookup_widget(config_dialog, day_m[daynum]);
+ alarm_conf.day[daynum].spin_min = GTK_SPIN_BUTTON(w);
+ gtk_spin_button_set_value(alarm_conf.day[daynum].spin_min, alarm_conf.day[daynum].min);
+*/
+ if(alarm_conf.day[daynum].flags & ALARM_DEFAULT)
+ {
+ w = lookup_widget(config_dialog, day_h[daynum]);
+ alarm_conf.day[daynum].spin_hr = GTK_SPIN_BUTTON(w);
+ gtk_spin_button_set_value(alarm_conf.day[daynum].spin_hr, alarm_conf.default_hour);
+
+ w = lookup_widget(config_dialog, day_m[daynum]);
+ alarm_conf.day[daynum].spin_min = GTK_SPIN_BUTTON(w);
+ gtk_spin_button_set_value(alarm_conf.day[daynum].spin_min, alarm_conf.default_min);
+
+ gtk_widget_set_sensitive((GtkWidget *)alarm_conf.day[daynum].spin_hr, FALSE);
+ gtk_widget_set_sensitive((GtkWidget *)alarm_conf.day[daynum].spin_min, FALSE);
+ }
+ else
+ {
+ w = lookup_widget(config_dialog, day_h[daynum]);
+ alarm_conf.day[daynum].spin_hr = GTK_SPIN_BUTTON(w);
+ gtk_spin_button_set_value(alarm_conf.day[daynum].spin_hr, alarm_conf.day[daynum].hour);
+
+ w = lookup_widget(config_dialog, day_m[daynum]);
+ alarm_conf.day[daynum].spin_min = GTK_SPIN_BUTTON(w);
+ gtk_spin_button_set_value(alarm_conf.day[daynum].spin_min, alarm_conf.day[daynum].min);
+
+ gtk_widget_set_sensitive((GtkWidget *)alarm_conf.day[daynum].spin_hr, TRUE);
+ gtk_widget_set_sensitive((GtkWidget *)alarm_conf.day[daynum].spin_min, TRUE);
+ }
+ }
+
+ /* END: days of week */
+
+ w = lookup_widget(config_dialog,"fading_spin");
+ alarm_conf.fading = GTK_SPIN_BUTTON(w);
+ gtk_spin_button_set_value(alarm_conf.fading, fading);
+
+ w = lookup_widget(config_dialog, "cmd_entry");
+ alarm_conf.cmdstr = GTK_ENTRY(w);
+ gtk_entry_set_text(alarm_conf.cmdstr, cmdstr);
+
+ w = lookup_widget(config_dialog, "cmd_checkb");
+ alarm_conf.cmd_on = GTK_TOGGLE_BUTTON(w);
+ gtk_toggle_button_set_active(alarm_conf.cmd_on, cmd_on);
+
+ w = lookup_widget(config_dialog, "playlist");
+ alarm_conf.playlist = GTK_ENTRY(w);
+ gtk_entry_set_text(alarm_conf.playlist, playlist);
+
+ w = lookup_widget(config_dialog, "reminder_text");
+ alarm_conf.reminder = GTK_ENTRY(w);
+ gtk_entry_set_text(alarm_conf.reminder, alarm_conf.reminder_msg);
+
+ w = lookup_widget(config_dialog, "reminder_cb");
+ alarm_conf.reminder_cb = GTK_TOGGLE_BUTTON(w);
+ gtk_toggle_button_set_active(alarm_conf.reminder_cb, alarm_conf.reminder_on);
+
+ g_signal_connect (config_dialog, "destroy", (GCallback) gtk_widget_destroyed,
+ & config_dialog);
+
+ gtk_widget_show_all(config_dialog);
+
+ AUDDBG("END alarm_configure\n");
+}
+
+/* functions for greying out the time for days */
+void on_day_def_toggled(GtkToggleButton *togglebutton, gpointer user_data, int daynum)
+{
+ GtkWidget *w;
+
+ /* change the time shown too */
+ w = lookup_widget(config_dialog, day_h[daynum]);
+ if(w == NULL)
+ return;
+
+ if(gtk_toggle_button_get_active(togglebutton) == TRUE)
+ {
+ gtk_spin_button_set_value(GTK_SPIN_BUTTON(w), alarm_conf.default_hour);
+ gtk_widget_set_sensitive(w, FALSE);
+ }
+ else
+ {
+ gtk_spin_button_set_value(GTK_SPIN_BUTTON(w), alarm_conf.day[daynum].hour);
+ gtk_widget_set_sensitive(w, TRUE);
+ }
+
+ w = lookup_widget(config_dialog, day_m[daynum]);
+ if(gtk_toggle_button_get_active(togglebutton) == TRUE)
+ {
+ gtk_spin_button_set_value(GTK_SPIN_BUTTON(w), alarm_conf.default_min);
+ gtk_widget_set_sensitive(w, FALSE);
+ }
+ else
+ {
+ gtk_spin_button_set_value(GTK_SPIN_BUTTON(w), alarm_conf.day[daynum].min);
+ gtk_widget_set_sensitive(w, TRUE);
+ }
+}
+
+void on_sun_def_toggled(GtkToggleButton *togglebutton, gpointer user_data)
+{
+ on_day_def_toggled(togglebutton, user_data, 0);
+}
+
+void on_mon_def_toggled(GtkToggleButton *togglebutton, gpointer user_data)
+{
+ on_day_def_toggled(togglebutton, user_data, 1);
+}
+
+void on_tue_def_toggled(GtkToggleButton *togglebutton, gpointer user_data)
+{
+ on_day_def_toggled(togglebutton, user_data, 2);
+}
+
+void on_wed_def_toggled(GtkToggleButton *togglebutton, gpointer user_data)
+{
+ on_day_def_toggled(togglebutton, user_data, 3);
+}
+
+void on_thu_def_toggled(GtkToggleButton *togglebutton, gpointer user_data)
+{
+ on_day_def_toggled(togglebutton, user_data, 4);
+}
+
+void on_fri_def_toggled(GtkToggleButton *togglebutton, gpointer user_data)
+{
+ on_day_def_toggled(togglebutton, user_data, 5);
+}
+
+void on_sat_def_toggled(GtkToggleButton *togglebutton, gpointer user_data)
+{
+ on_day_def_toggled(togglebutton, user_data, 6);
+}
+
+/* END: greying things */
+
+void alarm_current_volume(GtkButton *button, gpointer data)
+{
+ gint vol;
+ GtkAdjustment *adj;
+
+ AUDDBG("on_current_button_clicked\n");
+
+ aud_drct_get_volume_main(&vol);
+
+ adj = gtk_range_get_adjustment(alarm_conf.volume);
+ gtk_adjustment_set_value(adj, (gfloat)vol);
+}
+
+/*
+ * a thread safe sleeping function -
+ * and it even works in solaris (I think)
+ */
+static void threadsleep(float x)
+{
+ AUDDBG("threadsleep: waiting %f seconds\n", x);
+
+ g_usleep((int) ((float) x * (float) 1000000.0));
+
+ return;
+}
+
+static inline alarm_thread_t alarm_thread_create(void *(*start_routine)(void *), void *args, unsigned int detach)
+{
+ alarm_thread_t thrd;
+ pthread_attr_t attr;
+
+ pthread_attr_init(&attr);
+
+ if(detach != 0)
+ pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
+
+ pthread_attr_setinheritsched(&attr, PTHREAD_EXPLICIT_SCHED);
+ pthread_attr_setschedpolicy(&attr, SCHED_OTHER);
+ pthread_attr_setscope(&attr, PTHREAD_SCOPE_SYSTEM);
+
+ thrd.is_valid = (pthread_create(&thrd.tid, &attr, start_routine, args) == 0);
+
+ return thrd;
+}
+
+static void *alarm_fade(void *arg)
+{
+ fader *vols = (fader *)arg;
+ guint i;
+ gint v;
+ gint inc, diff, adiff;
+
+ /* lock */
+ pthread_mutex_lock(&fader_lock);
+
+ /* slide volume */
+ /* the Kaspar Giger way of fading, check the current mixer volume and
+ * increment from there so that if you have some other app lowering the
+ * volume at the same time xmms-alarm will not ignore it. If you have some
+ * other app increasing the volume, then it could get louder that you expect
+ * though - because the loop does not recalculate the difference each time.
+ */
+
+ /* difference between the 2 volumes */
+ diff = vols->end - vols->start;
+ adiff = abs(diff);
+
+ /* Are we going up or down? */
+ if(diff < 0)
+ inc = -1;
+ else
+ inc = 1;
+
+ aud_drct_set_volume_main((gint)vols->start);
+ //for(i=0;i<(vols->end - vols->start);i++)
+ for(i=0;i<adiff;i++)
+ {
+ //threadsleep((gfloat)fading / (vols->end - vols->start));
+ threadsleep((gfloat)fading / (gfloat)adiff);
+ aud_drct_get_volume_main(&v);
+ aud_drct_set_volume_main(v + inc);
+ }
+ /* Setting the volume to the end volume sort of defeats the point if having
+ * the code in there to allow other apps to control volume too :)
+ */
+ //aud_drct_set_volume_main((gint)vols->end);
+
+ /* and */
+ pthread_mutex_unlock(&fader_lock);
+
+ AUDDBG("volume = %f%%\n", (gdouble)vols->end);
+ return(0);
+}
+
+static void *alarm_stop_thread( void *args )
+{
+ gint currvol;
+ fader fade_vols;
+ alarm_thread_t f;
+
+ AUDDBG("alarm_stop_thread\n");
+
+
+ /* sleep for however long we are meant to be sleeping for until
+ * its time to shut up
+ */
+ threadsleep(((stop_h * 60) + stop_m) * 60);
+
+ AUDDBG("alarm_stop triggered\n");
+
+ if (alarm_dialog)
+ gtk_widget_destroy(alarm_dialog);
+
+ aud_drct_get_volume_main(&currvol),
+
+ /* fade back to zero */
+ fade_vols.start = currvol;
+ fade_vols.end = 0;
+
+ /* The fader thread locks the fader_mutex now */
+ f = alarm_thread_create(alarm_fade, &fade_vols, 0);
+
+ pthread_join(f.tid, NULL);
+ aud_drct_stop();
+
+ /* might as well set the volume to something higher than zero so we
+ * dont confuse the poor people who just woke up and cant work out why
+ * theres no music playing when they press the little play button :)
+ */
+ aud_drct_set_volume_main(currvol);
+
+ AUDDBG("alarm_stop done\n");
+ return(NULL);
+}
+
+void alarm_stop_cancel(GtkButton *w, gpointer data)
+{
+ AUDDBG("alarm_stop_cancel\n");
+ if (pthread_cancel(stop.tid) == 0) {
+ stop.is_valid = FALSE;
+ }
+}
+
+/* the main alarm thread */
+static void *alarm_start_thread(void *args)
+{
+ struct tm *currtime;
+ time_t timenow;
+ unsigned int play_start = 0;
+ guint today;
+
+ /* give it time to set start_tid to something */
+ threadsleep(1);
+
+ while (start.is_valid)
+ {
+ /* sit around and wait for the faders to not be doing anything */
+ AUDDBG("Waiting for fader to be unlocked..");
+ pthread_mutex_lock(&fader_lock);
+ AUDDBG("Ok\n");
+ pthread_mutex_unlock(&fader_lock);
+
+ AUDDBG("Getting time\n");
+ timenow = time(NULL);
+ currtime = localtime(&timenow);
+ today = currtime->tm_wday;
+ AUDDBG("Today is %d\n", today);
+
+ /* see if its time to do something */
+ AUDDBG("Checking Day\n");
+
+ /* Had to put something here so I put the hour string.
+ ** Its only debug stuff anyway */
+ AUDDBG("%s",day_h[today]);
+
+ if(alarm_conf.day[today].flags & ALARM_OFF)
+ {
+ threadsleep(8.5);
+ continue;
+ }
+ else
+ {
+ /* set the alarm_h and alarm_m for today, if not default */
+ if(!(alarm_conf.day[today].flags & ALARM_DEFAULT))
+ {
+ alarm_h = alarm_conf.day[today].hour;
+ alarm_m = alarm_conf.day[today].min;
+ }
+ else
+ {
+ alarm_h = alarm_conf.default_hour;
+ alarm_m = alarm_conf.default_min;
+ }
+ }
+
+ AUDDBG("Alarm time is %d:%d (def: %d:%d)\n", alarm_h, alarm_m,
+ alarm_conf.default_hour, alarm_conf.default_min);
+
+ AUDDBG("Checking time (%d:%d)\n", currtime->tm_hour, currtime->tm_min);
+ if((currtime->tm_hour != alarm_h) || (currtime->tm_min != alarm_m))
+ {
+ threadsleep(8.5);
+ continue;
+ }
+
+ if(cmd_on == TRUE)
+ {
+ AUDDBG("Executing %s, cmd_on is true\n", cmdstr);
+ if(system(cmdstr) == -1)
+ {
+ AUDDBG("Executing %s failed\n",cmdstr);
+ }
+ }
+
+ AUDDBG("strcmp playlist, playlist is [%s]\n", playlist);
+ if(strcmp(playlist, ""))
+ {
+ AUDDBG("playlist is not blank, aparently\n");
+ GList list;
+
+ list.prev = list.next = NULL;
+ list.data = playlist;
+
+ aud_drct_pl_clear();
+ aud_drct_pl_add_list (& list, -1);
+ }
+
+ if(fading)
+ {
+ fader fade_vols;
+
+ AUDDBG("Fading is true\n");
+ aud_drct_set_volume_main(quietvol);
+
+ /* start playing */
+ play_start = time(NULL);
+ aud_drct_play();
+
+ /* fade volume */
+ fade_vols.start = quietvol;
+ fade_vols.end = volume;
+
+ //alarm_fade(quietvol, volume);
+ alarm_thread_create(alarm_fade, &fade_vols, 0);
+ }
+ else
+ {
+ /* no fading */
+
+ /* set volume */
+ aud_drct_set_volume_main(volume);
+
+ /* start playing */
+ play_start = time(NULL);
+ aud_drct_play();
+ }
+
+ if(alarm_conf.reminder_on == TRUE)
+ {
+ GtkWidget *reminder_dialog;
+ AUDDBG("Showing reminder '%s'\n", alarm_conf.reminder_msg);
+
+ reminder_dialog = (GtkWidget*) create_reminder_dialog(alarm_conf.reminder_msg);
+ g_signal_connect (reminder_dialog, "destroy", (GCallback)
+ gtk_widget_destroyed, & reminder_dialog);
+ gtk_widget_show_all(reminder_dialog);
+ }
+
+ /* bring up the wakeup call dialog if stop_on is set TRUE, this
+ * has been moved to after making xmms play so that it doesnt
+ * get in the way for people with manual window placement turned on
+ *
+ * this means that the dialog doesnt get shown until the volume has
+ * finished fading though !, so thats something else to fix
+ */
+ if(stop_on == TRUE)
+ {
+ alarm_dialog = create_alarm_dialog();
+ g_signal_connect (alarm_dialog, "destroy", (GCallback)
+ gtk_widget_destroyed, & alarm_dialog);
+
+ gtk_widget_show_all(alarm_dialog);
+
+ AUDDBG("now starting stop thread\n");
+ stop = alarm_thread_create(alarm_stop_thread, NULL, 0);
+ AUDDBG("Created wakeup dialog and started stop thread\n");
+
+ /* now wait for the stop thread */
+ AUDDBG("Waiting for stop to stop.... ");
+ if (pthread_join(stop.tid, NULL) == 0)
+ stop.is_valid = FALSE;
+
+ /* loop until we are out of the starting minute */
+ while(time(NULL) < (play_start + 61))
+ {
+ AUDDBG("Waiting until out of starting minute\n");
+ threadsleep(5.0);
+ }
+ AUDDBG("OK\n");
+ }
+ /* loop until we are out of the starting minute */
+ while(time(NULL) < (play_start + 61))
+ {
+ threadsleep(5.0);
+ }
+ threadsleep(fading);
+ }
+
+ AUDDBG("Main thread has gone...\n");
+ return NULL;
+}
+
+/*
+ * initialization
+ * opens the config file and reads the value, creates a new
+ * config in memory if the file doesnt exist and sets default vals
+ */
+static gboolean alarm_init (void)
+{
+ AUDDBG("alarm_init\n");
+
+ alarm_conf.reminder_msg = NULL;
+ alarm_read_config();
+
+ /* start the main thread running */
+ start = alarm_thread_create(alarm_start_thread, NULL, 1);
+
+ return TRUE;
+}
+
+/*
+ * kill the main thread
+ */
+static void alarm_cleanup(void)
+{
+ AUDDBG("alarm_cleanup\n");
+
+ if (start.is_valid) {
+ pthread_cancel(start.tid);
+ start.is_valid = FALSE;
+ }
+ if (stop.is_valid) {
+ pthread_cancel(stop.tid);
+ stop.is_valid = FALSE;
+ }
+
+ g_free(alarm_conf.reminder_msg);
+ alarm_conf.reminder_msg = NULL;
+ g_free(playlist);
+ playlist = NULL;
+ g_free(cmdstr);
+ cmdstr = NULL;
+}
+
+AUD_GENERAL_PLUGIN
+(
+ .name = "Alarm",
+ .init = alarm_init,
+ .about = alarm_about,
+ .configure = alarm_configure,
+ .cleanup = alarm_cleanup,
+)

audacious-plugins-3.1.tar.bz2/src/alarm/alarm.h Added

audacious-plugins-3.1.tar.bz2/src/alarm/callbacks.h Added

@@ -0,0 +1,45 @@
+#include <gtk/gtk.h>
+
+
+void
+alarm_current_volume (GtkButton *button,
+ gpointer user_data);
+
+void
+alarm_save (GtkButton *button,
+ gpointer user_data);
+
+void
+alarm_stop_cancel (GtkButton *button,
+ gpointer user_data);
+
+void
+on_mon_def_toggled (GtkToggleButton *togglebutton,
+ gpointer user_data);
+
+void
+on_tue_def_toggled (GtkToggleButton *togglebutton,
+ gpointer user_data);
+
+void
+on_wed_def_toggled (GtkToggleButton *togglebutton,
+ gpointer user_data);
+
+void
+on_thu_def_toggled (GtkToggleButton *togglebutton,
+ gpointer user_data);
+
+void
+on_fri_def_toggled (GtkToggleButton *togglebutton,
+ gpointer user_data);
+
+void
+on_sat_def_toggled (GtkToggleButton *togglebutton,
+ gpointer user_data);
+
+void
+on_sun_def_toggled (GtkToggleButton *togglebutton,
+ gpointer user_data);
+/*
+ * vi:ai:expandtab:ts=2 sts=2 shiftwidth=2:nowrap:
+ */

audacious-plugins-3.1.tar.bz2/src/alarm/interface.c Added

@@ -0,0 +1,1457 @@
+/*
+ * DO NOT EDIT THIS FILE - it is generated by Glade.
+ */
+
+#include <config.h>
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <string.h>
+
+#include <gdk/gdkkeysyms.h>
+#include <gtk/gtk.h>
+
+#include "callbacks.h"
+#include "interface.h"
+
+#include <audacious/i18n.h>
+#include <audacious/gtk-compat.h>
+
+GtkWidget*
+create_about_dialog (void)
+{
+ GtkWidget *about_dialog;
+ GtkWidget *dialog_vbox2;
+ GtkWidget *frame6;
+ GtkWidget *label18;
+ GtkWidget *dialog_action_area2;
+ GtkWidget *close;
+
+ about_dialog = gtk_dialog_new ();
+ gtk_widget_set_name (about_dialog, "about_dialog");
+ g_object_set_data (G_OBJECT (about_dialog), "about_dialog", about_dialog);
+ gtk_window_set_title (GTK_WINDOW (about_dialog), _("About XMMS Alarm"));
+
+ dialog_vbox2 = gtk_dialog_get_content_area ((GtkDialog *) about_dialog);
+ gtk_widget_set_name (dialog_vbox2, "dialog_vbox2");
+ g_object_set_data (G_OBJECT (about_dialog), "dialog_vbox2", dialog_vbox2);
+ gtk_widget_show (dialog_vbox2);
+
+ frame6 = gtk_frame_new (_("XMMS Alarm"));
+ gtk_widget_set_name (frame6, "frame6");
+ g_object_ref (frame6);
+ g_object_set_data_full (G_OBJECT (about_dialog), "frame6", frame6,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (frame6);
+ gtk_box_pack_start (GTK_BOX (dialog_vbox2), frame6, TRUE, TRUE, 0);
+ gtk_container_set_border_width (GTK_CONTAINER (frame6), 10);
+
+ label18 = gtk_label_new (_("An XMMS plugin which can be used\nto start playing at a certain time.\n\nSend all complaints to:\nAdam Feakin <adamf@snika.uklinux.net>\nDaniel Stodden <stodden@in.tum.de>\n\nhttp://www.snika.uklinux.net/xmms-alarm/"));
+ gtk_widget_set_name (label18, "label18");
+ g_object_ref (label18);
+ g_object_set_data_full (G_OBJECT (about_dialog), "label18", label18,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (label18);
+ gtk_container_add (GTK_CONTAINER (frame6), label18);
+ gtk_misc_set_padding (GTK_MISC (label18), 10, 20);
+
+ dialog_action_area2 = gtk_dialog_get_action_area ((GtkDialog *) about_dialog);
+ gtk_widget_set_name (dialog_action_area2, "dialog_action_area2");
+ g_object_set_data (G_OBJECT (about_dialog), "dialog_action_area2", dialog_action_area2);
+ gtk_widget_show (dialog_action_area2);
+ gtk_container_set_border_width (GTK_CONTAINER (dialog_action_area2), 10);
+
+ close = gtk_button_new_with_label (_("Close"));
+ gtk_widget_set_name (close, "close");
+ g_object_ref (close);
+ g_object_set_data_full (G_OBJECT (about_dialog), "close", close,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (close);
+ gtk_box_pack_start (GTK_BOX (dialog_action_area2), close, FALSE, TRUE, 0);
+ gtk_widget_set_can_default (close, TRUE);
+
+ g_signal_connect_swapped (G_OBJECT (close), "clicked",
+ G_CALLBACK (gtk_widget_destroy),
+ G_OBJECT (about_dialog));
+
+ gtk_widget_grab_focus (close);
+ gtk_widget_grab_default (close);
+ return about_dialog;
+}
+
+GtkWidget*
+create_alarm_dialog (void)
+{
+ GtkWidget *alarm_dialog;
+ GtkWidget *dialog_vbox3;
+ GtkWidget *label19;
+ GtkWidget *dialog_action_area3;
+ GtkWidget *button9;
+
+ alarm_dialog = gtk_dialog_new ();
+ gtk_widget_set_name (alarm_dialog, "alarm_dialog");
+ g_object_set_data (G_OBJECT (alarm_dialog), "alarm_dialog", alarm_dialog);
+ gtk_window_set_title (GTK_WINDOW (alarm_dialog), _("Alarm"));
+
+ dialog_vbox3 = gtk_dialog_get_content_area ((GtkDialog *) alarm_dialog);
+ gtk_widget_set_name (dialog_vbox3, "dialog_vbox3");
+ g_object_set_data (G_OBJECT (alarm_dialog), "dialog_vbox3", dialog_vbox3);
+ gtk_widget_show (dialog_vbox3);
+
+ label19 = gtk_label_new (_("This is your wakeup call."));
+ gtk_widget_set_name (label19, "label19");
+ g_object_ref (label19);
+ g_object_set_data_full (G_OBJECT (alarm_dialog), "label19", label19,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (label19);
+ gtk_box_pack_start (GTK_BOX (dialog_vbox3), label19, FALSE, TRUE, 0);
+ gtk_misc_set_padding (GTK_MISC (label19), 10, 10);
+
+ dialog_action_area3 = gtk_dialog_get_action_area ((GtkDialog *) alarm_dialog);
+ gtk_widget_set_name (dialog_action_area3, "dialog_action_area3");
+ g_object_set_data (G_OBJECT (alarm_dialog), "dialog_action_area3", dialog_action_area3);
+ gtk_widget_show (dialog_action_area3);
+ gtk_container_set_border_width (GTK_CONTAINER (dialog_action_area3), 10);
+
+ button9 = gtk_button_new_with_label (_("OK"));
+ gtk_widget_set_name (button9, "button9");
+ g_object_ref (button9);
+ g_object_set_data_full (G_OBJECT (alarm_dialog), "button9", button9,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (button9);
+ gtk_box_pack_start (GTK_BOX (dialog_action_area3), button9, FALSE, TRUE, 0);
+ gtk_widget_set_can_default (button9, TRUE);
+
+ g_signal_connect (G_OBJECT (button9), "clicked",
+ G_CALLBACK (alarm_stop_cancel),
+ NULL);
+ g_signal_connect_swapped (G_OBJECT (button9), "clicked",
+ G_CALLBACK (gtk_widget_destroy),
+ G_OBJECT (alarm_dialog));
+
+ gtk_widget_grab_focus (button9);
+ gtk_widget_grab_default (button9);
+ return alarm_dialog;
+}
+
+GtkWidget*
+create_warning_dialog (void)
+{
+ GtkWidget *warning_dialog;
+ GtkWidget *dialog_vbox4;
+ GtkWidget *frame9;
+ GtkWidget *label70;
+ GtkWidget *dialog_action_area4;
+ GtkWidget *button10;
+
+ warning_dialog = gtk_dialog_new ();
+ gtk_widget_set_name (warning_dialog, "warning_dialog");
+ g_object_set_data (G_OBJECT (warning_dialog), "warning_dialog", warning_dialog);
+ gtk_window_set_title (GTK_WINDOW (warning_dialog), _("Sorry"));
+
+ dialog_vbox4 = gtk_dialog_get_content_area ((GtkDialog *) warning_dialog);
+ gtk_widget_set_name (dialog_vbox4, "dialog_vbox4");
+ g_object_set_data (G_OBJECT (warning_dialog), "dialog_vbox4", dialog_vbox4);
+ gtk_widget_show (dialog_vbox4);
+
+ frame9 = gtk_frame_new (_("Warning"));
+ gtk_widget_set_name (frame9, "frame9");
+ g_object_ref (frame9);
+ g_object_set_data_full (G_OBJECT (warning_dialog), "frame9", frame9,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (frame9);
+ gtk_box_pack_start (GTK_BOX (dialog_vbox4), frame9, TRUE, TRUE, 0);
+ gtk_container_set_border_width (GTK_CONTAINER (frame9), 10);
+
+ label70 = gtk_label_new (_("For safety reasons the \"quiet\" time must be at least 65 seconds longer than the fading time, it must also be more than 10 seconds. This basically means that there is a bug in the code and until I find a way of really fixing it this message will appear :)\n\nYour fading settings have NOT been saved\n\n--\nAdam"));
+ gtk_widget_set_name (label70, "label70");
+ g_object_ref (label70);
+ g_object_set_data_full (G_OBJECT (warning_dialog), "label70", label70,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (label70);
+ gtk_container_add (GTK_CONTAINER (frame9), label70);
+ gtk_label_set_line_wrap (GTK_LABEL (label70), TRUE);
+ gtk_misc_set_padding (GTK_MISC (label70), 10, 20);
+
+ dialog_action_area4 = gtk_dialog_get_action_area ((GtkDialog *) warning_dialog);
+ gtk_widget_set_name (dialog_action_area4, "dialog_action_area4");
+ g_object_set_data (G_OBJECT (warning_dialog), "dialog_action_area4", dialog_action_area4);
+ gtk_widget_show (dialog_action_area4);
+ gtk_container_set_border_width (GTK_CONTAINER (dialog_action_area4), 10);
+
+ button10 = gtk_button_new_with_label (_("Oh Well"));
+ gtk_widget_set_name (button10, "button10");
+ g_object_ref (button10);
+ g_object_set_data_full (G_OBJECT (warning_dialog), "button10", button10,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (button10);
+ gtk_box_pack_start (GTK_BOX (dialog_action_area4), button10, FALSE, TRUE, 0);
+ gtk_widget_set_can_default (button10, TRUE);
+
+ g_signal_connect_swapped (G_OBJECT (button10), "clicked",
+ G_CALLBACK (gtk_widget_destroy),
+ G_OBJECT (warning_dialog));
+
+ gtk_widget_grab_focus (button10);
+ gtk_widget_grab_default (button10);
+ return warning_dialog;
+}
+
+GtkWidget*
+create_config_dialog (void)
+{
+ GtkWidget *config_dialog;
+ GtkWidget *dialog_vbox5;
+ GtkWidget *notebook1;
+ GtkWidget *frame10;
+ GtkWidget *table3;
+ GtkWidget *hbox21;
+ GtkAdjustment *stop_h_spin_adj;
+ GtkWidget *stop_h_spin;
+ GtkWidget *label75;
+ GtkWidget *hbox22;
+ GtkAdjustment *alarm_h_spin_adj;
+ GtkWidget *alarm_h_spin;
+ GtkWidget *label76;
+ GtkWidget *hbox23;
+ GtkAdjustment *alarm_m_spin_adj;
+ GtkWidget *alarm_m_spin;
+ GtkWidget *label77;
+ GtkWidget *hbox24;
+ GtkAdjustment *stop_m_spin_adj;
+ GtkWidget *stop_m_spin;
+ GtkWidget *label78;
+ GtkWidget *stop_checkb;
+ GtkWidget *label79;
+ GtkWidget *label80;
+ GtkWidget *label71;
+ GtkWidget *frame15;
+ GtkWidget *table4;
+ GtkWidget *hbox31;
+ GtkWidget *mon_def;
+ GtkAdjustment *mon_h_adj;
+ GtkWidget *mon_h;
+ GtkWidget *label89;
+ GtkAdjustment *mon_m_adj;
+ GtkWidget *mon_m;
+ GtkWidget *hbox32;
+ GtkWidget *tue_def;
+ GtkAdjustment *tue_h_adj;
+ GtkWidget *tue_h;
+ GtkWidget *label90;
+ GtkAdjustment *tue_m_adj;
+ GtkWidget *tue_m;
+ GtkWidget *hbox33;
+ GtkWidget *wed_def;
+ GtkAdjustment *wed_h_adj;
+ GtkWidget *wed_h;
+ GtkWidget *label91;
+ GtkAdjustment *wed_m_adj;
+ GtkWidget *wed_m;
+ GtkWidget *hbox34;
+ GtkWidget *thu_def;
+ GtkAdjustment *thu_h_adj;
+ GtkWidget *thu_h;
+ GtkWidget *label92;
+ GtkAdjustment *thu_m_adj;
+ GtkWidget *thu_m;
+ GtkWidget *hbox35;
+ GtkWidget *fri_def;
+ GtkAdjustment *fri_h_adj;
+ GtkWidget *fri_h;
+ GtkWidget *label93;
+ GtkAdjustment *fri_m_adj;
+ GtkWidget *fri_m;
+ GtkWidget *hbox36;
+ GtkWidget *sat_def;
+ GtkAdjustment *sat_h_adj;
+ GtkWidget *sat_h;
+ GtkWidget *label94;
+ GtkAdjustment *sat_m_adj;
+ GtkWidget *sat_m;
+ GtkWidget *hbox37;
+ GtkWidget *sun_def;
+ GtkAdjustment *sun_h_adj;
+ GtkWidget *sun_h;
+ GtkWidget *label95;
+ GtkAdjustment *sun_m_adj;
+ GtkWidget *sun_m;
+ GtkWidget *label87;
+ GtkWidget *label88;
+ GtkWidget *tue_cb;
+ GtkWidget *wed_cb;
+ GtkWidget *thu_cb;
+ GtkWidget *fri_cb;
+ GtkWidget *sat_cb;
+ GtkWidget *sun_cb;
+ GtkWidget *mon_cb;
+ GtkWidget *label72;
+ GtkWidget *vbox8;
+ GtkWidget *frame11;
+ GtkWidget *alignment10;
+ GtkWidget *hbox25;
+ GtkAdjustment *fading_spin_adj;
+ GtkWidget *fading_spin;
+ GtkWidget *label81;
+ GtkWidget *frame12;
+ GtkWidget *vbox9;
+ GtkWidget *alignment11;
+ GtkWidget *current_button;
+ GtkWidget *label82;
+ GtkWidget *hbox26;
+ GtkWidget *quiet_vol_scale;
+ GtkWidget *label83;
+ GtkWidget *hseparator2;
+ GtkWidget *label84;
+ GtkWidget *hbox27;
+ GtkWidget *vol_scale;
+ GtkWidget *label85;
+ GtkWidget *label73;
+ GtkWidget *vbox10;
+ GtkWidget *frame13;
+ GtkWidget *hbox28;
+ GtkWidget *cmd_entry;
+ GtkWidget *cmd_checkb;
+ GtkWidget *frame14;
+ GtkWidget *hbox29;
+ GtkWidget *playlist;
+ GtkWidget *playlist_browse_button;
+ GtkWidget *frame18;
+ GtkWidget *hbox38;
+ GtkWidget *reminder_cb;
+ GtkWidget *reminder_text;
+ GtkWidget *label74;
+ GtkWidget *frame16;
+ GtkWidget *scrolledwindow1;
+ GtkWidget *text1;
+ GtkTextBuffer *text1buffer;
+ GtkTextIter iter;
+ GtkWidget *label86;
+ GtkWidget *dialog_action_area5;
+ GtkWidget *hbox20;
+ GtkWidget *ok_button;
+ GtkWidget *cancel_button;
+
+ config_dialog = gtk_dialog_new ();
+ gtk_widget_set_name (config_dialog, "config_dialog");
+ g_object_set_data (G_OBJECT (config_dialog), "config_dialog", config_dialog);
+ gtk_window_set_title (GTK_WINDOW (config_dialog), _("Alarm Settings"));
+
+ dialog_vbox5 = gtk_dialog_get_content_area ((GtkDialog *) config_dialog);
+ gtk_widget_set_name (dialog_vbox5, "dialog_vbox5");
+ g_object_set_data (G_OBJECT (config_dialog), "dialog_vbox5", dialog_vbox5);
+ gtk_widget_show (dialog_vbox5);
+
+ notebook1 = gtk_notebook_new ();
+ gtk_widget_set_name (notebook1, "notebook1");
+ g_object_ref (notebook1);
+ g_object_set_data_full (G_OBJECT (config_dialog), "notebook1", notebook1,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (notebook1);
+ gtk_box_pack_start (GTK_BOX (dialog_vbox5), notebook1, TRUE, TRUE, 0);
+
+ frame10 = gtk_frame_new (_("Time"));
+ gtk_widget_set_name (frame10, "frame10");
+ g_object_ref (frame10);
+ g_object_set_data_full (G_OBJECT (config_dialog), "frame10", frame10,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (frame10);
+ gtk_container_add (GTK_CONTAINER (notebook1), frame10);
+ gtk_container_set_border_width (GTK_CONTAINER (frame10), 10);
+
+ table3 = gtk_table_new (2, 3, FALSE);
+ gtk_widget_set_name (table3, "table3");
+ g_object_ref (table3);
+ g_object_set_data_full (G_OBJECT (config_dialog), "table3", table3,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (table3);
+ gtk_container_add (GTK_CONTAINER (frame10), table3);
+ gtk_container_set_border_width (GTK_CONTAINER (table3), 8);
+ gtk_table_set_row_spacings (GTK_TABLE (table3), 5);
+ gtk_table_set_col_spacings (GTK_TABLE (table3), 15);
+
+ hbox21 = gtk_hbox_new (FALSE, 0);
+ gtk_widget_set_name (hbox21, "hbox21");
+ g_object_ref (hbox21);
+ g_object_set_data_full (G_OBJECT (config_dialog), "hbox21", hbox21,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (hbox21);
+ gtk_table_attach (GTK_TABLE (table3), hbox21, 1, 2, 1, 2,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0);
+
+ stop_h_spin_adj = (GtkAdjustment *) gtk_adjustment_new (0, 0, 100, 1, 10, 0);
+ stop_h_spin = gtk_spin_button_new (GTK_ADJUSTMENT (stop_h_spin_adj), 1, 0);
+ gtk_widget_set_name (stop_h_spin, "stop_h_spin");
+ g_object_ref (stop_h_spin);
+ g_object_set_data_full (G_OBJECT (config_dialog), "stop_h_spin", stop_h_spin,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (stop_h_spin);
+ gtk_box_pack_start (GTK_BOX (hbox21), stop_h_spin, FALSE, FALSE, 0);
+ gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (stop_h_spin), TRUE);
+ gtk_spin_button_set_update_policy (GTK_SPIN_BUTTON (stop_h_spin), GTK_UPDATE_IF_VALID);
+
+ label75 = gtk_label_new (_("hours"));
+ gtk_widget_set_name (label75, "label75");
+ g_object_ref (label75);
+ g_object_set_data_full (G_OBJECT (config_dialog), "label75", label75,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (label75);
+ gtk_box_pack_start (GTK_BOX (hbox21), label75, FALSE, FALSE, 0);
+
+ hbox22 = gtk_hbox_new (FALSE, 0);
+ gtk_widget_set_name (hbox22, "hbox22");
+ g_object_ref (hbox22);
+ g_object_set_data_full (G_OBJECT (config_dialog), "hbox22", hbox22,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (hbox22);
+ gtk_table_attach (GTK_TABLE (table3), hbox22, 1, 2, 0, 1,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0);
+
+ alarm_h_spin_adj = (GtkAdjustment *) gtk_adjustment_new (6, 0, 23, 1, 10, 0);
+ alarm_h_spin = gtk_spin_button_new (GTK_ADJUSTMENT (alarm_h_spin_adj), 1, 0);
+ gtk_widget_set_name (alarm_h_spin, "alarm_h_spin");
+ g_object_ref (alarm_h_spin);
+ g_object_set_data_full (G_OBJECT (config_dialog), "alarm_h_spin", alarm_h_spin,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (alarm_h_spin);
+ gtk_box_pack_start (GTK_BOX (hbox22), alarm_h_spin, FALSE, FALSE, 0);
+ gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (alarm_h_spin), TRUE);
+ gtk_spin_button_set_update_policy (GTK_SPIN_BUTTON (alarm_h_spin), GTK_UPDATE_IF_VALID);
+ gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (alarm_h_spin), TRUE);
+
+ label76 = gtk_label_new (":");
+ gtk_widget_set_name (label76, "label76");
+ g_object_ref (label76);
+ g_object_set_data_full (G_OBJECT (config_dialog), "label76", label76,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (label76);
+ gtk_box_pack_start (GTK_BOX (hbox22), label76, FALSE, FALSE, 0);
+ gtk_misc_set_padding (GTK_MISC (label76), 5, 0);
+
+ hbox23 = gtk_hbox_new (FALSE, 0);
+ gtk_widget_set_name (hbox23, "hbox23");
+ g_object_ref (hbox23);
+ g_object_set_data_full (G_OBJECT (config_dialog), "hbox23", hbox23,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (hbox23);
+ gtk_table_attach (GTK_TABLE (table3), hbox23, 2, 3, 0, 1,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (GTK_FILL), 0, 0);
+
+ alarm_m_spin_adj = (GtkAdjustment *) gtk_adjustment_new (30, 0, 59, 1, 10, 0);
+ alarm_m_spin = gtk_spin_button_new (GTK_ADJUSTMENT (alarm_m_spin_adj), 1, 0);
+ gtk_widget_set_name (alarm_m_spin, "alarm_m_spin");
+ g_object_ref (alarm_m_spin);
+ g_object_set_data_full (G_OBJECT (config_dialog), "alarm_m_spin", alarm_m_spin,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (alarm_m_spin);
+ gtk_box_pack_start (GTK_BOX (hbox23), alarm_m_spin, FALSE, TRUE, 0);
+ gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (alarm_m_spin), TRUE);
+ gtk_spin_button_set_update_policy (GTK_SPIN_BUTTON (alarm_m_spin), GTK_UPDATE_IF_VALID);
+ gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (alarm_m_spin), TRUE);
+
+ label77 = gtk_label_new (_("h"));
+ gtk_widget_set_name (label77, "label77");
+ g_object_ref (label77);
+ g_object_set_data_full (G_OBJECT (config_dialog), "label77", label77,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (label77);
+ gtk_box_pack_start (GTK_BOX (hbox23), label77, FALSE, FALSE, 0);
+
+ hbox24 = gtk_hbox_new (FALSE, 0);
+ gtk_widget_set_name (hbox24, "hbox24");
+ g_object_ref (hbox24);
+ g_object_set_data_full (G_OBJECT (config_dialog), "hbox24", hbox24,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (hbox24);
+ gtk_table_attach (GTK_TABLE (table3), hbox24, 2, 3, 1, 2,
+ (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
+ (GtkAttachOptions) (GTK_FILL), 0, 0);
+
+ stop_m_spin_adj = (GtkAdjustment *) gtk_adjustment_new (0, 0, 59, 1, 10, 0);
+ stop_m_spin = gtk_spin_button_new (GTK_ADJUSTMENT (stop_m_spin_adj), 1, 0);
+ gtk_widget_set_name (stop_m_spin, "stop_m_spin");
+ g_object_ref (stop_m_spin);
+ g_object_set_data_full (G_OBJECT (config_dialog), "stop_m_spin", stop_m_spin,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (stop_m_spin);
+ gtk_box_pack_start (GTK_BOX (hbox24), stop_m_spin, FALSE, FALSE, 0);
+ gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (stop_m_spin), TRUE);
+ gtk_spin_button_set_update_policy (GTK_SPIN_BUTTON (stop_m_spin), GTK_UPDATE_IF_VALID);
+ gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (stop_m_spin), TRUE);
+
+ label78 = gtk_label_new (_("minutes"));
+ gtk_widget_set_name (label78, "label78");
+ g_object_ref (label78);
+ g_object_set_data_full (G_OBJECT (config_dialog), "label78", label78,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (label78);
+ gtk_box_pack_start (GTK_BOX (hbox24), label78, FALSE, FALSE, 0);
+
+ stop_checkb = gtk_check_button_new ();
+ gtk_widget_set_name (stop_checkb, "stop_checkb");
+ g_object_ref (stop_checkb);
+ g_object_set_data_full (G_OBJECT (config_dialog), "stop_checkb", stop_checkb,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (stop_checkb);
+ gtk_table_attach (GTK_TABLE (table3), stop_checkb, 0, 1, 1, 2,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (0), 0, 0);
+
+ label79 = gtk_label_new (_("Quiet after:"));
+ gtk_widget_set_name (label79, "label79");
+ g_object_ref (label79);
+ g_object_set_data_full (G_OBJECT (config_dialog), "label79", label79,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (label79);
+ gtk_container_add (GTK_CONTAINER (stop_checkb), label79);
+ gtk_label_set_justify (GTK_LABEL (label79), GTK_JUSTIFY_LEFT);
+ gtk_misc_set_alignment (GTK_MISC (label79), 0, 0.5);
+
+ label80 = gtk_label_new (_("Alarm at (default):"));
+ gtk_widget_set_name (label80, "label80");
+ g_object_ref (label80);
+ g_object_set_data_full (G_OBJECT (config_dialog), "label80", label80,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (label80);
+ gtk_table_attach (GTK_TABLE (table3), label80, 0, 1, 0, 1,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (0), 0, 0);
+ gtk_label_set_justify (GTK_LABEL (label80), GTK_JUSTIFY_LEFT);
+ gtk_misc_set_alignment (GTK_MISC (label80), 0, 0.5);
+
+ label71 = gtk_label_new (_("Time"));
+ gtk_widget_set_name (label71, "label71");
+ g_object_ref (label71);
+ g_object_set_data_full (G_OBJECT (config_dialog), "label71", label71,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (label71);
+ gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook1), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook1), 0), label71);
+
+ frame15 = gtk_frame_new (_("Choose the days for the alarm to come on"));
+ gtk_widget_set_name (frame15, "frame15");
+ g_object_ref (frame15);
+ g_object_set_data_full (G_OBJECT (config_dialog), "frame15", frame15,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (frame15);
+ gtk_container_add (GTK_CONTAINER (notebook1), frame15);
+ gtk_container_set_border_width (GTK_CONTAINER (frame15), 10);
+
+ table4 = gtk_table_new (8, 2, FALSE);
+ gtk_widget_set_name (table4, "table4");
+ g_object_ref (table4);
+ g_object_set_data_full (G_OBJECT (config_dialog), "table4", table4,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (table4);
+ gtk_container_add (GTK_CONTAINER (frame15), table4);
+ gtk_container_set_border_width (GTK_CONTAINER (table4), 5);
+
+ hbox31 = gtk_hbox_new (FALSE, 0);
+ gtk_widget_set_name (hbox31, "hbox31");
+ g_object_ref (hbox31);
+ g_object_set_data_full (G_OBJECT (config_dialog), "hbox31", hbox31,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (hbox31);
+ gtk_table_attach (GTK_TABLE (table4), hbox31, 1, 2, 1, 2,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0);
+
+ mon_def = gtk_check_button_new_with_label (_("Default"));
+ gtk_widget_set_name (mon_def, "mon_def");
+ g_object_ref (mon_def);
+ g_object_set_data_full (G_OBJECT (config_dialog), "mon_def", mon_def,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (mon_def);
+ gtk_box_pack_start (GTK_BOX (hbox31), mon_def, FALSE, FALSE, 0);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (mon_def), TRUE);
+
+ mon_h_adj = (GtkAdjustment *) gtk_adjustment_new (6, 0, 23, 1, 10, 0);
+ mon_h = gtk_spin_button_new (GTK_ADJUSTMENT (mon_h_adj), 1, 0);
+ gtk_widget_set_name (mon_h, "mon_h");
+ g_object_ref (mon_h);
+ g_object_set_data_full (G_OBJECT (config_dialog), "mon_h", mon_h,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (mon_h);
+ gtk_box_pack_start (GTK_BOX (hbox31), mon_h, TRUE, TRUE, 0);
+ gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (mon_h), TRUE);
+
+ label89 = gtk_label_new (":");
+ gtk_widget_set_name (label89, "label89");
+ g_object_ref (label89);
+ g_object_set_data_full (G_OBJECT (config_dialog), "label89", label89,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (label89);
+ gtk_box_pack_start (GTK_BOX (hbox31), label89, FALSE, FALSE, 0);
+
+ mon_m_adj = (GtkAdjustment *) gtk_adjustment_new (30, 0, 59, 1, 10, 0);
+ mon_m = gtk_spin_button_new (GTK_ADJUSTMENT (mon_m_adj), 1, 0);
+ gtk_widget_set_name (mon_m, "mon_m");
+ g_object_ref (mon_m);
+ g_object_set_data_full (G_OBJECT (config_dialog), "mon_m", mon_m,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (mon_m);
+ gtk_box_pack_start (GTK_BOX (hbox31), mon_m, TRUE, TRUE, 0);
+ gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (mon_m), TRUE);
+ gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (mon_m), TRUE);
+
+ hbox32 = gtk_hbox_new (FALSE, 0);
+ gtk_widget_set_name (hbox32, "hbox32");
+ g_object_ref (hbox32);
+ g_object_set_data_full (G_OBJECT (config_dialog), "hbox32", hbox32,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (hbox32);
+ gtk_table_attach (GTK_TABLE (table4), hbox32, 1, 2, 2, 3,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0);
+
+ tue_def = gtk_check_button_new_with_label (_("Default"));
+ gtk_widget_set_name (tue_def, "tue_def");
+ g_object_ref (tue_def);
+ g_object_set_data_full (G_OBJECT (config_dialog), "tue_def", tue_def,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (tue_def);
+ gtk_box_pack_start (GTK_BOX (hbox32), tue_def, FALSE, FALSE, 0);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (tue_def), TRUE);
+
+ tue_h_adj = (GtkAdjustment *) gtk_adjustment_new (6, 0, 23, 1, 10, 0);
+ tue_h = gtk_spin_button_new (GTK_ADJUSTMENT (tue_h_adj), 1, 0);
+ gtk_widget_set_name (tue_h, "tue_h");
+ g_object_ref (tue_h);
+ g_object_set_data_full (G_OBJECT (config_dialog), "tue_h", tue_h,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (tue_h);
+ gtk_box_pack_start (GTK_BOX (hbox32), tue_h, TRUE, TRUE, 0);
+ gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (tue_h), TRUE);
+
+ label90 = gtk_label_new (":");
+ gtk_widget_set_name (label90, "label90");
+ g_object_ref (label90);
+ g_object_set_data_full (G_OBJECT (config_dialog), "label90", label90,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (label90);
+ gtk_box_pack_start (GTK_BOX (hbox32), label90, FALSE, FALSE, 0);
+
+ tue_m_adj = (GtkAdjustment *) gtk_adjustment_new (30, 0, 59, 1, 10, 0);
+ tue_m = gtk_spin_button_new (GTK_ADJUSTMENT (tue_m_adj), 1, 0);
+ gtk_widget_set_name (tue_m, "tue_m");
+ g_object_ref (tue_m);
+ g_object_set_data_full (G_OBJECT (config_dialog), "tue_m", tue_m,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (tue_m);
+ gtk_box_pack_start (GTK_BOX (hbox32), tue_m, TRUE, TRUE, 0);
+ gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (tue_m), TRUE);
+ gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (tue_m), TRUE);
+
+ hbox33 = gtk_hbox_new (FALSE, 0);
+ gtk_widget_set_name (hbox33, "hbox33");
+ g_object_ref (hbox33);
+ g_object_set_data_full (G_OBJECT (config_dialog), "hbox33", hbox33,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (hbox33);
+ gtk_table_attach (GTK_TABLE (table4), hbox33, 1, 2, 3, 4,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0);
+
+ wed_def = gtk_check_button_new_with_label (_("Default"));
+ gtk_widget_set_name (wed_def, "wed_def");
+ g_object_ref (wed_def);
+ g_object_set_data_full (G_OBJECT (config_dialog), "wed_def", wed_def,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (wed_def);
+ gtk_box_pack_start (GTK_BOX (hbox33), wed_def, FALSE, FALSE, 0);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (wed_def), TRUE);
+
+ wed_h_adj = (GtkAdjustment *) gtk_adjustment_new (6, 0, 23, 1, 10, 0);
+ wed_h = gtk_spin_button_new (GTK_ADJUSTMENT (wed_h_adj), 1, 0);
+ gtk_widget_set_name (wed_h, "wed_h");
+ g_object_ref (wed_h);
+ g_object_set_data_full (G_OBJECT (config_dialog), "wed_h", wed_h,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (wed_h);
+ gtk_box_pack_start (GTK_BOX (hbox33), wed_h, TRUE, TRUE, 0);
+ gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (wed_h), TRUE);
+
+ label91 = gtk_label_new (":");
+ gtk_widget_set_name (label91, "label91");
+ g_object_ref (label91);
+ g_object_set_data_full (G_OBJECT (config_dialog), "label91", label91,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (label91);
+ gtk_box_pack_start (GTK_BOX (hbox33), label91, FALSE, FALSE, 0);
+
+ wed_m_adj = (GtkAdjustment *) gtk_adjustment_new (30, 0, 59, 1, 10, 0);
+ wed_m = gtk_spin_button_new (GTK_ADJUSTMENT (wed_m_adj), 1, 0);
+ gtk_widget_set_name (wed_m, "wed_m");
+ g_object_ref (wed_m);
+ g_object_set_data_full (G_OBJECT (config_dialog), "wed_m", wed_m,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (wed_m);
+ gtk_box_pack_start (GTK_BOX (hbox33), wed_m, TRUE, TRUE, 0);
+ gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (wed_m), TRUE);
+ gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (wed_m), TRUE);
+
+ hbox34 = gtk_hbox_new (FALSE, 0);
+ gtk_widget_set_name (hbox34, "hbox34");
+ g_object_ref (hbox34);
+ g_object_set_data_full (G_OBJECT (config_dialog), "hbox34", hbox34,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (hbox34);
+ gtk_table_attach (GTK_TABLE (table4), hbox34, 1, 2, 4, 5,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0);
+
+ thu_def = gtk_check_button_new_with_label (_("Default"));
+ gtk_widget_set_name (thu_def, "thu_def");
+ g_object_ref (thu_def);
+ g_object_set_data_full (G_OBJECT (config_dialog), "thu_def", thu_def,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (thu_def);
+ gtk_box_pack_start (GTK_BOX (hbox34), thu_def, FALSE, FALSE, 0);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (thu_def), TRUE);
+
+ thu_h_adj = (GtkAdjustment *) gtk_adjustment_new (6, 0, 23, 1, 10, 0);
+ thu_h = gtk_spin_button_new (GTK_ADJUSTMENT (thu_h_adj), 1, 0);
+ gtk_widget_set_name (thu_h, "thu_h");
+ g_object_ref (thu_h);
+ g_object_set_data_full (G_OBJECT (config_dialog), "thu_h", thu_h,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (thu_h);
+ gtk_box_pack_start (GTK_BOX (hbox34), thu_h, TRUE, TRUE, 0);
+ gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (thu_h), TRUE);
+
+ label92 = gtk_label_new (":");
+ gtk_widget_set_name (label92, "label92");
+ g_object_ref (label92);
+ g_object_set_data_full (G_OBJECT (config_dialog), "label92", label92,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (label92);
+ gtk_box_pack_start (GTK_BOX (hbox34), label92, FALSE, FALSE, 0);
+
+ thu_m_adj = (GtkAdjustment *) gtk_adjustment_new (30, 0, 59, 1, 10, 0);
+ thu_m = gtk_spin_button_new (GTK_ADJUSTMENT (thu_m_adj), 1, 0);
+ gtk_widget_set_name (thu_m, "thu_m");
+ g_object_ref (thu_m);
+ g_object_set_data_full (G_OBJECT (config_dialog), "thu_m", thu_m,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (thu_m);
+ gtk_box_pack_start (GTK_BOX (hbox34), thu_m, TRUE, TRUE, 0);
+ gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (thu_m), TRUE);
+ gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (thu_m), TRUE);
+
+ hbox35 = gtk_hbox_new (FALSE, 0);
+ gtk_widget_set_name (hbox35, "hbox35");
+ g_object_ref (hbox35);
+ g_object_set_data_full (G_OBJECT (config_dialog), "hbox35", hbox35,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (hbox35);
+ gtk_table_attach (GTK_TABLE (table4), hbox35, 1, 2, 5, 6,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0);
+
+ fri_def = gtk_check_button_new_with_label (_("Default"));
+ gtk_widget_set_name (fri_def, "fri_def");
+ g_object_ref (fri_def);
+ g_object_set_data_full (G_OBJECT (config_dialog), "fri_def", fri_def,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (fri_def);
+ gtk_box_pack_start (GTK_BOX (hbox35), fri_def, FALSE, FALSE, 0);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (fri_def), TRUE);
+
+ fri_h_adj = (GtkAdjustment *) gtk_adjustment_new (6, 0, 23, 1, 10, 0);
+ fri_h = gtk_spin_button_new (GTK_ADJUSTMENT (fri_h_adj), 1, 0);
+ gtk_widget_set_name (fri_h, "fri_h");
+ g_object_ref (fri_h);
+ g_object_set_data_full (G_OBJECT (config_dialog), "fri_h", fri_h,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (fri_h);
+ gtk_box_pack_start (GTK_BOX (hbox35), fri_h, TRUE, TRUE, 0);
+ gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (fri_h), TRUE);
+
+ label93 = gtk_label_new (":");
+ gtk_widget_set_name (label93, "label93");
+ g_object_ref (label93);
+ g_object_set_data_full (G_OBJECT (config_dialog), "label93", label93,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (label93);
+ gtk_box_pack_start (GTK_BOX (hbox35), label93, FALSE, FALSE, 0);
+
+ fri_m_adj = (GtkAdjustment *) gtk_adjustment_new (30, 0, 59, 1, 10, 0);
+ fri_m = gtk_spin_button_new (GTK_ADJUSTMENT (fri_m_adj), 1, 0);
+ gtk_widget_set_name (fri_m, "fri_m");
+ g_object_ref (fri_m);
+ g_object_set_data_full (G_OBJECT (config_dialog), "fri_m", fri_m,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (fri_m);
+ gtk_box_pack_start (GTK_BOX (hbox35), fri_m, TRUE, TRUE, 0);
+ gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (fri_m), TRUE);
+ gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (fri_m), TRUE);
+
+ hbox36 = gtk_hbox_new (FALSE, 0);
+ gtk_widget_set_name (hbox36, "hbox36");
+ g_object_ref (hbox36);
+ g_object_set_data_full (G_OBJECT (config_dialog), "hbox36", hbox36,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (hbox36);
+ gtk_table_attach (GTK_TABLE (table4), hbox36, 1, 2, 6, 7,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0);
+
+ sat_def = gtk_check_button_new_with_label (_("Default"));
+ gtk_widget_set_name (sat_def, "sat_def");
+ g_object_ref (sat_def);
+ g_object_set_data_full (G_OBJECT (config_dialog), "sat_def", sat_def,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (sat_def);
+ gtk_box_pack_start (GTK_BOX (hbox36), sat_def, FALSE, FALSE, 0);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (sat_def), TRUE);
+
+ sat_h_adj = (GtkAdjustment *) gtk_adjustment_new (6, 0, 23, 1, 10, 0);
+ sat_h = gtk_spin_button_new (GTK_ADJUSTMENT (sat_h_adj), 1, 0);
+ gtk_widget_set_name (sat_h, "sat_h");
+ g_object_ref (sat_h);
+ g_object_set_data_full (G_OBJECT (config_dialog), "sat_h", sat_h,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (sat_h);
+ gtk_box_pack_start (GTK_BOX (hbox36), sat_h, TRUE, TRUE, 0);
+ gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (sat_h), TRUE);
+
+ label94 = gtk_label_new (":");
+ gtk_widget_set_name (label94, "label94");
+ g_object_ref (label94);
+ g_object_set_data_full (G_OBJECT (config_dialog), "label94", label94,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (label94);
+ gtk_box_pack_start (GTK_BOX (hbox36), label94, FALSE, FALSE, 0);
+
+ sat_m_adj = (GtkAdjustment *) gtk_adjustment_new (30, 0, 59, 1, 10, 0);
+ sat_m = gtk_spin_button_new (GTK_ADJUSTMENT (sat_m_adj), 1, 0);
+ gtk_widget_set_name (sat_m, "sat_m");
+ g_object_ref (sat_m);
+ g_object_set_data_full (G_OBJECT (config_dialog), "sat_m", sat_m,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (sat_m);
+ gtk_box_pack_start (GTK_BOX (hbox36), sat_m, TRUE, TRUE, 0);
+ gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (sat_m), TRUE);
+ gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (sat_m), TRUE);
+
+ hbox37 = gtk_hbox_new (FALSE, 0);
+ gtk_widget_set_name (hbox37, "hbox37");
+ g_object_ref (hbox37);
+ g_object_set_data_full (G_OBJECT (config_dialog), "hbox37", hbox37,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (hbox37);
+ gtk_table_attach (GTK_TABLE (table4), hbox37, 1, 2, 7, 8,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0);
+
+ sun_def = gtk_check_button_new_with_label (_("Default"));
+ gtk_widget_set_name (sun_def, "sun_def");
+ g_object_ref (sun_def);
+ g_object_set_data_full (G_OBJECT (config_dialog), "sun_def", sun_def,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (sun_def);
+ gtk_box_pack_start (GTK_BOX (hbox37), sun_def, FALSE, FALSE, 0);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (sun_def), TRUE);
+
+ sun_h_adj = (GtkAdjustment *) gtk_adjustment_new (6, 0, 23, 1, 10, 0);
+ sun_h = gtk_spin_button_new (GTK_ADJUSTMENT (sun_h_adj), 1, 0);
+ gtk_widget_set_name (sun_h, "sun_h");
+ g_object_ref (sun_h);
+ g_object_set_data_full (G_OBJECT (config_dialog), "sun_h", sun_h,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (sun_h);
+ gtk_box_pack_start (GTK_BOX (hbox37), sun_h, TRUE, TRUE, 0);
+ gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (sun_h), TRUE);
+
+ label95 = gtk_label_new (":");
+ gtk_widget_set_name (label95, "label95");
+ g_object_ref (label95);
+ g_object_set_data_full (G_OBJECT (config_dialog), "label95", label95,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (label95);
+ gtk_box_pack_start (GTK_BOX (hbox37), label95, FALSE, FALSE, 0);
+
+ sun_m_adj = (GtkAdjustment *) gtk_adjustment_new (30, 0, 59, 1, 10, 0);
+ sun_m = gtk_spin_button_new (GTK_ADJUSTMENT (sun_m_adj), 1, 0);
+ gtk_widget_set_name (sun_m, "sun_m");
+ g_object_ref (sun_m);
+ g_object_set_data_full (G_OBJECT (config_dialog), "sun_m", sun_m,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (sun_m);
+ gtk_box_pack_start (GTK_BOX (hbox37), sun_m, TRUE, TRUE, 0);
+ gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (sun_m), TRUE);
+ gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (sun_m), TRUE);
+
+ label87 = gtk_label_new (_("Day"));
+ gtk_widget_set_name (label87, "label87");
+ g_object_ref (label87);
+ g_object_set_data_full (G_OBJECT (config_dialog), "label87", label87,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (label87);
+ gtk_table_attach (GTK_TABLE (table4), label87, 0, 1, 0, 1,
+ (GtkAttachOptions) (0),
+ (GtkAttachOptions) (0), 0, 0);
+
+ label88 = gtk_label_new (_("Time"));
+ gtk_widget_set_name (label88, "label88");
+ g_object_ref (label88);
+ g_object_set_data_full (G_OBJECT (config_dialog), "label88", label88,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (label88);
+ gtk_table_attach (GTK_TABLE (table4), label88, 1, 2, 0, 1,
+ (GtkAttachOptions) (0),
+ (GtkAttachOptions) (0), 0, 0);
+
+ tue_cb = gtk_check_button_new_with_label (_("Tuesday"));
+ gtk_widget_set_name (tue_cb, "tue_cb");
+ g_object_ref (tue_cb);
+ g_object_set_data_full (G_OBJECT (config_dialog), "tue_cb", tue_cb,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (tue_cb);
+ gtk_table_attach (GTK_TABLE (table4), tue_cb, 0, 1, 2, 3,
+ (GtkAttachOptions) (0),
+ (GtkAttachOptions) (0), 0, 0);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (tue_cb), TRUE);
+
+ wed_cb = gtk_check_button_new_with_label (_("Wednesday"));
+ gtk_widget_set_name (wed_cb, "wed_cb");
+ g_object_ref (wed_cb);
+ g_object_set_data_full (G_OBJECT (config_dialog), "wed_cb", wed_cb,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (wed_cb);
+ gtk_table_attach (GTK_TABLE (table4), wed_cb, 0, 1, 3, 4,
+ (GtkAttachOptions) (0),
+ (GtkAttachOptions) (0), 0, 0);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (wed_cb), TRUE);
+
+ thu_cb = gtk_check_button_new_with_label (_("Thursday"));
+ gtk_widget_set_name (thu_cb, "thu_cb");
+ g_object_ref (thu_cb);
+ g_object_set_data_full (G_OBJECT (config_dialog), "thu_cb", thu_cb,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (thu_cb);
+ gtk_table_attach (GTK_TABLE (table4), thu_cb, 0, 1, 4, 5,
+ (GtkAttachOptions) (0),
+ (GtkAttachOptions) (0), 0, 0);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (thu_cb), TRUE);
+
+ fri_cb = gtk_check_button_new_with_label (_("Friday"));
+ gtk_widget_set_name (fri_cb, "fri_cb");
+ g_object_ref (fri_cb);
+ g_object_set_data_full (G_OBJECT (config_dialog), "fri_cb", fri_cb,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (fri_cb);
+ gtk_table_attach (GTK_TABLE (table4), fri_cb, 0, 1, 5, 6,
+ (GtkAttachOptions) (0),
+ (GtkAttachOptions) (0), 0, 0);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (fri_cb), TRUE);
+
+ sat_cb = gtk_check_button_new_with_label (_("Saturday"));
+ gtk_widget_set_name (sat_cb, "sat_cb");
+ g_object_ref (sat_cb);
+ g_object_set_data_full (G_OBJECT (config_dialog), "sat_cb", sat_cb,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (sat_cb);
+ gtk_table_attach (GTK_TABLE (table4), sat_cb, 0, 1, 6, 7,
+ (GtkAttachOptions) (0),
+ (GtkAttachOptions) (0), 0, 0);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (sat_cb), TRUE);
+
+ sun_cb = gtk_check_button_new_with_label (_("Sunday"));
+ gtk_widget_set_name (sun_cb, "sun_cb");
+ g_object_ref (sun_cb);
+ g_object_set_data_full (G_OBJECT (config_dialog), "sun_cb", sun_cb,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (sun_cb);
+ gtk_table_attach (GTK_TABLE (table4), sun_cb, 0, 1, 7, 8,
+ (GtkAttachOptions) (0),
+ (GtkAttachOptions) (0), 0, 0);
+
+ mon_cb = gtk_check_button_new_with_label (_("Monday"));
+ gtk_widget_set_name (mon_cb, "mon_cb");
+ g_object_ref (mon_cb);
+ g_object_set_data_full (G_OBJECT (config_dialog), "mon_cb", mon_cb,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (mon_cb);
+ gtk_table_attach (GTK_TABLE (table4), mon_cb, 0, 1, 1, 2,
+ (GtkAttachOptions) (0),
+ (GtkAttachOptions) (0), 0, 0);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (mon_cb), TRUE);
+
+ label72 = gtk_label_new (_("Days"));
+ gtk_widget_set_name (label72, "label72");
+ g_object_ref (label72);
+ g_object_set_data_full (G_OBJECT (config_dialog), "label72", label72,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (label72);
+ gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook1), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook1), 1), label72);
+
+ vbox8 = gtk_vbox_new (FALSE, 0);
+ gtk_widget_set_name (vbox8, "vbox8");
+ g_object_ref (vbox8);
+ g_object_set_data_full (G_OBJECT (config_dialog), "vbox8", vbox8,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (vbox8);
+ gtk_container_add (GTK_CONTAINER (notebook1), vbox8);
+
+ frame11 = gtk_frame_new (_("Fading"));
+ gtk_widget_set_name (frame11, "frame11");
+ g_object_ref (frame11);
+ g_object_set_data_full (G_OBJECT (config_dialog), "frame11", frame11,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (frame11);
+ gtk_box_pack_start (GTK_BOX (vbox8), frame11, TRUE, TRUE, 0);
+ gtk_container_set_border_width (GTK_CONTAINER (frame11), 10);
+
+ alignment10 = gtk_alignment_new (0, 0.5, 0.1, 1);
+ gtk_widget_set_name (alignment10, "alignment10");
+ g_object_ref (alignment10);
+ g_object_set_data_full (G_OBJECT (config_dialog), "alignment10", alignment10,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (alignment10);
+ gtk_container_add (GTK_CONTAINER (frame11), alignment10);
+ gtk_container_set_border_width (GTK_CONTAINER (alignment10), 8);
+
+ hbox25 = gtk_hbox_new (FALSE, 0);
+ gtk_widget_set_name (hbox25, "hbox25");
+ g_object_ref (hbox25);
+ g_object_set_data_full (G_OBJECT (config_dialog), "hbox25", hbox25,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (hbox25);
+ gtk_container_add (GTK_CONTAINER (alignment10), hbox25);
+
+ fading_spin_adj = (GtkAdjustment *) gtk_adjustment_new (120, 0, 3600, 1, 10, 0);
+ fading_spin = gtk_spin_button_new (GTK_ADJUSTMENT (fading_spin_adj), 1, 0);
+ gtk_widget_set_name (fading_spin, "fading_spin");
+ g_object_ref (fading_spin);
+ g_object_set_data_full (G_OBJECT (config_dialog), "fading_spin", fading_spin,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (fading_spin);
+ gtk_box_pack_start (GTK_BOX (hbox25), fading_spin, TRUE, TRUE, 0);
+ gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (fading_spin), TRUE);
+ gtk_spin_button_set_update_policy (GTK_SPIN_BUTTON (fading_spin), GTK_UPDATE_IF_VALID);
+
+ label81 = gtk_label_new (_("seconds"));
+ gtk_widget_set_name (label81, "label81");
+ g_object_ref (label81);
+ g_object_set_data_full (G_OBJECT (config_dialog), "label81", label81,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (label81);
+ gtk_box_pack_start (GTK_BOX (hbox25), label81, FALSE, TRUE, 0);
+
+ frame12 = gtk_frame_new (_("Volume"));
+ gtk_widget_set_name (frame12, "frame12");
+ g_object_ref (frame12);
+ g_object_set_data_full (G_OBJECT (config_dialog), "frame12", frame12,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (frame12);
+ gtk_box_pack_start (GTK_BOX (vbox8), frame12, TRUE, TRUE, 0);
+ gtk_container_set_border_width (GTK_CONTAINER (frame12), 10);
+
+ vbox9 = gtk_vbox_new (FALSE, 10);
+ gtk_widget_set_name (vbox9, "vbox9");
+ g_object_ref (vbox9);
+ g_object_set_data_full (G_OBJECT (config_dialog), "vbox9", vbox9,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (vbox9);
+ gtk_container_add (GTK_CONTAINER (frame12), vbox9);
+ gtk_container_set_border_width (GTK_CONTAINER (vbox9), 8);
+
+ alignment11 = gtk_alignment_new (1, 0.5, 0.1, 1);
+ gtk_widget_set_name (alignment11, "alignment11");
+ g_object_ref (alignment11);
+ g_object_set_data_full (G_OBJECT (config_dialog), "alignment11", alignment11,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (alignment11);
+ gtk_box_pack_end (GTK_BOX (vbox9), alignment11, FALSE, FALSE, 0);
+
+ current_button = gtk_button_new_with_label (_("Current"));
+ gtk_widget_set_name (current_button, "current_button");
+ g_object_ref (current_button);
+ g_object_set_data_full (G_OBJECT (config_dialog), "current_button", current_button,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (current_button);
+ gtk_container_add (GTK_CONTAINER (alignment11), current_button);
+
+ label82 = gtk_label_new (_("Start at"));
+ gtk_widget_set_name (label82, "label82");
+ g_object_ref (label82);
+ g_object_set_data_full (G_OBJECT (config_dialog), "label82", label82,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (label82);
+ gtk_box_pack_start (GTK_BOX (vbox9), label82, FALSE, FALSE, 0);
+ gtk_label_set_justify (GTK_LABEL (label82), GTK_JUSTIFY_LEFT);
+ gtk_misc_set_alignment (GTK_MISC (label82), 7.45058e-09, 0.5);
+
+ hbox26 = gtk_hbox_new (FALSE, 0);
+ gtk_widget_set_name (hbox26, "hbox26");
+ g_object_ref (hbox26);
+ g_object_set_data_full (G_OBJECT (config_dialog), "hbox26", hbox26,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (hbox26);
+ gtk_box_pack_start (GTK_BOX (vbox9), hbox26, TRUE, TRUE, 0);
+
+ quiet_vol_scale = gtk_hscale_new (GTK_ADJUSTMENT (gtk_adjustment_new (20, 0, 100, 1, 5, 0)));
+ gtk_widget_set_name (quiet_vol_scale, "quiet_vol_scale");
+ g_object_ref (quiet_vol_scale);
+ g_object_set_data_full (G_OBJECT (config_dialog), "quiet_vol_scale", quiet_vol_scale,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (quiet_vol_scale);
+ gtk_box_pack_start (GTK_BOX (hbox26), quiet_vol_scale, TRUE, TRUE, 0);
+ gtk_scale_set_value_pos (GTK_SCALE (quiet_vol_scale), GTK_POS_RIGHT);
+ gtk_scale_set_digits (GTK_SCALE (quiet_vol_scale), 0);
+
+ label83 = gtk_label_new (_("%"));
+ gtk_widget_set_name (label83, "label83");
+ g_object_ref (label83);
+ g_object_set_data_full (G_OBJECT (config_dialog), "label83", label83,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (label83);
+ gtk_box_pack_start (GTK_BOX (hbox26), label83, FALSE, FALSE, 0);
+
+ hseparator2 = gtk_hseparator_new ();
+ gtk_widget_set_name (hseparator2, "hseparator2");
+ g_object_ref (hseparator2);
+ g_object_set_data_full (G_OBJECT (config_dialog), "hseparator2", hseparator2,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (hseparator2);
+ gtk_box_pack_start (GTK_BOX (vbox9), hseparator2, TRUE, TRUE, 0);
+
+ label84 = gtk_label_new (_("Final"));
+ gtk_widget_set_name (label84, "label84");
+ g_object_ref (label84);
+ g_object_set_data_full (G_OBJECT (config_dialog), "label84", label84,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (label84);
+ gtk_box_pack_start (GTK_BOX (vbox9), label84, FALSE, FALSE, 0);
+ gtk_label_set_justify (GTK_LABEL (label84), GTK_JUSTIFY_LEFT);
+ gtk_misc_set_alignment (GTK_MISC (label84), 0, 0.5);
+
+ hbox27 = gtk_hbox_new (FALSE, 0);
+ gtk_widget_set_name (hbox27, "hbox27");
+ g_object_ref (hbox27);
+ g_object_set_data_full (G_OBJECT (config_dialog), "hbox27", hbox27,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (hbox27);
+ gtk_box_pack_start (GTK_BOX (vbox9), hbox27, TRUE, TRUE, 0);
+
+ vol_scale = gtk_hscale_new (GTK_ADJUSTMENT (gtk_adjustment_new (80, 0, 100, 1, 5, 0)));
+ gtk_widget_set_name (vol_scale, "vol_scale");
+ g_object_ref (vol_scale);
+ g_object_set_data_full (G_OBJECT (config_dialog), "vol_scale", vol_scale,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (vol_scale);
+ gtk_box_pack_start (GTK_BOX (hbox27), vol_scale, TRUE, TRUE, 0);
+ gtk_scale_set_value_pos (GTK_SCALE (vol_scale), GTK_POS_RIGHT);
+ gtk_scale_set_digits (GTK_SCALE (vol_scale), 0);
+
+ label85 = gtk_label_new (_("%"));
+ gtk_widget_set_name (label85, "label85");
+ g_object_ref (label85);
+ g_object_set_data_full (G_OBJECT (config_dialog), "label85", label85,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (label85);
+ gtk_box_pack_start (GTK_BOX (hbox27), label85, FALSE, TRUE, 0);
+ gtk_label_set_justify (GTK_LABEL (label85), GTK_JUSTIFY_FILL);
+
+ label73 = gtk_label_new (_("Volume"));
+ gtk_widget_set_name (label73, "label73");
+ g_object_ref (label73);
+ g_object_set_data_full (G_OBJECT (config_dialog), "label73", label73,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (label73);
+ gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook1), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook1), 2), label73);
+
+ vbox10 = gtk_vbox_new (FALSE, 0);
+ gtk_widget_set_name (vbox10, "vbox10");
+ g_object_ref (vbox10);
+ g_object_set_data_full (G_OBJECT (config_dialog), "vbox10", vbox10,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (vbox10);
+ gtk_container_add (GTK_CONTAINER (notebook1), vbox10);
+
+ frame13 = gtk_frame_new (_("Additional Command"));
+ gtk_widget_set_name (frame13, "frame13");
+ g_object_ref (frame13);
+ g_object_set_data_full (G_OBJECT (config_dialog), "frame13", frame13,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (frame13);
+ gtk_box_pack_start (GTK_BOX (vbox10), frame13, FALSE, FALSE, 0);
+ gtk_container_set_border_width (GTK_CONTAINER (frame13), 10);
+
+ hbox28 = gtk_hbox_new (FALSE, 5);
+ gtk_widget_set_name (hbox28, "hbox28");
+ g_object_ref (hbox28);
+ g_object_set_data_full (G_OBJECT (config_dialog), "hbox28", hbox28,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (hbox28);
+ gtk_container_add (GTK_CONTAINER (frame13), hbox28);
+ gtk_container_set_border_width (GTK_CONTAINER (hbox28), 8);
+
+ cmd_entry = gtk_entry_new ();
+ gtk_widget_set_name (cmd_entry, "cmd_entry");
+ g_object_ref (cmd_entry);
+ g_object_set_data_full (G_OBJECT (config_dialog), "cmd_entry", cmd_entry,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (cmd_entry);
+ gtk_box_pack_start (GTK_BOX (hbox28), cmd_entry, TRUE, TRUE, 0);
+
+ cmd_checkb = gtk_check_button_new_with_label (_("enable"));
+ gtk_widget_set_name (cmd_checkb, "cmd_checkb");
+ g_object_ref (cmd_checkb);
+ g_object_set_data_full (G_OBJECT (config_dialog), "cmd_checkb", cmd_checkb,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (cmd_checkb);
+ gtk_box_pack_start (GTK_BOX (hbox28), cmd_checkb, FALSE, FALSE, 0);
+
+ frame14 = gtk_frame_new (_("Playlist (optional)"));
+ gtk_widget_set_name (frame14, "frame14");
+ g_object_ref (frame14);
+ g_object_set_data_full (G_OBJECT (config_dialog), "frame14", frame14,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (frame14);
+ gtk_box_pack_start (GTK_BOX (vbox10), frame14, FALSE, FALSE, 0);
+ gtk_container_set_border_width (GTK_CONTAINER (frame14), 10);
+
+ hbox29 = gtk_hbox_new (FALSE, 5);
+ gtk_widget_set_name (hbox29, "hbox29");
+ g_object_ref (hbox29);
+ g_object_set_data_full (G_OBJECT (config_dialog), "hbox29", hbox29,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (hbox29);
+ gtk_container_add (GTK_CONTAINER (frame14), hbox29);
+ gtk_container_set_border_width (GTK_CONTAINER (hbox29), 8);
+
+ playlist = gtk_entry_new ();
+ gtk_widget_set_name (playlist, "playlist");
+ g_object_ref (playlist);
+ g_object_set_data_full (G_OBJECT (config_dialog), "playlist", playlist,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (playlist);
+ gtk_box_pack_start (GTK_BOX (hbox29), playlist, TRUE, TRUE, 0);
+
+ playlist_browse_button = gtk_button_new_with_label (_("Browse..."));
+ gtk_widget_set_name (playlist_browse_button, "playlist_browse_button");
+ g_object_ref (playlist_browse_button);
+ g_object_set_data_full (G_OBJECT (config_dialog), "playlist_browse_button", playlist_browse_button,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (playlist_browse_button);
+ gtk_box_pack_start (GTK_BOX (hbox29), playlist_browse_button, FALSE, FALSE, 0);
+
+ frame18 = gtk_frame_new (_("Reminder"));
+ gtk_widget_set_name (frame18, "frame18");
+ g_object_ref (frame18);
+ g_object_set_data_full (G_OBJECT (config_dialog), "frame18", frame18,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (frame18);
+ gtk_box_pack_start (GTK_BOX (vbox10), frame18, TRUE, TRUE, 0);
+ gtk_container_set_border_width (GTK_CONTAINER (frame18), 10);
+
+ hbox38 = gtk_hbox_new (FALSE, 0);
+ gtk_widget_set_name (hbox38, "hbox38");
+ g_object_ref (hbox38);
+ g_object_set_data_full (G_OBJECT (config_dialog), "hbox38", hbox38,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (hbox38);
+ gtk_container_add (GTK_CONTAINER (frame18), hbox38);
+
+ reminder_cb = gtk_check_button_new_with_label (_("Use reminder"));
+ gtk_widget_set_name (reminder_cb, "reminder_cb");
+ g_object_ref (reminder_cb);
+ g_object_set_data_full (G_OBJECT (config_dialog), "reminder_cb", reminder_cb,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (reminder_cb);
+ gtk_box_pack_start (GTK_BOX (hbox38), reminder_cb, FALSE, FALSE, 0);
+
+ reminder_text = gtk_entry_new ();
+ gtk_widget_set_name (reminder_text, "reminder_text");
+ g_object_ref (reminder_text);
+ g_object_set_data_full (G_OBJECT (config_dialog), "reminder_text", reminder_text,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (reminder_text);
+ gtk_box_pack_start (GTK_BOX (hbox38), reminder_text, TRUE, TRUE, 5);
+
+ label74 = gtk_label_new (_("Options"));
+ gtk_widget_set_name (label74, "label74");
+ g_object_ref (label74);
+ g_object_set_data_full (G_OBJECT (config_dialog), "label74", label74,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (label74);
+ gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook1), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook1), 3), label74);
+
+ frame16 = gtk_frame_new (_("What do these options mean?"));
+ gtk_widget_set_name (frame16, "frame16");
+ g_object_ref (frame16);
+ g_object_set_data_full (G_OBJECT (config_dialog), "frame16", frame16,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (frame16);
+ gtk_container_add (GTK_CONTAINER (notebook1), frame16);
+ gtk_container_set_border_width (GTK_CONTAINER (frame16), 10);
+
+ scrolledwindow1 = gtk_scrolled_window_new (NULL, NULL);
+ gtk_widget_set_name (scrolledwindow1, "scrolledwindow1");
+ g_object_ref (scrolledwindow1);
+ g_object_set_data_full (G_OBJECT (config_dialog), "scrolledwindow1", scrolledwindow1,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (scrolledwindow1);
+ gtk_container_add (GTK_CONTAINER (frame16), scrolledwindow1);
+ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow1), GTK_POLICY_NEVER, GTK_POLICY_ALWAYS);
+
+ text1 = gtk_text_view_new();
+ text1buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW (text1));
+ gtk_text_buffer_get_iter_at_offset (text1buffer, &iter, 0);
+ gtk_widget_set_name (text1, "text1");
+ g_object_ref (text1);
+ g_object_set_data_full (G_OBJECT (config_dialog), "text1", text1,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (text1);
+ gtk_container_add (GTK_CONTAINER (scrolledwindow1), text1);
+ gtk_text_buffer_insert (text1buffer, &iter,
+ _("\nTime\n Alarm at: \n The time for the alarm to come on.\n\n Quiet After: \n Stop alarm after this amount of time.\n (if the wakeup dialog is not closed)\n\n\nDays\n Day:\n Select the days for the alarm to activate.\n\n Time:\n Choose the time for the alarm on each day,\n or select the toggle button to use the default\n time.\n\n\nVolume\n Fading: \n Fade the volume up to the chosen volume \n for this amount of time.\n\n Start at: \n Start fading from this volume.\n\n Final: \n The volume to stop fading at. If the fading\n time is 0 then set volume to this and start\n playing.\n\n\nOptions:\n Additional Command:\n Run this command at the alarm time.\n\n Playlist: \n Load this playlist for playing songs from \n (must have .m3u extension). If no playlist\n is given then the songs which are currently\n in the list will be used.\n The URL of an mp3/ogg stream can also be\n entered here, but loading of playlists from\n URLs is not currently supported by xmms.\n\n Reminder:\n Display a reminder when the alarm goes off,\n type the reminder in the box and turn on the\n toggle button if you want it to be shown.\n"), -1);
+
+ label86 = gtk_label_new (_("Help"));
+ gtk_widget_set_name (label86, "label86");
+ g_object_ref (label86);
+ g_object_set_data_full (G_OBJECT (config_dialog), "label86", label86,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (label86);
+ gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook1), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook1), 4), label86);
+
+ dialog_action_area5 = gtk_dialog_get_action_area ((GtkDialog *) config_dialog);
+ gtk_widget_set_name (dialog_action_area5, "dialog_action_area5");
+ g_object_set_data (G_OBJECT (config_dialog), "dialog_action_area5", dialog_action_area5);
+ gtk_widget_show (dialog_action_area5);
+ gtk_container_set_border_width (GTK_CONTAINER (dialog_action_area5), 10);
+
+ hbox20 = gtk_hbox_new (TRUE, 5);
+ gtk_widget_set_name (hbox20, "hbox20");
+ g_object_ref (hbox20);
+ g_object_set_data_full (G_OBJECT (config_dialog), "hbox20", hbox20,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (hbox20);
+ gtk_box_pack_start (GTK_BOX (dialog_action_area5), hbox20, TRUE, TRUE, 0);
+ gtk_container_set_border_width (GTK_CONTAINER (hbox20), 10);
+
+ ok_button = gtk_button_new_with_label (_("OK"));
+ gtk_widget_set_name (ok_button, "ok_button");
+ g_object_ref (ok_button);
+ g_object_set_data_full (G_OBJECT (config_dialog), "ok_button", ok_button,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (ok_button);
+ gtk_box_pack_start (GTK_BOX (hbox20), ok_button, FALSE, TRUE, 0);
+ gtk_widget_set_can_default (ok_button, TRUE);
+
+ cancel_button = gtk_button_new_with_label (_("Cancel"));
+ gtk_widget_set_name (cancel_button, "cancel_button");
+ g_object_ref (cancel_button);
+ g_object_set_data_full (G_OBJECT (config_dialog), "cancel_button", cancel_button,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (cancel_button);
+ gtk_box_pack_start (GTK_BOX (hbox20), cancel_button, FALSE, TRUE, 0);
+ gtk_widget_set_can_default (cancel_button, TRUE);
+
+ g_signal_connect (G_OBJECT (mon_def), "toggled",
+ G_CALLBACK (on_mon_def_toggled),
+ NULL);
+ g_signal_connect (G_OBJECT (tue_def), "toggled",
+ G_CALLBACK (on_tue_def_toggled),
+ NULL);
+ g_signal_connect (G_OBJECT (wed_def), "toggled",
+ G_CALLBACK (on_wed_def_toggled),
+ NULL);
+ g_signal_connect (G_OBJECT (thu_def), "toggled",
+ G_CALLBACK (on_thu_def_toggled),
+ NULL);
+ g_signal_connect (G_OBJECT (fri_def), "toggled",
+ G_CALLBACK (on_fri_def_toggled),
+ NULL);
+ g_signal_connect (G_OBJECT (sat_def), "toggled",
+ G_CALLBACK (on_sat_def_toggled),
+ NULL);
+ g_signal_connect (G_OBJECT (sun_def), "toggled",
+ G_CALLBACK (on_sun_def_toggled),
+ NULL);
+ g_signal_connect (G_OBJECT (current_button), "clicked",
+ G_CALLBACK (alarm_current_volume),
+ NULL);
+ g_signal_connect (G_OBJECT (ok_button), "clicked",
+ G_CALLBACK (alarm_save),
+ NULL);
+ g_signal_connect_swapped (G_OBJECT (ok_button), "clicked",
+ G_CALLBACK (gtk_widget_destroy),
+ G_OBJECT (config_dialog));
+ g_signal_connect_swapped (G_OBJECT (cancel_button), "clicked",
+ G_CALLBACK (gtk_widget_destroy),
+ G_OBJECT (config_dialog));
+
+ gtk_widget_grab_default (ok_button);
+
+ return config_dialog;
+}
+
+GtkWidget*
+create_reminder_dialog (gchar *reminder_msg)
+{
+ GtkWidget *reminder_dialog;
+ GtkWidget *dialog_vbox6;
+ GtkWidget *frame19;
+ GtkWidget *reminder_entry;
+ GtkWidget *dialog_action_area6;
+ GtkWidget *button11;
+
+ reminder_dialog = gtk_dialog_new ();
+ gtk_widget_set_name (reminder_dialog, "reminder_dialog");
+ g_object_set_data (G_OBJECT (reminder_dialog), "reminder_dialog", reminder_dialog);
+ gtk_window_set_title (GTK_WINDOW (reminder_dialog), _("Reminder"));
+
+ dialog_vbox6 = gtk_dialog_get_content_area ((GtkDialog *) reminder_dialog);
+ gtk_widget_set_name (dialog_vbox6, "dialog_vbox6");
+ g_object_set_data (G_OBJECT (reminder_dialog), "dialog_vbox6", dialog_vbox6);
+ gtk_widget_show (dialog_vbox6);
+
+ frame19 = gtk_frame_new (_("Your reminder for today is.."));
+ gtk_widget_set_name (frame19, "frame19");
+ g_object_ref (frame19);
+ g_object_set_data_full (G_OBJECT (reminder_dialog), "frame19", frame19,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (frame19);
+ gtk_box_pack_start (GTK_BOX (dialog_vbox6), frame19, TRUE, TRUE, 0);
+ gtk_container_set_border_width (GTK_CONTAINER (frame19), 10);
+
+ reminder_entry = gtk_entry_new ();
+ gtk_widget_set_name (reminder_entry, "reminder_entry");
+ g_object_ref (reminder_entry);
+ g_object_set_data_full (G_OBJECT (reminder_dialog), "reminder_entry", reminder_entry,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (reminder_entry);
+ gtk_container_add (GTK_CONTAINER (frame19), reminder_entry);
+ gtk_editable_set_editable ((GtkEditable *) reminder_entry, FALSE);
+ gtk_entry_set_text (GTK_ENTRY (reminder_entry), reminder_msg);
+
+ dialog_action_area6 = gtk_dialog_get_action_area ((GtkDialog *) reminder_dialog);
+ gtk_widget_set_name (dialog_action_area6, "dialog_action_area6");
+ g_object_set_data (G_OBJECT (reminder_dialog), "dialog_action_area6", dialog_action_area6);
+ gtk_widget_show (dialog_action_area6);
+ gtk_container_set_border_width (GTK_CONTAINER (dialog_action_area6), 10);
+
+ button11 = gtk_button_new_with_label (_("Thankyou"));
+ gtk_widget_set_name (button11, "button11");
+ g_object_ref (button11);
+ g_object_set_data_full (G_OBJECT (reminder_dialog), "button11", button11,
+ (GDestroyNotify) g_object_unref);
+ gtk_widget_show (button11);
+ gtk_box_pack_start (GTK_BOX (dialog_action_area6), button11, FALSE, FALSE, 0);
+
+ g_signal_connect_swapped (G_OBJECT (button11), "clicked",
+ G_CALLBACK (gtk_widget_destroy),
+ G_OBJECT(reminder_dialog));
+
+ return reminder_dialog;
+}
+
+/*
+ * vi:ai:expandtab:ts=2 sts=2 shiftwidth=2:nowrap:
+ */

audacious-plugins-3.1.tar.bz2/src/alarm/interface.h Added

audacious-plugins-3.0.3.tar.bz2/src/albumart/albumart.c -> audacious-plugins-3.1.tar.bz2/src/albumart/albumart.c Changed

@@ -31,6 +31,7 @@
 #include <libaudgui/libaudgui-gtk.h>
 
 static gint width;
+static gint height;
 
 static void draw_albumart(GtkWidget *widget, cairo_t *cr)
 {
@@ -40,12 +41,17 @@
 {
 album = audgui_pixbuf_for_current ();
 g_return_if_fail (album != NULL);
- audgui_pixbuf_scale_within(&album, width);
+ if (gdk_pixbuf_get_width(album) > width ||
+ gdk_pixbuf_get_height(album) > height)
+ audgui_pixbuf_scale_within(&album, width < height ? width : height);
 }
 
 if (album != NULL)
 {
- gdk_cairo_set_source_pixbuf(cr, album, 0.0, 0.0);
+ double x = (width - gdk_pixbuf_get_width(album)) / 2;
+ double y = (height - gdk_pixbuf_get_height(album)) / 2;
+
+ gdk_cairo_set_source_pixbuf(cr, album, x, y);
 cairo_paint_with_alpha(cr, 1.0);
 }
 
@@ -73,7 +79,8 @@
 
 static gboolean configure_event (GtkWidget * widget, GdkEventConfigure * event)
 {
- width = event->height = event->width;
+ width = event->width;
+ height = event->height;
 gtk_widget_queue_draw(widget);
 
 return TRUE;

audacious-plugins-3.0.3.tar.bz2/src/alsa/alsa.c -> audacious-plugins-3.1.tar.bz2/src/alsa/alsa.c Changed

@@ -48,8 +48,8 @@
 #include <alsa/asoundlib.h>
 #include <glib.h>
 
-#include <audacious/audconfig.h>
 #include <audacious/debug.h>
+#include <audacious/misc.h>
 #include <audacious/plugin.h>
 
 #include "alsa.h"
@@ -156,8 +156,9 @@
 pthread_mutex_lock (& alsa_mutex);
 pthread_cond_broadcast (& alsa_cond); /* signal thread started */
 
- gboolean workaround = FALSE;
- gint slept = 0;
+ char failed = 0;
+ char workaround = 0;
+ int slept = 0;
 
 while (! pump_quit)
 {
@@ -185,6 +186,8 @@
 CHECK_VAL_RECOVER (written, snd_pcm_writei, alsa_handle, (char *)
 alsa_buffer + alsa_buffer_data_start, length);
 
+ failed = 0;
+
 written = snd_pcm_frames_to_bytes (alsa_handle, written);
 alsa_buffer_data_start += written;
 alsa_buffer_data_length -= written;
@@ -206,7 +209,7 @@
 if (slept > 4)
 {
 AUDDBG ("Activating timer workaround.\n");
- workaround = TRUE;
+ workaround = 1;
 }
 
 if (workaround && slept)
@@ -222,9 +225,16 @@
 }
 
 pthread_mutex_lock (& alsa_mutex);
+ continue;
+
+ FAILED:
+ if (failed)
+ break;
+
+ failed = 1;
+ CHECK (snd_pcm_prepare, alsa_handle);
 }
 
-FAILED:
 pthread_mutex_unlock (& alsa_mutex);
 return NULL;
 }
@@ -361,7 +371,8 @@
 alsa_channels = channels;
 alsa_rate = rate;
 
- unsigned int useconds = 1000 * MIN (1000, aud_cfg->output_buffer_size / 2);
+ int total_buffer = aud_get_int (NULL, "output_buffer_size");
+ unsigned int useconds = 1000 * MIN (1000, total_buffer / 2);
 int direction = 0;
 CHECK_NOISY (snd_pcm_hw_params_set_buffer_time_near, alsa_handle, params,
 & useconds, & direction);
@@ -375,8 +386,7 @@
 
 CHECK_NOISY (snd_pcm_hw_params, alsa_handle, params);
 
- int soft_buffer = MAX (aud_cfg->output_buffer_size / 2,
- aud_cfg->output_buffer_size - hard_buffer);
+ int soft_buffer = MAX (total_buffer / 2, total_buffer - hard_buffer);
 AUDDBG ("Buffer: hardware %d ms, software %d ms, period %d ms.\n",
 hard_buffer, soft_buffer, alsa_period);
 
@@ -561,9 +571,9 @@
 frames -= alsa_paused_delay;
 else
 frames -= get_delay ();
- 
+
 int time = frames * 1000 / alsa_rate;
- 
+
 pthread_mutex_unlock (& alsa_mutex);
 return time;
 }

audacious-plugins-3.0.3.tar.bz2/src/alsa/config.c -> audacious-plugins-3.1.tar.bz2/src/alsa/config.c Changed

@@ -20,8 +20,8 @@
 #include <alsa/asoundlib.h>
 #include <gtk/gtk.h>
 
-#include <audacious/configdb.h>
 #include <audacious/i18n.h>
+#include <audacious/misc.h>
 #include <libaudgui/libaudgui.h>
 #include <libaudgui/libaudgui-gtk.h>
 
@@ -306,6 +306,7 @@
 {
 if (list_has_member (mixer_element_list, guesses[count]))
 {
+ free (alsa_config_mixer_element);
 alsa_config_mixer_element = strdup (guesses[count]);
 return;
 }
@@ -314,33 +315,27 @@
 ERROR_NOISY ("No suitable mixer element found.\n");
 }
 
+static const gchar * const alsa_defaults[] = {
+ "pcm", "default",
+ "mixer", "default",
+ "drain-workaround", "TRUE",
+ NULL};
+
 void alsa_config_load (void)
 {
- mcs_handle_t * database = aud_cfg_db_open ();
-
- aud_cfg_db_get_string (database, "alsa", "pcm", & alsa_config_pcm);
- if (! alsa_config_pcm)
- alsa_config_pcm = strdup ("default");
+ aud_config_set_defaults ("alsa", alsa_defaults);
 
- aud_cfg_db_get_string (database, "alsa", "mixer", & alsa_config_mixer);
- if (! alsa_config_mixer)
- alsa_config_mixer = strdup ("default");
+ alsa_config_pcm = aud_get_string ("alsa", "pcm");
+ alsa_config_mixer = aud_get_string ("alsa", "mixer");
+ alsa_config_mixer_element = aud_get_string ("alsa", "mixer-element");
+ alsa_config_drain_workaround = aud_get_bool ("alsa", "drain-workaround");
 
- aud_cfg_db_get_string (database, "alsa", "mixer-element",
- & alsa_config_mixer_element);
- if (! alsa_config_mixer_element)
+ if (! alsa_config_mixer_element[0])
 guess_mixer_element ();
-
- aud_cfg_db_get_bool (database, "alsa", "drain-workaround", &
- alsa_config_drain_workaround);
-
- aud_cfg_db_close (database);
 }
 
 void alsa_config_save (void)
 {
- mcs_handle_t * database = aud_cfg_db_open ();
-
 if (pcm_list)
 {
 g_object_unref (pcm_list);
@@ -359,12 +354,10 @@
 mixer_element_list = NULL;
 }
 
- aud_cfg_db_set_string (database, "alsa", "pcm", alsa_config_pcm);
- aud_cfg_db_set_string (database, "alsa", "mixer", alsa_config_mixer);
- aud_cfg_db_set_string (database, "alsa", "mixer-element",
- alsa_config_mixer_element);
- aud_cfg_db_set_bool (database, "alsa", "drain-workaround",
- alsa_config_drain_workaround);
+ aud_set_string ("alsa", "pcm", alsa_config_pcm);
+ aud_set_string ("alsa", "mixer", alsa_config_mixer);
+ aud_set_string ("alsa", "mixer-element", alsa_config_mixer_element);
+ aud_set_bool ("alsa", "drain-workaround", alsa_config_drain_workaround);
 
 free (alsa_config_pcm);
 alsa_config_pcm = NULL;
@@ -372,8 +365,6 @@
 alsa_config_mixer = NULL;
 free (alsa_config_mixer_element);
 alsa_config_mixer_element = NULL;
-
- aud_cfg_db_close (database);
 }
 
 static GtkWidget * combo_new (const char * title, GtkListStore * list,

audacious-plugins-3.0.3.tar.bz2/src/amidi-plug/amidi-plug.c -> audacious-plugins-3.1.tar.bz2/src/amidi-plug/amidi-plug.c Changed

audacious-plugins-3.0.3.tar.bz2/src/amidi-plug/i_configure.c -> audacious-plugins-3.1.tar.bz2/src/amidi-plug/i_configure.c Changed

audacious-plugins-3.0.3.tar.bz2/src/aosd/aosd_cfg.c -> audacious-plugins-3.1.tar.bz2/src/aosd/aosd_cfg.c Changed

@@ -23,7 +23,7 @@
 #include <glib.h>
 #include <stdlib.h>
 
-#include <audacious/configdb.h>
+#include <audacious/misc.h>
 #include <audacious/plugin.h>
 
 static gint
@@ -218,84 +218,77 @@
 }
 #endif
 
+static const gchar * const aosd_defaults[] = {
+ "position_placement", "1", /* AOSD_POSITION_PLACEMENT_TOPLEFT */
+ "position_offset_x", "0",
+ "position_offset_y", "0",
+ "position_maxsize_width", "0",
+ "position_multimon_id", "-1",
+ "animation_timing_display", "3000",
+ "animation_timing_fadein", "300",
+ "animation_timing_fadeout", "300",
+ "text_fonts_name_0", "Sans 26",
+ "text_fonts_color_0", "65535,65535,65535,65535",
+ "text_fonts_draw_shadow_0", "TRUE",
+ "text_fonts_shadow_color_0", "0,0,0,32767",
+ "text_utf8conv_disable", "FALSE",
+ "decoration_code", "0",
+ "decoration_color_0", "0,0,65535,32767",
+ "decoration_color_1", "65535,65535,65535,65535",
+ "trigger_active", "0",
+ "transparency_mode", "0",
+ NULL};
 
 gint
 aosd_cfg_load ( aosd_cfg_t * cfg )
 {
- mcs_handle_t *cfgfile = aud_cfg_db_open();
 gint i = 0;
 gint max_numcol;
 gchar *trig_active_str;
 
 /* position */
- if ( !aud_cfg_db_get_int( cfgfile , "aosd" ,
- "position_placement" , &(cfg->osd->position.placement) ) )
- cfg->osd->position.placement = AOSD_POSITION_PLACEMENT_TOPLEFT;
-
- if ( !aud_cfg_db_get_int( cfgfile , "aosd" ,
- "position_offset_x" , &(cfg->osd->position.offset_x) ) )
- cfg->osd->position.offset_x = 0;
-
- if ( !aud_cfg_db_get_int( cfgfile , "aosd" ,
- "position_offset_y" , &(cfg->osd->position.offset_y) ) )
- cfg->osd->position.offset_y = 0;
-
- if ( !aud_cfg_db_get_int( cfgfile , "aosd" ,
- "position_maxsize_width" , &(cfg->osd->position.maxsize_width) ) )
- cfg->osd->position.maxsize_width = 0;
-
- if ( !aud_cfg_db_get_int( cfgfile , "aosd" ,
- "position_multimon_id" , &(cfg->osd->position.multimon_id) ) )
- cfg->osd->position.multimon_id = -1;
+ cfg->osd->position.placement = aud_get_int ("aosd", "position_placement");
+ cfg->osd->position.offset_x = aud_get_int ("aosd", "position_offset_x");
+ cfg->osd->position.offset_y = aud_get_int ("aosd", "position_offset_y");
+ cfg->osd->position.maxsize_width = aud_get_int ("aosd", "position_maxsize_width");
+ cfg->osd->position.multimon_id = aud_get_int ("aosd", "position_multimon_id");
 
 /* animation */
- if ( !aud_cfg_db_get_int( cfgfile , "aosd" ,
- "animation_timing_display" , &(cfg->osd->animation.timing_display) ) )
- cfg->osd->animation.timing_display = 3000;
-
- if ( !aud_cfg_db_get_int( cfgfile , "aosd" ,
- "animation_timing_fadein" , &(cfg->osd->animation.timing_fadein) ) )
- cfg->osd->animation.timing_fadein = 300;
-
- if ( !aud_cfg_db_get_int( cfgfile , "aosd" ,
- "animation_timing_fadeout" , &(cfg->osd->animation.timing_fadeout) ) )
- cfg->osd->animation.timing_fadeout = 300;
+ cfg->osd->animation.timing_display = aud_get_int ("aosd", "animation_timing_display");
+ cfg->osd->animation.timing_fadein = aud_get_int ("aosd", "animation_timing_fadein");
+ cfg->osd->animation.timing_fadeout = aud_get_int ("aosd", "animation_timing_fadeout");
 
 /* text */
 for ( i = 0 ; i < AOSD_TEXT_FONTS_NUM ; i++ )
 {
 gchar *color_str = NULL;
 gchar *key_str = NULL;
+
 key_str = g_strdup_printf( "text_fonts_name_%i" , i );
- if ( !aud_cfg_db_get_string( cfgfile , "aosd" , key_str , &(cfg->osd->text.fonts_name[i]) ) )
- cfg->osd->text.fonts_name[i] = g_strdup( "Sans 26" );
+ cfg->osd->text.fonts_name[i] = aud_get_string ("aosd", key_str);
 g_free( key_str );
+
 key_str = g_strdup_printf( "text_fonts_color_%i" , i );
- if ( !aud_cfg_db_get_string( cfgfile , "aosd" , key_str , &color_str ) )
- color_str = g_strdup( "65535,65535,65535,65535" ); /* white , alpha 100% */
+ color_str = aud_get_string ("aosd", key_str);
 aosd_cfg_util_str_to_color( color_str , &(cfg->osd->text.fonts_color[i]) );
 g_free( key_str );
 g_free( color_str );
+
 key_str = g_strdup_printf( "text_fonts_draw_shadow_%i" , i );
- if ( !aud_cfg_db_get_bool( cfgfile , "aosd" , key_str , &(cfg->osd->text.fonts_draw_shadow[i]) ) )
- cfg->osd->text.fonts_draw_shadow[i] = TRUE;
+ cfg->osd->text.fonts_draw_shadow[i] = aud_get_bool ("aosd", key_str);
 g_free( key_str );
+
 key_str = g_strdup_printf( "text_fonts_shadow_color_%i" , i );
- if ( !aud_cfg_db_get_string( cfgfile , "aosd" , key_str , &color_str ) )
- color_str = g_strdup( "0,0,0,32767" ); /* black , alpha 50% */
+ color_str = aud_get_string ("aosd", key_str);
 aosd_cfg_util_str_to_color( color_str , &(cfg->osd->text.fonts_shadow_color[i]) );
 g_free( key_str );
 g_free( color_str );
 }
 
- if ( !aud_cfg_db_get_bool( cfgfile , "aosd" ,
- "text_utf8conv_disable" , &(cfg->osd->text.utf8conv_disable) ) )
- cfg->osd->text.utf8conv_disable = FALSE;
+ cfg->osd->text.utf8conv_disable = aud_get_bool ("aosd", "text_utf8conv_disable");
 
 /* decoration */
- if ( !aud_cfg_db_get_int( cfgfile , "aosd" ,
- "decoration_code" , &(cfg->osd->decoration.code) ) )
- cfg->osd->decoration.code = aosd_deco_style_get_first_code();
+ cfg->osd->decoration.code = aud_get_int ("aosd", "decoration_code");
 
 /* TODO not implemented yet
 if ( !aud_cfg_db_get_string( cfgfile , "aosd" ,
@@ -311,36 +304,15 @@
 gchar *color_str = NULL;
 aosd_color_t color;
 key_str = g_strdup_printf( "decoration_color_%i" , i );
- if ( !aud_cfg_db_get_string( cfgfile , "aosd" , key_str , &color_str ) )
- {
- /* we have different default values for the decoration colors */
- switch ( i )
- {
- case 0:
- color_str = g_strdup( "0,0,65535,32767" ); /* blue , alpha 50% */
- break;
- case 1:
- color_str = g_strdup( "65535,65535,65535,65535" ); /* white , alpha 100% */
- break;
- case 2:
- color_str = g_strdup( "51400,51400,51400,65535" ); /* gray , alpha 100% */
- break;
- default:
- color_str = g_strdup( "51400,51400,51400,65535" ); /* gray , alpha 100% */
- break;
- }
- }
+ color_str = aud_get_string ("aosd", key_str);
 aosd_cfg_util_str_to_color( color_str , &color );
 g_array_insert_val( cfg->osd->decoration.colors , i , color );
 }
 
 /* trigger */
- if ( !aud_cfg_db_get_string( cfgfile , "aosd" , "trigger_active" , &trig_active_str ) )
- {
- gint trig_active_defval = 0;
- g_array_append_val( cfg->osd->trigger.active , trig_active_defval );
- }
- else if ( strcmp("x",trig_active_str) )
+ trig_active_str = aud_get_string ("aosd", "trigger_active");
+
+ if (strcmp (trig_active_str, "x"))
 {
 gchar **trig_active_strv = g_strsplit( trig_active_str , "," , 0 );
 gint j = 0;
@@ -353,12 +325,10 @@
 g_strfreev( trig_active_strv );
 }
 
- /* miscellanous */
- if ( !aud_cfg_db_get_int( cfgfile , "aosd" ,
- "transparency_mode" , &(cfg->osd->misc.transparency_mode) ) )
- cfg->osd->misc.transparency_mode = AOSD_MISC_TRANSPARENCY_FAKE;
+ g_free (trig_active_str);
 
- aud_cfg_db_close( cfgfile );
+ /* miscellanous */
+ cfg->osd->misc.transparency_mode = aud_get_int ("aosd", "transparency_mode");
 
 /* the config object has been filled with information */
 cfg->set = TRUE;
@@ -370,7 +340,6 @@
 gint
 aosd_cfg_save ( aosd_cfg_t * cfg )
 {
- mcs_handle_t *cfgfile = aud_cfg_db_open();
 gint i = 0;
 gint max_numcol;
 GString *string = g_string_new( "" );
@@ -379,67 +348,52 @@
 return -1;
 
 /* position */
- aud_cfg_db_set_int( cfgfile , "aosd" ,
- "position_placement" , cfg->osd->position.placement );
-
- aud_cfg_db_set_int( cfgfile , "aosd" ,
- "position_offset_x" , cfg->osd->position.offset_x );
-
- aud_cfg_db_set_int( cfgfile , "aosd" ,
- "position_offset_y" , cfg->osd->position.offset_y );
-
- aud_cfg_db_set_int( cfgfile , "aosd" ,
- "position_maxsize_width" , cfg->osd->position.maxsize_width );
-
- aud_cfg_db_set_int( cfgfile , "aosd" ,
- "position_multimon_id" , cfg->osd->position.multimon_id );
+ aud_set_int ("aosd", "position_placement", cfg->osd->position.placement);
+ aud_set_int ("aosd", "position_offset_x", cfg->osd->position.offset_x);
+ aud_set_int ("aosd", "position_offset_y", cfg->osd->position.offset_y);
+ aud_set_int ("aosd", "position_maxsize_width", cfg->osd->position.maxsize_width);
+ aud_set_int ("aosd", "position_multimon_id", cfg->osd->position.multimon_id);
 
 /* animation */
- aud_cfg_db_set_int( cfgfile , "aosd" ,
- "animation_timing_display" , cfg->osd->animation.timing_display );
-
- aud_cfg_db_set_int( cfgfile , "aosd" ,
- "animation_timing_fadein" , cfg->osd->animation.timing_fadein );
-
- aud_cfg_db_set_int( cfgfile , "aosd" ,
- "animation_timing_fadeout" , cfg->osd->animation.timing_fadeout );
+ aud_set_int ("aosd", "animation_timing_display", cfg->osd->animation.timing_display);
+ aud_set_int ("aosd", "animation_timing_fadein", cfg->osd->animation.timing_fadein);
+ aud_set_int ("aosd", "animation_timing_fadeout", cfg->osd->animation.timing_fadeout);
 
 /* text */
 for ( i = 0 ; i < AOSD_TEXT_FONTS_NUM ; i++ )
 {
 gchar *color_str = NULL;
 gchar *key_str = NULL;
+
 key_str = g_strdup_printf( "text_fonts_name_%i" , i );
- aud_cfg_db_set_string( cfgfile , "aosd" ,
- key_str , cfg->osd->text.fonts_name[i] );
+ aud_set_string ("aosd", key_str, cfg->osd->text.fonts_name[i]);
 g_free( key_str );
+
 key_str = g_strdup_printf( "text_fonts_color_%i" , i );
 aosd_cfg_util_color_to_str( cfg->osd->text.fonts_color[i] , &color_str );
- aud_cfg_db_set_string( cfgfile , "aosd" ,
- key_str , color_str );
+ aud_set_string ("aosd", key_str, color_str);
 g_free( key_str );
 g_free( color_str );
+
 key_str = g_strdup_printf( "text_fonts_draw_shadow_%i" , i );
- aud_cfg_db_set_bool( cfgfile , "aosd" ,
- key_str , cfg->osd->text.fonts_draw_shadow[i] );
+ aud_set_bool ("aosd", key_str, cfg->osd->text.fonts_draw_shadow[i]);
 g_free( key_str );
+
 key_str = g_strdup_printf( "text_fonts_shadow_color_%i" , i );
 aosd_cfg_util_color_to_str( cfg->osd->text.fonts_shadow_color[i] , &color_str );
- aud_cfg_db_set_string( cfgfile , "aosd" ,
- key_str , color_str );
+ aud_set_string ("aosd", key_str, color_str);
 g_free( key_str );
 g_free( color_str );
 }
 
- aud_cfg_db_set_bool( cfgfile , "aosd" ,
- "text_utf8conv_disable" , cfg->osd->text.utf8conv_disable );
+ aud_set_bool ("aosd", "text_utf8conv_disable", cfg->osd->text.utf8conv_disable);
 
 /* decoration */
- aud_cfg_db_set_int( cfgfile , "aosd" ,
+ aud_set_int ("aosd" ,
 "decoration_code" , cfg->osd->decoration.code );
 
 /* TODO skip this since it's not implemented yet
- aud_cfg_db_set_string( cfgfile , "aosd" ,
+ aud_set_string ("aosd" ,
 "decoration_skin_file" , cfg->osd->decoration.skin_file ); */
 
 /* decoration - colors */
@@ -451,8 +405,7 @@
 aosd_color_t color = g_array_index( cfg->osd->decoration.colors , aosd_color_t , i );
 key_str = g_strdup_printf( "decoration_color_%i" , i );
 aosd_cfg_util_color_to_str( color , &color_str );
- aud_cfg_db_set_string( cfgfile , "aosd" ,
- key_str , color_str );
+ aud_set_string ("aosd", key_str, color_str);
 g_free( key_str );
 g_free( color_str );
 }
@@ -464,14 +417,11 @@
 g_string_truncate( string , string->len - 1 );
 else
 g_string_assign( string , "x" );
- aud_cfg_db_set_string( cfgfile , "aosd" , "trigger_active" , string->str );
+ aud_set_string ("aosd", "trigger_active", string->str);
 g_string_free( string , TRUE );
 
 /* miscellaneous */
- aud_cfg_db_set_int( cfgfile , "aosd" ,
- "transparency_mode" , cfg->osd->misc.transparency_mode );
-
- aud_cfg_db_close( cfgfile );
+ aud_set_int ("aosd", "transparency_mode", cfg->osd->misc.transparency_mode);
 
 return 0;
 }

audacious-plugins-3.0.3.tar.bz2/src/asx/Makefile -> audacious-plugins-3.1.tar.bz2/src/asx/Makefile Changed

audacious-plugins-3.0.3.tar.bz2/src/blur_scope/blur_scope.c -> audacious-plugins-3.1.tar.bz2/src/blur_scope/blur_scope.c Changed

@@ -26,8 +26,8 @@
 #include <gtk/gtk.h>
 #include <string.h>
 
-#include <audacious/configdb.h>
 #include <audacious/gtk-compat.h>
+#include <audacious/misc.h>
 #include <audacious/plugin.h>
 
 #include "blur_scope.h"
@@ -37,42 +37,42 @@
 
 static gboolean bscope_init (void);
 static void bscope_cleanup(void);
-static void bscope_playback_stop(void);
-static void bscope_render_pcm(gint16 data[2][512]);
+static void bscope_clear (void);
+static void bscope_render (const gfloat * data);
 static void /* GtkWidget */ * bscope_get_widget (void);
 
 AUD_VIS_PLUGIN
 (
 .name = "Blur Scope", /* description */
- .num_pcm_chs_wanted = 1, /* Number of PCM channels wanted */
- .num_freq_chs_wanted = 0, /* Number of freq channels wanted */
 .init = bscope_init, /* init */
 .cleanup = bscope_cleanup, /* cleanup */
 .configure = bscope_configure, /* configure */
- .playback_stop = bscope_playback_stop, /* playback_stop */
- .render_pcm = bscope_render_pcm, /* render_pcm */
+ .clear = bscope_clear,
+ .render_mono_pcm = bscope_render,
 .get_widget = bscope_get_widget,
 )
 
-gint color = 0xFF3F7F;
-
 static GtkWidget * area = NULL;
 static gint width, height, stride, image_size;
 static guint32 * image = NULL, * corner = NULL;
 
+static const gchar * const bscope_defaults[] = {
+ "color", "16727935", /* 0xFF3F7F */
+ NULL};
+
+gint color;
+
 static gboolean bscope_init (void)
 {
- mcs_handle_t * db = aud_cfg_db_open ();
- aud_cfg_db_get_int (db, "BlurScope", "color", & color);
- aud_cfg_db_close (db);
+ aud_config_set_defaults ("BlurScope", bscope_defaults);
+ color = aud_get_int ("BlurScope", "color");
+
 return TRUE;
 }
 
 static void bscope_cleanup (void)
 {
- mcs_handle_t * db = aud_cfg_db_open ();
- aud_cfg_db_set_int (db, "BlurScope", "color", color);
- aud_cfg_db_close (db);
+ aud_set_int ("BlurScope", "color", color);
 
 g_free (image);
 image = NULL;
@@ -145,7 +145,7 @@
 return area;
 }
 
-static void bscope_playback_stop (void)
+static void bscope_clear (void)
 {
 g_return_if_fail (image != NULL);
 memset (image, 0, image_size);
@@ -185,16 +185,16 @@
 * p = color;
 }
 
-static void bscope_render_pcm (gint16 data[2][512])
+static void bscope_render (const gfloat * data)
 {
 bscope_blur ();
 
- gint prev_y = ((32768 + (gint) data[0][0]) * height) >> 16;
+ gint prev_y = (0.5 + data[0]) * height;
 prev_y = CLAMP (prev_y, 0, height - 1);
 
 for (gint i = 0; i < width; i ++)
 {
- gint y = ((32768 + (gint) data[0][i * 512 / width]) * height) >> 16;
+ gint y = (0.5 + data[i * 512 / width]) * height;
 y = CLAMP (y, 0, height - 1);
 draw_vert_line (i, prev_y, y);
 prev_y = y;

audacious-plugins-3.0.3.tar.bz2/src/bs2b/Makefile -> audacious-plugins-3.1.tar.bz2/src/bs2b/Makefile Changed

audacious-plugins-3.0.3.tar.bz2/src/bs2b/plugin.c -> audacious-plugins-3.1.tar.bz2/src/bs2b/plugin.c Changed

@@ -3,6 +3,7 @@
 * Copyright (C) 2009, Sebastian Pipping <sebastian@pipping.org>
 * Copyright (C) 2009, Tony Vroon <chainsaw@gentoo.org>
 * Copyright (C) 2010, John Lindgren <john.lindgren@tds.net>
+ * Copyright (C) 2011, Michał Lipski <tallica@o2.pl>
 *
 * 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
@@ -18,29 +19,47 @@
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include "config.h"
+
+#include <gtk/gtk.h>
+#include <audacious/gtk-compat.h>
 #include <audacious/plugin.h>
+#include <audacious/i18n.h>
+#include <libaudgui/libaudgui.h>
+#include <libaudgui/libaudgui-gtk.h>
+#include <audacious/misc.h>
 #include <bs2b.h>
-#define AB_EFFECT_LEVEL BS2B_DEFAULT_CLEVEL
 
 static t_bs2bdp bs2b = NULL;
 static gint bs2b_channels;
+static GtkWidget *config_window, *feed_slider, *fcut_slider;
+static const gchar * const bs2b_defaults[] = {
+ "feed", "45",
+ "fcut", "700",
+ NULL};
+
+#define feed_level aud_get_int("bs2b", "feed")
+#define fcut_level aud_get_int("bs2b", "fcut")
 
 gboolean init()
 {
+ aud_config_set_defaults("bs2b", bs2b_defaults);
 bs2b = bs2b_open();
 
 if (bs2b == NULL)
 return FALSE;
 
- bs2b_set_level(bs2b, AB_EFFECT_LEVEL);
+ bs2b_set_level_feed(bs2b, feed_level);
+ bs2b_set_level_fcut(bs2b, fcut_level);
 
 return TRUE;
 }
 
-static void cleanup() {
- if (bs2b == NULL) {
+static void cleanup()
+{
+ if (bs2b == NULL)
 return;
- }
+
 bs2b_close(bs2b);
 bs2b = NULL;
 }
@@ -85,11 +104,130 @@
 return time;
 }
 
+static void feed_value_changed(GtkRange *range, gpointer data)
+{
+ aud_set_int("bs2b", "feed", gtk_range_get_value(range));
+ bs2b_set_level_feed(bs2b, feed_level);
+}
+
+static gchar *feed_format_value(GtkScale *scale, gdouble value)
+{
+ return g_strdup_printf("%.1f dB", (float) value / 10);
+}
+
+static void fcut_value_changed(GtkRange *range, gpointer data)
+{
+ aud_set_int("bs2b", "fcut", gtk_range_get_value(range));
+ bs2b_set_level_fcut(bs2b, fcut_level);
+}
+
+static gchar *fcut_format_value(GtkScale *scale, gdouble value)
+{
+ return g_strdup_printf("%d Hz, %dµs", (int) value, bs2b_level_delay((int) value));
+}
+
+static void preset_button_clicked(GtkButton *button, gpointer data)
+{
+ gint clevel = GPOINTER_TO_INT(data);
+ gtk_range_set_value(GTK_RANGE(feed_slider), clevel >> 16);
+ gtk_range_set_value(GTK_RANGE(fcut_slider), clevel & 0xffff);
+}
+
+static GtkWidget *preset_button(const gchar *label, gint clevel)
+{
+ GtkWidget *button = gtk_button_new_with_label(label);
+ gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
+ g_signal_connect(button, "clicked", (GCallback)
+ preset_button_clicked, GINT_TO_POINTER(clevel));
+
+ return button;
+}
+
+static void configure (void)
+{
+ if (config_window == NULL)
+ {
+ GtkWidget *vbox, *hbox, *button;
+
+ config_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+ gtk_window_set_type_hint ((GtkWindow *) config_window,
+ GDK_WINDOW_TYPE_HINT_DIALOG);
+ gtk_window_set_resizable ((GtkWindow *) config_window, FALSE);
+ gtk_window_set_title ((GtkWindow *) config_window,
+ _("Bauer stereophonic-to-binaural Preferences"));
+ gtk_container_set_border_width ((GtkContainer *) config_window, 6);
+ g_signal_connect (config_window, "destroy", (GCallback)
+ gtk_widget_destroyed, & config_window);
+
+ vbox = gtk_vbox_new (FALSE, 6);
+ gtk_container_add ((GtkContainer *) config_window, vbox);
+
+ hbox = gtk_hbox_new (FALSE, 6);
+ gtk_box_pack_start ((GtkBox *) vbox, hbox, FALSE, FALSE, 0);
+
+ gtk_box_pack_start(GTK_BOX(hbox), gtk_label_new(_("Feed level:")), TRUE, FALSE, 0);
+
+ feed_slider = gtk_hscale_new_with_range(BS2B_MINFEED, BS2B_MAXFEED, 1.0);
+ gtk_range_set_value (GTK_RANGE(feed_slider), feed_level);
+ gtk_widget_set_size_request (feed_slider, 200, -1);
+ gtk_box_pack_start ((GtkBox *) hbox, feed_slider, FALSE, FALSE, 0);
+ g_signal_connect (feed_slider, "value-changed", (GCallback) feed_value_changed,
+ NULL);
+ g_signal_connect (feed_slider, "format-value", (GCallback) feed_format_value,
+ NULL);
+
+ hbox = gtk_hbox_new (FALSE, 6);
+ gtk_box_pack_start ((GtkBox *) vbox, hbox, FALSE, FALSE, 0);
+
+ gtk_box_pack_start (GTK_BOX(hbox), gtk_label_new(_("Cut frequency:")), TRUE, FALSE, 0);
+
+ fcut_slider = gtk_hscale_new_with_range(BS2B_MINFCUT, BS2B_MAXFCUT, 1.0);
+ gtk_range_set_value (GTK_RANGE(fcut_slider), fcut_level);
+ gtk_widget_set_size_request (fcut_slider, 200, -1);
+ gtk_box_pack_start ((GtkBox *) hbox, fcut_slider, FALSE, FALSE, 0);
+ g_signal_connect (fcut_slider, "value-changed", (GCallback) fcut_value_changed,
+ NULL);
+ g_signal_connect (fcut_slider, "format-value", (GCallback) fcut_format_value,
+ NULL);
+
+ hbox = gtk_hbox_new (FALSE, 6);
+ gtk_box_pack_start ((GtkBox *) vbox, hbox, FALSE, FALSE, 0);
+
+ gtk_box_pack_start ((GtkBox *) hbox, gtk_label_new(_("Presets:")), TRUE, FALSE, 0);
+
+ button = preset_button(_("Default"), BS2B_DEFAULT_CLEVEL);
+ gtk_box_pack_start ((GtkBox *) hbox, button, TRUE, FALSE, 0);
+
+ button = preset_button("C. Moy", BS2B_CMOY_CLEVEL);
+ gtk_box_pack_start ((GtkBox *) hbox, button, TRUE, FALSE, 0);
+
+ button = preset_button("J. Meier", BS2B_JMEIER_CLEVEL);
+ gtk_box_pack_start ((GtkBox *) hbox, button, TRUE, FALSE, 0);
+
+ hbox = gtk_hbox_new (FALSE, 6);
+ gtk_box_pack_start ((GtkBox *) vbox, hbox, FALSE, FALSE, 0);
+
+ button = gtk_button_new_from_stock (GTK_STOCK_CLOSE);
+ gtk_box_pack_end ((GtkBox *) hbox, button, FALSE, FALSE, 0);
+ gtk_widget_set_can_default (button, TRUE);
+ gtk_widget_grab_default (button);
+ g_signal_connect_swapped (button, "clicked", (GCallback)
+ gtk_widget_destroy, config_window);
+
+ audgui_destroy_on_escape (config_window);
+
+ gtk_widget_show_all (vbox);
+ }
+
+ gtk_window_present ((GtkWindow *) config_window);
+}
+
 AUD_EFFECT_PLUGIN
 (
 .name = "Bauer stereophonic-to-binaural",
 .init = init,
 .cleanup = cleanup,
+ .configure = configure,
 .start = bs2b_start,
 .process = bs2b_process,
 .flush = bs2b_flush,

audacious-plugins-3.0.3.tar.bz2/src/cairo-spectrum/cairo-spectrum.c -> audacious-plugins-3.1.tar.bz2/src/cairo-spectrum/cairo-spectrum.c Changed

@@ -36,6 +36,7 @@
 #define VIS_DELAY 2 /* delay before falloff in frames */
 #define VIS_FALLOFF 2 /* falloff in pixels per frame */
 
+static GtkWidget * spect_widget = NULL;
 static gfloat xscale[MAX_BANDS + 1];
 static gint width, height, bands;
 static gint bars[MAX_BANDS + 1];
@@ -49,10 +50,9 @@
 		xscale[i] = powf(257., ((gfloat) i / (gfloat) bands_)) - 1;
 }
 
-static void vis_update_cb (const VisNode * vis, GtkWidget *widget)
+static void render_cb (gfloat * freq)
 {
-	gint16 fft[2][256];
-	aud_calc_mono_freq (fft, vis->data, vis->nch);
+	g_return_if_fail (spect_widget);
 
 	calculate_bands(bands);
 
@@ -60,37 +60,37 @@
 	{
 		gint a = ceil (xscale[i]);
 		gint b = floor (xscale[i + 1]);
-		gint n = 0;
+		gfloat n = 0;
 
 		if (b < a)
-			n += fft[0][b] * (xscale[i + 1] - xscale[i]);
+			n += freq[b] * (xscale[i + 1] - xscale[i]);
 		else
 		{
 			if (a > 0)
-				n += fft[0][a - 1] * (a - xscale[i]);
+				n += freq[a - 1] * (a - xscale[i]);
 			for (; a < b; a ++)
-				n += fft[0][a];
+				n += freq[a];
 			if (b < 256)
-				n += fft[0][b] * (xscale[i + 1] - b);
+				n += freq[b] * (xscale[i + 1] - b);
 		}
 
 		/* 40 dB range */
-		/* 0.00305 == 1 / 32767 * 10^(40/20) */
-		n = 20 * log10 (n * 0.00305);
-		n = CLAMP (n, 0, 40);
+		gint x = 20 * log10 (n * 100);
+		x = CLAMP (x, 0, 40);
+
 		bars[i] -= MAX (0, VIS_FALLOFF - delay[i]);
 
 		if (delay[i])
 			delay[i]--;
 
-		if (n > bars[i])
+		if (x > bars[i])
 		{
-			bars[i] = n;
+			bars[i] = x;
 			delay[i] = VIS_DELAY;
 		}
 	}
 
-	gtk_widget_queue_draw(widget);
+	gtk_widget_queue_draw (spect_widget);
 }
 
 static void rgb_to_hsv (gfloat r, gfloat g, gfloat b, gfloat * h, gfloat * s, gfloat * v)
@@ -263,13 +263,15 @@
 
 static gboolean destroy_event (void)
 {
-	aud_vis_runner_remove_hook ((VisHookFunc) vis_update_cb);
+	aud_vis_func_remove ((VisFunc) render_cb);
+	spect_widget = NULL;
 	return TRUE;
 }
 
 static /* GtkWidget * */ gpointer get_widget(void)
 {
 	GtkWidget *area = gtk_drawing_area_new();
+	spect_widget = area;
 
 #if GTK_CHECK_VERSION (3, 0, 0)
 	g_signal_connect(area, "draw", (GCallback) draw_event, NULL);
@@ -279,7 +281,7 @@
 	g_signal_connect(area, "configure-event", (GCallback) configure_event, NULL);
 	g_signal_connect(area, "destroy", (GCallback) destroy_event, NULL);
 
-	aud_vis_runner_add_hook ((VisHookFunc) vis_update_cb, area);
+	aud_vis_func_add (AUD_VIS_TYPE_FREQ, (VisFunc) render_cb);
 
 	return area;
 }

audacious-plugins-3.0.3.tar.bz2/src/cdaudio-ng/Makefile -> audacious-plugins-3.1.tar.bz2/src/cdaudio-ng/Makefile Changed

audacious-plugins-3.0.3.tar.bz2/src/cdaudio-ng/cdaudio-ng.c -> audacious-plugins-3.1.tar.bz2/src/cdaudio-ng/cdaudio-ng.c Changed

@@ -36,8 +36,6 @@
 
 #include <glib.h>
 
-#include <audacious/audconfig.h>
-#include <audacious/configdb.h>
 #include <audacious/debug.h>
 #include <audacious/i18n.h>
 #include <audacious/misc.h>
@@ -73,7 +71,8 @@
 cdng_cfg_t cdng_cfg;
 static gint firsttrackno = -1;
 static gint lasttrackno = -1;
-static CdIo_t *pcdio = NULL;
+static gint n_audio_tracks;
+static cdrom_drive_t *pcdrom_drive = NULL;
 static trackinfo_t *trackinfo = NULL;
 static gint monitor_source = 0;
 
@@ -190,59 +189,37 @@
 #endif
 }
 
+static const gchar * const cdaudio_defaults[] = {
+ "use_cdtext", "TRUE",
+ "use_cddb", "TRUE",
+ "cddbserver", "freedb.org",
+ "cddbport", "8880",
+ "cddbhttp", "FALSE",
+ "disc_speed", "2",
+ NULL};
+
 /* main thread only */
 static gboolean cdaudio_init (void)
 {
- mcs_handle_t *db;
-
 mutex = g_mutex_new ();
 
- cdng_cfg.use_cdtext = TRUE;
- cdng_cfg.use_cddb = TRUE;
- cdng_cfg.cddb_port = CDDA_DEFAULT_CDDB_PORT;
- cdng_cfg.cddb_http = FALSE;
- cdng_cfg.disc_speed = DEFAULT_DISC_SPEED;
- cdng_cfg.use_proxy = FALSE;
- cdng_cfg.proxy_port = CDDA_DEFAULT_PROXY_PORT;
+ aud_config_set_defaults ("CDDA", cdaudio_defaults);
 
- if ((db = aud_cfg_db_open ()) == NULL)
- {
- cdaudio_error ("Failed to read configuration.");
- return FALSE;
- }
+ cdng_cfg.use_cdtext = aud_get_bool ("CDDA", "use_cdtext");
+ cdng_cfg.use_cddb = aud_get_bool ("CDDA", "use_cddb");
+ cdng_cfg.device = aud_get_string ("CDDA", "device");
+ cdng_cfg.cddb_server = aud_get_string ("CDDA", "cddbserver");
+ cdng_cfg.cddb_path = aud_get_string ("CDDA", "cddbpath");
+ cdng_cfg.cddb_port = aud_get_int ("CDDA", "cddbport");
+ cdng_cfg.cddb_http = aud_get_bool ("CDDA", "cddbhttp");
+ cdng_cfg.disc_speed = aud_get_int ("CDDA", "disc_speed");
+ cdng_cfg.disc_speed = CLAMP (cdng_cfg.disc_speed, MIN_DISC_SPEED, MAX_DISC_SPEED);
 
- aud_cfg_db_get_bool (db, "CDDA", "use_cdtext", &cdng_cfg.use_cdtext);
- aud_cfg_db_get_bool (db, "CDDA", "use_cddb", &cdng_cfg.use_cddb);
- aud_cfg_db_get_string (db, "CDDA", "device", &cdng_cfg.device);
- aud_cfg_db_get_string (db, "CDDA", "cddbserver", &cdng_cfg.cddb_server);
- aud_cfg_db_get_string (db, "CDDA", "cddbpath", &cdng_cfg.cddb_path);
- aud_cfg_db_get_int (db, "CDDA", "cddbport", &cdng_cfg.cddb_port);
- aud_cfg_db_get_bool (db, "CDDA", "cddbhttp", &cdng_cfg.cddb_http);
- aud_cfg_db_get_int (db, "CDDA", "disc_speed", & cdng_cfg.disc_speed);
- cdng_cfg.disc_speed = CLAMP (cdng_cfg.disc_speed, MIN_DISC_SPEED,
- MAX_DISC_SPEED);
- aud_cfg_db_get_bool (db, "audacious", "use_proxy", &cdng_cfg.use_proxy);
- aud_cfg_db_get_string (db, "audacious", "proxy_host", &cdng_cfg.proxy_host);
- aud_cfg_db_get_int (db, "audacious", "proxy_port", &cdng_cfg.proxy_port);
- aud_cfg_db_get_string (db, "audacious", "proxy_user",
- &cdng_cfg.proxy_username);
- aud_cfg_db_get_string (db, "audacious", "proxy_pass",
- &cdng_cfg.proxy_password);
-
- if (cdng_cfg.device == NULL)
- cdng_cfg.device = g_strdup ("");
- if (cdng_cfg.cddb_server == NULL)
- cdng_cfg.cddb_server = g_strdup (CDDA_DEFAULT_CDDB_SERVER);
- if (cdng_cfg.cddb_path == NULL)
- cdng_cfg.cddb_path = g_strdup ("");
- if (cdng_cfg.proxy_host == NULL)
- cdng_cfg.proxy_host = g_strdup ("");
- if (cdng_cfg.proxy_username == NULL)
- cdng_cfg.proxy_username = g_strdup ("");
- if (cdng_cfg.proxy_password == NULL)
- cdng_cfg.proxy_password = g_strdup ("");
-
- aud_cfg_db_close (db);
+ cdng_cfg.use_proxy = aud_get_bool (NULL, "use_proxy");
+ cdng_cfg.proxy_host = aud_get_string (NULL, "proxy_host");
+ cdng_cfg.proxy_port = aud_get_int (NULL, "proxy_port");
+ cdng_cfg.proxy_username = aud_get_string (NULL, "proxy_user");
+ cdng_cfg.proxy_password = aud_get_string (NULL, "proxy_pass");
 
 if (!cdio_init ())
 {
@@ -335,6 +312,13 @@
 goto ERR;
 }
 
+ /* don't play any data tracks */
+ if (!cdda_track_audiop (pcdrom_drive, trackno))
+ {
+ cdaudio_error ("Track %d is a data track.\n", trackno);
+ goto ERR;
+ }
+
 gint startlsn = trackinfo[trackno].startlsn;
 gint endlsn = trackinfo[trackno].endlsn;
 
@@ -358,8 +342,8 @@
 
 g_mutex_unlock (mutex);
 
- gint sectors = CLAMP (aud_cfg->output_buffer_size / 2, 50, 250) *
- cdng_cfg.disc_speed * 75 / 1000;
+ gint buffer_size = aud_get_int (NULL, "output_buffer_size");
+ gint sectors = CLAMP (buffer_size / 2, 50, 250) * cdng_cfg.disc_speed * 75 / 1000;
 guchar buffer[2352 * sectors];
 gint currlsn = startlsn;
 gint retry_count = 0, skip_count = 0;
@@ -387,7 +371,7 @@
 if (sectors < 1)
 break;
 
- if (cdio_read_audio_sectors (pcdio, buffer, currlsn, sectors) ==
+ if (cdio_read_audio_sectors (pcdrom_drive->p_cdio, buffer, currlsn, sectors) ==
 DRIVER_OP_SUCCESS)
 {
 retry_count = 0;
@@ -484,10 +468,10 @@
 monitor_source = 0;
 }
 
- if (pcdio != NULL)
+ if (pcdrom_drive != NULL)
 {
- cdio_destroy (pcdio);
- pcdio = NULL;
+ cdda_close (pcdrom_drive);
+ pcdrom_drive = NULL;
 }
 if (trackinfo != NULL)
 {
@@ -499,16 +483,14 @@
 
 // todo: destroy the gui
 
- mcs_handle_t *db = aud_cfg_db_open ();
- aud_cfg_db_set_int (db, "CDDA", "disc_speed", cdng_cfg.disc_speed);
- aud_cfg_db_set_bool (db, "CDDA", "use_cdtext", cdng_cfg.use_cdtext);
- aud_cfg_db_set_bool (db, "CDDA", "use_cddb", cdng_cfg.use_cddb);
- aud_cfg_db_set_string (db, "CDDA", "cddbserver", cdng_cfg.cddb_server);
- aud_cfg_db_set_string (db, "CDDA", "cddbpath", cdng_cfg.cddb_path);
- aud_cfg_db_set_int (db, "CDDA", "cddbport", cdng_cfg.cddb_port);
- aud_cfg_db_set_bool (db, "CDDA", "cddbhttp", cdng_cfg.cddb_http);
- aud_cfg_db_set_string (db, "CDDA", "device", cdng_cfg.device);
- aud_cfg_db_close (db);
+ aud_set_bool ("CDDA", "use_cdtext", cdng_cfg.use_cdtext);
+ aud_set_bool ("CDDA", "use_cddb", cdng_cfg.use_cddb);
+ aud_set_string ("CDDA", "device", cdng_cfg.device);
+ aud_set_string ("CDDA", "cddbserver", cdng_cfg.cddb_server);
+ aud_set_string ("CDDA", "cddbpath", cdng_cfg.cddb_path);
+ aud_set_int ("CDDA", "cddbport", cdng_cfg.cddb_port);
+ aud_set_bool ("CDDA", "cddbhttp", cdng_cfg.cddb_http);
+ aud_set_int ("CDDA", "disc_speed", cdng_cfg.disc_speed);
 
 g_free (cdng_cfg.device);
 g_free (cdng_cfg.cddb_server);
@@ -536,12 +518,16 @@
 
 if (!strcmp (filename, "cdda://"))
 {
+ gint i = 0;
+
 tuple = tuple_new_from_filename (filename);
- tuple->nsubtunes = 1 + lasttrackno - firsttrackno;
+ tuple->nsubtunes = n_audio_tracks;
 tuple->subtunes = g_malloc (sizeof *tuple->subtunes * tuple->nsubtunes);
 
+ /* only add the audio tracks to the playlist */
 for (trackno = firsttrackno; trackno <= lasttrackno; trackno++)
- tuple->subtunes[trackno - firsttrackno] = trackno;
+ if (cdda_track_audiop (pcdrom_drive, trackno))
+ tuple->subtunes[i++] = trackno;
 
 goto DONE;
 }
@@ -554,6 +540,12 @@
 goto DONE;
 }
 
+ if (!cdda_track_audiop (pcdrom_drive, trackno))
+ {
+ warn ("Track %d is a data track.\n", trackno);
+ goto DONE;
+ }
+
 tuple = tuple_new_from_filename (filename);
 tuple_set_format (tuple, _("Audio CD"), 2, 44100, 1411);
 
@@ -596,13 +588,13 @@
 static void open_cd (void)
 {
 AUDDBG ("Opening CD drive.\n");
- g_return_if_fail (pcdio == NULL);
+ g_return_if_fail (pcdrom_drive == NULL);
 
 /* find an available, audio capable, cd drive */
 if (cdng_cfg.device != NULL && strlen (cdng_cfg.device) > 0)
 {
- pcdio = cdio_open (cdng_cfg.device, DRIVER_UNKNOWN);
- if (pcdio == NULL)
+ pcdrom_drive = cdda_identify (cdng_cfg.device, 1, NULL);
+ if (pcdrom_drive == NULL)
 {
 cdaudio_error ("Failed to open CD device \"%s\".", cdng_cfg.device);
 return;
@@ -615,8 +607,8 @@
 
 if (ppcd_drives != NULL && *ppcd_drives != NULL)
 { /* we have at least one audio capable cd drive */
- pcdio = cdio_open (*ppcd_drives, DRIVER_UNKNOWN);
- if (pcdio == NULL)
+ pcdrom_drive = cdda_identify (*ppcd_drives, 1, NULL);
+ if (pcdrom_drive == NULL)
 {
 cdaudio_error ("Failed to open CD.");
 return;
@@ -639,16 +631,27 @@
 static void scan_cd (void)
 {
 AUDDBG ("Scanning CD drive.\n");
- g_return_if_fail (pcdio != NULL);
+ g_return_if_fail (pcdrom_drive != NULL);
 g_return_if_fail (trackinfo == NULL);
 
 gint trackno;
 
- if (cdio_set_speed (pcdio, cdng_cfg.disc_speed) != DRIVER_OP_SUCCESS)
+ /* general track initialization */
+
+ /* skip endianness detection (because it only affects cdda_read, and we use
+ * cdio_read_audio_sectors instead) */
+ pcdrom_drive->bigendianp = 0;
+
+ /* finish initialization of drive/disc (performs disc TOC sanitization) */
+ if (cdda_open (pcdrom_drive) != 0)
+ {
+ cdaudio_error ("Failed to finish initializing opened CD drive.");
+ goto ERR;
+ }
+
+ if (cdda_speed_set (pcdrom_drive, cdng_cfg.disc_speed) != DRIVER_OP_SUCCESS)
 warn ("Cannot set drive speed.\n");
 
- /* general track initialization */
- cdrom_drive_t *pcdrom_drive = cdio_cddap_identify_cdio (pcdio, 1, NULL); // todo : check return / NULL
 firsttrackno = cdio_get_first_track_num (pcdrom_drive->p_cdio);
 lasttrackno = cdio_get_last_track_num (pcdrom_drive->p_cdio);
 if (firsttrackno == CDIO_INVALID_TRACK || lasttrackno == CDIO_INVALID_TRACK)
@@ -662,18 +665,18 @@
 trackinfo = (trackinfo_t *) g_new (trackinfo_t, (lasttrackno + 1));
 
 cdaudio_set_fullinfo (&trackinfo[0],
- cdio_get_track_lsn (pcdrom_drive->p_cdio, 0),
- cdio_get_track_last_lsn (pcdrom_drive->p_cdio,
- CDIO_CDROM_LEADOUT_TRACK),
+ cdda_track_firstsector (pcdrom_drive, 0),
+ cdda_track_lastsector (pcdrom_drive, lasttrackno),
 "", "", "");
 
+ n_audio_tracks = 0;
+
 for (trackno = firsttrackno; trackno <= lasttrackno; trackno++)
 {
 cdaudio_set_fullinfo (&trackinfo[trackno],
- cdio_get_track_lsn (pcdrom_drive->p_cdio,
- trackno),
- cdio_get_track_last_lsn (pcdrom_drive->p_cdio,
- trackno), "", "", "");
+ cdda_track_firstsector (pcdrom_drive, trackno),
+ cdda_track_lastsector (pcdrom_drive, trackno),
+ "", "", "");
 
 if (trackinfo[trackno].startlsn == CDIO_INVALID_LSN
 || trackinfo[trackno].endlsn == CDIO_INVALID_LSN)
@@ -681,6 +684,10 @@
 cdaudio_error ("Cannot read start/end LSN for track %d.", trackno);
 goto ERR;
 }
+
+ /* count how many tracks are audio tracks */
+ if (cdda_track_audiop (pcdrom_drive, trackno))
+ n_audio_tracks++;
 }
 
 /* get trackinfo[0] cdtext information (the disc) */
@@ -788,15 +795,17 @@
 
 pcddb_disc = cddb_disc_new ();
 
- lba = cdio_get_track_lba (pcdio, CDIO_CDROM_LEADOUT_TRACK);
+ lba = cdio_get_track_lba (pcdrom_drive->p_cdio,
+ CDIO_CDROM_LEADOUT_TRACK);
 cddb_disc_set_length (pcddb_disc, FRAMES_TO_SECONDS (lba));
 
 for (trackno = firsttrackno; trackno <= lasttrackno; trackno++)
 {
 pcddb_track = cddb_track_new ();
 cddb_track_set_frame_offset (pcddb_track,
- cdio_get_track_lba (pcdio,
- trackno));
+ cdio_get_track_lba (
+ pcdrom_drive->p_cdio,
+ trackno));
 cddb_disc_add_track (pcddb_disc, pcddb_track);
 }
 
@@ -893,14 +902,14 @@
 {
 trigger_monitor ();
 
- if (pcdio == NULL)
+ if (pcdrom_drive == NULL)
 {
 open_cd ();
- if (pcdio == NULL)
+ if (pcdrom_drive == NULL)
 return;
 }
 
- int mode = cdio_get_discmode (pcdio);
+ int mode = cdio_get_discmode (pcdrom_drive->p_cdio);
 #ifdef _WIN32 /* cdio_get_discmode reports the wrong disk type sometimes */
 if (mode == CDIO_DISC_MODE_NO_INFO || mode == CDIO_DISC_MODE_ERROR)
 #else
@@ -920,7 +929,7 @@
 return;
 }
 
- if (trackinfo == NULL || cdio_get_media_changed (pcdio))
+ if (trackinfo == NULL || cdio_get_media_changed (pcdrom_drive->p_cdio))
 {
 g_free (trackinfo);
 trackinfo = NULL;

audacious-plugins-3.0.3.tar.bz2/src/cdaudio-ng/cdaudio-ng.h -> audacious-plugins-3.1.tar.bz2/src/cdaudio-ng/cdaudio-ng.h Changed

audacious-plugins-3.0.3.tar.bz2/src/compressor/compressor.c -> audacious-plugins-3.1.tar.bz2/src/compressor/compressor.c Changed

audacious-plugins-3.0.3.tar.bz2/src/compressor/compressor.h -> audacious-plugins-3.1.tar.bz2/src/compressor/compressor.h Changed

audacious-plugins-3.0.3.tar.bz2/src/compressor/plugin.c -> audacious-plugins-3.1.tar.bz2/src/compressor/plugin.c Changed

@@ -21,28 +21,30 @@
 
 #include "config.h"
 
-#include <audacious/configdb.h>
 #include <audacious/gtk-compat.h>
 #include <audacious/i18n.h>
+#include <audacious/misc.h>
 #include <audacious/plugin.h>
 #include <libaudgui/libaudgui.h>
 #include <libaudgui/libaudgui-gtk.h>
 
 #include "compressor.h"
 
+/* What is a "normal" volume? Replay Gain stuff claims to use 89 dB, but what
+ * does that translate to in our PCM range? Does anybody even know? */
+static const gchar * const compressor_defaults[] = {
+ "center", "0.5",
+ "range", "0.5",
+ NULL};
+
 static GtkWidget * about_window = NULL;
 static GtkWidget * config_window = NULL;
 
 void compressor_config_load (void)
 {
- mcs_handle_t * database = aud_cfg_db_open ();
- if (! database)
- return;
-
- aud_cfg_db_get_float (database, "compressor", "center", & compressor_center);
- aud_cfg_db_get_float (database, "compressor", "range", & compressor_range);
-
- aud_cfg_db_close (database);
+ aud_config_set_defaults ("compressor", compressor_defaults);
+ compressor_center = aud_get_double ("compressor", "center");
+ compressor_range = aud_get_double ("compressor", "range");
 }
 
 void compressor_config_save (void)
@@ -52,14 +54,8 @@
 if (config_window != NULL)
 gtk_widget_destroy (config_window);
 
- mcs_handle_t * database = aud_cfg_db_open ();
- if (! database)
- return;
-
- aud_cfg_db_set_float (database, "compressor", "center", compressor_center);
- aud_cfg_db_set_float (database, "compressor", "range", compressor_range);
-
- aud_cfg_db_close (database);
+ aud_set_double ("compressor", "center", compressor_center);
+ aud_set_double ("compressor", "range", compressor_range);
 }
 
 static void compressor_about (void)
@@ -83,7 +79,7 @@
 
 static void value_changed (GtkRange * range, void * data)
 {
- * (float *) data = gtk_range_get_value (range);
+ * (double *) data = gtk_range_get_value (range);
 }
 
 static void compressor_configure (void)

audacious-plugins-3.0.3.tar.bz2/src/console/Makefile -> audacious-plugins-3.1.tar.bz2/src/console/Makefile Changed

audacious-plugins-3.0.3.tar.bz2/src/console/configure.c -> audacious-plugins-3.1.tar.bz2/src/console/configure.c Changed

@@ -13,53 +13,51 @@
 #include <glib.h>
 #include <gtk/gtk.h>
 
-#include <audacious/configdb.h>
 #include <audacious/gtk-compat.h>
 #include <audacious/i18n.h>
+#include <audacious/misc.h>
 #include <audacious/plugin.h>
 
 #define CON_CFGID "console"
 
-AudaciousConsoleConfig audcfg = {
- 180,
- FALSE,
- 32000,
- 0,
- 0,
- FALSE,
- 0,
- FALSE
-};
+AudaciousConsoleConfig audcfg;
 
+static const gchar * const console_defaults[] = {
+ "loop_length", "180",
+ "resample", "FALSE",
+ "resample_rate", "32000",
+ "treble", "0",
+ "bass", "0",
+ "ignore_spc_length", "FALSE",
+ "echo", "0",
+ "inc_spc_reverb", "FALSE",
+ NULL};
 
 // TODO: add UI for echo
-void console_cfg_load( void )
+void console_cfg_load (void)
 {
- mcs_handle_t *db = aud_cfg_db_open();
- aud_cfg_db_get_int(db, CON_CFGID, "loop_length", &audcfg.loop_length);
- aud_cfg_db_get_bool(db, CON_CFGID, "resample", &audcfg.resample);
- aud_cfg_db_get_int(db, CON_CFGID, "resample_rate", &audcfg.resample_rate);
- aud_cfg_db_get_int(db, CON_CFGID, "treble", &audcfg.treble);
- aud_cfg_db_get_int(db, CON_CFGID, "bass", &audcfg.bass);
- aud_cfg_db_get_bool(db, CON_CFGID, "ignore_spc_length", &audcfg.ignore_spc_length);
- aud_cfg_db_get_int(db, CON_CFGID, "echo", &audcfg.echo);
- aud_cfg_db_get_bool(db, CON_CFGID, "inc_spc_reverb", &audcfg.inc_spc_reverb);
- aud_cfg_db_close(db);
-}
+ aud_config_set_defaults (CON_CFGID, console_defaults);
 
+ audcfg.loop_length = aud_get_int (CON_CFGID, "loop_length");
+ audcfg.resample = aud_get_bool (CON_CFGID, "resample");
+ audcfg.resample_rate = aud_get_int (CON_CFGID, "resample_rate");
+ audcfg.treble = aud_get_int (CON_CFGID, "treble");
+ audcfg.bass = aud_get_int (CON_CFGID, "bass");
+ audcfg.ignore_spc_length = aud_get_bool (CON_CFGID, "ignore_spc_length");
+ audcfg.echo = aud_get_int (CON_CFGID, "echo");
+ audcfg.inc_spc_reverb = aud_get_bool (CON_CFGID, "inc_spc_reverb");
+}
 
-void console_cfg_save( void )
+void console_cfg_save (void)
 {
- mcs_handle_t *db = aud_cfg_db_open();
- aud_cfg_db_set_int(db, CON_CFGID, "loop_length", audcfg.loop_length);
- aud_cfg_db_set_bool(db, CON_CFGID, "resample", audcfg.resample);
- aud_cfg_db_set_int(db, CON_CFGID, "resample_rate", audcfg.resample_rate);
- aud_cfg_db_set_int(db, CON_CFGID, "treble", audcfg.treble);
- aud_cfg_db_set_int(db, CON_CFGID, "bass", audcfg.bass);
- aud_cfg_db_set_bool(db, CON_CFGID, "ignore_spc_length", audcfg.ignore_spc_length);
- aud_cfg_db_set_int(db, CON_CFGID, "echo", audcfg.echo);
- aud_cfg_db_set_bool(db, CON_CFGID, "inc_spc_reverb", audcfg.inc_spc_reverb);
- aud_cfg_db_close(db);
+ aud_set_int (CON_CFGID, "loop_length", audcfg.loop_length);
+ aud_set_bool (CON_CFGID, "resample", audcfg.resample);
+ aud_set_int (CON_CFGID, "resample_rate", audcfg.resample_rate);
+ aud_set_int (CON_CFGID, "treble", audcfg.treble);
+ aud_set_int (CON_CFGID, "bass", audcfg.bass);
+ aud_set_bool (CON_CFGID, "ignore_spc_length", audcfg.ignore_spc_length);
+ aud_set_int (CON_CFGID, "echo", audcfg.echo);
+ aud_set_bool (CON_CFGID, "inc_spc_reverb", audcfg.inc_spc_reverb);
 }

audacious-plugins-3.0.3.tar.bz2/src/crossfade/crossfade.c -> audacious-plugins-3.1.tar.bz2/src/crossfade/crossfade.c Changed

audacious-plugins-3.0.3.tar.bz2/src/crossfade/plugin.c -> audacious-plugins-3.1.tar.bz2/src/crossfade/plugin.c Changed

audacious-plugins-3.0.3.tar.bz2/src/crystalizer/crystalizer.c -> audacious-plugins-3.1.tar.bz2/src/crystalizer/crystalizer.c Changed

@@ -22,9 +22,9 @@
 
 #include <gtk/gtk.h>
 
-#include <audacious/configdb.h>
 #include <audacious/gtk-compat.h>
 #include <audacious/i18n.h>
+#include <audacious/misc.h>
 #include <audacious/plugin.h>
 
 static gboolean init (void);
@@ -55,16 +55,14 @@
 static gint cryst_channels;
 static gfloat * cryst_prev;
 
+static const gchar * const cryst_defaults[] = {
+ "intensity", "1",
+ NULL};
+
 static gboolean init (void)
 {
-	value = 1.0;
-
-	mcs_handle_t * db = aud_cfg_db_open ();
-	if (db)
-	{
-		aud_cfg_db_get_double (db, "crystalizer", "intensity", & value);
-		aud_cfg_db_close (db);
-	}
+	aud_config_set_defaults ("crystalizer", cryst_defaults);
+	value = aud_get_double ("crystalizer", "intensity");
 
 	return TRUE;
 }
@@ -73,13 +71,7 @@
 static void conf_ok_cb (GtkButton * button, GtkAdjustment * adj)
 {
 	value = gtk_adjustment_get_value (adj);
-
-	mcs_handle_t * db = aud_cfg_db_open ();
-	if (db)
-	{
-		aud_cfg_db_set_double (db, "crystalizer", "intensity", value);
-		aud_cfg_db_close (db);
-	}
+	aud_set_double ("crystalizer", "intensity", value);
 
 	gtk_widget_destroy(conf_dialog);
 }

audacious-plugins-3.0.3.tar.bz2/src/echo_plugin/echo.c -> audacious-plugins-3.1.tar.bz2/src/echo_plugin/echo.c Changed

@@ -4,8 +4,8 @@
 #include <string.h>
 #include <gtk/gtk.h>
 
-#include <audacious/configdb.h>
 #include <audacious/i18n.h>
+#include <audacious/misc.h>
 #include <audacious/plugin.h>
 
 #include "echo.h"
@@ -21,21 +21,23 @@
 #define BUFFER_SHORTS (BUFFER_SAMPLES * MAX_CHANNELS)
 #define BUFFER_BYTES (BUFFER_SHORTS * BYTES_PS)
 
+static const gchar * const echo_defaults[] = {
+ "delay", "500",
+ "feedback", "50",
+ "volume", "50",
+ NULL};
+
 static gfloat *buffer = NULL;
-gint echo_delay = 500, echo_feedback = 50, echo_volume = 50;
+gint echo_delay, echo_feedback, echo_volume;
 static int w_ofs;
 
 static gboolean init (void)
 {
-	mcs_handle_t *cfg;
-
-	cfg = aud_cfg_db_open();
-	if (! cfg)
-		return TRUE;
-	aud_cfg_db_get_int(cfg, "echo_plugin", "delay", &echo_delay);
-	aud_cfg_db_get_int(cfg, "echo_plugin", "feedback", &echo_feedback);
-	aud_cfg_db_get_int(cfg, "echo_plugin", "volume", &echo_volume);
-	aud_cfg_db_close(cfg);
+	aud_config_set_defaults ("echo_plugin", echo_defaults);
+
+	echo_delay = aud_get_int ("echo_plugin", "delay");
+	echo_feedback = aud_get_int ("echo_plugin", "feedback");
+	echo_volume = aud_get_int ("echo_plugin", "volume");
 
 	return TRUE;
 }

audacious-plugins-3.0.3.tar.bz2/src/echo_plugin/gui.c -> audacious-plugins-3.1.tar.bz2/src/echo_plugin/gui.c Changed

audacious-plugins-3.0.3.tar.bz2/src/ffaudio/Makefile -> audacious-plugins-3.1.tar.bz2/src/ffaudio/Makefile Changed

audacious-plugins-3.0.3.tar.bz2/src/ffaudio/ffaudio-core.c -> audacious-plugins-3.1.tar.bz2/src/ffaudio/ffaudio-core.c Changed

@@ -19,6 +19,12 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
+/*
+ * NOTE: Using libav with this code is entirely unsupported. Do so at your own
+ * risk. Any bugs filed against this plugin on systems using libav will be rejected
+ * by us.
+ */
+
 #undef FFAUDIO_DOUBLECHECK /* Doublecheck probing result for debugging purposes */
 #undef FFAUDIO_NO_BLACKLIST /* Don't blacklist any recognized codecs/formats */
 #define FFAUDIO_USE_AUDTAG /* Use Audacious tagging library */
@@ -267,23 +273,21 @@
 
 typedef struct {
 TupleValueType ttype; /* Tuple field value type */
- gint field; /* Tuple field constant or if -1, use prim_key as field key */
- gchar *prim_key; /* Primary FFmpeg metadata key, matches any with this suffix */
- gchar *alt_keys[5]; /* Fallback keys, strict (but case-insensitive) matching */
+ gint field; /* Tuple field constant */
+ gchar *keys[5]; /* Keys to match (case-insensitive), ended by NULL */
 } ffaudio_meta_t;
 
 static const ffaudio_meta_t metaentries[] = {
- { TUPLE_STRING, FIELD_ARTIST, "author", { "hor", "artist", NULL } },
- { TUPLE_STRING, FIELD_TITLE, "title", { "le", NULL } },
- { TUPLE_STRING, FIELD_ALBUM, "album", { "WM/AlbumTitle", NULL } },
- { TUPLE_STRING, FIELD_PERFORMER, "performer", { NULL } },
- { TUPLE_STRING, FIELD_COPYRIGHT, "copyright", { NULL } },
- { TUPLE_STRING, FIELD_GENRE, "genre", { "WM/Genre", NULL } },
- { TUPLE_STRING, FIELD_COMMENT, "comment", { NULL } },
- { TUPLE_STRING, FIELD_COMPOSER, "composer", { NULL } },
- { TUPLE_STRING, -1, "lyrics", { "WM/Lyrics", NULL } },
- { TUPLE_INT, FIELD_YEAR, "year", { "WM/Year", "date", NULL } },
- { TUPLE_INT, FIELD_TRACK_NUMBER, "track", { "WM/TrackNumber", NULL } },
+ {TUPLE_STRING, FIELD_ARTIST, {"author", "hor", "artist", NULL}},
+ {TUPLE_STRING, FIELD_TITLE, {"title", "le", NULL}},
+ {TUPLE_STRING, FIELD_ALBUM, {"album", "WM/AlbumTitle", NULL}},
+ {TUPLE_STRING, FIELD_PERFORMER, {"performer", NULL}},
+ {TUPLE_STRING, FIELD_COPYRIGHT, {"copyright", NULL}},
+ {TUPLE_STRING, FIELD_GENRE, {"genre", "WM/Genre", NULL}},
+ {TUPLE_STRING, FIELD_COMMENT, {"comment", NULL}},
+ {TUPLE_STRING, FIELD_COMPOSER, {"composer", NULL}},
+ {TUPLE_INT, FIELD_YEAR, {"year", "WM/Year", "date", NULL}},
+ {TUPLE_INT, FIELD_TRACK_NUMBER, {"track", "WM/TrackNumber", NULL}},
 };
 
 static const gint n_metaentries = sizeof(metaentries) / sizeof(metaentries[0]);
@@ -291,32 +295,23 @@
 static void
 ffaudio_get_meta(Tuple *tuple, AVFormatContext *ic, const ffaudio_meta_t *m)
 {
+ if (! ic->metadata)
+ return;
+
 AVDictionaryEntry *tag = NULL;
 
- if (ic->metadata != NULL)
- {
- tag = av_dict_get(ic->metadata, m->prim_key, NULL, AV_METADATA_IGNORE_SUFFIX);
- if (tag == NULL) {
- gint i;
- for (i = 0; tag == NULL && m->alt_keys[i] != NULL; i++)
- tag = av_dict_get(ic->metadata, m->alt_keys[i], NULL, 0);
- }
- }
+ for (gint i = 0; ! tag && m->keys[i]; i ++)
+ tag = av_dict_get (ic->metadata, m->keys[i], NULL, 0);
 
 if (tag != NULL)
 {
- const gchar *key_name = (m->field < 0) ? m->prim_key : NULL;
- gchar *tmp;
-
 switch (m->ttype) {
 case TUPLE_STRING:
- tmp = str_to_utf8(tag->value);
- tuple_associate_string(tuple, m->field, key_name, tmp);
- g_free(tmp);
+ tuple_associate_string (tuple, m->field, NULL, tag->value);
 break;
 
 case TUPLE_INT:
- tuple_associate_int(tuple, m->field, key_name, atoi(tag->value));
+ tuple_associate_int (tuple, m->field, NULL, atoi(tag->value));
 break;
 
 default:

audacious-plugins-3.0.3.tar.bz2/src/filewriter/filewriter.c -> audacious-plugins-3.1.tar.bz2/src/filewriter/filewriter.c Changed

@@ -22,7 +22,6 @@
 
 #include <gtk/gtk.h>
 
-#include <audacious/configdb.h>
 #include <audacious/gtk-compat.h>
 #include <audacious/misc.h>
 #include <audacious/playlist.h>
@@ -58,7 +57,7 @@
 FILEEXT_MAX
 };
 
-static gint fileext = WAV;
+static gint fileext;
 static const gchar *fileext_str[FILEEXT_MAX] =
 {
 "wav",
@@ -76,18 +75,18 @@
 static FileWriter *plugin;
 
 static GtkWidget *saveplace_hbox, *saveplace;
-static gboolean save_original = TRUE;
+static gboolean save_original;
 
 static GtkWidget *filenamefrom_hbox, *filenamefrom_label, *filenamefrom_toggle;
-static gboolean filenamefromtags = TRUE;
+static gboolean filenamefromtags;
 
 static GtkWidget *use_suffix_toggle = NULL;
-static gboolean use_suffix = FALSE;
+static gboolean use_suffix;
 
 static GtkWidget *prependnumber_toggle;
-static gboolean prependnumber = FALSE;
+static gboolean prependnumber;
 
-static gchar *file_path = NULL;
+static gchar *file_path;
 
 VFSFile *output_file = NULL;
 Tuple *tuple = NULL;
@@ -120,20 +119,26 @@
 return vfs_fwrite (data, 1, length, output_file);
 }
 
+static const gchar * const filewriter_defaults[] = {
+ "fileext", "0", /* WAV */
+ "filenamefromtags", "TRUE",
+ "prependnumber", "FALSE",
+ "save_original", "TRUE",
+ "use_suffix", "FALSE",
+ NULL};
+
 static gboolean file_init (void)
 {
- mcs_handle_t *db;
-
- db = aud_cfg_db_open();
- aud_cfg_db_get_int(db, "filewriter", "fileext", &fileext);
- aud_cfg_db_get_string(db, "filewriter", "file_path", &file_path);
- aud_cfg_db_get_bool(db, "filewriter", "save_original", &save_original);
- aud_cfg_db_get_bool(db, "filewriter", "use_suffix", &use_suffix);
- aud_cfg_db_get_bool(db, "filewriter", "filenamefromtags", &filenamefromtags);
- aud_cfg_db_get_bool(db, "filewriter", "prependnumber", &prependnumber);
- aud_cfg_db_close(db);
-
- if (file_path == NULL)
+ aud_config_set_defaults ("filewriter", filewriter_defaults);
+
+ fileext = aud_get_int ("filewriter", "fileext");
+ filenamefromtags = aud_get_bool ("filewriter", "filenamefromtags");
+ file_path = aud_get_string ("filewriter", "file_path");
+ prependnumber = aud_get_bool ("filewriter", "prependnumber");
+ save_original = aud_get_bool ("filewriter", "save_original");
+ use_suffix = aud_get_bool ("filewriter", "use_suffix");
+
+ if (! file_path[0])
 {
 g_return_val_if_fail (getenv ("HOME") != NULL, FALSE);
 file_path = g_filename_to_uri (getenv ("HOME"), NULL, NULL);
@@ -147,13 +152,19 @@
 return TRUE;
 }
 
+static void file_cleanup (void)
+{
+ g_free (file_path);
+ file_path = NULL;
+}
+
 void file_about (void)
 {
 static GtkWidget * dialog;
 
 audgui_simple_message (& dialog, GTK_MESSAGE_INFO,
 _("About FileWriter-Plugin"),
- _("FileWriter-Plugin\n\n"
+ "FileWriter-Plugin\n\n"
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
 "the Free Software Foundation; either version 2 of the License, or\n"
@@ -167,7 +178,7 @@
 "You should have received a copy of the GNU General Public License\n"
 "along with this program; if not, write to the Free Software\n"
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
- "USA."));
+ "USA.");
 }
 
 static VFSFile * safe_create (const gchar * filename)
@@ -218,8 +229,7 @@
 
 if (filenamefromtags)
 {
- gchar *utf8 = tuple_formatter_make_title_string(tuple, aud_get_gentitle_format());
-
+ gchar * utf8 = aud_playlist_entry_get_title (playlist, pos, FALSE);
 string_replace_char (utf8, '/', ' ');
 filename = string_encode_percent (utf8, FALSE);
 g_free (utf8);
@@ -344,8 +354,6 @@
 
 static void configure_ok_cb(gpointer data)
 {
- mcs_handle_t *db;
-
 fileext = gtk_combo_box_get_active(GTK_COMBO_BOX(fileext_combo));
 
 g_free (file_path);
@@ -357,15 +365,12 @@
 prependnumber =
 gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prependnumber_toggle));
 
- db = aud_cfg_db_open();
- aud_cfg_db_set_int(db, "filewriter", "fileext", fileext);
- aud_cfg_db_set_string(db, "filewriter", "file_path", file_path);
- aud_cfg_db_set_bool(db, "filewriter", "save_original", save_original);
- aud_cfg_db_set_bool(db, "filewriter", "filenamefromtags", filenamefromtags);
- aud_cfg_db_set_bool(db, "filewriter", "use_suffix", use_suffix);
- aud_cfg_db_set_bool(db, "filewriter", "prependnumber", prependnumber);
-
- aud_cfg_db_close(db);
+ aud_set_int ("filewriter", "fileext", fileext);
+ aud_set_bool ("filewriter", "filenamefromtags", filenamefromtags);
+ aud_set_string ("filewriter", "file_path", file_path);
+ aud_set_bool ("filewriter", "prependnumber", prependnumber);
+ aud_set_bool ("filewriter", "save_original", save_original);
+ aud_set_bool ("filewriter", "use_suffix", use_suffix);
 
 gtk_widget_destroy(configure_win);
 if (path_dirbrowser)
@@ -596,6 +601,7 @@
 (
 .name = "FileWriter",
 .init = file_init,
+ .cleanup = file_cleanup,
 .about = file_about,
 .configure = file_configure,
 .probe_priority = 0,

audacious-plugins-3.0.3.tar.bz2/src/filewriter/mp3.c -> audacious-plugins-3.1.tar.bz2/src/filewriter/mp3.c Changed

@@ -28,8 +28,8 @@
 
 #include <lame/lame.h>
 
-#include <audacious/configdb.h>
 #include <audacious/debug.h>
+#include <audacious/misc.h>
 #include <audacious/gtk-compat.h>
 
 #define MODES 4
@@ -89,28 +89,6 @@
 static unsigned long numsamples = 0;
 static int inside;
 
-static gint vbr_on = 0;
-static gint vbr_type = 0;
-static gint vbr_min_val = 32;
-static gint vbr_max_val = 320;
-static gint enforce_min_val = 0;
-static gint vbr_quality_val = 4;
-static gint abr_val = 128;
-static gint toggle_xing_val = 1;
-static gint mark_original_val = 1;
-static gint mark_copyright_val = 0;
-static gint force_v2_val = 0;
-static gint only_v1_val = 0;
-static gint only_v2_val = 0;
-static gint algo_quality_val = 5;
-static gint out_samplerate_val = 0;
-static gint bitrate_val = 128;
-static gfloat compression_val = 11;
-static gint enc_toggle_val = 0;
-static gint audio_mode_val = MODE_AUTO;
-static gint enforce_iso_val = 0;
-static gint error_protect_val = 0;
-
 static gint available_samplerates[] =
 { 8000, 11025, 12000, 16000, 22050, 24000, 32000, 44100, 48000 } ;
 
@@ -157,41 +135,63 @@
 (void) vfprintf(stdout, format, ap);
 }
 
+static const gchar * const mp3_defaults[] = {
+ "vbr_on", "0",
+ "vbr_type", "0",
+ "vbr_min_val", "32",
+ "vbr_max_val", "320",
+ "enforce_min_val", "0",
+ "vbr_quality_val", "4",
+ "abr_val", "128",
+ "toggle_xing_val", "1",
+ "mark_original_val", "1",
+ "mark_copyright_val", "0",
+ "force_v2_val", "0",
+ "only_v1_val", "0",
+ "only_v2_val", "0",
+ "algo_quality_val", "5",
+ "out_samplerate_val", "0",
+ "bitrate_val", "128",
+ "compression_val", "11",
+ "enc_toggle_val", "0",
+ "audio_mode_val", "4", /* MODE_AUTO */
+ "enforce_iso_val", "0",
+ "error_protect_val", "0",
+ NULL};
+
+static gint vbr_on, vbr_type, vbr_min_val, vbr_max_val, enforce_min_val,
+ vbr_quality_val, abr_val, toggle_xing_val, mark_original_val,
+ mark_copyright_val, force_v2_val, only_v1_val, only_v2_val, algo_quality_val,
+ out_samplerate_val, bitrate_val;
+static gfloat compression_val;
+static gint enc_toggle_val, audio_mode_val, enforce_iso_val, error_protect_val;
+
 static void mp3_init(write_output_callback write_output_func)
 {
- mcs_handle_t *db = aud_cfg_db_open();
- aud_cfg_db_get_int(db, "filewriter_mp3", "vbr_on", &vbr_on);
- aud_cfg_db_get_int(db, "filewriter_mp3", "vbr_type", &vbr_type);
- aud_cfg_db_get_int(db, "filewriter_mp3", "vbr_min_val", &vbr_min_val);
- aud_cfg_db_get_int(db, "filewriter_mp3", "vbr_max_val", &vbr_max_val);
- aud_cfg_db_get_int(db, "filewriter_mp3", "enforce_min_val",
- &enforce_min_val);
- aud_cfg_db_get_int(db, "filewriter_mp3", "vbr_quality_val",
- &vbr_quality_val);
- aud_cfg_db_get_int(db, "filewriter_mp3", "abr_val", &abr_val);
- aud_cfg_db_get_int(db, "filewriter_mp3", "toggle_xing_val",
- &toggle_xing_val);
- aud_cfg_db_get_int(db, "filewriter_mp3", "mark_original_val",
- &mark_original_val);
- aud_cfg_db_get_int(db, "filewriter_mp3", "mark_copyright_val",
- &mark_copyright_val);
- aud_cfg_db_get_int(db, "filewriter_mp3", "force_v2_val", &force_v2_val);
- aud_cfg_db_get_int(db, "filewriter_mp3", "only_v1_val", &only_v1_val);
- aud_cfg_db_get_int(db, "filewriter_mp3", "only_v2_val", &only_v2_val);
- aud_cfg_db_get_int(db, "filewriter_mp3", "algo_quality_val",
- &algo_quality_val);
- aud_cfg_db_get_int(db, "filewriter_mp3", "out_samplerate_val",
- &out_samplerate_val);
- aud_cfg_db_get_int(db, "filewriter_mp3", "bitrate_val", &bitrate_val);
- aud_cfg_db_get_float(db, "filewriter_mp3", "compression_val",
- &compression_val);
- aud_cfg_db_get_int(db, "filewriter_mp3", "enc_toggle_val", &enc_toggle_val);
- aud_cfg_db_get_int(db, "filewriter_mp3", "audio_mode_val", &audio_mode_val);
- aud_cfg_db_get_int(db, "filewriter_mp3", "enforce_iso_val",
- &enforce_iso_val);
- aud_cfg_db_get_int(db, "filewriter_mp3", "error_protect_val",
- &error_protect_val);
- aud_cfg_db_close(db);
+ aud_config_set_defaults ("filewriter_mp3", mp3_defaults);
+
+ vbr_on = aud_get_int ("filewriter_mp3", "vbr_on");
+ vbr_type = aud_get_int ("filewriter_mp3", "vbr_type");
+ vbr_min_val = aud_get_int ("filewriter_mp3", "vbr_min_val");
+ vbr_max_val = aud_get_int ("filewriter_mp3", "vbr_max_val");
+ enforce_min_val = aud_get_int ("filewriter_mp3", "enforce_min_val");
+ vbr_quality_val = aud_get_int ("filewriter_mp3", "vbr_quality_val");
+ abr_val = aud_get_int ("filewriter_mp3", "abr_val");
+ toggle_xing_val = aud_get_int ("filewriter_mp3", "toggle_xing_val");
+ mark_original_val = aud_get_int ("filewriter_mp3", "mark_original_val");
+ mark_copyright_val = aud_get_int ("filewriter_mp3", "mark_copyright_val");
+ force_v2_val = aud_get_int ("filewriter_mp3", "force_v2_val");
+ only_v1_val = aud_get_int ("filewriter_mp3", "only_v1_val");
+ only_v2_val = aud_get_int ("filewriter_mp3", "only_v2_val");
+ algo_quality_val = aud_get_int ("filewriter_mp3", "algo_quality_val");
+ out_samplerate_val = aud_get_int ("filewriter_mp3", "out_samplerate_val");
+ bitrate_val = aud_get_int ("filewriter_mp3", "bitrate_val");
+ compression_val = aud_get_double ("filewriter_mp3", "compression_val");
+ enc_toggle_val = aud_get_int ("filewriter_mp3", "enc_toggle_val");
+ audio_mode_val = aud_get_int ("filewriter_mp3", "audio_mode_val");
+ enforce_iso_val = aud_get_int ("filewriter_mp3", "enforce_iso_val");
+ error_protect_val = aud_get_int ("filewriter_mp3", "error_protect_val");
+
 if (write_output_func)
 write_output=write_output_func;
 }
@@ -410,7 +410,7 @@
 static void samplerate_changed (GtkComboBox * combo)
 {
 gint i = gtk_combo_box_get_active (combo) - 1;
- 
+
 if (i >= 0 && i < G_N_ELEMENTS (available_samplerates))
 out_samplerate_val = available_samplerates[i];
 else
@@ -420,7 +420,7 @@
 static void bitrate_changed (GtkComboBox * combo)
 {
 gint i = gtk_combo_box_get_active (combo);
- 
+
 if (i >= 0 && i < G_N_ELEMENTS (available_bitrates))
 bitrate_val = available_bitrates[i];
 else
@@ -445,7 +445,7 @@
 static void mode_changed (GtkComboBox * combo)
 {
 gint i = gtk_combo_box_get_active (combo);
- 
+
 if (i >= 0 && i < MODES)
 audio_mode_val = modes[i];
 else
@@ -523,7 +523,7 @@
 static void vbr_min_changed (GtkComboBox * combo)
 {
 gint i = gtk_combo_box_get_active (combo);
- 
+
 if (i >= 0 && i < G_N_ELEMENTS (available_bitrates))
 vbr_min_val = available_bitrates[i];
 else
@@ -533,7 +533,7 @@
 static void vbr_max_changed (GtkComboBox * combo)
 {
 gint i = gtk_combo_box_get_active (combo);
- 
+
 if (i >= 0 && i < G_N_ELEMENTS (available_bitrates))
 vbr_max_val = available_bitrates[i];
 else
@@ -564,7 +564,7 @@
 static void abr_changed (GtkComboBox * combo)
 {
 gint i = gtk_combo_box_get_active (combo);
- 
+
 if (i >= 0 && i < G_N_ELEMENTS (available_bitrates))
 abr_val = available_bitrates[i];
 else
@@ -664,42 +664,30 @@
 
 static void configure_ok_cb(gpointer data)
 {
- mcs_handle_t *db;
-
 if (vbr_min_val > vbr_max_val)
 vbr_max_val = vbr_min_val;
 
- db = aud_cfg_db_open();
-
- aud_cfg_db_set_int(db, "filewriter_mp3", "vbr_on", vbr_on);
- aud_cfg_db_set_int(db, "filewriter_mp3", "vbr_type", vbr_type);
- aud_cfg_db_set_int(db, "filewriter_mp3", "vbr_min_val", vbr_min_val);
- aud_cfg_db_set_int(db, "filewriter_mp3", "vbr_max_val", vbr_max_val);
- aud_cfg_db_set_int(db, "filewriter_mp3", "enforce_min_val", enforce_min_val);
- aud_cfg_db_set_int(db, "filewriter_mp3", "vbr_quality_val", vbr_quality_val);
- aud_cfg_db_set_int(db, "filewriter_mp3", "abr_val", abr_val);
- aud_cfg_db_set_int(db, "filewriter_mp3", "toggle_xing_val", toggle_xing_val);
- aud_cfg_db_set_int(db, "filewriter_mp3", "mark_original_val",
- mark_original_val);
- aud_cfg_db_set_int(db, "filewriter_mp3", "mark_copyright_val",
- mark_copyright_val);
- aud_cfg_db_set_int(db, "filewriter_mp3", "force_v2_val", force_v2_val);
- aud_cfg_db_set_int(db, "filewriter_mp3", "only_v1_val", only_v1_val);
- aud_cfg_db_set_int(db, "filewriter_mp3", "only_v2_val", only_v2_val);
- aud_cfg_db_set_int(db, "filewriter_mp3", "algo_quality_val",
- algo_quality_val);
- aud_cfg_db_set_int(db, "filewriter_mp3", "out_samplerate_val",
- out_samplerate_val);
- aud_cfg_db_set_int(db, "filewriter_mp3", "bitrate_val", bitrate_val);
- aud_cfg_db_set_float(db, "filewriter_mp3", "compression_val",
- compression_val);
- aud_cfg_db_set_int(db, "filewriter_mp3", "enc_toggle_val", enc_toggle_val);
- aud_cfg_db_set_int(db, "filewriter_mp3", "audio_mode_val", audio_mode_val);
- aud_cfg_db_set_int(db, "filewriter_mp3", "enforce_iso_val", enforce_iso_val);
- aud_cfg_db_set_int(db, "filewriter_mp3", "error_protect_val",
- error_protect_val);
- aud_cfg_db_close(db);
-
+ aud_set_int ("filewriter_mp3", "vbr_on", vbr_on);
+ aud_set_int ("filewriter_mp3", "vbr_type", vbr_type);
+ aud_set_int ("filewriter_mp3", "vbr_min_val", vbr_min_val);
+ aud_set_int ("filewriter_mp3", "vbr_max_val", vbr_max_val);
+ aud_set_int ("filewriter_mp3", "enforce_min_val", enforce_min_val);
+ aud_set_int ("filewriter_mp3", "vbr_quality_val", vbr_quality_val);
+ aud_set_int ("filewriter_mp3", "abr_val", abr_val);
+ aud_set_int ("filewriter_mp3", "toggle_xing_val", toggle_xing_val);
+ aud_set_int ("filewriter_mp3", "mark_original_val", mark_original_val);
+ aud_set_int ("filewriter_mp3", "mark_copyright_val", mark_copyright_val);
+ aud_set_int ("filewriter_mp3", "force_v2_val", force_v2_val);
+ aud_set_int ("filewriter_mp3", "only_v1_val", only_v1_val);
+ aud_set_int ("filewriter_mp3", "only_v2_val", only_v2_val);
+ aud_set_int ("filewriter_mp3", "algo_quality_val", algo_quality_val);
+ aud_set_int ("filewriter_mp3", "out_samplerate_val", out_samplerate_val);
+ aud_set_int ("filewriter_mp3", "bitrate_val", bitrate_val);
+ aud_set_double ("filewriter_mp3", "compression_val", compression_val);
+ aud_set_int ("filewriter_mp3", "enc_toggle_val", enc_toggle_val);
+ aud_set_int ("filewriter_mp3", "audio_mode_val", audio_mode_val);
+ aud_set_int ("filewriter_mp3", "enforce_iso_val", enforce_iso_val);
+ aud_set_int ("filewriter_mp3", "error_protect_val", error_protect_val);
 
 gtk_widget_destroy(configure_win);
 }
@@ -789,7 +777,7 @@
 gchar buf[10];
 snprintf (buf, sizeof buf, "%d", available_samplerates[i]);
 gtk_combo_box_text_append_text ((GtkComboBoxText *) combo, buf);
- 
+
 if (out_samplerate_val == available_samplerates[i])
 gtk_combo_box_set_active ((GtkComboBox *) combo, 1 + i);
 }
@@ -840,7 +828,7 @@
 gchar buf[10];
 snprintf (buf, sizeof buf, "%d", available_bitrates[i]);
 gtk_combo_box_text_append_text ((GtkComboBoxText *) combo, buf);
- 
+
 if (bitrate_val == available_bitrates[i])
 gtk_combo_box_set_active ((GtkComboBox *) combo, i);
 }
@@ -900,7 +888,7 @@
 {
 gtk_combo_box_text_append_text ((GtkComboBoxText *) combo,
 _(mode_names[i]));
- 
+
 if (audio_mode_val == modes[i])
 gtk_combo_box_set_active ((GtkComboBox *) combo, i);
 }
@@ -1025,7 +1013,7 @@
 gchar buf[10];
 snprintf (buf, sizeof buf, "%d", available_bitrates[i]);
 gtk_combo_box_text_append_text ((GtkComboBoxText *) combo, buf);
- 
+
 if (vbr_min_val == available_bitrates[i])
 gtk_combo_box_set_active ((GtkComboBox *) combo, i);
 }
@@ -1052,7 +1040,7 @@
 gchar buf[10];
 snprintf (buf, sizeof buf, "%d", available_bitrates[i]);
 gtk_combo_box_text_append_text ((GtkComboBoxText *) combo, buf);
- 
+
 if (vbr_max_val == available_bitrates[i])
 gtk_combo_box_set_active ((GtkComboBox *) combo, i);
 }
@@ -1096,7 +1084,7 @@
 gchar buf[10];
 snprintf (buf, sizeof buf, "%d", available_bitrates[i]);
 gtk_combo_box_text_append_text ((GtkComboBoxText *) combo, buf);
- 
+
 if (abr_val == available_bitrates[i])
 gtk_combo_box_set_active ((GtkComboBox *) combo, i);
 }

audacious-plugins-3.0.3.tar.bz2/src/filewriter/vorbis.c -> audacious-plugins-3.1.tar.bz2/src/filewriter/vorbis.c Changed

@@ -27,8 +27,8 @@
 #include <stdlib.h>
 #include <stdint.h>
 
-#include <audacious/configdb.h>
 #include <audacious/gtk-compat.h>
+#include <audacious/misc.h>
 
 static void vorbis_init(write_output_callback write_output_func);
 static void vorbis_configure(void);
@@ -47,8 +47,6 @@
 .format_required = FMT_FLOAT,
 };
 
-static float v_base_quality = 0.5;
-
 static ogg_stream_state os;
 static ogg_page og;
 static ogg_packet op;
@@ -58,13 +56,17 @@
 static vorbis_info vi;
 static vorbis_comment vc;
 
+static const gchar * const vorbis_defaults[] = {
+ "base_quality", "0.5",
+ NULL};
+
+static gdouble v_base_quality;
+
 static void vorbis_init(write_output_callback write_output_func)
 {
- mcs_handle_t *db = aud_cfg_db_open();
+ aud_config_set_defaults ("filewriter_vorbis", vorbis_defaults);
 
- aud_cfg_db_get_float(db, "filewriter_vorbis", "base_quality", &v_base_quality);
-
- aud_cfg_db_close(db);
+ v_base_quality = aud_get_double ("filewriter_vorbis", "base_quality");
 
 if (write_output_func)
 write_output=write_output_func;
@@ -215,11 +217,7 @@
 
 static void configure_ok_cb(gpointer data)
 {
- mcs_handle_t *db = aud_cfg_db_open();
-
- aud_cfg_db_set_float(db, "filewrite_vorbis", "base_quality", v_base_quality);
-
- aud_cfg_db_close(db);
+ aud_set_double ("filewrite_vorbis", "base_quality", v_base_quality);
 
 gtk_widget_hide(configure_win);
 }

audacious-plugins-3.0.3.tar.bz2/src/gio/Makefile -> audacious-plugins-3.1.tar.bz2/src/gio/Makefile Changed

audacious-plugins-3.0.3.tar.bz2/src/gtkui/Makefile -> audacious-plugins-3.1.tar.bz2/src/gtkui/Makefile Changed

audacious-plugins-3.0.3.tar.bz2/src/gtkui/columns.c -> audacious-plugins-3.1.tar.bz2/src/gtkui/columns.c Changed

@@ -25,11 +25,11 @@
 
 #include <audacious/gtk-compat.h>
 #include <audacious/i18n.h>
+#include <audacious/misc.h>
 #include <libaudcore/index.h>
 #include <libaudgui/list.h>
 
 #include "config.h"
-#include "gtkui_cfg.h"
 #include "ui_playlist_notebook.h"
 #include "ui_playlist_widget.h"
 
@@ -47,33 +47,25 @@
 
 void pw_col_init (void)
 {
- if (! config.playlist_columns || ! config.playlist_columns[0])
- {
- g_free (config.playlist_columns);
- config.playlist_columns = g_strdup ("number title artist album queued "
- "length");
- }
-
 pw_num_cols = 0;
- const gchar * c = config.playlist_columns;
- while (pw_num_cols < PW_COLS)
- {
- while (* c == ' ' || * c == ',')
- c ++;
- if (! * c)
- break;
 
+ gchar * columns = aud_get_string ("gtkui", "playlist_columns");
+ gchar * * split = g_strsplit (columns, " ", -1);
+
+ for (gchar * * elem = split; * elem && pw_num_cols < PW_COLS; elem ++)
+ {
 gint i = 0;
- while (i < PW_COLS && strncasecmp (c, pw_col_keys[i], strlen
- (pw_col_keys[i])))
+ while (i < PW_COLS && strcmp (* elem, pw_col_keys[i]))
 i ++;
 
 if (i == PW_COLS)
 break;
 
 pw_cols[pw_num_cols ++] = i;
- c += strlen (pw_col_keys[i]);
 }
+
+ g_strfreev (split);
+ g_free (columns);
 }
 
 typedef struct {
@@ -362,9 +354,8 @@
 break;
 }
 
- g_free (config.playlist_columns);
- config.playlist_columns = s->str;
- g_string_free (s, FALSE);
+ aud_set_string ("gtkui", "playlist_columns", s->str);
+ g_string_free (s, TRUE);
 }
 
 void pw_col_cleanup (void)

audacious-plugins-3.0.3.tar.bz2/src/gtkui/layout.c -> audacious-plugins-3.1.tar.bz2/src/gtkui/layout.c Changed

@@ -19,7 +19,6 @@
 * using our public API to be a derived work.
 */
 
-#include <limits.h>
 #include <string.h>
 
 #include <gdk/gdkkeysyms.h>
@@ -33,7 +32,8 @@
 #include "config.h"
 #include "layout.h"
 
-#define LAYOUT_FILE "gtkui-layout"
+#define DEFAULT_WIDTH 300
+#define DEFAULT_HEIGHT 200
 
 enum {DOCK_LEFT, DOCK_RIGHT, DOCK_TOP, DOCK_BOTTOM, DOCKS};
 
@@ -222,7 +222,8 @@
 item->name = g_strdup (name);
 item->widget = item->vbox = item->paned = item->window = NULL;
 item->dock = item->x = item->y = -1;
- item->w = item->h = 0;
+ item->w = DEFAULT_WIDTH;
+ item->h = DEFAULT_HEIGHT;
 items = g_list_append (items, item);
 return item;
 }
@@ -438,6 +439,12 @@
 {
 item->w = rect->width;
 item->h = rect->height;
+
+ if (item->dock < 0)
+ {
+ g_return_if_fail (item->window);
+ gtk_window_get_position ((GtkWindow *) item->window, & item->x, & item->y);
+ }
 }
 
 void layout_add (GtkWidget * widget, const gchar * name)
@@ -505,99 +512,48 @@
 
 void layout_save (void)
 {
- gchar scratch[PATH_MAX];
- FILE * handle;
-
- snprintf (scratch, sizeof scratch, "%s/" LAYOUT_FILE,
- aud_get_path (AUD_PATH_USER_DIR));
- handle = fopen (scratch, "w");
- g_return_if_fail (handle);
+ gint i = 0;
 
 for (GList * node = items; node; node = node->next)
 {
 Item * item = node->data;
 g_return_if_fail (item && item->name);
 
- fprintf (handle, "item %s\npane %d\nx %d\ny %d\nw %d\nh %d\n",
- item->name, item->dock, item->x, item->y, item->w, item->h);
- }
-
- fclose (handle);
-}
+ gchar key[16], value[64];
 
-static gchar parse_key[512];
-static gchar * parse_value;
-
-static void parse_next (FILE * handle)
-{
- parse_value = NULL;
+ snprintf (key, sizeof key, "item%d_name", i);
+ aud_set_string ("gtkui-layout", key, item->name);
 
- if (fgets (parse_key, sizeof parse_key, handle) == NULL)
- return;
+ snprintf (key, sizeof key, "item%d_pos", i);
+ snprintf (value, sizeof value, "%d,%d,%d,%d,%d", item->dock, item->x,
+ item->y, item->w, item->h);
+ aud_set_string ("gtkui-layout", key, value);
 
- gchar * space = strchr (parse_key, ' ');
- if (space == NULL)
- return;
-
- * space = 0;
- parse_value = space + 1;
-
- gchar * newline = strchr (parse_value, '\n');
- if (newline != NULL)
- * newline = 0;
-}
-
-static gboolean parse_integer (const gchar * key, gint * value)
-{
- return (parse_value != NULL && ! strcmp (parse_key, key) && sscanf
- (parse_value, "%d", value) == 1);
-}
+ i ++;
+ }
 
-static const gchar * parse_string (const gchar * key)
-{
- return (parse_value != NULL && ! strcmp (parse_key, key)) ? parse_value : NULL;
+ aud_set_int ("gtkui-layout", "item_count", i);
 }
 
 void layout_load (void)
 {
 g_return_if_fail (! items);
 
- gchar scratch[PATH_MAX];
- FILE * handle;
+ gint count = aud_get_int ("gtkui-layout", "item_count");
 
- snprintf (scratch, sizeof scratch, "%s/" LAYOUT_FILE,
- aud_get_path (AUD_PATH_USER_DIR));
- handle = fopen (scratch, "r");
- if (! handle)
- return;
-
- while (1)
+ for (gint i = 0; i < count; i ++)
 {
- parse_next (handle);
- const gchar * name = parse_string ("item");
- if (! name)
- break;
+ gchar key[16];
 
+ snprintf (key, sizeof key, "item%d_name", i);
+ gchar * name = aud_get_string ("gtkui-layout", key);
 Item * item = item_new (name);
+ g_free (name);
 
- parse_next (handle);
- if (! parse_integer ("pane", & item->dock))
- break;
- parse_next (handle);
- if (! parse_integer ("x", & item->x))
- break;
- parse_next (handle);
- if (! parse_integer ("y", & item->y))
- break;
- parse_next (handle);
- if (! parse_integer ("w", & item->w))
- break;
- parse_next (handle);
- if (! parse_integer ("h", & item->h))
- break;
+ snprintf (key, sizeof key, "item%d_pos", i);
+ gchar * pos = aud_get_string ("gtkui-layout", key);
+ sscanf (pos, "%d,%d,%d,%d,%d", & item->dock, & item->x, & item->y, & item->w, & item->h);
 }
-
- fclose (handle);
 }
 
 void layout_cleanup (void)

audacious-plugins-3.0.3.tar.bz2/src/gtkui/menus.c -> audacious-plugins-3.1.tar.bz2/src/gtkui/menus.c Changed

@@ -22,7 +22,6 @@
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
-#include <audacious/audconfig.h>
 #include <audacious/drct.h>
 #include <audacious/gtk-compat.h>
 #include <audacious/i18n.h>
@@ -34,7 +33,6 @@
 
 #include "config.h"
 #include "gtkui.h"
-#include "gtkui_cfg.h"
 #include "playlist_util.h"
 #include "ui_playlist_notebook.h"
 #include "ui_playlist_widget.h"
@@ -73,14 +71,14 @@
 static void add_files (void) {audgui_run_filebrowser (FALSE); }
 static void add_url (void) {audgui_show_add_url_window (FALSE); }
 
-static gboolean repeat_get (void) {return aud_cfg->repeat; }
-static void repeat_set (gboolean on) {aud_cfg->repeat = on; }
-static gboolean shuffle_get (void) {return aud_cfg->shuffle; }
-static void shuffle_set (gboolean on) {aud_cfg->shuffle = on; }
-static gboolean no_advance_get (void) {return aud_cfg->no_playlist_advance; }
-static void no_advance_set (gboolean on) {aud_cfg->no_playlist_advance = on; }
-static gboolean stop_after_get (void) {return aud_cfg->stopaftersong; }
-static void stop_after_set (gboolean on) {aud_cfg->stopaftersong = on; }
+static gboolean repeat_get (void) {return aud_get_bool (NULL, "repeat"); }
+static void repeat_set (gboolean on) {aud_set_bool (NULL, "repeat", on); }
+static gboolean shuffle_get (void) {return aud_get_bool (NULL, "shuffle"); }
+static void shuffle_set (gboolean on) {aud_set_bool (NULL, "shuffle", on); }
+static gboolean no_advance_get (void) {return aud_get_bool (NULL, "no_playlist_advance"); }
+static void no_advance_set (gboolean on) {aud_set_bool (NULL, "no_playlist_advance", on); }
+static gboolean stop_after_get (void) {return aud_get_bool (NULL, "stop_after_current_song"); }
+static void stop_after_set (gboolean on) {aud_set_bool (NULL, "stop_after_current_song", on); }
 
 static void pl_sort_track (void) {aud_playlist_sort_by_scheme (aud_playlist_get_active (), PLAYLIST_SORT_TRACK); }
 static void pl_sort_title (void) {aud_playlist_sort_by_scheme (aud_playlist_get_active (), PLAYLIST_SORT_TITLE); }
@@ -121,12 +119,12 @@
 aud_drct_set_volume_main (vol - 5);
 }
 
-static gboolean menu_bar_get (void) {return config.menu_visible; }
-static gboolean info_bar_get (void) {return config.infoarea_visible; }
-static gboolean status_bar_get (void) {return config.statusbar_visible; }
-static gboolean column_headers_get (void) {return config.playlist_headers; }
-static gboolean autoscroll_get (void) {return config.autoscroll; }
-static void autoscroll_set (gboolean on) {config.autoscroll = on; };
+static gboolean menu_bar_get (void) {return aud_get_bool ("gtkui", "menu_visible"); }
+static gboolean info_bar_get (void) {return aud_get_bool ("gtkui", "infoarea_visible"); }
+static gboolean status_bar_get (void) {return aud_get_bool ("gtkui", "statusbar_visible"); }
+static gboolean column_headers_get (void) {return aud_get_bool ("gtkui", "playlist_headers"); }
+static gboolean autoscroll_get (void) {return aud_get_bool ("gtkui", "autoscroll"); }
+static void autoscroll_set (gboolean on) {aud_set_bool ("gtkui", "autoscroll", on); }
 
 static const struct MenuItem file_items[] = {
 {N_("_Open Files ..."), GTK_STOCK_OPEN, 'l', .func = open_files},
@@ -145,10 +143,10 @@
 {N_("Pre_vious"), GTK_STOCK_MEDIA_PREVIOUS, 'z', .func = aud_drct_pl_prev},
 {N_("_Next"), GTK_STOCK_MEDIA_NEXT, 'b', .func = aud_drct_pl_next},
 {.sep = TRUE},
- {N_("_Repeat"), NULL, 'r', .get = repeat_get, repeat_set, "toggle repeat"},
- {N_("S_huffle"), NULL, 's', .get = shuffle_get, shuffle_set, "toggle shuffle"},
- {N_("N_o Playlist Advance"), NULL, 'n', CTRL, .get = no_advance_get, no_advance_set, "toggle no playlist advance"},
- {N_("Stop _After This Song"), NULL, 'm', CTRL, .get = stop_after_get, stop_after_set, "toggle stop after song"},
+ {N_("_Repeat"), NULL, 'r', .get = repeat_get, repeat_set, "set repeat"},
+ {N_("S_huffle"), NULL, 's', .get = shuffle_get, shuffle_set, "set shuffle"},
+ {N_("N_o Playlist Advance"), NULL, 'n', CTRL, .get = no_advance_get, no_advance_set, "set no_playlist_advance"},
+ {N_("Stop _After This Song"), NULL, 'm', CTRL, .get = stop_after_get, stop_after_set, "set stop_after_current_song"},
 {.sep = TRUE},
 {N_("Song _Info ..."), GTK_STOCK_INFO, 'i', .func = audgui_infowin_show_current},
 {N_("Jump to _Time ..."), GTK_STOCK_JUMP_TO, 'j', CTRL, .func = audgui_jump_to_time},
@@ -177,7 +175,8 @@
 {N_("_Import ..."), GTK_STOCK_OPEN, 'o', .func = audgui_import_playlist},
 {N_("_Export ..."), GTK_STOCK_SAVE, 's', SHIFT, .func = audgui_export_playlist},
 {.sep = TRUE},
- {N_("_Playlist Manager ..."), AUD_STOCK_PLAYLIST, 'p', .func = audgui_playlist_manager}};
+ {N_("_Playlist Manager ..."), AUD_STOCK_PLAYLIST, 'p', .func = audgui_playlist_manager},
+ {N_("_Queue Manager ..."), AUD_STOCK_QUEUETOGGLE, 'u', CTRL, .func = audgui_queue_manager_show}};
 
 static const struct MenuItem output_items[] = {
 {N_("Volume _Up"), GTK_STOCK_GO_UP, '+', .func = volume_up},
@@ -219,7 +218,8 @@
 {N_("_Services"), .get_sub = get_services_pl}};
 
 static const struct MenuItem tab_items[] = {
- {N_("_Rename"), GTK_STOCK_EDIT, GDK_F2, .func = pl_rename}};
+ {N_("_Rename"), GTK_STOCK_EDIT, GDK_F2, .func = pl_rename},
+ {N_("_Close"), GTK_STOCK_CLOSE, .func = pl_close}};
 
 static void toggled_cb (GtkCheckMenuItem * check, const struct MenuItem * item)
 {
@@ -227,9 +227,6 @@
 return;
 
 item->set (gtk_check_menu_item_get_active (check));
-
- if (item->hook)
- hook_call (item->hook, NULL);
 }
 
 static void hook_cb (void * data, GtkWidget * check)

audacious-plugins-3.0.3.tar.bz2/src/gtkui/ui_gtk.c -> audacious-plugins-3.1.tar.bz2/src/gtkui/ui_gtk.c Changed

@@ -20,7 +20,6 @@
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
-#include <audacious/audconfig.h>
 #include <audacious/debug.h>
 #include <audacious/drct.h>
 #include <audacious/gtk-compat.h>
@@ -34,7 +33,6 @@
 
 #include "config.h"
 #include "gtkui.h"
-#include "gtkui_cfg.h"
 #include "layout.h"
 #include "ui_playlist_notebook.h"
 #include "ui_playlist_widget.h"
@@ -42,6 +40,28 @@
 #include "ui_statusbar.h"
 #include "playlist_util.h"
 
+static const gchar * const gtkui_defaults[] = {
+ "infoarea_visible", "TRUE",
+ "menu_visible", "TRUE",
+ "player_visible", "TRUE",
+ "statusbar_visible", "TRUE",
+
+ "autoscroll", "TRUE",
+ "playlist_columns", "number title artist album queued length",
+ "playlist_headers", "TRUE",
+
+ "player_x", "-1",
+ "player_y", "-1",
+ "player_width", "600",
+ "player_height", "400",
+
+ /* hidden settings */
+ "always_on_top", "FALSE",
+ "save_window_position", "TRUE",
+ "show_song_titles", "TRUE",
+ "custom_playlist_colors", "FALSE",
+ NULL};
+
 static GtkWidget *volume;
 static gboolean volume_slider_is_moving = FALSE;
 static guint update_volume_timeout_source = 0;
@@ -87,12 +107,14 @@
 
 static void save_window_size (void)
 {
- gtk_window_get_position ((GtkWindow *) window, & config.player_x,
- & config.player_y);
+ gint x, y, w, h;
+ gtk_window_get_position ((GtkWindow *) window, & x, & y);
+ gtk_window_get_size ((GtkWindow *) window, & w, & h);
 
- if (gtk_window_get_resizable ((GtkWindow *) window))
- gtk_window_get_size ((GtkWindow *) window, & config.player_width,
- & config.player_height);
+ aud_set_int ("gtkui", "player_x", x);
+ aud_set_int ("gtkui", "player_y", y);
+ aud_set_int ("gtkui", "player_width", w);
+ aud_set_int ("gtkui", "player_height", h);
 }
 
 static gboolean window_delete()
@@ -126,13 +148,18 @@
 delayed_title_change_source = 0;
 }
 
- if (aud_drct_get_playing () && config.show_song_titles)
+ if (aud_drct_get_playing () && aud_get_bool ("gtkui", "show_song_titles"))
 {
- gchar * title = aud_drct_get_title ();
- gchar * title_s = g_strdup_printf (_("%s - Audacious"), title);
- gtk_window_set_title ((GtkWindow *) window, title_s);
- g_free (title_s);
- g_free (title);
+ if (aud_drct_get_ready ())
+ {
+ gchar * title = aud_drct_get_title ();
+ gchar * title_s = g_strdup_printf (_("%s - Audacious"), title);
+ gtk_window_set_title ((GtkWindow *) window, title_s);
+ g_free (title_s);
+ g_free (title);
+ }
+ else
+ gtk_window_set_title ((GtkWindow *) window, _("Buffering ..."));
 }
 else
 gtk_window_set_title ((GtkWindow *) window, _("Audacious"));
@@ -142,21 +169,28 @@
 
 static void ui_show (gboolean show)
 {
- config.player_visible = show;
+ aud_set_bool ("gtkui", "player_visible", show);
 
 if (show)
 {
- if (config.save_window_position && ! gtk_widget_get_visible (window))
- gtk_window_move ((GtkWindow *) window, config.player_x,
- config.player_y);
+ if (aud_get_bool ("gtkui", "save_window_position") && ! gtk_widget_get_visible (window))
+ {
+ gint x = aud_get_int ("gtkui", "player_x");
+ gint y = aud_get_int ("gtkui", "player_y");
+ gtk_window_move ((GtkWindow *) window, x, y);
+ }
 
 gtk_window_present ((GtkWindow *) window);
 }
 else if (gtk_widget_get_visible (window))
 {
- if (config.save_window_position)
- gtk_window_get_position ((GtkWindow *) window, & config.player_x,
- & config.player_y);
+ if (aud_get_bool ("gtkui", "save_window_position"))
+ {
+ gint x, y;
+ gtk_window_get_position ((GtkWindow *) window, & x, & y);
+ aud_set_int ("gtkui", "player_x", x);
+ aud_set_int ("gtkui", "player_y", y);
+ }
 
 gtk_widget_hide (window);
 }
@@ -164,7 +198,7 @@
 
 static gboolean ui_is_shown (void)
 {
- return config.player_visible;
+ return aud_get_bool ("gtkui", "player_visible");
 }
 
 static gboolean ui_is_focused (void)
@@ -185,8 +219,8 @@
 time /= 1000;
 
 if (time < 3600)
- snprintf (s + strlen (s), sizeof s - strlen (s), aud_cfg->leading_zero ?
- "%02d:%02d" : "%d:%02d", time / 60, time % 60);
+ snprintf (s + strlen (s), sizeof s - strlen (s), aud_get_bool (NULL,
+ "leading_zero") ? "%02d:%02d" : "%d:%02d", time / 60, time % 60);
 else
 snprintf (s + strlen (s), sizeof s - strlen (s), "%d:%02d:%02d", time /
 3600, (time / 60) % 60, time % 60);
@@ -196,9 +230,8 @@
 len /= 1000;
 
 if (len < 3600)
- snprintf (s + strlen (s), sizeof s - strlen (s),
- aud_cfg->leading_zero ? " / %02d:%02d" : " / %d:%02d", len / 60,
- len % 60);
+ snprintf (s + strlen (s), sizeof s - strlen (s), aud_get_bool (NULL,
+ "leading_zero") ? " / %02d:%02d" : " / %d:%02d", len / 60, len % 60);
 else
 snprintf (s + strlen (s), sizeof s - strlen (s), " / %d:%02d:%02d",
 len / 3600, (len / 60) % 60, len % 60);
@@ -330,7 +363,7 @@
 }
 }
 
-static void ui_playback_begin(gpointer hook_data, gpointer user_data)
+static void ui_playback_begin (void)
 {
 pause_cb ();
 gtk_widget_set_sensitive (button_stop, TRUE);
@@ -342,7 +375,11 @@
 * show "Buffering ..." as the window title. */
 delayed_title_change_source = g_timeout_add (250, (GSourceFunc)
 title_change_cb, NULL);
+}
 
+static void ui_playback_ready (void)
+{
+ title_change_cb ();
 set_slider_length (aud_drct_get_length ());
 time_counter_cb ();
 
@@ -354,7 +391,7 @@
 gtk_widget_show (label_time);
 }
 
-static void ui_playback_stop(gpointer hook_data, gpointer user_data)
+static void ui_playback_stop (void)
 {
 if (update_song_timeout_source)
 {
@@ -546,28 +583,18 @@
 
 static void update_toggles (void * data, void * user)
 {
- if (gtk_toggle_button_get_active ((GtkToggleButton *) button_repeat) != aud_cfg->repeat)
- gtk_toggle_button_set_active ((GtkToggleButton *) button_repeat, aud_cfg->repeat);
- if (gtk_toggle_button_get_active ((GtkToggleButton *) button_shuffle) != aud_cfg->shuffle)
- gtk_toggle_button_set_active ((GtkToggleButton *) button_shuffle, aud_cfg->shuffle);
+ gtk_toggle_button_set_active ((GtkToggleButton *) button_repeat, aud_get_bool (NULL, "repeat"));
+ gtk_toggle_button_set_active ((GtkToggleButton *) button_shuffle, aud_get_bool (NULL, "shuffle"));
 }
 
 static void toggle_repeat (GtkToggleButton * button, void * unused)
 {
- if (aud_cfg->repeat != gtk_toggle_button_get_active (button))
- {
- aud_cfg->repeat = gtk_toggle_button_get_active (button);
- hook_call ("toggle repeat", NULL);
- }
+ aud_set_bool (NULL, "repeat", gtk_toggle_button_get_active (button));
 }
 
 static void toggle_shuffle (GtkToggleButton * button, void * unused)
 {
- if (aud_cfg->shuffle != gtk_toggle_button_get_active (button))
- {
- aud_cfg->shuffle = gtk_toggle_button_get_active (button);
- hook_call ("toggle shuffle", NULL);
- }
+ aud_set_bool (NULL, "shuffle", gtk_toggle_button_get_active (button));
 }
 
 static void config_save (void)
@@ -575,23 +602,23 @@
 save_window_size ();
 layout_save ();
 pw_col_save ();
- gtkui_cfg_save ();
 }
 
 static void ui_hooks_associate(void)
 {
 hook_associate ("title change", (HookFunction) title_change_cb, NULL);
 hook_associate ("playback seek", (HookFunction) time_counter_cb, NULL);
- hook_associate("playback begin", ui_playback_begin, NULL);
+ hook_associate ("playback begin", (HookFunction) ui_playback_begin, NULL);
+ hook_associate ("playback ready", (HookFunction) ui_playback_ready, NULL);
 hook_associate ("playback pause", (HookFunction) pause_cb, NULL);
 hook_associate ("playback unpause", (HookFunction) pause_cb, NULL);
- hook_associate("playback stop", ui_playback_stop, NULL);
+ hook_associate ("playback stop", (HookFunction) ui_playback_stop, NULL);
 hook_associate("playlist update", ui_playlist_notebook_update, NULL);
 hook_associate ("playlist activate", ui_playlist_notebook_activate, NULL);
+ hook_associate ("playlist set playing", ui_playlist_notebook_set_playing, NULL);
 hook_associate ("playlist position", ui_playlist_notebook_position, NULL);
- hook_associate ("toggle stop after song", update_toggles, NULL);
- hook_associate ("toggle shuffle", update_toggles, NULL);
- hook_associate ("toggle repeat", update_toggles, NULL);
+ hook_associate ("set shuffle", update_toggles, NULL);
+ hook_associate ("set repeat", update_toggles, NULL);
 hook_associate ("config save", (HookFunction) config_save, NULL);
 }
 
@@ -599,16 +626,17 @@
 {
 hook_dissociate ("title change", (HookFunction) title_change_cb);
 hook_dissociate ("playback seek", (HookFunction) time_counter_cb);
- hook_dissociate("playback begin", ui_playback_begin);
+ hook_dissociate ("playback begin", (HookFunction) ui_playback_begin);
+ hook_dissociate ("playback ready", (HookFunction) ui_playback_ready);
 hook_dissociate ("playback pause", (HookFunction) pause_cb);
 hook_dissociate ("playback unpause", (HookFunction) pause_cb);
- hook_dissociate("playback stop", ui_playback_stop);
+ hook_dissociate ("playback stop", (HookFunction) ui_playback_stop);
 hook_dissociate("playlist update", ui_playlist_notebook_update);
 hook_dissociate ("playlist activate", ui_playlist_notebook_activate);
+ hook_dissociate ("playlist set playing", ui_playlist_notebook_set_playing);
 hook_dissociate ("playlist position", ui_playlist_notebook_position);
- hook_dissociate ("toggle stop after song", update_toggles);
- hook_dissociate ("toggle shuffle", update_toggles);
- hook_dissociate ("toggle repeat", update_toggles);
+ hook_dissociate ("set shuffle", update_toggles);
+ hook_dissociate ("set repeat", update_toggles);
 hook_dissociate ("config save", (HookFunction) config_save);
 }
 
@@ -619,24 +647,24 @@
 GtkWidget *shbox; /* box for volume control + slider + time combo --nenolod */
 GtkWidget *evbox;
 
- gtkui_cfg_load();
+ aud_config_set_defaults ("gtkui", gtkui_defaults);
 
 audgui_set_default_icon();
 audgui_register_stock_icons();
 
 pw_col_init ();
 
- window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
- gtk_window_set_default_size(GTK_WINDOW(window), MAINWIN_DEFAULT_WIDTH, MAINWIN_DEFAULT_HEIGHT);
- gtk_window_set_keep_above(GTK_WINDOW(window), config.always_on_top);
+ gint x = aud_get_int ("gtkui", "player_x");
+ gint y = aud_get_int ("gtkui", "player_y");
+ gint w = aud_get_int ("gtkui", "player_width");
+ gint h = aud_get_int ("gtkui", "player_height");
 
- if (config.save_window_position && config.player_width && config.player_height)
- gtk_window_resize(GTK_WINDOW(window), config.player_width, config.player_height);
+ window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+ gtk_window_set_default_size ((GtkWindow *) window, w, h);
+ gtk_window_set_keep_above ((GtkWindow *) window, aud_get_bool ("gtkui", "always_on_top"));
 
- if (config.save_window_position && config.player_x != -1)
- gtk_window_move(GTK_WINDOW(window), config.player_x, config.player_y);
- else
- gtk_window_move(GTK_WINDOW(window), MAINWIN_DEFAULT_POS_X, MAINWIN_DEFAULT_POS_Y);
+ if (aud_get_bool ("gtkui", "save_window_position") && (x != -1 || y != -1))
+ gtk_window_move ((GtkWindow *) window, x, y);
 
 g_signal_connect(G_OBJECT(window), "delete-event", G_CALLBACK(window_delete), NULL);
 
@@ -648,7 +676,7 @@
 
 menu_box = gtk_hbox_new (FALSE, 0);
 gtk_box_pack_start ((GtkBox *) vbox, menu_box, FALSE, FALSE, 0);
- show_menu (config.menu_visible);
+ show_menu (aud_get_bool ("gtkui", "menu_visible"));
 
 tophbox = gtk_hbox_new(FALSE, 0);
 gtk_box_pack_start(GTK_BOX(vbox), tophbox, FALSE, TRUE, 0);
@@ -694,12 +722,6 @@
 
 gtk_box_pack_end ((GtkBox *) shbox, label_time, FALSE, FALSE, 6);
 
- /* XXX: LOL REALLY BAD HACK FOR MOODBAR PLUGIN. Remove once AUD-283 is solved.
- * Because, I mean, who cares if this stuff is supposed to be final. --nenolod */
- mowgli_global_storage_put("gtkui.shbox", shbox);
- mowgli_global_storage_put("gtkui.slider", slider);
- mowgli_global_storage_put("gtkui.label_time", label_time);
-
 volume = gtk_volume_button_new();
 gtk_button_set_relief(GTK_BUTTON(volume), GTK_RELIEF_NONE);
 gtk_scale_button_set_adjustment(GTK_SCALE_BUTTON(volume), GTK_ADJUSTMENT(gtk_adjustment_new(0, 0, 100, 1, 5, 0)));
@@ -726,9 +748,8 @@
 ui_playlist_notebook_new ();
 g_object_ref (G_OBJECT(UI_PLAYLIST_NOTEBOOK));
 
- if (config.statusbar_visible)
+ if (aud_get_bool ("gtkui", "statusbar_visible"))
 {
- AUDDBG("statusbar setup\n");
 statusbar = ui_statusbar_new();
 gtk_box_pack_end(GTK_BOX(vbox), statusbar, FALSE, FALSE, 3);
 }
@@ -739,9 +760,8 @@
 gtk_box_pack_start ((GtkBox *) playlist_box, layout, TRUE, TRUE, 0);
 layout_add_center ((GtkWidget *) UI_PLAYLIST_NOTEBOOK);
 
- if (config.infoarea_visible)
+ if (aud_get_bool ("gtkui", "infoarea_visible"))
 {
- AUDDBG ("infoarea setup\n");
 infoarea = ui_infoarea_new ();
 gtk_box_pack_end (GTK_BOX(vbox), infoarea, FALSE, FALSE, 0);
 }
@@ -763,16 +783,20 @@
 
 g_signal_connect(window, "key-press-event", G_CALLBACK(ui_key_press_cb), NULL);
 
- if (aud_drct_get_playing())
- ui_playback_begin(NULL, NULL);
+ if (aud_drct_get_playing ())
+ {
+ ui_playback_begin ();
+ if (aud_drct_get_ready ())
+ ui_playback_ready ();
+ }
 else
- ui_playback_stop (NULL, NULL);
+ ui_playback_stop ();
 
 title_change_cb ();
 
 gtk_widget_show_all (vbox);
 
- if (config.player_visible)
+ if (aud_get_bool ("gtkui", "player_visible"))
 ui_show (TRUE);
 
 update_toggles (NULL, NULL);
@@ -812,7 +836,6 @@
 delayed_title_change_source = 0;
 }
 
- gtkui_cfg_free();
 ui_hooks_disassociate();
 
 pw_col_cleanup ();
@@ -825,9 +848,9 @@
 
 void show_menu (gboolean show)
 {
- config.menu_visible = show;
+ aud_set_bool ("gtkui", "menu_visible", show);
 
- if (config.menu_visible)
+ if (show)
 {
 if (menu_main)
 gtk_widget_destroy (menu_main);
@@ -857,9 +880,9 @@
 
 void show_infoarea (gboolean show)
 {
- config.infoarea_visible = show;
+ aud_set_bool ("gtkui", "infoarea_visible", show);
 
- if (config.infoarea_visible && ! infoarea)
+ if (show && ! infoarea)
 {
 infoarea = ui_infoarea_new ();
 gtk_box_pack_end ((GtkBox *) vbox, infoarea, FALSE, FALSE, 0);
@@ -867,7 +890,7 @@
 gtk_widget_show_all (infoarea);
 }
 
- if (! config.infoarea_visible && infoarea)
+ if (! show && infoarea)
 {
 gtk_widget_destroy (infoarea);
 infoarea = NULL;
@@ -876,9 +899,9 @@
 
 void show_statusbar (gboolean show)
 {
- config.statusbar_visible = show;
+ aud_set_bool ("gtkui", "statusbar_visible", show);
 
- if (config.statusbar_visible && ! statusbar)
+ if (show && ! statusbar)
 {
 statusbar = ui_statusbar_new ();
 gtk_box_pack_end ((GtkBox *) vbox, statusbar, FALSE, FALSE, 3);
@@ -889,7 +912,7 @@
 gtk_widget_show_all (statusbar);
 }
 
- if (! config.statusbar_visible && statusbar)
+ if (! show && statusbar)
 {
 gtk_widget_destroy (statusbar);
 statusbar = NULL;

audacious-plugins-3.0.3.tar.bz2/src/gtkui/ui_infoarea.c -> audacious-plugins-3.1.tar.bz2/src/gtkui/ui_infoarea.c Changed

@@ -59,45 +59,45 @@
 
 /****************************************************************************/
 
-static void vis_update_cb (const VisNode * vis, UIInfoArea * area)
+static UIInfoArea * area = NULL;
+
+static void vis_render_cb (const gfloat * freq)
 {
+ g_return_if_fail (area);
+
 const gfloat xscale[VIS_BANDS + 1] = {0.00, 0.59, 1.52, 3.00, 5.36, 9.10,
 15.0, 24.5, 39.4, 63.2, 101, 161, 256}; /* logarithmic scale - 1 */
 
- gint16 fft[2][256];
- aud_calc_mono_freq (fft, vis->data, vis->nch);
-
 for (gint i = 0; i < VIS_BANDS; i ++)
 {
 gint a = ceil (xscale[i]);
 gint b = floor (xscale[i + 1]);
- gint n = 0;
+ gfloat n = 0;
 
 if (b < a)
- n += fft[0][b] * (xscale[i + 1] - xscale[i]);
+ n += freq[b] * (xscale[i + 1] - xscale[i]);
 else
 {
 if (a > 0)
- n += fft[0][a - 1] * (a - xscale[i]);
+ n += freq[a - 1] * (a - xscale[i]);
 for (; a < b; a ++)
- n += fft[0][a];
+ n += freq[a];
 if (b < 256)
- n += fft[0][b] * (xscale[i + 1] - b);
+ n += freq[b] * (xscale[i + 1] - b);
 }
 
 /* 40 dB range */
- /* 0.00305 == 1 / 32767 * 10^(40/20) */
- n = 20 * log10 (n * 0.00305);
- n = CLAMP (n, 0, 40);
+ int x = 20 * log10 (n * 100);
+ x = CLAMP (x, 0, 40);
 
 area->bars[i] -= MAX (0, VIS_FALLOFF - area->delay[i]);
 
 if (area->delay[i])
 area->delay[i] --;
 
- if (n > area->bars[i])
+ if (x > area->bars[i])
 {
- area->bars[i] = n;
+ area->bars[i] = x;
 area->delay[i] = VIS_DELAY;
 }
 }
@@ -105,8 +105,10 @@
 gtk_widget_queue_draw (area->vis);
 }
 
-static void vis_clear_cb (void * hook_data, UIInfoArea * area)
+static void vis_clear_cb (void)
 {
+ g_return_if_fail (area);
+
 memset (area->bars, 0, sizeof area->bars);
 memset (area->delay, 0, sizeof area->delay);
 
@@ -237,18 +239,18 @@
 }
 
 #if GTK_CHECK_VERSION (3, 0, 0)
-static gboolean draw_vis_cb (GtkWidget * vis, cairo_t * cr, UIInfoArea * area)
+static gboolean draw_vis_cb (GtkWidget * vis, cairo_t * cr)
 {
 #else
-static gboolean expose_vis_cb (GtkWidget * vis, GdkEventExpose * event,
- UIInfoArea * area)
+static gboolean expose_vis_cb (GtkWidget * vis, GdkEventExpose * event)
 {
 cairo_t * cr = gdk_cairo_create (gtk_widget_get_window (vis));
 #endif
+ g_return_val_if_fail (area, FALSE);
 
 clear (vis, cr);
 
- for (auto gint i = 0; i < VIS_BANDS; i++)
+ for (gint i = 0; i < VIS_BANDS; i++)
 {
 gint x = SPACING + 8 * i;
 gint t = VIS_CENTER - area->bars[i];
@@ -272,8 +274,10 @@
 return TRUE;
 }
 
-static void draw_album_art (UIInfoArea * area, cairo_t * cr)
+static void draw_album_art (cairo_t * cr)
 {
+ g_return_if_fail (area);
+
 if (area->pb != NULL)
 {
 gdk_cairo_set_source_pixbuf (cr, area->pb, SPACING, SPACING);
@@ -287,8 +291,10 @@
 }
 }
 
-static void draw_title (UIInfoArea * area, cairo_t * cr)
+static void draw_title (cairo_t * cr)
 {
+ g_return_if_fail (area);
+
 GtkAllocation alloc;
 gtk_widget_get_allocation (area->main, & alloc);
 
@@ -316,19 +322,19 @@
 }
 
 #if GTK_CHECK_VERSION (3, 0, 0)
-static gboolean draw_cb (GtkWidget * widget, cairo_t * cr, UIInfoArea * area)
+static gboolean draw_cb (GtkWidget * widget, cairo_t * cr)
 {
 #else
-static gboolean expose_cb (GtkWidget * widget, GdkEventExpose * event,
- UIInfoArea * area)
+static gboolean expose_cb (GtkWidget * widget, GdkEventExpose * event)
 {
 cairo_t * cr = gdk_cairo_create (gtk_widget_get_window (widget));
 #endif
+ g_return_val_if_fail (area, FALSE);
 
 clear (widget, cr);
 
- draw_album_art (area, cr);
- draw_title (area, cr);
+ draw_album_art (cr);
+ draw_title (cr);
 
 #if ! GTK_CHECK_VERSION (3, 0, 0)
 cairo_destroy (cr);
@@ -336,8 +342,9 @@
 return TRUE;
 }
 
-static gboolean ui_infoarea_do_fade (UIInfoArea * area)
+static gboolean ui_infoarea_do_fade (void)
 {
+ g_return_val_if_fail (area, FALSE);
 gboolean ret = FALSE;
 
 if (aud_drct_get_playing () && area->alpha < 1)
@@ -369,8 +376,10 @@
 return strcmp (a, b);
 }
 
-void ui_infoarea_set_title (void * data, UIInfoArea * area)
+void ui_infoarea_set_title (void)
 {
+ g_return_if_fail (area);
+
 if (! aud_drct_get_playing ())
 return;
 
@@ -378,8 +387,7 @@
 gint entry = aud_playlist_get_position (playlist);
 
 gchar * title, * artist, * album;
- aud_playlist_entry_describe (playlist, entry, & title, & artist, & album,
- FALSE);
+ aud_playlist_entry_describe (playlist, entry, & title, & artist, & album, TRUE);
 
 if (! strcmp_null (title, area->title) && ! strcmp_null (artist,
 area->artist) && ! strcmp_null (album, area->album))
@@ -400,8 +408,10 @@
 gtk_widget_queue_draw (area->main);
 }
 
-static void set_album_art (UIInfoArea * area)
+static void set_album_art (void)
 {
+ g_return_if_fail (area);
+
 if (area->pb)
 g_object_unref (area->pb);
 
@@ -410,8 +420,10 @@
 audgui_pixbuf_scale_within (& area->pb, ICON_SIZE);
 }
 
-static void infoarea_next (UIInfoArea * area)
+static void infoarea_next (void)
 {
+ g_return_if_fail (area);
+
 if (area->last_pb)
 g_object_unref (area->last_pb);
 area->last_pb = area->pb;
@@ -435,23 +447,27 @@
 gtk_widget_queue_draw (area->main);
 }
 
-static void ui_infoarea_playback_start (void * data, UIInfoArea * area)
+static void ui_infoarea_playback_start (void)
 {
+ g_return_if_fail (area);
+
 if (! area->stopped) /* moved to the next song without stopping? */
- infoarea_next (area);
+ infoarea_next ();
 area->stopped = FALSE;
 
- ui_infoarea_set_title (NULL, area);
- set_album_art (area);
+ ui_infoarea_set_title ();
+ set_album_art ();
 
 if (! area->fade_timeout)
 area->fade_timeout = g_timeout_add (30, (GSourceFunc)
 ui_infoarea_do_fade, area);
 }
 
-static void ui_infoarea_playback_stop (void * data, UIInfoArea * area)
+static void ui_infoarea_playback_stop (void)
 {
- infoarea_next (area);
+ g_return_if_fail (area);
+
+ infoarea_next ();
 area->stopped = TRUE;
 
 if (! area->fade_timeout)
@@ -459,15 +475,18 @@
 ui_infoarea_do_fade, area);
 }
 
-static void destroy_cb (GtkWidget * widget, UIInfoArea * area)
+static void destroy_cb (GtkWidget * widget)
 {
+ g_return_if_fail (area);
+
 hook_dissociate ("playlist update", (HookFunction) ui_infoarea_set_title);
 hook_dissociate ("playback begin", (HookFunction)
 ui_infoarea_playback_start);
 hook_dissociate ("playback stop", (HookFunction)
 ui_infoarea_playback_stop);
- hook_dissociate ("visualization clear", (HookFunction) vis_clear_cb);
- aud_vis_runner_remove_hook ((VisHookFunc) vis_update_cb);
+
+ aud_vis_func_remove ((VisFunc) vis_clear_cb);
+ aud_vis_func_remove ((VisFunc) vis_render_cb);
 
 if (area->fade_timeout)
 {
@@ -488,11 +507,13 @@
 g_object_unref (area->last_pb);
 
 g_slice_free (UIInfoArea, area);
+ area = NULL;
 }
 
 GtkWidget * ui_infoarea_new (void)
 {
- UIInfoArea * area = g_slice_new0 (UIInfoArea);
+ g_return_val_if_fail (! area, NULL);
+ area = g_slice_new0 (UIInfoArea);
 
 area->box = gtk_hbox_new (FALSE, 0);
 
@@ -505,24 +526,25 @@
 gtk_box_pack_start ((GtkBox *) area->box, area->vis, FALSE, FALSE, 0);
 
 #if GTK_CHECK_VERSION (3, 0, 0)
- g_signal_connect (area->main, "draw", (GCallback) draw_cb, area);
- g_signal_connect (area->vis, "draw", (GCallback) draw_vis_cb, area);
+ g_signal_connect (area->main, "draw", (GCallback) draw_cb, NULL);
+ g_signal_connect (area->vis, "draw", (GCallback) draw_vis_cb, NULL);
 #else
- g_signal_connect (area->main, "expose-event", (GCallback) expose_cb, area);
- g_signal_connect (area->vis, "expose-event", (GCallback) expose_vis_cb, area);
+ g_signal_connect (area->main, "expose-event", (GCallback) expose_cb, NULL);
+ g_signal_connect (area->vis, "expose-event", (GCallback) expose_vis_cb, NULL);
 #endif
 
- hook_associate ("playlist update", (HookFunction) ui_infoarea_set_title, area);
- hook_associate ("playback begin", (HookFunction) ui_infoarea_playback_start, area);
- hook_associate ("playback stop", (HookFunction) ui_infoarea_playback_stop, area);
- hook_associate ("visualization clear", (HookFunction) vis_clear_cb, area);
- aud_vis_runner_add_hook ((VisHookFunc) vis_update_cb, area);
+ hook_associate ("playlist update", (HookFunction) ui_infoarea_set_title, NULL);
+ hook_associate ("playback begin", (HookFunction) ui_infoarea_playback_start, NULL);
+ hook_associate ("playback stop", (HookFunction) ui_infoarea_playback_stop, NULL);
+
+ aud_vis_func_add (AUD_VIS_TYPE_CLEAR, (VisFunc) vis_clear_cb);
+ aud_vis_func_add (AUD_VIS_TYPE_FREQ, (VisFunc) vis_render_cb);
 
- g_signal_connect (area->box, "destroy", (GCallback) destroy_cb, area);
+ g_signal_connect (area->box, "destroy", (GCallback) destroy_cb, NULL);
 
 if (aud_drct_get_playing ())
 {
- ui_infoarea_playback_start (NULL, area);
+ ui_infoarea_playback_start ();
 
 /* skip fade-in */
 area->alpha = 1;

audacious-plugins-3.0.3.tar.bz2/src/gtkui/ui_playlist_notebook.c -> audacious-plugins-3.1.tar.bz2/src/gtkui/ui_playlist_notebook.c Changed

@@ -24,13 +24,13 @@
 
 #include <audacious/debug.h>
 #include <audacious/gtk-compat.h>
+#include <audacious/misc.h>
 #include <audacious/playlist.h>
 #include <audacious/plugin.h>
 #include <libaudgui/list.h>
 #include <libaudgui/libaudgui.h>
 
 #include "gtkui.h"
-#include "gtkui_cfg.h"
 #include "ui_playlist_notebook.h"
 #include "ui_playlist_widget.h"
 #include "playlist_util.h"
@@ -40,7 +40,7 @@
 static GtkWidget * notebook = NULL;
 static GQueue follow_queue = G_QUEUE_INIT;
 static gboolean playlist_activated = FALSE;
-static gint bolded_playlist = -1;
+static gint highlighted = -1;
 
 static struct index *pages;
 GtkWidget *ui_playlist_notebook_tab_title_editing = NULL;
@@ -252,7 +252,7 @@
 gtk_notebook_set_current_page (UI_PLAYLIST_NOTEBOOK, aud_playlist_get_active ());
 gtk_widget_grab_focus (gtk_bin_get_child ((GtkBin *)
 gtk_notebook_get_nth_page (UI_PLAYLIST_NOTEBOOK, aud_playlist_get_active ())));
- bolded_playlist = aud_playlist_get_playing ();
+ highlighted = aud_playlist_get_playing ();
 
 if (! switch_handler)
 switch_handler = g_signal_connect (notebook, "switch-page", (GCallback)
@@ -276,20 +276,23 @@
 ui_playlist_notebook_destroy_tab (-- n_pages);
 }
 
-static void do_follow (void)
+static void do_highlight (void)
 {
 gint playing = aud_playlist_get_playing ();
 
- if (bolded_playlist != playing)
+ if (highlighted != playing)
 {
- if (bolded_playlist >= 0)
- set_tab_label (bolded_playlist, get_tab_label (bolded_playlist));
+ if (highlighted >= 0 && highlighted < aud_playlist_count ())
+ set_tab_label (highlighted, get_tab_label (highlighted));
 if (playing >= 0)
 set_tab_label (playing, get_tab_label (playing));
 
- bolded_playlist = playing;
+ highlighted = playing;
 }
+}
 
+static void do_follow (void)
+{
 while (! g_queue_is_empty (& follow_queue))
 {
 gint list = aud_playlist_by_unique_id (GPOINTER_TO_INT (g_queue_pop_head
@@ -306,7 +309,7 @@
 row = aud_playlist_get_position (list);
 audgui_list_set_highlight (widget, row);
 
- if (! config.autoscroll)
+ if (! aud_get_bool ("gtkui", "autoscroll"))
 continue;
 }
 
@@ -360,6 +363,7 @@
 update_list (list, type, 0, aud_playlist_entry_count (list));
 }
 
+ do_highlight ();
 do_follow ();
 }
 
@@ -377,7 +381,7 @@
 {
 gint list = GPOINTER_TO_INT (data);
 
- if (config.autoscroll)
+ if (aud_get_bool ("gtkui", "autoscroll"))
 {
 aud_playlist_select_all (list, FALSE);
 
@@ -397,6 +401,12 @@
 aud_playlist_get_active ());
 }
 
+void ui_playlist_notebook_set_playing (void * data, void * user)
+{
+ if (! aud_playlist_update_pending ())
+ do_highlight ();
+}
+
 static void destroy_cb (void)
 {
 notebook = NULL;
@@ -420,9 +430,11 @@
 
 void playlist_show_headers (gboolean show)
 {
- if (config.playlist_headers == show)
+ gboolean old = aud_get_bool ("gtkui", "playlist_headers");
+ if (old == show)
 return;
- config.playlist_headers = show;
+
+ aud_set_bool ("gtkui", "playlist_headers", show);
 ui_playlist_notebook_empty ();
 ui_playlist_notebook_populate ();
 }

audacious-plugins-3.0.3.tar.bz2/src/gtkui/ui_playlist_notebook.h -> audacious-plugins-3.1.tar.bz2/src/gtkui/ui_playlist_notebook.h Changed

audacious-plugins-3.0.3.tar.bz2/src/gtkui/ui_playlist_widget.c -> audacious-plugins-3.1.tar.bz2/src/gtkui/ui_playlist_widget.c Changed

@@ -23,16 +23,15 @@
 
 #include <gtk/gtk.h>
 
-#include <audacious/audconfig.h>
 #include <audacious/drct.h>
 #include <audacious/i18n.h>
+#include <audacious/misc.h>
 #include <audacious/playlist.h>
 #include <libaudgui/libaudgui.h>
 #include <libaudgui/list.h>
 
 #include "config.h"
 #include "gtkui.h"
-#include "gtkui_cfg.h"
 #include "playlist_util.h"
 #include "ui_playlist_widget.h"
 
@@ -83,8 +82,8 @@
 
 gchar s[16];
 if (len < 3600)
- snprintf (s, sizeof s, aud_cfg->leading_zero ? "%02d:%02d" :
- "%d:%02d", len / 60, len % 60);
+ snprintf (s, sizeof s, aud_get_bool (NULL, "leading_zero") ?
+ "%02d:%02d" : "%d:%02d", len / 60, len % 60);
 else
 snprintf (s, sizeof s, "%d:%02d:%02d", len / 3600, (len / 60) % 60,
 len % 60);
@@ -300,29 +299,34 @@
 GtkWidget * list = audgui_list_new (& callbacks, data,
 aud_playlist_entry_count (playlist));
 
- if (config.custom_playlist_colors)
+ if (aud_get_bool ("gtkui", "custom_playlist_colors"))
 {
 GdkColor c;
+ gchar * tmp;
 
- gdk_color_parse(config.playlist_bg, &c);
+ tmp = aud_get_string ("gtkui", "playlist_bg");
+ gdk_color_parse (tmp, & c);
 gtk_widget_modify_base(list, GTK_STATE_NORMAL, &c);
 
- gdk_color_parse(config.playlist_fg, &c);
+ tmp = aud_get_string ("gtkui", "playlist_fg");
+ gdk_color_parse (tmp, & c);
 gtk_widget_modify_text(list, GTK_STATE_NORMAL, &c);
 }
 
- if (config.playlist_font != NULL)
+ gchar * font = aud_get_string ("gtkui", "playlist_font");
+ if (font[0])
 {
 PangoFontDescription *desc;
 
- desc = pango_font_description_from_string(config.playlist_font);
+ desc = pango_font_description_from_string (font);
 gtk_widget_modify_font(list, desc);
 
 pango_font_description_free(desc);
 }
+ g_free (font);
 
 gtk_tree_view_set_headers_visible ((GtkTreeView *) list,
- config.playlist_headers);
+ aud_get_bool ("gtkui", "playlist_headers"));
 gtk_tree_view_set_search_equal_func ((GtkTreeView *) list, search_cb, data,
 NULL);
 g_signal_connect_swapped (list, "destroy", (GCallback) destroy_cb, data);

audacious-plugins-3.0.3.tar.bz2/src/gtkui/ui_statusbar.c -> audacious-plugins-3.1.tar.bz2/src/gtkui/ui_statusbar.c Changed

@@ -18,7 +18,7 @@
 */
 
 #include <glib.h>
-#include <glib/gi18n.h>
+#include <audacious/i18n.h>
 #include <gdk/gdk.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
@@ -31,6 +31,7 @@
 #include <audacious/playlist.h>
 #include <libaudcore/hook.h>
 
+#include "config.h"
 #include "ui_statusbar.h"
 
 #define APPEND(b, ...) snprintf (b + strlen (b), sizeof b - strlen (b), \
@@ -43,8 +44,8 @@
 gint64 selection, total;
 gchar *sel_text, *tot_text, *text;
 
- total = aud_playlist_get_total_length (playlist, TRUE) / 1000;
- selection = aud_playlist_get_selected_length (playlist, TRUE) / 1000;
+ total = aud_playlist_get_total_length (playlist) / 1000;
+ selection = aud_playlist_get_selected_length (playlist) / 1000;
 
 if (selection >= 3600)
 sel_text = g_strdup_printf ("%" PRId64 ":%02" PRId64 ":%02" PRId64,
@@ -131,10 +132,10 @@
 
 static void ui_statusbar_destroy_cb(GtkWidget *widget, gpointer user_data)
 {
+ hook_dissociate("playback ready", (HookFunction) ui_statusbar_info_change);
 hook_dissociate("info change", (HookFunction) ui_statusbar_info_change);
 hook_dissociate("playback stop", (HookFunction) ui_statusbar_playback_stop);
 hook_dissociate("playlist update", (HookFunction) ui_statusbar_update_playlist_length);
- hook_dissociate("info change", (HookFunction) ui_statusbar_update_playlist_length);
 }
 
 GtkWidget *
@@ -149,6 +150,7 @@
 gtk_label_set_ellipsize ((GtkLabel *) status, PANGO_ELLIPSIZE_END);
 gtk_box_pack_start(GTK_BOX(hbox), status, TRUE, TRUE, 5);
 
+ hook_associate("playback ready", (HookFunction) ui_statusbar_info_change, status);
 hook_associate("info change", (HookFunction) ui_statusbar_info_change, status);
 hook_associate("playback stop", (HookFunction) ui_statusbar_playback_stop, status);
 
@@ -157,14 +159,11 @@
 ui_statusbar_update_playlist_length(NULL, length);
 
 hook_associate("playlist update", (HookFunction) ui_statusbar_update_playlist_length, length);
- hook_associate("info change", (HookFunction) ui_statusbar_update_playlist_length, length);
 
 g_signal_connect(G_OBJECT(hbox), "destroy", G_CALLBACK(ui_statusbar_destroy_cb), NULL);
 
- if (aud_drct_get_playing())
- {
+ if (aud_drct_get_playing() && aud_drct_get_ready())
 ui_statusbar_info_change(NULL, status);
- }
 
 return hbox;
 }

audacious-plugins-3.0.3.tar.bz2/src/hotkey/plugin.c -> audacious-plugins-3.1.tar.bz2/src/hotkey/plugin.c Changed

@@ -40,14 +40,13 @@
 
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
+#include <gtk/gtk.h>
 
-#include <audacious/audconfig.h>
-#include <audacious/configdb.h>
 #include <audacious/drct.h>
 #include <audacious/i18n.h>
+#include <audacious/misc.h>
 #include <audacious/plugin.h>
 #include <libaudcore/hook.h>
-#include <libaudcore/eventqueue.h>
 
 #include "plugin.h"
 #include "gui.h"
@@ -83,6 +82,12 @@
 */
 static gboolean init (void)
 {
+	if (! gtk_init_check (NULL, NULL))
+	{
+		fprintf (stderr, "hotkey: GTK+ initialization failed.\n");
+		return FALSE;
+	}
+
 	setup_filter();
 	load_config ( );
 	grab_keys ( );
@@ -240,11 +245,7 @@
 	/* Toggle Windows */
 	if (event == EVENT_TOGGLE_WIN)
 	{
-		/* Workaround for AUD-369:
-		 * When a hotkey is pressed, the interface temporarily loses keyboard
-		 * focus. This causes "interface toggle visibility" to raise the window
-		 * when it ought to hide it. The 1/10 second delay prevents this. */
-		event_queue_timed (100, "interface toggle visibility", NULL);
+		hook_call ("interface toggle visibility", NULL);
 		return TRUE;
 	}
 
@@ -255,15 +256,9 @@
 		return TRUE;
 	}
 	else if (event == EVENT_TOGGLE_REPEAT)
-	{
-		aud_cfg->repeat = ! aud_cfg->repeat;
-		hook_call ("toggle repeat", NULL);
-	}
+		aud_set_bool (NULL, "repeat", ! aud_get_bool (NULL, "repeat"));
 	else if (event == EVENT_TOGGLE_SHUFFLE)
-	{
-		aud_cfg->shuffle = ! aud_cfg->shuffle;
-		hook_call ("toggle shuffle", NULL);
-	}
+		aud_set_bool (NULL, "shuffle", ! aud_get_bool (NULL, "shuffle"));
 
 	return FALSE;
 }
@@ -316,7 +311,6 @@
 /* load plugin configuration */
 void load_config (void)
 {
-	mcs_handle_t *cfdb;
 	HotkeyConfiguration *hotkey;
 	int i,max;
 
@@ -324,22 +318,20 @@
 	plugin_cfg.vol_increment = 4;
 	plugin_cfg.vol_decrement = 4;
 
-	/* open configuration database */
-	cfdb = aud_cfg_db_open ( );
 	hotkey = &(plugin_cfg.first);
 	hotkey->next = NULL;
 	hotkey->key = 0;
 	hotkey->mask = 0;
 	hotkey->event = 0;
 	hotkey->type = TYPE_KEY;
-	max = 0;
-	aud_cfg_db_get_int (cfdb, "globalHotkey", "NumHotkeys", &max);
+
+	max = aud_get_int ("globalHotkey", "NumHotkeys");
 	if (max == 0)
 		load_defaults();
 	else for (i=0; i<max; i++)
 	{
 		gchar *text = NULL;
-		gint value;
+
 		if (hotkey->key) {
 			hotkey->next = (HotkeyConfiguration*)
 				malloc(sizeof (HotkeyConfiguration));
@@ -351,64 +343,56 @@
 			hotkey->type = TYPE_KEY;
 		}
 		text = g_strdup_printf("Hotkey_%d_key", i);
-		aud_cfg_db_get_int (cfdb, "globalHotkey", text, &(hotkey->key));
+		hotkey->key = aud_get_int ("globalHotkey", text);
 		g_free(text);
 
 		text = g_strdup_printf("Hotkey_%d_mask", i);
-		aud_cfg_db_get_int (cfdb, "globalHotkey", text, &(hotkey->mask));
+		hotkey->mask = aud_get_int ("globalHotkey", text);
 		g_free(text);
 
 		text = g_strdup_printf("Hotkey_%d_type", i);
-		aud_cfg_db_get_int (cfdb, "globalHotkey", text, &(hotkey->type));
+		hotkey->type = aud_get_int ("globalHotkey", text);
 		g_free(text);
 
 		text = g_strdup_printf("Hotkey_%d_event", i);
-		value = (gint)hotkey->event;
-		aud_cfg_db_get_int (cfdb, "globalHotkey", text, &value);
-		hotkey->event = (EVENT) value;
+		hotkey->event = aud_get_int ("globalHotkey", text);
 		g_free(text);
 	}
-
-	aud_cfg_db_close (cfdb);
 }
 
 /* save plugin configuration */
 void save_config (void)
 {
-	mcs_handle_t *cfdb;
 	int max;
 	HotkeyConfiguration *hotkey;
 
-	/* open configuration database */
-	cfdb = aud_cfg_db_open ( );
 	hotkey = &(plugin_cfg.first);
 	max = 0;
 	while (hotkey) {
 		gchar *text = NULL;
 		if (hotkey->key) {
 			text = g_strdup_printf("Hotkey_%d_key", max);
-			aud_cfg_db_set_int (cfdb, "globalHotkey", text, hotkey->key);
+			aud_set_int ("globalHotkey", text, hotkey->key);
 			g_free(text);
 
 			text = g_strdup_printf("Hotkey_%d_mask", max);
-			aud_cfg_db_set_int (cfdb, "globalHotkey", text, hotkey->mask);
+			aud_set_int ("globalHotkey", text, hotkey->mask);
 			g_free(text);
 
 			text = g_strdup_printf("Hotkey_%d_type", max);
-			aud_cfg_db_set_int (cfdb, "globalHotkey", text, hotkey->type);
+			aud_set_int ("globalHotkey", text, hotkey->type);
 			g_free(text);
 
 			text = g_strdup_printf("Hotkey_%d_event", max);
-			aud_cfg_db_set_int (cfdb, "globalHotkey", text, hotkey->event);
+			aud_set_int ("globalHotkey", text, hotkey->event);
 			g_free(text);
 			max++;
 		}
 
 		hotkey = hotkey->next;
 	}
-	aud_cfg_db_set_int (cfdb, "globalHotkey", "NumHotkeys", max);
 
-	aud_cfg_db_close (cfdb);
+	aud_set_int ("globalHotkey", "NumHotkeys", max);
 }
 
 static void cleanup (void)

audacious-plugins-3.0.3.tar.bz2/src/jack/configure.c -> audacious-plugins-3.1.tar.bz2/src/jack/configure.c Changed

@@ -24,9 +24,9 @@
 
 #include "jack.h"
 
-#include <audacious/configdb.h>
-#include <audacious/plugin.h>
 #include <audacious/i18n.h>
+#include <audacious/misc.h>
+#include <audacious/plugin.h>
 
 #include "config.h"
 
@@ -47,18 +47,13 @@
 
 static void configure_win_ok_cb(GtkWidget * w, gpointer data)
 {
- mcs_handle_t *cfgfile;
-
 jack_cfg.isTraceEnabled = (gint) GTK_CHECK_BUTTON(GTK_isTraceEnabled)->toggle_button.active;
 jack_cfg.port_connection_mode = GET_CHARS(GTK_COMBO(port_connection_mode_combo)->entry);
 
 jack_set_port_connection_mode(); /* update the connection mode */
 
- cfgfile = aud_cfg_db_open();
-
- aud_cfg_db_set_bool(cfgfile, "jack", "isTraceEnabled", jack_cfg.isTraceEnabled);
- aud_cfg_db_set_string(cfgfile, "jack", "port_connection_mode", jack_cfg.port_connection_mode);
- aud_cfg_db_close(cfgfile);
+ aud_set_bool ("jack", "isTraceEnabled", jack_cfg.isTraceEnabled);
+ aud_set_string ("jack", "port_connection_mode", jack_cfg.port_connection_mode);
 
 gtk_widget_destroy(configure_win);
 }

audacious-plugins-3.0.3.tar.bz2/src/jack/jack.c -> audacious-plugins-3.1.tar.bz2/src/jack/jack.c Changed

@@ -13,8 +13,8 @@
 #include "jack.h"
 #include <string.h>
 
-#include <audacious/configdb.h>
 #include <audacious/i18n.h>
+#include <audacious/misc.h>
 #include <audacious/plugin.h>
 #include <libaudgui/libaudgui.h>
 #include <libaudgui/libaudgui-gtk.h>
@@ -193,32 +193,22 @@
 JACK_SetPortConnectionMode(mode);
 }
 
+static const gchar * const jack_defaults[] = {
+ "isTraceEnabled", "FALSE",
+ "port_connection_mode", "CONNECT_ALL",
+ "volume_left", "25",
+ "volume_right", "25",
+ NULL};
+
 /* Initialize necessary things */
 static gboolean jack_init (void)
 {
- /* read the isTraceEnabled setting from the config file */
- mcs_handle_t *cfgfile;
-
- cfgfile = aud_cfg_db_open();
- if (!cfgfile)
- {
- jack_cfg.isTraceEnabled = FALSE;
- jack_cfg.port_connection_mode = "CONNECT_ALL"; /* default to connect all */
- jack_cfg.volume_left = 25; /* set default volume to 25 % */
- jack_cfg.volume_right = 25;
- } else
- {
- aud_cfg_db_get_bool(cfgfile, "jack", "isTraceEnabled", &jack_cfg.isTraceEnabled);
- if(!aud_cfg_db_get_string(cfgfile, "jack", "port_connection_mode", &jack_cfg.port_connection_mode))
- jack_cfg.port_connection_mode = "CONNECT_ALL";
- if(!aud_cfg_db_get_int(cfgfile, "jack", "volume_left", &jack_cfg.volume_left))
- jack_cfg.volume_left = 25;
- if(!aud_cfg_db_get_int(cfgfile, "jack", "volume_right", &jack_cfg.volume_right))
- jack_cfg.volume_right = 25;
- }
-
- aud_cfg_db_close(cfgfile);
+ aud_config_set_defaults ("jack", jack_defaults);
 
+ jack_cfg.isTraceEnabled = aud_get_bool ("jack", "isTraceEnabled");
+ jack_cfg.port_connection_mode = aud_get_string ("jack", "port_connection_mode");
+ jack_cfg.volume_left = aud_get_int ("jack", "volume_left");
+ jack_cfg.volume_right = aud_get_int ("jack", "volume_right");
 
 TRACE("initializing\n");
 JACK_Init(); /* initialize the driver */
@@ -269,14 +259,8 @@
 /* Close the device */
 static void jack_close(void)
 {
- mcs_handle_t *cfgfile;
-
- cfgfile = aud_cfg_db_open();
- aud_cfg_db_set_int(cfgfile, "jack", "volume_left", jack_cfg.volume_left); /* stores the volume setting */
- aud_cfg_db_set_int(cfgfile, "jack", "volume_right", jack_cfg.volume_right);
- aud_cfg_db_close(cfgfile);
-
- TRACE("\n");
+ aud_set_int ("jack", "volume_left", jack_cfg.volume_left);
+ aud_set_int ("jack", "volume_right", jack_cfg.volume_right);
 
 JACK_Reset(driver); /* flush buffers, reset position and set state to STOPPED */
 TRACE("resetting driver, not closing now, destructor will close for us\n");

audacious-plugins-3.1.tar.bz2/src/ladspa Added

audacious-plugins-3.1.tar.bz2/src/ladspa/Makefile Added

audacious-plugins-3.1.tar.bz2/src/ladspa/effect.c Added

@@ -0,0 +1,262 @@
+/*
+ * LADSPA Host for Audacious
+ * Copyright 2011 John Lindgren
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions, and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions, and the following disclaimer in the documentation
+ * provided with the distribution.
+ *
+ * This software is provided "as is" and without any warranty, express or
+ * implied. In no event shall the authors be liable for any damages arising from
+ * the use of this software.
+ */
+
+#include <assert.h>
+#include <stdio.h>
+
+#include "ladspa.h"
+#include "plugin.h"
+
+static int ladspa_channels, ladspa_rate;
+
+static void start_plugin (LoadedPlugin * loaded)
+{
+ if (loaded->active)
+ return;
+
+ loaded->active = 1;
+
+ PluginData * plugin = loaded->plugin;
+ const LADSPA_Descriptor * desc = plugin->desc;
+
+ int ports = plugin->in_ports->len;
+
+ if (ports == 0 || ports != plugin->out_ports->len)
+ {
+ fprintf (stderr, "Plugin has unusable port configuration: %s\n", desc->Name);
+ return;
+ }
+
+ if (ladspa_channels % ports != 0)
+ {
+ fprintf (stderr, "Plugin cannot be used with %d channels: %s\n",
+ ladspa_channels, desc->Name);
+ return;
+ }
+
+ int instances = ladspa_channels / ports;
+
+ loaded->instances = index_new ();
+ loaded->in_bufs = g_malloc (sizeof (float *) * ladspa_channels);
+ loaded->out_bufs = g_malloc (sizeof (float *) * ladspa_channels);
+
+ for (int i = 0; i < instances; i ++)
+ {
+ LADSPA_Handle handle = desc->instantiate (desc, ladspa_rate);
+ index_append (loaded->instances, handle);
+
+ int controls = index_count (plugin->controls);
+ for (int c = 0; c < controls; c ++)
+ {
+ ControlData * control = index_get (plugin->controls, c);
+ desc->connect_port (handle, control->port, & loaded->values[c]);
+ }
+
+ for (int p = 0; p < ports; p ++)
+ {
+ int channel = ports * i + p;
+
+ float * in = g_malloc (sizeof (float) * LADSPA_BUFLEN);
+ loaded->in_bufs[channel] = in;
+ int in_port = g_array_index (plugin->in_ports, int, p);
+ desc->connect_port (handle, in_port, in);
+
+ float * out = g_malloc (sizeof (float) * LADSPA_BUFLEN);
+ loaded->out_bufs[channel] = out;
+ int out_port = g_array_index (plugin->out_ports, int, p);
+ desc->connect_port (handle, out_port, out);
+ }
+
+ if (desc->activate)
+ desc->activate (handle);
+ }
+}
+
+static void run_plugin (LoadedPlugin * loaded, float * data, int samples)
+{
+ if (! loaded->instances)
+ return;
+
+ PluginData * plugin = loaded->plugin;
+ const LADSPA_Descriptor * desc = plugin->desc;
+
+ int ports = plugin->in_ports->len;
+ int instances = index_count (loaded->instances);
+ assert (ports * instances == ladspa_channels);
+
+ while (samples / ladspa_channels > 0)
+ {
+ int frames = MIN (samples / ladspa_channels, LADSPA_BUFLEN);
+
+ for (int i = 0; i < instances; i ++)
+ {
+ LADSPA_Handle * handle = index_get (loaded->instances, i);
+
+ for (int p = 0; p < ports; p ++)
+ {
+ int channel = ports * i + p;
+ float * get = data + channel;
+ float * in = loaded->in_bufs[channel];
+ float * in_end = in + frames;
+
+ while (in < in_end)
+ {
+ * in ++ = * get;
+ get += ladspa_channels;
+ }
+ }
+
+ desc->run (handle, frames);
+
+ for (int p = 0; p < ports; p ++)
+ {
+ int channel = ports * i + p;
+ float * set = data + channel;
+ float * out = loaded->out_bufs[channel];
+ float * out_end = out + frames;
+
+ while (out < out_end)
+ {
+ * set = * out ++;
+ set += ladspa_channels;
+ }
+ }
+ }
+
+ data += ladspa_channels * frames;
+ samples -= ladspa_channels * frames;
+ }
+}
+
+static void flush_plugin (LoadedPlugin * loaded)
+{
+ if (! loaded->instances)
+ return;
+
+ PluginData * plugin = loaded->plugin;
+ const LADSPA_Descriptor * desc = plugin->desc;
+
+ int instances = index_count (loaded->instances);
+ for (int i = 0; i < instances; i ++)
+ {
+ LADSPA_Handle * handle = index_get (loaded->instances, i);
+
+ if (desc->deactivate)
+ desc->deactivate (handle);
+ if (desc->activate)
+ desc->activate (handle);
+ }
+}
+
+void shutdown_plugin_locked (LoadedPlugin * loaded)
+{
+ loaded->active = 0;
+
+ if (! loaded->instances)
+ return;
+
+ PluginData * plugin = loaded->plugin;
+ const LADSPA_Descriptor * desc = plugin->desc;
+
+ int instances = index_count (loaded->instances);
+ for (int i = 0; i < instances; i ++)
+ {
+ LADSPA_Handle * handle = index_get (loaded->instances, i);
+
+ if (desc->deactivate)
+ desc->deactivate (handle);
+
+ desc->cleanup (handle);
+ }
+
+ for (int channel = 0; channel < ladspa_channels; channel ++)
+ {
+ g_free (loaded->in_bufs[channel]);
+ g_free (loaded->out_bufs[channel]);
+ }
+
+ index_free (loaded->instances);
+ loaded->instances = NULL;
+ g_free (loaded->in_bufs);
+ loaded->in_bufs = NULL;
+ g_free (loaded->out_bufs);
+ loaded->out_bufs = NULL;
+}
+
+void ladspa_start (int * channels, int * rate)
+{
+ pthread_mutex_lock (& mutex);
+
+ int count = index_count (loadeds);
+ for (int i = 0; i < count; i ++)
+ {
+ LoadedPlugin * loaded = index_get (loadeds, i);
+ shutdown_plugin_locked (loaded);
+ }
+
+ ladspa_channels = * channels;
+ ladspa_rate = * rate;
+
+ pthread_mutex_unlock (& mutex);
+}
+
+void ladspa_process (float * * data, int * samples)
+{
+ pthread_mutex_lock (& mutex);
+
+ int count = index_count (loadeds);
+ for (int i = 0; i < count; i ++)
+ {
+ LoadedPlugin * loaded = index_get (loadeds, i);
+ start_plugin (loaded);
+ run_plugin (loaded, * data, * samples);
+ }
+
+ pthread_mutex_unlock (& mutex);
+}
+
+void ladspa_flush (void)
+{
+ pthread_mutex_lock (& mutex);
+
+ int count = index_count (loadeds);
+ for (int i = 0; i < count; i ++)
+ {
+ LoadedPlugin * loaded = index_get (loadeds, i);
+ flush_plugin (loaded);
+ }
+
+ pthread_mutex_unlock (& mutex);
+}
+
+void ladspa_finish (float * * data, int * samples)
+{
+ pthread_mutex_lock (& mutex);
+
+ int count = index_count (loadeds);
+ for (int i = 0; i < count; i ++)
+ {
+ LoadedPlugin * loaded = index_get (loadeds, i);
+ start_plugin (loaded);
+ run_plugin (loaded, * data, * samples);
+ shutdown_plugin_locked (loaded);
+ }
+
+ pthread_mutex_unlock (& mutex);
+}

audacious-plugins-3.1.tar.bz2/src/ladspa/ladspa.h Added

@@ -0,0 +1,603 @@
+/* ladspa.h
+
+   Linux Audio Developer's Simple Plugin API Version 1.1[LGPL].
+   Copyright (C) 2000-2002 Richard W.E. Furse, Paul Barton-Davis,
+   Stefan Westerfeld.
+
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public License
+   as published by the Free Software Foundation; either version 2.1 of
+   the License, or (at your option) any later version.
+
+   This library 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
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with this library; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+   USA. */
+
+#ifndef LADSPA_INCLUDED
+#define LADSPA_INCLUDED
+
+#define LADSPA_VERSION "1.1"
+#define LADSPA_VERSION_MAJOR 1
+#define LADSPA_VERSION_MINOR 1
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*****************************************************************************/
+
+/* Overview:
+
+   There is a large number of synthesis packages in use or development
+   on the Linux platform at this time. This API (`The Linux Audio
+   Developer's Simple Plugin API') attempts to give programmers the
+   ability to write simple `plugin' audio processors in C/C++ and link
+   them dynamically (`plug') into a range of these packages (`hosts').
+   It should be possible for any host and any plugin to communicate
+   completely through this interface.
+
+   This API is deliberately short and simple. To achieve compatibility
+   with a range of promising Linux sound synthesis packages it
+   attempts to find the `greatest common divisor' in their logical
+   behaviour. Having said this, certain limiting decisions are
+   implicit, notably the use of a fixed type (LADSPA_Data) for all
+   data transfer and absence of a parameterised `initialisation'
+   phase. See below for the LADSPA_Data typedef.
+
+   Plugins are expected to distinguish between control and audio
+   data. Plugins have `ports' that are inputs or outputs for audio or
+   control data and each plugin is `run' for a `block' corresponding
+   to a short time interval measured in samples. Audio data is
+   communicated using arrays of LADSPA_Data, allowing a block of audio
+   to be processed by the plugin in a single pass. Control data is
+   communicated using single LADSPA_Data values. Control data has a
+   single value at the start of a call to the `run()' or `run_adding()'
+   function, and may be considered to remain this value for its
+   duration. The plugin may assume that all its input and output ports
+   have been connected to the relevant data location (see the
+   `connect_port()' function below) before it is asked to run.
+
+   Plugins will reside in shared object files suitable for dynamic
+   linking by dlopen() and family. The file will provide a number of
+   `plugin types' that can be used to instantiate actual plugins
+   (sometimes known as `plugin instances') that can be connected
+   together to perform tasks.
+
+   This API contains very limited error-handling. */
+
+/*****************************************************************************/
+
+/* Fundamental data type passed in and out of plugin. This data type
+   is used to communicate audio samples and control values. It is
+   assumed that the plugin will work sensibly given any numeric input
+   value although it may have a preferred range (see hints below).
+
+   For audio it is generally assumed that 1.0f is the `0dB' reference
+   amplitude and is a `normal' signal level. */
+
+typedef float LADSPA_Data;
+
+/*****************************************************************************/
+
+/* Special Plugin Properties:
+
+   Optional features of the plugin type are encapsulated in the
+   LADSPA_Properties type. This is assembled by ORing individual
+   properties together. */
+
+typedef int LADSPA_Properties;
+
+/* Property LADSPA_PROPERTY_REALTIME indicates that the plugin has a
+   real-time dependency (e.g. listens to a MIDI device) and so its
+   output must not be cached or subject to significant latency. */
+#define LADSPA_PROPERTY_REALTIME        0x1
+
+/* Property LADSPA_PROPERTY_INPLACE_BROKEN indicates that the plugin
+   may cease to work correctly if the host elects to use the same data
+   location for both input and output (see connect_port()). This
+   should be avoided as enabling this flag makes it impossible for
+   hosts to use the plugin to process audio `in-place.' */
+#define LADSPA_PROPERTY_INPLACE_BROKEN  0x2
+
+/* Property LADSPA_PROPERTY_HARD_RT_CAPABLE indicates that the plugin
+   is capable of running not only in a conventional host but also in a
+   `hard real-time' environment. To qualify for this the plugin must
+   satisfy all of the following:
+
+   (1) The plugin must not use malloc(), free() or other heap memory
+   management within its run() or run_adding() functions. All new
+   memory used in run() must be managed via the stack. These
+   restrictions only apply to the run() function.
+
+   (2) The plugin will not attempt to make use of any library
+   functions with the exceptions of functions in the ANSI standard C
+   and C maths libraries, which the host is expected to provide.
+
+   (3) The plugin will not access files, devices, pipes, sockets, IPC
+   or any other mechanism that might result in process or thread
+   blocking.
+
+   (4) The plugin will take an amount of time to execute a run() or
+   run_adding() call approximately of form (A+B*SampleCount) where A
+   and B depend on the machine and host in use. This amount of time
+   may not depend on input signals or plugin state. The host is left
+   the responsibility to perform timings to estimate upper bounds for
+   A and B. */
+#define LADSPA_PROPERTY_HARD_RT_CAPABLE 0x4
+
+#define LADSPA_IS_REALTIME(x)        ((x) & LADSPA_PROPERTY_REALTIME)
+#define LADSPA_IS_INPLACE_BROKEN(x)  ((x) & LADSPA_PROPERTY_INPLACE_BROKEN)
+#define LADSPA_IS_HARD_RT_CAPABLE(x) ((x) & LADSPA_PROPERTY_HARD_RT_CAPABLE)
+
+/*****************************************************************************/
+
+/* Plugin Ports:
+
+   Plugins have `ports' that are inputs or outputs for audio or
+   data. Ports can communicate arrays of LADSPA_Data (for audio
+   inputs/outputs) or single LADSPA_Data values (for control
+   input/outputs). This information is encapsulated in the
+   LADSPA_PortDescriptor type which is assembled by ORing individual
+   properties together.
+
+   Note that a port must be an input or an output port but not both
+   and that a port must be a control or audio port but not both. */
+
+typedef int LADSPA_PortDescriptor;
+
+/* Property LADSPA_PORT_INPUT indicates that the port is an input. */
+#define LADSPA_PORT_INPUT   0x1
+
+/* Property LADSPA_PORT_OUTPUT indicates that the port is an output. */
+#define LADSPA_PORT_OUTPUT  0x2
+
+/* Property LADSPA_PORT_CONTROL indicates that the port is a control
+   port. */
+#define LADSPA_PORT_CONTROL 0x4
+
+/* Property LADSPA_PORT_AUDIO indicates that the port is a audio
+   port. */
+#define LADSPA_PORT_AUDIO   0x8
+
+#define LADSPA_IS_PORT_INPUT(x)   ((x) & LADSPA_PORT_INPUT)
+#define LADSPA_IS_PORT_OUTPUT(x)  ((x) & LADSPA_PORT_OUTPUT)
+#define LADSPA_IS_PORT_CONTROL(x) ((x) & LADSPA_PORT_CONTROL)
+#define LADSPA_IS_PORT_AUDIO(x)   ((x) & LADSPA_PORT_AUDIO)
+
+/*****************************************************************************/
+
+/* Plugin Port Range Hints:
+
+   The host may wish to provide a representation of data entering or
+   leaving a plugin (e.g. to generate a GUI automatically). To make
+   this more meaningful, the plugin should provide `hints' to the host
+   describing the usual values taken by the data.
+
+   Note that these are only hints. The host may ignore them and the
+   plugin must not assume that data supplied to it is meaningful. If
+   the plugin receives invalid input data it is expected to continue
+   to run without failure and, where possible, produce a sensible
+   output (e.g. a high-pass filter given a negative cutoff frequency
+   might switch to an all-pass mode).
+
+   Hints are meaningful for all input and output ports but hints for
+   input control ports are expected to be particularly useful.
+
+   More hint information is encapsulated in the
+   LADSPA_PortRangeHintDescriptor type which is assembled by ORing
+   individual hint types together. Hints may require further
+   LowerBound and UpperBound information.
+
+   All the hint information for a particular port is aggregated in the
+   LADSPA_PortRangeHint structure. */
+
+typedef int LADSPA_PortRangeHintDescriptor;
+
+/* Hint LADSPA_HINT_BOUNDED_BELOW indicates that the LowerBound field
+   of the LADSPA_PortRangeHint should be considered meaningful. The
+   value in this field should be considered the (inclusive) lower
+   bound of the valid range. If LADSPA_HINT_SAMPLE_RATE is also
+   specified then the value of LowerBound should be multiplied by the
+   sample rate. */
+#define LADSPA_HINT_BOUNDED_BELOW   0x1
+
+/* Hint LADSPA_HINT_BOUNDED_ABOVE indicates that the UpperBound field
+   of the LADSPA_PortRangeHint should be considered meaningful. The
+   value in this field should be considered the (inclusive) upper
+   bound of the valid range. If LADSPA_HINT_SAMPLE_RATE is also
+   specified then the value of UpperBound should be multiplied by the
+   sample rate. */
+#define LADSPA_HINT_BOUNDED_ABOVE   0x2
+
+/* Hint LADSPA_HINT_TOGGLED indicates that the data item should be
+   considered a Boolean toggle. Data less than or equal to zero should
+   be considered `off' or `false,' and data above zero should be
+   considered `on' or `true.' LADSPA_HINT_TOGGLED may not be used in
+   conjunction with any other hint except LADSPA_HINT_DEFAULT_0 or
+   LADSPA_HINT_DEFAULT_1. */
+#define LADSPA_HINT_TOGGLED         0x4
+
+/* Hint LADSPA_HINT_SAMPLE_RATE indicates that any bounds specified
+   should be interpreted as multiples of the sample rate. For
+   instance, a frequency range from 0Hz to the Nyquist frequency (half
+   the sample rate) could be requested by this hint in conjunction
+   with LowerBound = 0 and UpperBound = 0.5. Hosts that support bounds
+   at all must support this hint to retain meaning. */
+#define LADSPA_HINT_SAMPLE_RATE     0x8
+
+/* Hint LADSPA_HINT_LOGARITHMIC indicates that it is likely that the
+   user will find it more intuitive to view values using a logarithmic
+   scale. This is particularly useful for frequencies and gains. */
+#define LADSPA_HINT_LOGARITHMIC     0x10
+
+/* Hint LADSPA_HINT_INTEGER indicates that a user interface would
+   probably wish to provide a stepped control taking only integer
+   values. Any bounds set should be slightly wider than the actual
+   integer range required to avoid floating point rounding errors. For
+   instance, the integer set {0,1,2,3} might be described as [-0.1,
+   3.1]. */
+#define LADSPA_HINT_INTEGER         0x20
+
+/* The various LADSPA_HINT_HAS_DEFAULT_* hints indicate a `normal'
+   value for the port that is sensible as a default. For instance,
+   this value is suitable for use as an initial value in a user
+   interface or as a value the host might assign to a control port
+   when the user has not provided one. Defaults are encoded using a
+   mask so only one default may be specified for a port. Some of the
+   hints make use of lower and upper bounds, in which case the
+   relevant bound or bounds must be available and
+   LADSPA_HINT_SAMPLE_RATE must be applied as usual. The resulting
+   default must be rounded if LADSPA_HINT_INTEGER is present. Default
+   values were introduced in LADSPA v1.1. */
+#define LADSPA_HINT_DEFAULT_MASK    0x3C0
+
+/* This default values indicates that no default is provided. */
+#define LADSPA_HINT_DEFAULT_NONE    0x0
+
+/* This default hint indicates that the suggested lower bound for the
+   port should be used. */
+#define LADSPA_HINT_DEFAULT_MINIMUM 0x40
+
+/* This default hint indicates that a low value between the suggested
+   lower and upper bounds should be chosen. For ports with
+   LADSPA_HINT_LOGARITHMIC, this should be exp(log(lower) * 0.75 +
+   log(upper) * 0.25). Otherwise, this should be (lower * 0.75 + upper
+   * 0.25). */
+#define LADSPA_HINT_DEFAULT_LOW     0x80
+
+/* This default hint indicates that a middle value between the
+   suggested lower and upper bounds should be chosen. For ports with
+   LADSPA_HINT_LOGARITHMIC, this should be exp(log(lower) * 0.5 +
+   log(upper) * 0.5). Otherwise, this should be (lower * 0.5 + upper *
+   0.5). */
+#define LADSPA_HINT_DEFAULT_MIDDLE  0xC0
+
+/* This default hint indicates that a high value between the suggested
+   lower and upper bounds should be chosen. For ports with
+   LADSPA_HINT_LOGARITHMIC, this should be exp(log(lower) * 0.25 +
+   log(upper) * 0.75). Otherwise, this should be (lower * 0.25 + upper
+   * 0.75). */
+#define LADSPA_HINT_DEFAULT_HIGH    0x100
+
+/* This default hint indicates that the suggested upper bound for the
+   port should be used. */
+#define LADSPA_HINT_DEFAULT_MAXIMUM 0x140
+
+/* This default hint indicates that the number 0 should be used. Note
+   that this default may be used in conjunction with
+   LADSPA_HINT_TOGGLED. */
+#define LADSPA_HINT_DEFAULT_0       0x200
+
+/* This default hint indicates that the number 1 should be used. Note
+   that this default may be used in conjunction with
+   LADSPA_HINT_TOGGLED. */
+#define LADSPA_HINT_DEFAULT_1       0x240
+
+/* This default hint indicates that the number 100 should be used. */
+#define LADSPA_HINT_DEFAULT_100     0x280
+
+/* This default hint indicates that the Hz frequency of `concert A'
+   should be used. This will be 440 unless the host uses an unusual
+   tuning convention, in which case it may be within a few Hz. */
+#define LADSPA_HINT_DEFAULT_440     0x2C0
+
+#define LADSPA_IS_HINT_BOUNDED_BELOW(x)   ((x) & LADSPA_HINT_BOUNDED_BELOW)
+#define LADSPA_IS_HINT_BOUNDED_ABOVE(x)   ((x) & LADSPA_HINT_BOUNDED_ABOVE)
+#define LADSPA_IS_HINT_TOGGLED(x)         ((x) & LADSPA_HINT_TOGGLED)
+#define LADSPA_IS_HINT_SAMPLE_RATE(x)     ((x) & LADSPA_HINT_SAMPLE_RATE)
+#define LADSPA_IS_HINT_LOGARITHMIC(x)     ((x) & LADSPA_HINT_LOGARITHMIC)
+#define LADSPA_IS_HINT_INTEGER(x)         ((x) & LADSPA_HINT_INTEGER)
+
+#define LADSPA_IS_HINT_HAS_DEFAULT(x)     ((x) & LADSPA_HINT_DEFAULT_MASK)
+#define LADSPA_IS_HINT_DEFAULT_MINIMUM(x) (((x) & LADSPA_HINT_DEFAULT_MASK)   \
+                                           == LADSPA_HINT_DEFAULT_MINIMUM)
+#define LADSPA_IS_HINT_DEFAULT_LOW(x)     (((x) & LADSPA_HINT_DEFAULT_MASK)   \
+                                           == LADSPA_HINT_DEFAULT_LOW)
+#define LADSPA_IS_HINT_DEFAULT_MIDDLE(x)  (((x) & LADSPA_HINT_DEFAULT_MASK)   \
+                                           == LADSPA_HINT_DEFAULT_MIDDLE)
+#define LADSPA_IS_HINT_DEFAULT_HIGH(x)    (((x) & LADSPA_HINT_DEFAULT_MASK)   \
+                                           == LADSPA_HINT_DEFAULT_HIGH)
+#define LADSPA_IS_HINT_DEFAULT_MAXIMUM(x) (((x) & LADSPA_HINT_DEFAULT_MASK)   \
+                                           == LADSPA_HINT_DEFAULT_MAXIMUM)
+#define LADSPA_IS_HINT_DEFAULT_0(x)       (((x) & LADSPA_HINT_DEFAULT_MASK)   \
+                                           == LADSPA_HINT_DEFAULT_0)
+#define LADSPA_IS_HINT_DEFAULT_1(x)       (((x) & LADSPA_HINT_DEFAULT_MASK)   \
+                                           == LADSPA_HINT_DEFAULT_1)
+#define LADSPA_IS_HINT_DEFAULT_100(x)     (((x) & LADSPA_HINT_DEFAULT_MASK)   \
+                                           == LADSPA_HINT_DEFAULT_100)
+#define LADSPA_IS_HINT_DEFAULT_440(x)     (((x) & LADSPA_HINT_DEFAULT_MASK)   \
+                                            == LADSPA_HINT_DEFAULT_440)
+
+typedef struct _LADSPA_PortRangeHint {
+
+  /* Hints about the port. */
+  LADSPA_PortRangeHintDescriptor HintDescriptor;
+
+  /* Meaningful when hint LADSPA_HINT_BOUNDED_BELOW is active. When
+     LADSPA_HINT_SAMPLE_RATE is also active then this value should be
+     multiplied by the relevant sample rate. */
+  LADSPA_Data LowerBound;
+
+  /* Meaningful when hint LADSPA_HINT_BOUNDED_ABOVE is active. When
+     LADSPA_HINT_SAMPLE_RATE is also active then this value should be
+     multiplied by the relevant sample rate. */
+  LADSPA_Data UpperBound;
+
+} LADSPA_PortRangeHint;
+
+/*****************************************************************************/
+
+/* Plugin Handles:
+
+   This plugin handle indicates a particular instance of the plugin
+   concerned. It is valid to compare this to NULL (0 for C++) but
+   otherwise the host should not attempt to interpret it. The plugin
+   may use it to reference internal instance data. */
+
+typedef void * LADSPA_Handle;
+
+/*****************************************************************************/
+
+/* Descriptor for a Type of Plugin:
+
+   This structure is used to describe a plugin type. It provides a
+   number of functions to examine the type, instantiate it, link it to
+   buffers and workspaces and to run it. */
+
+typedef struct _LADSPA_Descriptor {
+
+  /* This numeric identifier indicates the plugin type
+     uniquely. Plugin programmers may reserve ranges of IDs from a
+     central body to avoid clashes. Hosts may assume that IDs are
+     below 0x1000000. */
+  unsigned long UniqueID;
+
+  /* This identifier can be used as a unique, case-sensitive
+     identifier for the plugin type within the plugin file. Plugin
+     types should be identified by file and label rather than by index
+     or plugin name, which may be changed in new plugin
+     versions. Labels must not contain white-space characters. */
+  const char * Label;
+
+  /* This indicates a number of properties of the plugin. */
+  LADSPA_Properties Properties;
+
+  /* This member points to the null-terminated name of the plugin
+     (e.g. "Sine Oscillator"). */
+  const char * Name;
+
+  /* This member points to the null-terminated string indicating the
+     maker of the plugin. This can be an empty string but not NULL. */
+  const char * Maker;
+
+  /* This member points to the null-terminated string indicating any
+     copyright applying to the plugin. If no Copyright applies the
+     string "None" should be used. */
+  const char * Copyright;
+
+  /* This indicates the number of ports (input AND output) present on
+     the plugin. */
+  unsigned long PortCount;
+
+  /* This member indicates an array of port descriptors. Valid indices
+     vary from 0 to PortCount-1. */
+  const LADSPA_PortDescriptor * PortDescriptors;
+
+  /* This member indicates an array of null-terminated strings
+     describing ports (e.g. "Frequency (Hz)"). Valid indices vary from
+     0 to PortCount-1. */
+  const char * const * PortNames;
+
+  /* This member indicates an array of range hints for each port (see
+     above). Valid indices vary from 0 to PortCount-1. */
+  const LADSPA_PortRangeHint * PortRangeHints;
+
+  /* This may be used by the plugin developer to pass any custom
+     implementation data into an instantiate call. It must not be used
+     or interpreted by the host. It is expected that most plugin
+     writers will not use this facility as LADSPA_Handle should be
+     used to hold instance data. */
+  void * ImplementationData;
+
+  /* This member is a function pointer that instantiates a plugin. A
+     handle is returned indicating the new plugin instance. The
+     instantiation function accepts a sample rate as a parameter. The
+     plugin descriptor from which this instantiate function was found
+     must also be passed. This function must return NULL if
+     instantiation fails.
+
+     Note that instance initialisation should generally occur in
+     activate() rather than here. */
+  LADSPA_Handle (*instantiate)(const struct _LADSPA_Descriptor * Descriptor,
+                               unsigned long                     SampleRate);
+
+  /* This member is a function pointer that connects a port on an
+     instantiated plugin to a memory location at which a block of data
+     for the port will be read/written. The data location is expected
+     to be an array of LADSPA_Data for audio ports or a single
+     LADSPA_Data value for control ports. Memory issues will be
+     managed by the host. The plugin must read/write the data at these
+     locations every time run() or run_adding() is called and the data
+     present at the time of this connection call should not be
+     considered meaningful.
+
+     connect_port() may be called more than once for a plugin instance
+     to allow the host to change the buffers that the plugin is
+     reading or writing. These calls may be made before or after
+     activate() or deactivate() calls.
+
+     connect_port() must be called at least once for each port before
+     run() or run_adding() is called. When working with blocks of
+     LADSPA_Data the plugin should pay careful attention to the block
+     size passed to the run function as the block allocated may only
+     just be large enough to contain the block of samples.
+
+     Plugin writers should be aware that the host may elect to use the
+     same buffer for more than one port and even use the same buffer
+     for both input and output (see LADSPA_PROPERTY_INPLACE_BROKEN).
+     However, overlapped buffers or use of a single buffer for both
+     audio and control data may result in unexpected behaviour. */
+   void (*connect_port)(LADSPA_Handle Instance,
+                        unsigned long Port,
+                        LADSPA_Data * DataLocation);
+
+  /* This member is a function pointer that initialises a plugin
+     instance and activates it for use. This is separated from
+     instantiate() to aid real-time support and so that hosts can
+     reinitialise a plugin instance by calling deactivate() and then
+     activate(). In this case the plugin instance must reset all state
+     information dependent on the history of the plugin instance
+     except for any data locations provided by connect_port() and any
+     gain set by set_run_adding_gain(). If there is nothing for
+     activate() to do then the plugin writer may provide a NULL rather
+     than an empty function.
+
+     When present, hosts must call this function once before run() (or
+     run_adding()) is called for the first time. This call should be
+     made as close to the run() call as possible and indicates to
+     real-time plugins that they are now live. Plugins should not rely
+     on a prompt call to run() after activate(). activate() may not be
+     called again unless deactivate() is called first. Note that
+     connect_port() may be called before or after a call to
+     activate(). */
+  void (*activate)(LADSPA_Handle Instance);
+
+  /* This method is a function pointer that runs an instance of a
+     plugin for a block. Two parameters are required: the first is a
+     handle to the particular instance to be run and the second
+     indicates the block size (in samples) for which the plugin
+     instance may run.
+
+     Note that if an activate() function exists then it must be called
+     before run() or run_adding(). If deactivate() is called for a
+     plugin instance then the plugin instance may not be reused until
+     activate() has been called again.
+
+     If the plugin has the property LADSPA_PROPERTY_HARD_RT_CAPABLE
+     then there are various things that the plugin should not do
+     within the run() or run_adding() functions (see above). */
+  void (*run)(LADSPA_Handle Instance,
+              unsigned long SampleCount);
+
+  /* This method is a function pointer that runs an instance of a
+     plugin for a block. This has identical behaviour to run() except
+     in the way data is output from the plugin. When run() is used,
+     values are written directly to the memory areas associated with
+     the output ports. However when run_adding() is called, values
+     must be added to the values already present in the memory
+     areas. Furthermore, output values written must be scaled by the
+     current gain set by set_run_adding_gain() (see below) before
+     addition.
+
+     run_adding() is optional. When it is not provided by a plugin,
+     this function pointer must be set to NULL. When it is provided,
+     the function set_run_adding_gain() must be provided also. */
+  void (*run_adding)(LADSPA_Handle Instance,
+                     unsigned long SampleCount);
+
+  /* This method is a function pointer that sets the output gain for
+     use when run_adding() is called (see above). If this function is
+     never called the gain is assumed to default to 1. Gain
+     information should be retained when activate() or deactivate()
+     are called.
+
+     This function should be provided by the plugin if and only if the
+     run_adding() function is provided. When it is absent this
+     function pointer must be set to NULL. */
+  void (*set_run_adding_gain)(LADSPA_Handle Instance,
+                              LADSPA_Data   Gain);
+
+  /* This is the counterpart to activate() (see above). If there is
+     nothing for deactivate() to do then the plugin writer may provide
+     a NULL rather than an empty function.
+
+     Hosts must deactivate all activated units after they have been
+     run() (or run_adding()) for the last time. This call should be
+     made as close to the last run() call as possible and indicates to
+     real-time plugins that they are no longer live. Plugins should
+     not rely on prompt deactivation. Note that connect_port() may be
+     called before or after a call to deactivate().
+
+     Deactivation is not similar to pausing as the plugin instance
+     will be reinitialised when activate() is called to reuse it. */
+  void (*deactivate)(LADSPA_Handle Instance);
+
+  /* Once an instance of a plugin has been finished with it can be
+     deleted using the following function. The instance handle passed
+     ceases to be valid after this call.
+
+     If activate() was called for a plugin instance then a
+     corresponding call to deactivate() must be made before cleanup()
+     is called. */
+  void (*cleanup)(LADSPA_Handle Instance);
+
+} LADSPA_Descriptor;
+
+/**********************************************************************/
+
+/* Accessing a Plugin: */
+
+/* The exact mechanism by which plugins are loaded is host-dependent,
+   however all most hosts will need to know is the name of shared
+   object file containing the plugin types. To allow multiple hosts to
+   share plugin types, hosts may wish to check for environment
+   variable LADSPA_PATH. If present, this should contain a
+   colon-separated path indicating directories that should be searched
+   (in order) when loading plugin types.
+
+   A plugin programmer must include a function called
+   "ladspa_descriptor" with the following function prototype within
+   the shared object file. This function will have C-style linkage (if
+   you are using C++ this is taken care of by the `extern "C"' clause
+   at the top of the file).
+
+   A host will find the plugin shared object file by one means or
+   another, find the ladspa_descriptor() function, call it, and
+   proceed from there.
+
+   Plugin types are accessed by index (not ID) using values from 0
+   upwards. Out of range indexes must result in this function
+   returning NULL, so the plugin count can be determined by checking
+   for the least index that results in NULL being returned. */
+
+const LADSPA_Descriptor * ladspa_descriptor(unsigned long Index);
+
+/* Datatype corresponding to the ladspa_descriptor() function. */
+typedef const LADSPA_Descriptor *
+(*LADSPA_Descriptor_Function)(unsigned long Index);
+
+/**********************************************************************/
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* LADSPA_INCLUDED */
+
+/* EOF */

audacious-plugins-3.1.tar.bz2/src/ladspa/loaded-list.c Added

@@ -0,0 +1,135 @@
+/*
+ * LADSPA Host for Audacious
+ * Copyright 2011 John Lindgren
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions, and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions, and the following disclaimer in the documentation
+ * provided with the distribution.
+ *
+ * This software is provided "as is" and without any warranty, express or
+ * implied. In no event shall the authors be liable for any damages arising from
+ * the use of this software.
+ */
+
+#include <libaudgui/list.h>
+
+#include "plugin.h"
+
+static void get_value (void * user, int row, int column, GValue * value)
+{
+ g_return_if_fail (row >= 0 && row < index_count (loadeds));
+ g_return_if_fail (column == 0);
+
+ LoadedPlugin * loaded = index_get (loadeds, row);
+ g_value_set_string (value, loaded->plugin->desc->Name);
+}
+
+static int get_selected (void * user, int row)
+{
+ g_return_val_if_fail (row >= 0 && row < index_count (loadeds), 0);
+
+ LoadedPlugin * loaded = index_get (loadeds, row);
+ return loaded->selected;
+}
+
+static void set_selected (void * user, int row, int selected)
+{
+ g_return_if_fail (row >= 0 && row < index_count (loadeds));
+
+ LoadedPlugin * loaded = index_get (loadeds, row);
+ loaded->selected = selected;
+}
+
+static void select_all (void * user, int selected)
+{
+ int count = index_count (loadeds);
+ for (int i = 0; i < count; i ++)
+ {
+ LoadedPlugin * loaded = index_get (loadeds, i);
+ loaded->selected = selected;
+ }
+}
+
+static void shift_rows (void * user, int row, int before)
+{
+ pthread_mutex_lock (& mutex);
+
+ int rows = index_count (loadeds);
+ g_return_if_fail (row >= 0 && row < rows);
+ g_return_if_fail (before >= 0 && before <= rows);
+
+ if (before == row)
+ return;
+
+ struct index * move = index_new ();
+ struct index * others = index_new ();
+
+ int begin, end;
+ if (before < row)
+ {
+ begin = before;
+ end = row + 1;
+ while (end < rows && ((LoadedPlugin *) index_get (loadeds, end))->selected)
+ end ++;
+ }
+ else
+ {
+ begin = row;
+ while (begin > 0 && ((LoadedPlugin *) index_get (loadeds, begin - 1))->selected)
+ begin --;
+ end = before;
+ }
+
+ for (gint i = begin; i < end; i ++)
+ {
+ LoadedPlugin * loaded = index_get (loadeds, i);
+ index_append (loaded->selected ? move : others, loaded);
+ }
+
+ if (before < row)
+ {
+ index_merge_append (move, others);
+ index_free (others);
+ }
+ else
+ {
+ index_merge_append (others, move);
+ index_free (move);
+ move = others;
+ }
+
+ index_copy_set (move, 0, loadeds, begin, end - begin);
+ index_free (move);
+
+ pthread_mutex_unlock (& mutex);
+
+ if (loaded_list)
+ update_loaded_list (loaded_list);
+}
+
+static const AudguiListCallbacks callbacks = {
+ .get_value = get_value,
+ .get_selected = get_selected,
+ .set_selected = set_selected,
+ .select_all = select_all,
+ .shift_rows = shift_rows};
+
+GtkWidget * create_loaded_list (void)
+{
+ GtkWidget * list = audgui_list_new (& callbacks, NULL, index_count (loadeds));
+ audgui_list_add_column (list, NULL, 0, G_TYPE_STRING, 1);
+ gtk_tree_view_set_headers_visible ((GtkTreeView *) list, 0);
+ return list;
+}
+
+void update_loaded_list (GtkWidget * list)
+{
+ audgui_list_delete_rows (list, 0, audgui_list_row_count (list));
+ audgui_list_insert_rows (list, 0, index_count (loadeds));
+}

audacious-plugins-3.1.tar.bz2/src/ladspa/plugin-list.c Added

@@ -0,0 +1,77 @@
+/*
+ * LADSPA Host for Audacious
+ * Copyright 2011 John Lindgren
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions, and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions, and the following disclaimer in the documentation
+ * provided with the distribution.
+ *
+ * This software is provided "as is" and without any warranty, express or
+ * implied. In no event shall the authors be liable for any damages arising from
+ * the use of this software.
+ */
+
+#include <libaudgui/list.h>
+
+#include "plugin.h"
+
+static void get_value (void * user, int row, int column, GValue * value)
+{
+ g_return_if_fail (row >= 0 && row < index_count (plugins));
+ g_return_if_fail (column == 0);
+
+ PluginData * plugin = index_get (plugins, row);
+ g_value_set_string (value, plugin->desc->Name);
+}
+
+static int get_selected (void * user, int row)
+{
+ g_return_val_if_fail (row >= 0 && row < index_count (plugins), 0);
+
+ PluginData * plugin = index_get (plugins, row);
+ return plugin->selected;
+}
+
+static void set_selected (void * user, int row, int selected)
+{
+ g_return_if_fail (row >= 0 && row < index_count (plugins));
+
+ PluginData * plugin = index_get (plugins, row);
+ plugin->selected = selected;
+}
+
+static void select_all (void * user, int selected)
+{
+ int count = index_count (plugins);
+ for (int i = 0; i < count; i ++)
+ {
+ PluginData * plugin = index_get (plugins, i);
+ plugin->selected = selected;
+ }
+}
+
+static const AudguiListCallbacks callbacks = {
+ .get_value = get_value,
+ .get_selected = get_selected,
+ .set_selected = set_selected,
+ .select_all = select_all};
+
+GtkWidget * create_plugin_list (void)
+{
+ GtkWidget * list = audgui_list_new (& callbacks, NULL, index_count (plugins));
+ audgui_list_add_column (list, NULL, 0, G_TYPE_STRING, 1);
+ gtk_tree_view_set_headers_visible ((GtkTreeView *) list, 0);
+ return list;
+}
+
+void update_plugin_list (GtkWidget * list)
+{
+ audgui_list_delete_rows (list, 0, audgui_list_row_count (list));
+ audgui_list_insert_rows (list, 0, index_count (plugins));
+}

audacious-plugins-3.1.tar.bz2/src/ladspa/plugin.c Added

@@ -0,0 +1,676 @@
+/*
+ * LADSPA Host for Audacious
+ * Copyright 2011 John Lindgren
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions, and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions, and the following disclaimer in the documentation
+ * provided with the distribution.
+ *
+ * This software is provided "as is" and without any warranty, express or
+ * implied. In no event shall the authors be liable for any damages arising from
+ * the use of this software.
+ */
+
+#include <dirent.h>
+#include <errno.h>
+#include <math.h>
+#include <stdio.h>
+#include <string.h>
+
+#include <gmodule.h>
+#include <gtk/gtk.h>
+
+#include <audacious/i18n.h>
+#include <audacious/gtk-compat.h>
+#include <audacious/misc.h>
+#include <audacious/plugin.h>
+#include <libaudcore/audstrings.h>
+#include <libaudgui/libaudgui-gtk.h>
+
+#include "config.h"
+#include "plugin.h"
+
+static const gchar * const ladspa_defaults[] = {
+ "plugin_count", "0",
+ NULL};
+
+pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
+char * module_path;
+struct index * modules; /* (void *) */
+struct index * plugins; /* (PluginData *) */
+struct index * loadeds; /* (LoadedPlugin *) */
+
+GtkWidget * about_win;
+GtkWidget * config_win;
+GtkWidget * plugin_list;
+GtkWidget * loaded_list;
+
+static ControlData * parse_control (const LADSPA_Descriptor * desc, int port)
+{
+ g_return_val_if_fail (desc->PortNames[port], NULL);
+ const LADSPA_PortRangeHint * hint = & desc->PortRangeHints[port];
+
+ ControlData * control = g_slice_new (ControlData);
+ control->port = port;
+ control->name = g_strdup (desc->PortNames[port]);
+ control->is_toggle = LADSPA_IS_HINT_TOGGLED (hint->HintDescriptor) ? 1 : 0;
+
+ control->min = LADSPA_IS_HINT_BOUNDED_BELOW (hint->HintDescriptor) ? hint->LowerBound :
+ LADSPA_IS_HINT_BOUNDED_ABOVE (hint->HintDescriptor) ? hint->UpperBound - 100 : -100;
+ control->max = LADSPA_IS_HINT_BOUNDED_ABOVE (hint->HintDescriptor) ? hint->UpperBound :
+ LADSPA_IS_HINT_BOUNDED_BELOW (hint->HintDescriptor) ? hint->LowerBound + 100 : 100;
+
+ if (LADSPA_IS_HINT_SAMPLE_RATE (hint->HintDescriptor))
+ {
+ control->min *= 96000;
+ control->max *= 96000;
+ }
+
+ if (LADSPA_IS_HINT_DEFAULT_0 (hint->HintDescriptor))
+ control->def = 0;
+ else if (LADSPA_IS_HINT_DEFAULT_1 (hint->HintDescriptor))
+ control->def = 1;
+ else if (LADSPA_IS_HINT_DEFAULT_100 (hint->HintDescriptor))
+ control->def = 100;
+ else if (LADSPA_IS_HINT_DEFAULT_440 (hint->HintDescriptor))
+ control->def = 440;
+ else if (LADSPA_IS_HINT_DEFAULT_MINIMUM (hint->HintDescriptor))
+ control->def = control->min;
+ else if (LADSPA_IS_HINT_DEFAULT_MAXIMUM (hint->HintDescriptor))
+ control->def = control->max;
+ else if (LADSPA_IS_HINT_DEFAULT_LOW (hint->HintDescriptor))
+ {
+ if (LADSPA_IS_HINT_LOGARITHMIC (hint->HintDescriptor))
+ control->def = expf (0.75 * logf (control->min) + 0.25 * logf (control->max));
+ else
+ control->def = 0.75 * control->min + 0.25 * control->max;
+ }
+ else if (LADSPA_IS_HINT_DEFAULT_HIGH (hint->HintDescriptor))
+ {
+ if (LADSPA_IS_HINT_LOGARITHMIC (hint->HintDescriptor))
+ control->def = expf (0.25 * logf (control->min) + 0.75 * logf (control->max));
+ else
+ control->def = 0.25 * control->min + 0.75 * control->max;
+ }
+ else
+ {
+ if (LADSPA_IS_HINT_LOGARITHMIC (hint->HintDescriptor))
+ control->def = expf (0.5 * logf (control->min) + 0.5 * logf (control->max));
+ else
+ control->def = 0.5 * control->min + 0.5 * control->max;
+ }
+
+ return control;
+}
+
+static PluginData * open_plugin (const char * path, const LADSPA_Descriptor * desc)
+{
+ const char * slash = strrchr (path, G_DIR_SEPARATOR);
+ g_return_val_if_fail (slash && slash[1], NULL);
+ g_return_val_if_fail (desc->Label && desc->Name, NULL);
+
+ PluginData * plugin = g_slice_new (PluginData);
+ plugin->path = g_strdup (slash + 1);
+ plugin->desc = desc;
+ plugin->controls = index_new ();
+ plugin->in_ports = g_array_new (0, 0, sizeof (int));
+ plugin->out_ports = g_array_new (0, 0, sizeof (int));
+ plugin->selected = 0;
+
+ for (int i = 0; i < desc->PortCount; i ++)
+ {
+ if (LADSPA_IS_PORT_CONTROL (desc->PortDescriptors[i]))
+ {
+ ControlData * control = parse_control (desc, i);
+ if (control)
+ index_append (plugin->controls, control);
+ }
+ else if (LADSPA_IS_PORT_AUDIO (desc->PortDescriptors[i]) &&
+ LADSPA_IS_PORT_INPUT (desc->PortDescriptors[i]))
+ g_array_append_val (plugin->in_ports, i);
+ else if (LADSPA_IS_PORT_AUDIO (desc->PortDescriptors[i]) &&
+ LADSPA_IS_PORT_OUTPUT (desc->PortDescriptors[i]))
+ g_array_append_val (plugin->out_ports, i);
+ }
+
+ return plugin;
+}
+
+static void close_plugin (PluginData * plugin)
+{
+ int count = index_count (plugin->controls);
+ for (int i = 0; i < count; i ++)
+ {
+ ControlData * control = index_get (plugin->controls, i);
+ g_free (control->name);
+ g_slice_free (ControlData, control);
+ }
+
+ g_free (plugin->path);
+ index_free (plugin->controls);
+ g_array_free (plugin->in_ports, 1);
+ g_array_free (plugin->out_ports, 1);
+ g_slice_free (PluginData, plugin);
+}
+
+static void * open_module (const char * path)
+{
+ GModule * handle = g_module_open (path, G_MODULE_BIND_LOCAL);
+ if (! handle)
+ {
+ fprintf (stderr, "ladspa: Failed to open module %s: %s\n", path, g_module_error ());
+ return NULL;
+ }
+
+ void * sym;
+ if (! g_module_symbol (handle, "ladspa_descriptor", & sym))
+ {
+ fprintf (stderr, "ladspa: Not a valid LADSPA module: %s\n", path);
+ g_module_close (handle);
+ return NULL;
+ }
+
+ LADSPA_Descriptor_Function descfun = (LADSPA_Descriptor_Function) sym;
+ 
+ const LADSPA_Descriptor * desc;
+ for (int i = 0; (desc = descfun (i)); i ++)
+ {
+ PluginData * plugin = open_plugin (path, desc);
+ if (plugin)
+ index_append (plugins, plugin);
+ }
+
+ return handle;
+}
+
+static void open_modules_for_path (const char * path)
+{
+ DIR * folder = opendir (path);
+ if (! folder)
+ {
+ fprintf (stderr, "ladspa: Failed to read folder %s: %s\n", path, strerror (errno));
+ return;
+ }
+
+ struct dirent * entry;
+ while ((entry = readdir (folder)))
+ {
+ if (entry->d_name[0] == '.' || ! str_has_suffix_nocase (entry->d_name, G_MODULE_SUFFIX))
+ continue;
+
+ char filename[strlen (path) + strlen (entry->d_name) + 2];
+ snprintf (filename, sizeof filename, "%s" G_DIR_SEPARATOR_S "%s", path, entry->d_name);
+
+ void * handle = open_module (filename);
+ if (handle)
+ index_append (modules, handle);
+ }
+
+ closedir (folder);
+}
+
+static void open_modules_for_paths (const char * paths)
+{
+ if (! paths || ! paths[0])
+ return;
+
+ char * * split = g_strsplit (paths, ":", -1);
+
+ for (int i = 0; split[i]; i ++)
+ open_modules_for_path (split[i]);
+
+ g_strfreev (split);
+}
+
+static void open_modules (void)
+{
+ open_modules_for_paths (getenv ("LADSPA_PATH"));
+ open_modules_for_paths (module_path);
+}
+
+static void close_modules (void)
+{
+ int count = index_count (plugins);
+ for (int i = 0; i < count; i ++)
+ close_plugin (index_get (plugins, i));
+
+ index_delete (plugins, 0, count);
+
+ count = index_count (modules);
+ for (int i = 0; i < count; i ++)
+ g_module_close (index_get (modules, i));
+
+ index_delete (modules, 0, count);
+}
+
+LoadedPlugin * enable_plugin_locked (PluginData * plugin)
+{
+ LoadedPlugin * loaded = g_slice_new (LoadedPlugin);
+ loaded->plugin = plugin;
+ loaded->selected = 0;
+
+ int count = index_count (plugin->controls);
+ loaded->values = g_malloc (sizeof (float) * count);
+
+ for (int i = 0; i < count; i ++)
+ {
+ ControlData * control = index_get (plugin->controls, i);
+ loaded->values[i] = control->def;
+ }
+
+ loaded->active = 0;
+ loaded->instances = NULL;
+ loaded->in_bufs = NULL;
+ loaded->out_bufs = NULL;
+
+ loaded->settings_win = NULL;
+
+ index_append (loadeds, loaded);
+ return loaded;
+}
+
+void disable_plugin_locked (int i)
+{
+ g_return_if_fail (i >= 0 && i < index_count (loadeds));
+ LoadedPlugin * loaded = index_get (loadeds, i);
+
+ if (loaded->settings_win)
+ gtk_widget_destroy (loaded->settings_win);
+
+ shutdown_plugin_locked (loaded);
+
+ g_free (loaded->values);
+ g_slice_free (LoadedPlugin, loaded);
+ index_delete (loadeds, i, 1);
+}
+
+static PluginData * find_plugin (const char * path, const char * label)
+{
+ int count = index_count (plugins);
+ for (int i = 0; i < count; i ++)
+ {
+ PluginData * plugin = index_get (plugins, i);
+ if (! strcmp (plugin->path, path) && ! strcmp (plugin->desc->Label, label))
+ return plugin;
+ }
+
+ return NULL;
+}
+
+static void save_enabled_to_config (void)
+{
+ int count = index_count (loadeds);
+ aud_set_int ("ladspa", "plugin_count", count);
+
+ for (int i = 0; i < count; i ++)
+ {
+ LoadedPlugin * loaded = index_get (loadeds, 0);
+ char key[32];
+
+ snprintf (key, sizeof key, "plugin%d_path", i);
+ aud_set_string ("ladspa", key, loaded->plugin->path);
+
+ snprintf (key, sizeof key, "plugin%d_label", i);
+ aud_set_string ("ladspa", key, loaded->plugin->desc->Label);
+
+ int ccount = index_count (loaded->plugin->controls);
+ for (int ci = 0; ci < ccount; ci ++)
+ {
+ snprintf (key, sizeof key, "plugin%d_control%d", i, ci);
+ aud_set_double ("ladspa", key, loaded->values[ci]);
+ }
+
+ disable_plugin_locked (0);
+ }
+}
+
+static void load_enabled_from_config (void)
+{
+ int count = aud_get_int ("ladspa", "plugin_count");
+
+ for (int i = 0; i < count; i ++)
+ {
+ char key[32];
+
+ snprintf (key, sizeof key, "plugin%d_path", i);
+ char * path = aud_get_string ("ladspa", key);
+
+ snprintf (key, sizeof key, "plugin%d_label", i);
+ char * label = aud_get_string ("ladspa", key);
+
+ PluginData * plugin = find_plugin (path, label);
+ if (plugin)
+ {
+ LoadedPlugin * loaded = enable_plugin_locked (plugin);
+
+ int ccount = index_count (loaded->plugin->controls);
+ for (int ci = 0; ci < ccount; ci ++)
+ {
+ snprintf (key, sizeof key, "plugin%d_control%d", i, ci);
+ loaded->values[ci] = aud_get_double ("ladspa", key);
+ }
+ }
+
+ g_free (path);
+ g_free (label);
+ }
+}
+
+static int init (void)
+{
+ pthread_mutex_lock (& mutex);
+
+ modules = index_new ();
+ plugins = index_new ();
+ loadeds = index_new ();
+
+ aud_config_set_defaults ("ladspa", ladspa_defaults);
+
+ module_path = aud_get_string ("ladspa", "module_path");
+
+ open_modules ();
+ load_enabled_from_config ();
+
+ pthread_mutex_unlock (& mutex);
+ return 1;
+}
+
+static void cleanup (void)
+{
+ if (about_win)
+ gtk_widget_destroy (about_win);
+ if (config_win)
+ gtk_widget_destroy (config_win);
+
+ pthread_mutex_lock (& mutex);
+
+ aud_config_clear_section ("ladspa");
+ aud_set_string ("ladspa", "module_path", module_path);
+ save_enabled_to_config ();
+ close_modules ();
+
+ index_free (modules);
+ modules = NULL;
+ index_free (plugins);
+ plugins = NULL;
+ index_free (loadeds);
+ loadeds = NULL;
+
+ g_free (module_path);
+ module_path = NULL;
+
+ pthread_mutex_unlock (& mutex);
+}
+
+static void about (void)
+{
+ audgui_simple_message (& about_win, GTK_MESSAGE_INFO,
+ _("About LADSPA Host"), "LADSPA Host for Audacious\n"
+ "Copyright 2011 John Lindgren\n\n"
+ "Redistribution and use in source and binary forms, with or without "
+ "modification, are permitted provided that the following conditions are "
+ "met:\n\n"
+ "1. Redistributions of source code must retain the above copyright "
+ "notice, this list of conditions, and the following disclaimer.\n\n"
+ "2. Redistributions in binary form must reproduce the above copyright "
+ "notice, this list of conditions, and the following disclaimer in the "
+ "documentation provided with the distribution.\n\n"
+ "This software is provided \"as is\" and without any warranty, express or "
+ "implied. In no event shall the authors be liable for any damages arising "
+ "from the use of this software.");
+}
+
+static void set_module_path (GtkEntry * entry)
+{
+ pthread_mutex_lock (& mutex);
+
+ save_enabled_to_config ();
+ close_modules ();
+
+ g_free (module_path);
+ module_path = g_strdup (gtk_entry_get_text (entry));
+
+ open_modules ();
+ load_enabled_from_config ();
+
+ pthread_mutex_unlock (& mutex);
+
+ if (plugin_list)
+ update_plugin_list (plugin_list);
+ if (loaded_list)
+ update_loaded_list (loaded_list);
+}
+
+static void enable_selected (void)
+{
+ pthread_mutex_lock (& mutex);
+
+ int count = index_count (plugins);
+ for (int i = 0; i < count; i ++)
+ {
+ PluginData * plugin = index_get (plugins, i);
+ if (plugin->selected)
+ enable_plugin_locked (plugin);
+ }
+
+ pthread_mutex_unlock (& mutex);
+
+ if (loaded_list)
+ update_loaded_list (loaded_list);
+}
+
+static void disable_selected (void)
+{
+ pthread_mutex_lock (& mutex);
+
+ int count = index_count (loadeds);
+ int offset = 0;
+ for (int i = 0; i < count; i ++)
+ {
+ LoadedPlugin * loaded = index_get (loadeds, i - offset);
+ if (loaded->selected)
+ {
+ disable_plugin_locked (i - offset);
+ offset ++;
+ }
+ }
+
+ pthread_mutex_unlock (& mutex);
+
+ if (loaded_list)
+ update_loaded_list (loaded_list);
+}
+
+static void control_toggled (GtkToggleButton * toggle, float * value)
+{
+ pthread_mutex_lock (& mutex);
+ * value = gtk_toggle_button_get_active (toggle) ? 1 : 0;
+ pthread_mutex_unlock (& mutex);
+}
+
+static void control_changed (GtkSpinButton * spin, float * value)
+{
+ pthread_mutex_lock (& mutex);
+ * value = gtk_spin_button_get_value (spin);
+ pthread_mutex_unlock (& mutex);
+}
+
+static void configure_plugin (LoadedPlugin * loaded)
+{
+ if (loaded->settings_win)
+ {
+ gtk_window_present ((GtkWindow *) loaded->settings_win);
+ return;
+ }
+
+ PluginData * plugin = loaded->plugin;
+ char buf[200];
+
+ snprintf (buf, sizeof buf, _("%s Settings"), plugin->desc->Name);
+ loaded->settings_win = gtk_dialog_new_with_buttons (buf, (GtkWindow *)
+ config_win, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_CLOSE,
+ GTK_RESPONSE_CLOSE, NULL);
+ gtk_window_set_resizable ((GtkWindow *) loaded->settings_win, 0);
+
+ GtkWidget * vbox = gtk_dialog_get_content_area ((GtkDialog *) loaded->settings_win);
+
+ int count = index_count (plugin->controls);
+ for (int i = 0; i < count; i ++)
+ {
+ ControlData * control = index_get (plugin->controls, i);
+
+ GtkWidget * hbox = gtk_hbox_new (0, 6);
+ gtk_box_pack_start ((GtkBox *) vbox, hbox, 0, 0, 0);
+
+ if (control->is_toggle)
+ {
+ GtkWidget * toggle = gtk_check_button_new_with_label (control->name);
+ gtk_toggle_button_set_active ((GtkToggleButton *) toggle, (loaded->values[i] > 0) ? 1 : 0);
+ gtk_box_pack_start ((GtkBox *) hbox, toggle, 0, 0, 0);
+
+ g_signal_connect (toggle, "toggled", (GCallback) control_toggled, & loaded->values[i]);
+ }
+ else
+ {
+ snprintf (buf, sizeof buf, "%s:", control->name);
+ GtkWidget * label = gtk_label_new (buf);
+ gtk_box_pack_start ((GtkBox *) hbox, label, 0, 0, 0);
+
+ GtkWidget * spin = gtk_spin_button_new_with_range (control->min, control->max, 0.01);
+ gtk_spin_button_set_value ((GtkSpinButton *) spin, loaded->values[i]);
+ gtk_box_pack_start ((GtkBox *) hbox, spin, 0, 0, 0);
+
+ g_signal_connect (spin, "value-changed", (GCallback) control_changed, & loaded->values[i]);
+ }
+ }
+
+ g_signal_connect (loaded->settings_win, "response", (GCallback) gtk_widget_destroy, NULL);
+ g_signal_connect (loaded->settings_win, "destroy", (GCallback)
+ gtk_widget_destroyed, & loaded->settings_win);
+
+ gtk_widget_show_all (loaded->settings_win);
+}
+
+static void configure_selected (void)
+{
+ pthread_mutex_lock (& mutex);
+
+ int count = index_count (loadeds);
+ for (int i = 0; i < count; i ++)
+ {
+ LoadedPlugin * loaded = index_get (loadeds, i);
+ if (loaded->selected)
+ configure_plugin (loaded);
+ }
+
+ pthread_mutex_unlock (& mutex);
+}
+
+static void configure (void)
+{
+ if (config_win)
+ {
+ gtk_window_present ((GtkWindow *) config_win);
+ return;
+ }
+
+ config_win = gtk_dialog_new_with_buttons (_("LADSPA Host Settings"), NULL,
+ 0, GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, NULL);
+ gtk_window_set_default_size ((GtkWindow *) config_win, 480, 360);
+
+ GtkWidget * vbox = gtk_dialog_get_content_area ((GtkDialog *) config_win);
+
+ GtkWidget * hbox = gtk_hbox_new (0, 6);
+ gtk_box_pack_start ((GtkBox *) vbox, hbox, 0, 0, 0);
+
+ GtkWidget * label = gtk_label_new (_("Module paths:"));
+ gtk_box_pack_start ((GtkBox *) hbox, label, 0, 0, 0);
+
+ label = gtk_label_new (0);
+ gtk_label_set_markup ((GtkLabel *) label,
+ _("Separate multiple paths with a colon.\n"
+ "These paths are searched in addition to LADSPA_PATH.\n"
+ "After adding new paths, press Enter to scan for new plugins."));
+ gtk_misc_set_padding ((GtkMisc *) label, 12, 6);
+ gtk_misc_set_alignment ((GtkMisc *) label, 0, 0);
+ gtk_box_pack_start ((GtkBox *) vbox, label, 0, 0, 0);
+
+ GtkWidget * entry = gtk_entry_new ();
+ gtk_box_pack_start ((GtkBox *) hbox, entry, 1, 1, 0);
+
+ hbox = gtk_hbox_new (0, 6);
+ gtk_box_pack_start ((GtkBox *) vbox, hbox, 1, 1, 0);
+
+ GtkWidget * vbox2 = gtk_vbox_new (0, 6);
+ gtk_box_pack_start ((GtkBox *) hbox, vbox2, 1, 1, 0);
+
+ label = gtk_label_new (_("Available plugins:"));
+ gtk_box_pack_start ((GtkBox *) vbox2, label, 0, 0, 0);
+
+ GtkWidget * scrolled = gtk_scrolled_window_new (NULL, NULL);
+ gtk_box_pack_start ((GtkBox *) vbox2, scrolled, 1, 1, 0);
+
+ plugin_list = create_plugin_list ();
+ gtk_container_add ((GtkContainer *) scrolled, plugin_list);
+
+ GtkWidget * hbox2 = gtk_hbox_new (0, 6);
+ gtk_box_pack_start ((GtkBox *) vbox2, hbox2, 0, 0, 0);
+
+ GtkWidget * enable_button = gtk_button_new_with_label (_("Enable"));
+ gtk_box_pack_end ((GtkBox *) hbox2, enable_button, 0, 0, 0);
+
+ vbox2 = gtk_vbox_new (0, 6);
+ gtk_box_pack_start ((GtkBox *) hbox, vbox2, 1, 1, 0);
+
+ label = gtk_label_new (_("Enabled plugins:"));
+ gtk_box_pack_start ((GtkBox *) vbox2, label, 0, 0, 0);
+
+ scrolled = gtk_scrolled_window_new (NULL, NULL);
+ gtk_box_pack_start ((GtkBox *) vbox2, scrolled, 1, 1, 0);
+
+ loaded_list = create_loaded_list ();
+ gtk_container_add ((GtkContainer *) scrolled, loaded_list);
+
+ hbox2 = gtk_hbox_new (0, 6);
+ gtk_box_pack_start ((GtkBox *) vbox2, hbox2, 0, 0, 0);
+
+ GtkWidget * disable_button = gtk_button_new_with_label (_("Disable"));
+ gtk_box_pack_end ((GtkBox *) hbox2, disable_button, 0, 0, 0);
+
+ GtkWidget * settings_button = gtk_button_new_with_label (_("Settings"));
+ gtk_box_pack_end ((GtkBox *) hbox2, settings_button, 0, 0, 0);
+
+ if (module_path)
+ gtk_entry_set_text ((GtkEntry *) entry, module_path);
+
+ g_signal_connect (config_win, "response", (GCallback) gtk_widget_destroy, NULL);
+ g_signal_connect (config_win, "destroy", (GCallback) gtk_widget_destroyed, & config_win);
+ g_signal_connect (entry, "activate", (GCallback) set_module_path, NULL);
+ g_signal_connect (plugin_list, "destroy", (GCallback) gtk_widget_destroyed, & plugin_list);
+ g_signal_connect (enable_button, "clicked", (GCallback) enable_selected, NULL);
+ g_signal_connect (loaded_list, "destroy", (GCallback) gtk_widget_destroyed, & loaded_list);
+ g_signal_connect (disable_button, "clicked", (GCallback) disable_selected, NULL);
+ g_signal_connect (settings_button, "clicked", (GCallback) configure_selected, NULL);
+
+ gtk_widget_show_all (config_win);
+}
+
+AUD_EFFECT_PLUGIN
+(
+ .name = "LADSPA Host",
+ .init = init,
+ .cleanup = cleanup,
+ .about = about,
+ .configure = configure,
+ .start = ladspa_start,
+ .process = ladspa_process,
+ .flush = ladspa_flush,
+ .finish = ladspa_finish,
+ .preserves_format = 1,
+)

audacious-plugins-3.1.tar.bz2/src/ladspa/plugin.h Added

@@ -0,0 +1,95 @@
+/*
+ * LADSPA Host for Audacious
+ * Copyright 2011 John Lindgren
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions, and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions, and the following disclaimer in the documentation
+ * provided with the distribution.
+ *
+ * This software is provided "as is" and without any warranty, express or
+ * implied. In no event shall the authors be liable for any damages arising from
+ * the use of this software.
+ */
+
+#ifndef AUD_LADSPA_PLUGIN_H
+#define AUD_LADSPA_PLUGIN_H
+
+#include <pthread.h>
+#include <gtk/gtk.h>
+#include <libaudcore/index.h>
+
+#include "ladspa.h"
+
+#define LADSPA_BUFLEN 1024
+
+typedef struct {
+ int port;
+ char * name;
+ char is_toggle;
+ float min, max, def;
+} ControlData;
+
+typedef struct {
+ char * path;
+ const LADSPA_Descriptor * desc;
+ struct index * controls; /* (ControlData *) */
+ GArray * in_ports, * out_ports; /* (int) */
+ char selected;
+} PluginData;
+
+typedef struct {
+ PluginData * plugin;
+ float * values;
+ char selected;
+ char active;
+ struct index * instances; /* (LADSPA_Handle) */
+ float * * in_bufs, * * out_bufs; /* (float *) */
+ GtkWidget * settings_win;
+} LoadedPlugin;
+
+/* plugin.c */
+
+/* The mutex needs to be locked when the main thread is writing to the data
+ * structures below (but not when it is only reading from them) and when the
+ * audio thread is reading from them. */
+
+extern pthread_mutex_t mutex;
+extern char * module_path;
+extern struct index * modules; /* (GModule *) */
+extern struct index * plugins; /* (PluginData *) */
+extern struct index * loadeds; /* (LoadedPlugin *) */
+
+extern GtkWidget * about_win;
+extern GtkWidget * config_win;
+extern GtkWidget * plugin_list;
+extern GtkWidget * loaded_list;
+
+LoadedPlugin * enable_plugin_locked (PluginData * plugin);
+void disable_plugin_locked (int i);
+
+/* effect.c */
+
+void shutdown_plugin_locked (LoadedPlugin * loaded);
+
+void ladspa_start (gint * channels, gint * rate);
+void ladspa_process (gfloat * * data, gint * samples);
+void ladspa_flush (void);
+void ladspa_finish (gfloat * * data, gint * samples);
+
+/* plugin-list.c */
+
+GtkWidget * create_plugin_list (void);
+void update_plugin_list (GtkWidget * list);
+
+/* loaded-list.c */
+
+GtkWidget * create_loaded_list (void);
+void update_loaded_list (GtkWidget * list);
+
+#endif

audacious-plugins-3.0.3.tar.bz2/src/lyricwiki/Makefile -> audacious-plugins-3.1.tar.bz2/src/lyricwiki/Makefile Changed

audacious-plugins-3.0.3.tar.bz2/src/lyricwiki/lyricwiki.c -> audacious-plugins-3.1.tar.bz2/src/lyricwiki/lyricwiki.c Changed

@@ -28,7 +28,6 @@
 
 #include <stdio.h>
 #include <glib.h>
-#include <glib/gi18n.h>
 #include <string.h>
 #include <gtk/gtk.h>
 #include <libxml/parser.h>
@@ -38,6 +37,7 @@
 #include <mowgli.h>
 
 #include <audacious/drct.h>
+#include <audacious/i18n.h>
 #include <audacious/misc.h>
 #include <audacious/playlist.h>
 #include <audacious/plugin.h>
@@ -45,6 +45,7 @@
 #include <libaudcore/hook.h>
 #include <libaudcore/vfs_async.h>
 
+#include "config.h"
 #include "urlencode.h"
 
 /*
@@ -115,7 +116,7 @@
 				g_regex_match(reg, (gchar *) lyric, G_REGEX_MATCH_NEWLINE_ANY, &match_info);
 
 				ret = g_match_info_fetch(match_info, 2);
-				if (!g_utf8_collate(ret, "\n\n\n\n"))
+				if (!g_utf8_collate(ret, "\n\n"))
 				{
 					g_free(ret);
 					ret = NULL;
@@ -187,6 +188,44 @@
 	return uri;
 }
 
+gboolean
+check_current_track(Tuple *tu)
+{
+	gboolean ret = TRUE;
+	gint playlist, pos, i;
+	gint fields[] = {FIELD_ARTIST, FIELD_TITLE};
+	Tuple *cu = NULL;
+
+	if (tu == NULL)
+		return FALSE;
+
+	playlist = aud_playlist_get_playing();
+	pos = aud_playlist_get_position(playlist);
+	cu = aud_playlist_entry_get_tuple(playlist, pos, FALSE);
+
+	if (cu == NULL)
+		return FALSE;
+
+	for (i = 0; i < sizeof(fields)/sizeof(gint); i++)
+	{
+		const gchar* string1 = tuple_get_string(tu, fields[i], NULL);
+		const gchar* string2 = tuple_get_string(cu, fields[i], NULL);
+
+		if (string1 == NULL && string2 == NULL)
+			continue;
+
+		if (string1 == NULL || string2 == NULL ||
+			strcmp(string1, string2) != 0)
+		{
+		 ret = FALSE;
+		 break;
+		}
+	}
+
+	tuple_free(cu);
+	return ret;
+}
+
 void update_lyrics_window(const Tuple *tu, const gchar *lyrics);
 
 gboolean
@@ -200,7 +239,8 @@
 		g_free(buf);
 	}
 
-	update_lyrics_window(tu, lyrics);
+	if (check_current_track(tu))
+		update_lyrics_window(tu, lyrics);
 	mowgli_object_unref(tu);
 
 	if (lyrics != NULL)
@@ -217,14 +257,18 @@
 	uri = scrape_uri_from_lyricwiki_search_result(buf, len);
 	if (uri == NULL)
 	{
-		update_lyrics_window(tu, NULL);
+		if (check_current_track(tu))
+			update_lyrics_window(tu, NULL);
 		mowgli_object_unref(tu);
 
 		return FALSE;
 	}
 
-	update_lyrics_window(tu, _("\nLooking for lyrics..."));
-	vfs_async_file_get_contents(uri, (VFSConsumer) get_lyrics_step_3, tu);
+	if (check_current_track(tu))
+	{
+		update_lyrics_window(tu, _("\nLooking for lyrics..."));
+		vfs_async_file_get_contents(uri, (VFSConsumer) get_lyrics_step_3, tu);
+	}
 
 	g_free(buf);
 
@@ -363,6 +407,7 @@
 static gboolean init (void)
 {
 	hook_associate("title change", (HookFunction) lyricwiki_playback_began, NULL);
+	hook_associate("playback ready", (HookFunction) lyricwiki_playback_began, NULL);
 
 	build_widget();
 
@@ -374,6 +419,7 @@
 cleanup(void)
 {
 	hook_dissociate("title change", (HookFunction) lyricwiki_playback_began);
+	hook_dissociate("playback ready", (HookFunction) lyricwiki_playback_began);
 
 	if (vbox)
 		gtk_widget_destroy (vbox);

audacious-plugins-3.0.3.tar.bz2/src/m3u/Makefile -> audacious-plugins-3.1.tar.bz2/src/m3u/Makefile Changed

audacious-plugins-3.0.3.tar.bz2/src/m3u/m3u.c -> audacious-plugins-3.1.tar.bz2/src/m3u/m3u.c Changed

audacious-plugins-3.0.3.tar.bz2/src/metronom/Makefile -> audacious-plugins-3.1.tar.bz2/src/metronom/Makefile Changed

audacious-plugins-3.1.tar.bz2/src/mixer Added

audacious-plugins-3.1.tar.bz2/src/mixer/Makefile Added

audacious-plugins-3.1.tar.bz2/src/mixer/mixer.c Added

@@ -0,0 +1,146 @@
+/*
+ * Channel Mixer Plugin for Audacious
+ * Copyright 2011 John Lindgren
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions, and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions, and the following disclaimer in the documentation
+ * provided with the distribution.
+ *
+ * This software is provided "as is" and without any warranty, express or
+ * implied. In no event shall the authors be liable for any damages arising from
+ * the use of this software.
+ */
+
+/* TODO: implement surround converters */
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "mixer.h"
+
+typedef void (* Converter) (float * * data, int * samples);
+
+static void mono_to_stereo (float * * data, int * samples)
+{
+ int frames = * samples;
+ float * get = * data;
+ float * set = mixer_buf = realloc (mixer_buf, sizeof (float) * 2 * frames);
+
+ * data = mixer_buf;
+ * samples = 2 * frames;
+
+ while (frames --)
+ {
+ float val = * get ++;
+ * set ++ = val;
+ * set ++ = val;
+ }
+}
+
+static void stereo_to_mono (float * * data, int * samples)
+{
+ int frames = * samples / 2;
+ float * get = * data;
+ float * set = mixer_buf = realloc (mixer_buf, sizeof (float) * frames);
+
+ * data = mixer_buf;
+ * samples = frames;
+
+ while (frames --)
+ {
+ float val = * get ++;
+ val += * get ++;
+ * set ++ = val / 2;
+ }
+}
+
+static void quadro_to_stereo(float * * data, int * samples)
+{
+ int frames = * samples / 4;
+ float * get = * data;
+ float * set = mixer_buf = realloc (mixer_buf, sizeof (float) * 2 * frames);
+
+ * data = mixer_buf;
+ * samples = 2 * frames;
+
+ while (frames --)
+ {
+ float front_left = * get ++;
+ float front_right = * get ++;
+ float back_left = * get ++;
+ float back_right = * get ++;
+ * set ++ = front_left + (back_left * 0.7);
+ * set ++ = front_right + (back_right * 0.7);
+ }
+}
+
+static void surround_5p1_to_stereo(float * * data, int * samples)
+{
+ int frames = * samples / 6;
+ float * get = * data;
+ float * set = mixer_buf = realloc (mixer_buf, sizeof (float) * 2 * frames);
+
+ * data = mixer_buf;
+ * samples = 2 * frames;
+
+ while (frames --)
+ {
+ float front_left = * get ++;
+ float front_right = * get ++;
+ float center = * get ++;
+ float lfe = * get ++;
+ float rear_left = * get ++;
+ float rear_right = * get ++;
+ * set ++ = front_left + (center * 0.5) + (lfe * 0.5) + (rear_left * 0.5);
+ * set ++ = front_right + (center * 0.5) + (lfe * 0.5) + (rear_right * 0.5);
+ }
+}
+
+static const Converter converters[MAX_CHANNELS + 1][MAX_CHANNELS + 1] = {
+ [1][2] = mono_to_stereo,
+ [2][1] = stereo_to_mono,
+ [4][2] = quadro_to_stereo,
+ [6][2] = surround_5p1_to_stereo};
+
+static int input_channels, output_channels;
+
+void mixer_start (int * channels, int * rate)
+{
+ input_channels = * channels;
+ output_channels = mixer_channels;
+
+ if (input_channels == output_channels)
+ return;
+
+ if (input_channels < 1 || input_channels > MAX_CHANNELS ||
+ ! converters[input_channels][output_channels])
+ {
+ fprintf (stderr, "Converting %d to %d channels is not implemented.\n",
+ input_channels, output_channels);
+ return;
+ }
+
+ * channels = output_channels;
+}
+
+void mixer_process (float * * data, int * samples)
+{
+ if (input_channels == output_channels)
+ return;
+
+ if (input_channels < 1 || input_channels > MAX_CHANNELS ||
+ ! converters[input_channels][output_channels])
+ return;
+
+ converters[input_channels][output_channels] (data, samples);
+}
+
+void mixer_flush (void)
+{
+}

audacious-plugins-3.1.tar.bz2/src/mixer/mixer.h Added

@@ -0,0 +1,27 @@
+/*
+ * Channel Mixer Plugin for Audacious
+ * Copyright 2011 John Lindgren
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions, and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions, and the following disclaimer in the documentation
+ *    provided with the distribution.
+ *
+ * This software is provided "as is" and without any warranty, express or
+ * implied. In no event shall the authors be liable for any damages arising from
+ * the use of this software.
+ */
+
+#define MAX_CHANNELS 8
+
+extern int mixer_channels;
+extern float * mixer_buf;
+
+void mixer_start (int * channels, int * rate);
+void mixer_process (float * * data, int * samples);
+void mixer_flush (void);

audacious-plugins-3.1.tar.bz2/src/mixer/plugin.c Added

@@ -0,0 +1,134 @@
+/*
+ * Channel Mixer Plugin for Audacious
+ * Copyright 2011 John Lindgren
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions, and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions, and the following disclaimer in the documentation
+ * provided with the distribution.
+ *
+ * This software is provided "as is" and without any warranty, express or
+ * implied. In no event shall the authors be liable for any damages arising from
+ * the use of this software.
+ */
+
+#include <stdlib.h>
+#include <gtk/gtk.h>
+
+#include <audacious/gtk-compat.h>
+#include <audacious/i18n.h>
+#include <audacious/misc.h>
+#include <audacious/plugin.h>
+#include <libaudgui/libaudgui-gtk.h>
+
+#include "config.h"
+#include "mixer.h"
+
+static const gchar * const mixer_defaults[] = {
+ "channels", "2",
+ NULL};
+
+int mixer_channels;
+float * mixer_buf;
+
+static GtkWidget * about_win, * config_win;
+
+static int mixer_init (void)
+{
+ aud_config_set_defaults ("mixer", mixer_defaults);
+ mixer_channels = aud_get_int ("mixer", "channels");
+ return 1;
+}
+
+static void mixer_cleanup (void)
+{
+ if (about_win)
+ gtk_widget_destroy (about_win);
+ if (config_win)
+ gtk_widget_destroy (config_win);
+
+ aud_set_int ("mixer", "channels", mixer_channels);
+
+ free (mixer_buf);
+ mixer_buf = 0;
+}
+
+static void mixer_about (void)
+{
+ audgui_simple_message (& about_win, GTK_MESSAGE_INFO,
+ _("About Channel Mixer"),
+ "Channel Mixer Plugin for Audacious\n"
+ "Copyright 2011 John Lindgren\n\n"
+ "Redistribution and use in source and binary forms, with or without "
+ "modification, are permitted provided that the following conditions are "
+ "met:\n\n"
+ "1. Redistributions of source code must retain the above copyright "
+ "notice, this list of conditions, and the following disclaimer.\n\n"
+ "2. Redistributions in binary form must reproduce the above copyright "
+ "notice, this list of conditions, and the following disclaimer in the "
+ "documentation provided with the distribution.\n\n"
+ "This software is provided \"as is\" and without any warranty, express or "
+ "implied. In no event shall the authors be liable for any damages arising "
+ "from the use of this software.");
+}
+
+static void spin_changed (GtkSpinButton * spin, void * data)
+{
+ * (int *) data = gtk_spin_button_get_value (spin);
+}
+
+static void mixer_configure (void)
+{
+ if (config_win)
+ {
+ gtk_window_present ((GtkWindow *) config_win);
+ return;
+ }
+
+ config_win = gtk_dialog_new_with_buttons (_("Channel Mixer Settings"), 0, 0,
+ GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, 0);
+ gtk_window_set_resizable ((GtkWindow *) config_win, 0);
+
+ GtkWidget * vbox = gtk_dialog_get_content_area ((GtkDialog *) config_win);
+
+ GtkWidget * hbox = gtk_hbox_new (0, 6);
+ gtk_box_pack_start ((GtkBox *) vbox, hbox, 0, 0, 0);
+
+ GtkWidget * label = gtk_label_new (_("Output channels:"));
+ gtk_box_pack_start ((GtkBox *) hbox, label, 0, 0, 0);
+
+ GtkWidget * spin = gtk_spin_button_new_with_range (1, MAX_CHANNELS, 1);
+ gtk_spin_button_set_value ((GtkSpinButton *) spin, mixer_channels);
+ gtk_box_pack_start ((GtkBox *) hbox, spin, 0, 0, 0);
+
+ hbox = gtk_hbox_new (0, 6);
+ gtk_box_pack_start ((GtkBox *) vbox, hbox, 0, 0, 0);
+
+ label = gtk_label_new (_("Changes take effect at the next song change."));
+ gtk_box_pack_start ((GtkBox *) hbox, label, 0, 0, 0);
+
+ g_signal_connect (config_win, "response", (GCallback) gtk_widget_destroy, 0);
+ g_signal_connect (config_win, "destroy", (GCallback) gtk_widget_destroyed, & config_win);
+ g_signal_connect (spin, "value-changed", (GCallback) spin_changed, & mixer_channels);
+
+ gtk_widget_show_all (config_win);
+}
+
+AUD_EFFECT_PLUGIN
+(
+ .name = "Channel Mixer",
+ .init = mixer_init,
+ .cleanup = mixer_cleanup,
+ .about = mixer_about,
+ .configure = mixer_configure,
+ .start = mixer_start,
+ .process = mixer_process,
+ .flush = mixer_flush,
+ .finish = mixer_process,
+ .order = 2, /* must be before crossfade */
+)

audacious-plugins-3.0.3.tar.bz2/src/mms/Makefile -> audacious-plugins-3.1.tar.bz2/src/mms/Makefile Changed

audacious-plugins-3.0.3.tar.bz2/src/modplug/modplugbmp.cxx -> audacious-plugins-3.1.tar.bz2/src/modplug/modplugbmp.cxx Changed

@@ -5,17 +5,19 @@
 */
 
 #include <fstream>
+#include <stdint.h>
 #include <unistd.h>
 #include <math.h>
 
+#include <libmodplug/stdafx.h>
+#include <libmodplug/sndfile.h>
+
 extern "C" {
-#include <audacious/configdb.h>
 #include <audacious/debug.h>
+#include <audacious/misc.h>
 }
 
 #include "modplugbmp.h"
-#include "stdafx.h"
-#include "sndfile.h"
 #include "stddefs.h"
 #include "archive/open.h"
 
@@ -37,66 +39,57 @@
 g_cond_free (control_cond);
 }
 
-ModplugXMMS::Settings::Settings()
-{
-	mSurround = true;
-	mOversamp = true;
-	mReverb = false;
-	mMegabass = false;
-	mNoiseReduction = true;
-	mVolumeRamp = true;
-	mFastinfo = true;
-	mUseFilename = false;
-	mGrabAmigaMOD = true;
-
-	mChannels = 2;
-	mFrequency = 44100;
-	mBits = 16;
-	mResamplingMode = SRCMODE_POLYPHASE;
-
-	mReverbDepth = 30;
-	mReverbDelay = 100;
-	mBassAmount = 40;
-	mBassRange = 30;
-	mSurroundDepth = 20;
-	mSurroundDelay = 20;
-
-	mPreamp = false;
-	mPreampLevel = 0.0f;
-
-	mLoopCount = 0; //don't loop
-}
+static const gchar * const modplug_defaults[] = {
+ "Surround", "TRUE",
+ "Oversampling", "TRUE",
+ "Megabass", "FALSE",
+ "NoiseReduction", "TRUE",
+ "VolumeRamp", "TRUE",
+ "Reverb", "FALSE",
+ "Fastinfo", "TRUE",
+ "UseFileName", "FALSE",
+ "GrabAmigaMOD", "TRUE",
+ "PreAmp", "FALSE",
+ "PreAmpLevel", "0",
+ "Channels", "2",
+ "Bits", "16",
+ "Frequency", "44100",
+ "ResamplingMode", "3", /* SRCMODE_POLYPHASE */
+ "ReverbDepth", "30",
+ "ReverbDelay", "100",
+ "BassAmount", "40",
+ "BassRange", "30",
+ "SurroundDepth", "20",
+ "SurroundDelay", "20",
+ "LoopCount", "0",
+ NULL};
 
 void ModplugXMMS::Init(void)
 {
-	mcs_handle_t *db;
-
-	db = aud_cfg_db_open();
-
-	aud_cfg_db_get_bool(db, MODPLUG_CFGID,"Surround", &mModProps.mSurround);
- aud_cfg_db_get_bool(db, MODPLUG_CFGID,"Oversampling", &mModProps.mOversamp);
- aud_cfg_db_get_bool(db, MODPLUG_CFGID,"Megabass", &mModProps.mMegabass);
- aud_cfg_db_get_bool(db, MODPLUG_CFGID,"NoiseReduction", &mModProps.mNoiseReduction);
- aud_cfg_db_get_bool(db, MODPLUG_CFGID,"VolumeRamp", &mModProps.mVolumeRamp);
- aud_cfg_db_get_bool(db, MODPLUG_CFGID,"Reverb", &mModProps.mReverb);
- aud_cfg_db_get_bool(db, MODPLUG_CFGID,"FastInfo", &mModProps.mFastinfo);
- aud_cfg_db_get_bool(db, MODPLUG_CFGID,"UseFileName", &mModProps.mUseFilename);
- aud_cfg_db_get_bool(db, MODPLUG_CFGID,"GrabAmigaMOD", &mModProps.mGrabAmigaMOD);
- aud_cfg_db_get_bool(db, MODPLUG_CFGID,"PreAmp", &mModProps.mPreamp);
- aud_cfg_db_get_float(db, MODPLUG_CFGID,"PreAmpLevel", &mModProps.mPreampLevel);
- aud_cfg_db_get_int(db, MODPLUG_CFGID, "Channels", &mModProps.mChannels);
- aud_cfg_db_get_int(db, MODPLUG_CFGID, "Bits", &mModProps.mBits);
- aud_cfg_db_get_int(db, MODPLUG_CFGID, "Frequency", &mModProps.mFrequency);
- aud_cfg_db_get_int(db, MODPLUG_CFGID, "ResamplineMode", &mModProps.mResamplingMode);
- aud_cfg_db_get_int(db, MODPLUG_CFGID, "ReverbDepth", &mModProps.mReverbDepth);
- aud_cfg_db_get_int(db, MODPLUG_CFGID, "ReverbDelay", &mModProps.mReverbDelay);
- aud_cfg_db_get_int(db, MODPLUG_CFGID, "BassAmount", &mModProps.mBassAmount);
- aud_cfg_db_get_int(db, MODPLUG_CFGID, "BassRange", &mModProps.mBassRange);
- aud_cfg_db_get_int(db, MODPLUG_CFGID, "SurroundDepth", &mModProps.mSurroundDepth);
- aud_cfg_db_get_int(db, MODPLUG_CFGID, "SurroundDelay", &mModProps.mSurroundDelay);
- aud_cfg_db_get_int(db, MODPLUG_CFGID, "LoopCount", &mModProps.mLoopCount);
-
-	aud_cfg_db_close(db);
+	aud_config_set_defaults (MODPLUG_CFGID, modplug_defaults);
+
+	mModProps.mSurround = aud_get_bool (MODPLUG_CFGID, "Surround");
+	mModProps.mOversamp = aud_get_bool (MODPLUG_CFGID, "Oversampling");
+	mModProps.mMegabass = aud_get_bool (MODPLUG_CFGID, "Megabass");
+	mModProps.mNoiseReduction = aud_get_bool (MODPLUG_CFGID, "NoiseReduction");
+	mModProps.mVolumeRamp = aud_get_bool (MODPLUG_CFGID, "VolumeRamp");
+	mModProps.mReverb = aud_get_bool (MODPLUG_CFGID, "Reverb");
+	mModProps.mFastinfo = aud_get_bool (MODPLUG_CFGID, "FastInfo");
+	mModProps.mUseFilename = aud_get_bool (MODPLUG_CFGID, "UseFileName");
+	mModProps.mGrabAmigaMOD = aud_get_bool (MODPLUG_CFGID, "GrabAmigaMOD");
+	mModProps.mPreamp = aud_get_bool (MODPLUG_CFGID, "PreAmp");
+	mModProps.mPreampLevel = aud_get_double (MODPLUG_CFGID, "PreAmpLevel");
+	mModProps.mChannels = aud_get_int (MODPLUG_CFGID, "Channels");
+	mModProps.mBits = aud_get_int (MODPLUG_CFGID, "Bits");
+	mModProps.mFrequency = aud_get_int (MODPLUG_CFGID, "Frequency");
+	mModProps.mResamplingMode = aud_get_int (MODPLUG_CFGID, "ResamplineMode");
+	mModProps.mReverbDepth = aud_get_int (MODPLUG_CFGID, "ReverbDepth");
+	mModProps.mReverbDelay = aud_get_int (MODPLUG_CFGID, "ReverbDelay");
+	mModProps.mBassAmount = aud_get_int (MODPLUG_CFGID, "BassAmount");
+	mModProps.mBassRange = aud_get_int (MODPLUG_CFGID, "BassRange");
+	mModProps.mSurroundDepth = aud_get_int (MODPLUG_CFGID, "SurroundDepth");
+	mModProps.mSurroundDelay = aud_get_int (MODPLUG_CFGID, "SurroundDelay");
+	mModProps.mLoopCount = aud_get_int (MODPLUG_CFGID, "LoopCount");
 }
 
 bool ModplugXMMS::CanPlayFileFromVFS(const string& aFilename, VFSFile *file)
@@ -516,7 +509,6 @@
 
 void ModplugXMMS::SetModProps(const Settings& aModProps)
 {
-	mcs_handle_t *db;
 	mModProps = aModProps;
 
 	// [Reverb level 0(quiet)-100(loud)], [delay in ms, usually 40-200ms]
@@ -567,32 +559,28 @@
 	CSoundFile::SetResamplingMode(mModProps.mResamplingMode);
 	mPreampFactor = exp(mModProps.mPreampLevel);
 
-	db = aud_cfg_db_open();
-
-	aud_cfg_db_set_bool(db, MODPLUG_CFGID,"Surround", mModProps.mSurround);
- aud_cfg_db_set_bool(db, MODPLUG_CFGID,"Oversampling", mModProps.mOversamp);
- aud_cfg_db_set_bool(db, MODPLUG_CFGID,"Megabass", mModProps.mMegabass);
- aud_cfg_db_set_bool(db, MODPLUG_CFGID,"NoiseReduction", mModProps.mNoiseReduction);
- aud_cfg_db_set_bool(db, MODPLUG_CFGID,"VolumeRamp", mModProps.mVolumeRamp);
- aud_cfg_db_set_bool(db, MODPLUG_CFGID,"Reverb", mModProps.mReverb);
- aud_cfg_db_set_bool(db, MODPLUG_CFGID,"FastInfo", mModProps.mFastinfo);
- aud_cfg_db_set_bool(db, MODPLUG_CFGID,"UseFileName", mModProps.mUseFilename);
- aud_cfg_db_set_bool(db, MODPLUG_CFGID,"GrabAmigaMOD", mModProps.mGrabAmigaMOD);
- aud_cfg_db_set_bool(db, MODPLUG_CFGID,"PreAmp", mModProps.mPreamp);
- aud_cfg_db_set_float(db, MODPLUG_CFGID,"PreAmpLevel", mModProps.mPreampLevel);
- aud_cfg_db_set_int(db, MODPLUG_CFGID, "Channels", mModProps.mChannels);
- aud_cfg_db_set_int(db, MODPLUG_CFGID, "Bits", mModProps.mBits);
- aud_cfg_db_set_int(db, MODPLUG_CFGID, "Frequency", mModProps.mFrequency);
- aud_cfg_db_set_int(db, MODPLUG_CFGID, "ResamplineMode", mModProps.mResamplingMode);
- aud_cfg_db_set_int(db, MODPLUG_CFGID, "ReverbDepth", mModProps.mReverbDepth);
- aud_cfg_db_set_int(db, MODPLUG_CFGID, "ReverbDelay", mModProps.mReverbDelay);
- aud_cfg_db_set_int(db, MODPLUG_CFGID, "BassAmount", mModProps.mBassAmount);
- aud_cfg_db_set_int(db, MODPLUG_CFGID, "BassRange", mModProps.mBassRange);
- aud_cfg_db_set_int(db, MODPLUG_CFGID, "SurroundDepth", mModProps.mSurroundDepth);
- aud_cfg_db_set_int(db, MODPLUG_CFGID, "SurroundDelay", mModProps.mSurroundDelay);
- aud_cfg_db_set_int(db, MODPLUG_CFGID, "LoopCount", mModProps.mLoopCount);
-
-	aud_cfg_db_close(db);
+	aud_set_bool (MODPLUG_CFGID, "Surround", mModProps.mSurround);
+	aud_set_bool (MODPLUG_CFGID, "Oversampling", mModProps.mOversamp);
+	aud_set_bool (MODPLUG_CFGID, "Megabass", mModProps.mMegabass);
+	aud_set_bool (MODPLUG_CFGID, "NoiseReduction", mModProps.mNoiseReduction);
+	aud_set_bool (MODPLUG_CFGID, "VolumeRamp", mModProps.mVolumeRamp);
+	aud_set_bool (MODPLUG_CFGID, "Reverb", mModProps.mReverb);
+	aud_set_bool (MODPLUG_CFGID, "FastInfo", mModProps.mFastinfo);
+	aud_set_bool (MODPLUG_CFGID, "UseFileName", mModProps.mUseFilename);
+	aud_set_bool (MODPLUG_CFGID, "GrabAmigaMOD", mModProps.mGrabAmigaMOD);
+	aud_set_bool (MODPLUG_CFGID, "PreAmp", mModProps.mPreamp);
+	aud_set_double (MODPLUG_CFGID, "PreAmpLevel", mModProps.mPreampLevel);
+	aud_set_int (MODPLUG_CFGID, "Channels", mModProps.mChannels);
+	aud_set_int (MODPLUG_CFGID, "Bits", mModProps.mBits);
+	aud_set_int (MODPLUG_CFGID, "Frequency", mModProps.mFrequency);
+	aud_set_int (MODPLUG_CFGID, "ResamplineMode", mModProps.mResamplingMode);
+	aud_set_int (MODPLUG_CFGID, "ReverbDepth", mModProps.mReverbDepth);
+	aud_set_int (MODPLUG_CFGID, "ReverbDelay", mModProps.mReverbDelay);
+	aud_set_int (MODPLUG_CFGID, "BassAmount", mModProps.mBassAmount);
+	aud_set_int (MODPLUG_CFGID, "BassRange", mModProps.mBassRange);
+	aud_set_int (MODPLUG_CFGID, "SurroundDepth", mModProps.mSurroundDepth);
+	aud_set_int (MODPLUG_CFGID, "SurroundDelay", mModProps.mSurroundDelay);
+	aud_set_int (MODPLUG_CFGID, "LoopCount", mModProps.mLoopCount);
 }
 
 ModplugXMMS gModplugXMMS;

audacious-plugins-3.0.3.tar.bz2/src/modplug/modplugbmp.h -> audacious-plugins-3.1.tar.bz2/src/modplug/modplugbmp.h Changed

audacious-plugins-3.0.3.tar.bz2/src/mpg123/mpg123.c -> audacious-plugins-3.1.tar.bz2/src/mpg123/mpg123.c Changed

audacious-plugins-3.0.3.tar.bz2/src/neon/Makefile -> audacious-plugins-3.1.tar.bz2/src/neon/Makefile Changed

audacious-plugins-3.0.3.tar.bz2/src/neon/neon.c -> audacious-plugins-3.1.tar.bz2/src/neon/neon.c Changed

@@ -25,7 +25,7 @@
 
 #include "neon.h"
 
-#include <audacious/configdb.h>
+#include <audacious/misc.h>
 #include <audacious/plugin.h>
 #include <libaudcore/audstrings.h>
 
@@ -396,35 +396,17 @@
 * -----
 */
 
-static int neon_proxy_auth_cb(void *userdata, const char *realm, int attempt, char *username, char *password) {
-
- mcs_handle_t *db;
- gchar *value = NULL;
-
- if ((db = aud_cfg_db_open()) == NULL) {
- _DEBUG("<%p> configdb failed to open!", userdata);
- return -1;
- }
-
- aud_cfg_db_get_string(db, NULL, "proxy_user", &value);
- if (!value) {
- _DEBUG("<%p> proxy_auth requested but no proxy_user", userdata);
- aud_cfg_db_close(db);
- return -1;
- }
- g_strlcpy(username, value, NE_ABUFSIZ);
- value = NULL;
+static int neon_proxy_auth_cb (void * userdata, const char * realm, int attempt,
+ char * username, char * password)
+{
+ gchar * value = aud_get_string (NULL, "proxy_user");
+ g_strlcpy (username, value, NE_ABUFSIZ);
+ g_free (value);
 
- aud_cfg_db_get_string(db, NULL, "proxy_pass", &value);
- if (!value) {
- _DEBUG("<%p> proxy_auth requested but no proxy_pass", userdata);
- aud_cfg_db_close(db);
- return -1;
- }
- g_strlcpy(password, value, NE_ABUFSIZ);
- value = NULL;
+ value = aud_get_string (NULL, "proxy_pass");
+ g_strlcpy (password, value, NE_ABUFSIZ);
+ g_free (value);
 
- aud_cfg_db_close(db);
 return attempt;
 }
 
@@ -541,44 +523,17 @@
 static gint open_handle(struct neon_handle* handle, gulong startbyte) {
 
 gint ret;
- mcs_handle_t* db;
 gchar* proxy_host = NULL;
- gchar* proxy_port_s = NULL;
- gchar* endptr;
 guint proxy_port = 0;
- gboolean use_proxy, proxy_use_auth;
 
- db = aud_cfg_db_open();
- if (FALSE == aud_cfg_db_get_bool(db, NULL, "use_proxy", &use_proxy)) {
- use_proxy = FALSE;
- }
-
- if (FALSE == aud_cfg_db_get_bool(db, NULL, "proxy_use_auth", &proxy_use_auth)) {
- proxy_use_auth = FALSE;
- }
+ gboolean use_proxy = aud_get_bool (NULL, "use_proxy");
+ gboolean proxy_use_auth = aud_get_bool (NULL, "proxy_use_auth");
 
- if (use_proxy) {
- if (FALSE == aud_cfg_db_get_string(db, NULL, "proxy_host", &proxy_host)) {
- _ERROR ("<%p> Could not read proxy host, disabling proxy use",
- (void *) handle);
- use_proxy = FALSE;
- }
- if (FALSE == aud_cfg_db_get_string(db, NULL, "proxy_port", &proxy_port_s)) {
- _ERROR ("<%p> Could not read proxy port, disabling proxy use",
- (void *) handle);
- use_proxy = FALSE;
- }
- proxy_port = strtoul(proxy_port_s, &endptr, 10);
- if (!((*proxy_port_s != '\0') && (*endptr == '\0') && (proxy_port < 65536))) {
- /*
- * Invalid data
- */
- _ERROR ("<%p> Invalid proxy port, disabling proxy use", (void *)
- handle);
- use_proxy = FALSE;
- }
+ if (use_proxy)
+ {
+ proxy_host = aud_get_string (NULL, "proxy_host");
+ proxy_port = aud_get_int (NULL, "proxy_port");
 }
- aud_cfg_db_close(db);
 
 handle->redircount = 0;
 
@@ -626,11 +581,16 @@
 _DEBUG("<%p> Creating request", handle);
 ret = open_request(handle, startbyte);
 
- if (0 == ret) {
+ if (ret == 0)
+ {
+ g_free (proxy_host);
 return 0;
- } else if (-1 == ret) {
+ }
+ else if (ret == -1)
+ {
 ne_session_destroy(handle->session);
 handle->session = NULL;
+ g_free (proxy_host);
 return -1;
 }
 
@@ -646,6 +606,7 @@
 _ERROR ("<%p> Redirect count exceeded for URL %s", (void *) handle,
 handle->url);
 
+ g_free (proxy_host);
 return 1;
 }

audacious-plugins-3.0.3.tar.bz2/src/null/null.c -> audacious-plugins-3.1.tar.bz2/src/null/null.c Changed

@@ -23,7 +23,7 @@
 #include <glib.h>
 #include <gtk/gtk.h>
 
-#include <audacious/configdb.h>
+#include <audacious/misc.h>
 #include <audacious/gtk-compat.h>
 #include <audacious/plugin.h>
 #include <audacious/i18n.h>
@@ -33,217 +33,212 @@
 static GTimer *timer;
 static gulong offset_time, written;
 static gint bps;
-static gboolean real_time = TRUE;
 static gboolean paused, started;
 static GtkWidget *configurewin;
 static struct {
-	gint format;
-	gint frequency;
-	gint channels;
+ gint format;
+ gint frequency;
+ gint channels;
 } input_format;
 
+static const gchar * const null_defaults[] = {
+ "real_time", "TRUE",
+ NULL};
+
 #define ELAPSED_TIME (offset_time + g_timer_elapsed(timer, NULL) * 1000)
 
 static gboolean null_init (void)
 {
-	mcs_handle_t *db;
-	db = aud_cfg_db_open();
-	aud_cfg_db_get_bool(db, "null", "real_time", &real_time);
-	aud_cfg_db_close(db);
-	return TRUE;
+ aud_config_set_defaults("null", null_defaults);
+ return TRUE;
 }
 
 static void null_about(void)
 {
-	static GtkWidget *about;
-	gchar *about_text;
+ static GtkWidget *about;
+ gchar *about_text;
 
-	if (about)
-		return;
+ if (about)
+ return;
 
-	about_text = g_strjoin("", _("Null output plugin "), VERSION,
-			 _(" by Christian Birchinger <joker@netswarm.net>\n"
-			 "based on the XMMS plugin by Håvard Kvål <havardk@xmms.org>"), NULL);
+ about_text = g_strjoin("", _("Null output plugin "), VERSION,
+ _(" by Christian Birchinger <joker@netswarm.net>\n"
+ "based on the XMMS plugin by Håvard Kvål <havardk@xmms.org>"), NULL);
 
-	audgui_simple_message (& about, GTK_MESSAGE_INFO, _("About Null Output"),
+ audgui_simple_message (& about, GTK_MESSAGE_INFO, _("About Null Output"),
 about_text);
 
-	g_free(about_text);
+ g_free(about_text);
 }
 
 static void null_configure_ok_cb(GtkButton *w, gpointer data)
 {
-	mcs_handle_t *db;
-
-	db = aud_cfg_db_open();
-	real_time = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(data));
-	aud_cfg_db_set_bool(db, "null", "real_time", real_time);
-	aud_cfg_db_close(db);
-	gtk_widget_destroy(configurewin);
+ aud_set_bool("null", "real_time", gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(data)));
+ gtk_widget_destroy(configurewin);
 }
 
 
 static void null_configure(void)
 {
-	GtkWidget *rt_btn, *ok_button, *cancel_button, *vbox, *bbox;
-
-	if (configurewin)
-		return;
-
-	configurewin = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-	gtk_window_set_title(GTK_WINDOW(configurewin), _("Null output preferences"));
-	gtk_window_set_type_hint(GTK_WINDOW(configurewin), GDK_WINDOW_TYPE_HINT_DIALOG);
-	gtk_window_set_resizable(GTK_WINDOW(configurewin), FALSE);
-	gtk_window_set_position(GTK_WINDOW(configurewin), GTK_WIN_POS_CENTER);
-	gtk_container_set_border_width(GTK_CONTAINER(configurewin), 10);
-	g_signal_connect(G_OBJECT(configurewin), "destroy",
-			 G_CALLBACK(gtk_widget_destroyed), &configurewin);
-
-	vbox = gtk_vbox_new(FALSE, 10);
-	gtk_container_add(GTK_CONTAINER(configurewin), vbox);
-
-	rt_btn = gtk_check_button_new_with_label(_("Run in real time"));
-	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(rt_btn), real_time);
-	gtk_box_pack_start(GTK_BOX(vbox), rt_btn, FALSE, FALSE, 0);
-	bbox = gtk_hbutton_box_new();
-	gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END);
-	gtk_box_set_spacing(GTK_BOX(bbox), 5);
-	gtk_box_pack_start(GTK_BOX(vbox), bbox, FALSE, FALSE, 0);
-	ok_button = gtk_button_new_with_label(_("Ok"));
-	cancel_button = gtk_button_new_with_label(_("Cancel"));
-	gtk_widget_set_can_default(ok_button, TRUE);
-	gtk_widget_set_can_default(cancel_button, TRUE);
-	g_signal_connect_swapped(G_OBJECT(cancel_button), "clicked",
-				 G_CALLBACK(gtk_widget_destroy), configurewin);
-	g_signal_connect(G_OBJECT(ok_button), "clicked",
-			 G_CALLBACK(null_configure_ok_cb), rt_btn);
-	gtk_box_pack_start(GTK_BOX(bbox), ok_button, FALSE, FALSE, 0);
-	gtk_box_pack_start(GTK_BOX(bbox), cancel_button, FALSE, FALSE, 0);
-	gtk_widget_grab_default(ok_button);
-
-	gtk_widget_show_all(configurewin);
+ GtkWidget *rt_btn, *ok_button, *cancel_button, *vbox, *bbox;
+
+ if (configurewin)
+ return;
+
+ configurewin = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+ gtk_window_set_title(GTK_WINDOW(configurewin), _("Null output preferences"));
+ gtk_window_set_type_hint(GTK_WINDOW(configurewin), GDK_WINDOW_TYPE_HINT_DIALOG);
+ gtk_window_set_resizable(GTK_WINDOW(configurewin), FALSE);
+ gtk_window_set_position(GTK_WINDOW(configurewin), GTK_WIN_POS_CENTER);
+ gtk_container_set_border_width(GTK_CONTAINER(configurewin), 10);
+ g_signal_connect(G_OBJECT(configurewin), "destroy",
+ G_CALLBACK(gtk_widget_destroyed), &configurewin);
+
+ vbox = gtk_vbox_new(FALSE, 10);
+ gtk_container_add(GTK_CONTAINER(configurewin), vbox);
+
+ rt_btn = gtk_check_button_new_with_label(_("Run in real time"));
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(rt_btn), aud_get_bool("null", "real_time"));
+ gtk_box_pack_start(GTK_BOX(vbox), rt_btn, FALSE, FALSE, 0);
+ bbox = gtk_hbutton_box_new();
+ gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END);
+ gtk_box_set_spacing(GTK_BOX(bbox), 5);
+ gtk_box_pack_start(GTK_BOX(vbox), bbox, FALSE, FALSE, 0);
+ ok_button = gtk_button_new_with_label(_("Ok"));
+ cancel_button = gtk_button_new_with_label(_("Cancel"));
+ gtk_widget_set_can_default(ok_button, TRUE);
+ gtk_widget_set_can_default(cancel_button, TRUE);
+ g_signal_connect_swapped(G_OBJECT(cancel_button), "clicked",
+ G_CALLBACK(gtk_widget_destroy), configurewin);
+ g_signal_connect(G_OBJECT(ok_button), "clicked",
+ G_CALLBACK(null_configure_ok_cb), rt_btn);
+ gtk_box_pack_start(GTK_BOX(bbox), ok_button, FALSE, FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(bbox), cancel_button, FALSE, FALSE, 0);
+ gtk_widget_grab_default(ok_button);
+
+ gtk_widget_show_all(configurewin);
 }
 
 static int null_open(gint fmt, int rate, int nch)
 {
-	offset_time = 0;
-	written = 0;
-	started = FALSE;
-	paused = FALSE;
-	input_format.format = fmt;
-	input_format.frequency = rate;
-	input_format.channels = nch;
-	bps = rate * nch;
-	switch (fmt)
-	{
-		case FMT_U8:
-		case FMT_S8:
-			break;
-		default:
-			bps <<= 1;
-			break;
-	}
-	if (real_time)
-		timer = g_timer_new();
-	return 1;
+ offset_time = 0;
+ written = 0;
+ started = FALSE;
+ paused = FALSE;
+ input_format.format = fmt;
+ input_format.frequency = rate;
+ input_format.channels = nch;
+ bps = rate * nch;
+ switch (fmt)
+ {
+ case FMT_U8:
+ case FMT_S8:
+ break;
+ default:
+ bps <<= 1;
+ break;
+ }
+ if (aud_get_bool("null", "real_time"))
+ timer = g_timer_new();
+ return 1;
 }
 
 static void null_write(void *ptr, int length)
 {
-	if (timer && !started)
-	{
-		g_timer_start(timer);
-		started = TRUE;
-	}
+ if (timer && !started)
+ {
+ g_timer_start(timer);
+ started = TRUE;
+ }
 
-	written += length;
+ written += length;
 }
 
 static void null_close(void)
 {
-	if (timer)
-		g_timer_destroy(timer);
-	timer = NULL;
+ if (timer)
+ g_timer_destroy(timer);
+ timer = NULL;
 }
 
 static void null_flush(int time)
 {
-	offset_time = time;
-	written = ((double)time * bps) / 1000;
-	if (timer)
-		g_timer_reset(timer);
+ offset_time = time;
+ written = ((double)time * bps) / 1000;
+ if (timer)
+ g_timer_reset(timer);
 }
 
 static void null_pause (gboolean p)
 {
-	paused = p;
-	if (!timer)
-		return;
-
-	if (paused)
-		g_timer_stop(timer);
-	else
-	{
-		offset_time += g_timer_elapsed(timer, NULL) * 1000;
-		g_timer_start(timer);
-	}
+ paused = p;
+ if (!timer)
+ return;
+
+ if (paused)
+ g_timer_stop(timer);
+ else
+ {
+ offset_time += g_timer_elapsed(timer, NULL) * 1000;
+ g_timer_start(timer);
+ }
 }
 
 static int null_buffer_free(void)
 {
-	if (timer)
-	{
-		return 10240 - (written - (ELAPSED_TIME * bps) / 1000);
-	}
-	else
-	{
-		if (!paused)
-			return 10000;
-		else
-			return 0;
-	}
+ if (timer)
+ {
+ return 10240 - (written - (ELAPSED_TIME * bps) / 1000);
+ }
+ else
+ {
+ if (!paused)
+ return 10000;
+ else
+ return 0;
+ }
 }
 
 #if 0
 static int null_playing(void)
 {
-	if (!timer)
-		return FALSE;
+ if (!timer)
+ return FALSE;
 
-	if ((gdouble)(written * 1000) / bps > ELAPSED_TIME)
-		return TRUE;
-	return FALSE;
+ if ((gdouble)(written * 1000) / bps > ELAPSED_TIME)
+ return TRUE;
+ return FALSE;
 }
 #endif
 
 static int null_get_written_time(void)
 {
-	if (!bps)
-		return 0;
-	return ((gint64)written * 1000) / bps;
+ if (!bps)
+ return 0;
+ return ((gint64)written * 1000) / bps;
 }
 
 static int null_get_output_time(void)
 {
-	if (!timer)
-		return null_get_written_time();
+ if (!timer)
+ return null_get_written_time();
 
-	return ELAPSED_TIME;
+ return ELAPSED_TIME;
 }
 
 AUD_OUTPUT_PLUGIN
 (
-	.name = "No Output",
-	.probe_priority = 0,
-	.init = null_init,
-	.about = null_about,
-	.configure = null_configure,
-	.open_audio = null_open,
-	.write_audio = null_write,
-	.close_audio = null_close,
-	.flush = null_flush,
-	.pause = null_pause,
-	.buffer_free = null_buffer_free,
-	.output_time = null_get_output_time,
-	.written_time = null_get_written_time,
-)
+ .name = "No Output",
+ .probe_priority = 0,
+ .init = null_init,
+ .about = null_about,
+ .configure = null_configure,
+ .open_audio = null_open,
+ .write_audio = null_write,
+ .close_audio = null_close,
+ .flush = null_flush,
+ .pause = null_pause,
+ .buffer_free = null_buffer_free,
+ .output_time = null_get_output_time,
+ .written_time = null_get_written_time,
+ )

audacious-plugins-3.0.3.tar.bz2/src/openal/openal.c -> audacious-plugins-3.1.tar.bz2/src/openal/openal.c Changed

audacious-plugins-3.0.3.tar.bz2/src/oss4/Makefile -> audacious-plugins-3.1.tar.bz2/src/oss4/Makefile Changed

audacious-plugins-3.0.3.tar.bz2/src/oss4/configure.c -> audacious-plugins-3.1.tar.bz2/src/oss4/configure.c Changed

@@ -1,6 +1,6 @@
 /*
 * OSS4 Output Plugin for Audacious
- * Copyright 2010 Michał Lipski <tallica@o2.pl>
+ * Copyright 2010-2011 Michał Lipski <tallica@o2.pl>
 *
 * 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
@@ -19,10 +19,8 @@
 
 #include "oss.h"
 #include <gtk/gtk.h>
-#include <audacious/configdb.h>
 
 static GtkWidget *window;
-static oss_cfg_t *tmp_cfg;
 
 static void dev_list_changed_cb(GtkComboBox *combo, gpointer data)
 {
@@ -36,32 +34,29 @@
 gtk_tree_model_get(model, &iter, 1, &string, -1);
 }
 
- tmp_cfg->device = string;
+ aud_set_string("oss4", "device", string);
 }
 
-static void alt_dev_toggled_cb(GtkToggleButton *widget, gpointer data)
+static void alt_dev_text_changed_cb(GtkEditable *widget, gpointer data)
 {
- tmp_cfg->use_alt_device = gtk_toggle_button_get_active(widget);
- gtk_widget_set_sensitive(GTK_WIDGET(data), tmp_cfg->use_alt_device);
+ aud_set_string("oss4", "alt_device", gtk_editable_get_chars(widget, 0, -1));
 }
 
-static void cookedmode_toggled_cb(GtkToggleButton *widget, gpointer data)
+static void alt_dev_toggled_cb(GtkToggleButton *widget, gpointer data)
 {
- tmp_cfg->cookedmode = gtk_toggle_button_get_active(widget);
+ gboolean active = gtk_toggle_button_get_active(widget);
+ aud_set_bool("oss4", "use_alt_device", active);
+ gtk_widget_set_sensitive(GTK_WIDGET(data), active);
 }
 
-static void vol_toggled_cb(GtkToggleButton *widget, gpointer data)
+static void cookedmode_toggled_cb(GtkToggleButton *widget, gpointer data)
 {
- tmp_cfg->save_volume = gtk_toggle_button_get_active(widget);
+ aud_set_bool("oss4", "cookedmode", gtk_toggle_button_get_active(widget));
 }
 
-static void button_ok_clicked_cb(GtkButton *button, gpointer data)
+static void vol_toggled_cb(GtkToggleButton *widget, gpointer data)
 {
- g_free(oss_cfg);
- oss_cfg = g_memdup(tmp_cfg, sizeof(oss_cfg_t));
- oss_cfg->alt_device = gtk_editable_get_chars(GTK_EDITABLE(GTK_WIDGET(data)), 0, -1);
- oss_config_save();
- gtk_widget_destroy(window);
+ aud_set_bool("oss4", "save_volume", gtk_toggle_button_get_active(widget));
 }
 
 static GtkTreeModel *get_device_list(void)
@@ -73,17 +68,9 @@
 
 list = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_STRING);
 
- if ((mixerfd = open(DEFAULT_MIXER, O_RDWR)) == -1)
- goto FAILED;
-
- if (ioctl(mixerfd, SNDCTL_SYSINFO, &sysinfo) == -1)
- goto FAILED;
-
- if (sysinfo.numaudios < 1)
- {
- errno = ENXIO;
- goto FAILED;
- }
+ CHECK_NOISY(mixerfd = open, DEFAULT_MIXER, O_RDWR);
+ CHECK(ioctl, mixerfd, SNDCTL_SYSINFO, &sysinfo);
+ CHECK_NOISY(oss_probe_for_adev, &sysinfo);
 
 gtk_list_store_append(list, &iter);
 gtk_list_store_set(list, &iter, 0, _("1. Default device"), 1, DEFAULT_DSP, -1);
@@ -93,8 +80,7 @@
 oss_audioinfo ainfo;
 ainfo.dev = i;
 
- if (ioctl(mixerfd, SNDCTL_AUDIOINFO, &ainfo) == -1)
- goto FAILED;
+ CHECK(ioctl, mixerfd, SNDCTL_AUDIOINFO, &ainfo);
 
 if (ainfo.caps & PCM_CAP_OUTPUT)
 {
@@ -110,7 +96,6 @@
 return GTK_TREE_MODEL(list);
 
 FAILED:
- SHOW_ERROR_MSG;
 close(mixerfd);
 return NULL;
 }
@@ -135,17 +120,13 @@
 while (gtk_tree_model_iter_next(model, &iter));
 }
 
-static void window_destroy(void)
-{
- g_free(tmp_cfg);
-}
-
 static void window_create(void)
 {
 GtkWidget *vbox, *dev_list_box, *dev_label, *dev_list_combo, *alt_dev_box, *alt_dev_check,
- *alt_dev_text, *option_box, *vol_check, *cookedmode_check, *button_box, *button_ok, *button_cancel;
+ *alt_dev_text, *option_box, *vol_check, *cookedmode_check, *button_box, *button_ok;
 GtkTreeModel *dev_list_model;
 GtkCellRenderer *cell;
+ gchar *device;
 
 window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 gtk_window_set_title(GTK_WINDOW(window), _("OSS4 Output Plugin Preferences"));
@@ -179,7 +160,9 @@
 
 g_object_unref(G_OBJECT(dev_list_model));
 
- select_combo_item(GTK_COMBO_BOX(dev_list_combo), tmp_cfg->device);
+ device = aud_get_string("oss4", "device");
+ select_combo_item(GTK_COMBO_BOX(dev_list_combo), device);
+ g_free(device);
 
 gtk_box_pack_start(GTK_BOX(dev_list_box), dev_list_combo, TRUE, TRUE, 5);
 
@@ -187,24 +170,26 @@
 gtk_box_pack_start(GTK_BOX(vbox), alt_dev_box, FALSE, FALSE, 0);
 
 alt_dev_check = gtk_check_button_new_with_label(_("Use alternate device:"));
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(alt_dev_check), tmp_cfg->use_alt_device);
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(alt_dev_check), aud_get_bool("oss4", "use_alt_device"));
 
 gtk_box_pack_start(GTK_BOX(alt_dev_box), alt_dev_check, FALSE, FALSE, 5);
 
 alt_dev_text = gtk_entry_new();
- gtk_entry_set_text(GTK_ENTRY(alt_dev_text), tmp_cfg->alt_device);
- gtk_widget_set_sensitive(alt_dev_text, tmp_cfg->use_alt_device);
+ device = aud_get_string("oss4", "alt_device");
+ gtk_entry_set_text(GTK_ENTRY(alt_dev_text), device);
+ gtk_widget_set_sensitive(alt_dev_text, aud_get_bool("oss4", "use_alt_device"));
 gtk_box_pack_start(GTK_BOX(alt_dev_box), alt_dev_text, TRUE, TRUE, 5);
+ g_free(device);
 
 option_box = gtk_vbox_new(FALSE, 0);
 gtk_box_pack_start(GTK_BOX(vbox), option_box, FALSE, FALSE, 0);
 
 vol_check = gtk_check_button_new_with_label(_("Save volume between sessions"));
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(vol_check), tmp_cfg->save_volume);
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(vol_check), aud_get_bool("oss4", "save_volume"));
 gtk_box_pack_start(GTK_BOX(option_box), vol_check, FALSE, FALSE, 5);
 
 cookedmode_check = gtk_check_button_new_with_label(_("Enable format conversions made by the OSS software."));
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(cookedmode_check), tmp_cfg->cookedmode);
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(cookedmode_check), aud_get_bool("oss4", "cookedmode"));
 gtk_box_pack_start(GTK_BOX(option_box), cookedmode_check, FALSE, FALSE, 5);
 
 button_box = gtk_hbutton_box_new();
@@ -212,19 +197,17 @@
 gtk_box_set_spacing(GTK_BOX(button_box), 5);
 gtk_box_pack_start(GTK_BOX(vbox), button_box, TRUE, TRUE, 5);
 
- button_cancel = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
- gtk_box_pack_start(GTK_BOX(button_box), button_cancel, FALSE, FALSE, 5);
-
 button_ok = gtk_button_new_from_stock(GTK_STOCK_OK);
 gtk_box_pack_start(GTK_BOX(button_box), button_ok, FALSE, FALSE, 5);
 
+ gtk_widget_set_can_default(button_ok, TRUE);
 gtk_widget_grab_default(button_ok);
 
 g_signal_connect(G_OBJECT(dev_list_combo), "changed",
 G_CALLBACK(dev_list_changed_cb), NULL);
 
- g_signal_connect(G_OBJECT(window), "destroy",
- G_CALLBACK(window_destroy), NULL);
+ g_signal_connect(G_OBJECT(alt_dev_text), "changed",
+ G_CALLBACK(alt_dev_text_changed_cb), NULL);
 
 g_signal_connect(G_OBJECT(alt_dev_check), "toggled",
 G_CALLBACK(alt_dev_toggled_cb), alt_dev_text);
@@ -235,12 +218,9 @@
 g_signal_connect(G_OBJECT(cookedmode_check), "toggled",
 G_CALLBACK(cookedmode_toggled_cb), NULL);
 
- g_signal_connect_swapped(G_OBJECT(button_cancel), "clicked",
+ g_signal_connect_swapped(G_OBJECT(button_ok), "clicked",
 G_CALLBACK(gtk_widget_destroy), window);
 
- g_signal_connect(G_OBJECT(button_ok), "clicked",
- G_CALLBACK(button_ok_clicked_cb), alt_dev_text);
-
 gtk_widget_show_all(window);
 }
 
@@ -252,33 +232,5 @@
 return;
 }
 
- tmp_cfg = g_memdup(oss_cfg, sizeof(oss_cfg_t));
-
 window_create();
 }
-
-void oss_config_load(void)
-{
- mcs_handle_t *db = aud_cfg_db_open();
-
- aud_cfg_db_get_string(db, "oss4", "device", &oss_cfg->device);
- aud_cfg_db_get_bool(db, "oss4", "use_alt_device", &oss_cfg->use_alt_device);
- aud_cfg_db_get_string(db, "oss4", "alt_device", &oss_cfg->alt_device);
- aud_cfg_db_get_bool(db, "oss4", "save_volume", &oss_cfg->save_volume);
- aud_cfg_db_get_int(db, "oss4", "volume", &oss_cfg->volume);
- aud_cfg_db_get_bool(db, "oss4", "cookedmode", &oss_cfg->cookedmode);
- aud_cfg_db_close(db);
-}
-
-void oss_config_save(void)
-{
- mcs_handle_t *db = aud_cfg_db_open();
-
- aud_cfg_db_set_string(db, "oss4", "device", oss_cfg->device);
- aud_cfg_db_set_bool(db, "oss4", "use_alt_device", oss_cfg->use_alt_device);
- aud_cfg_db_set_string(db, "oss4", "alt_device", oss_cfg->alt_device);
- aud_cfg_db_set_bool(db, "oss4", "save_volume", oss_cfg->save_volume);
- aud_cfg_db_set_int(db, "oss4", "volume", oss_cfg->volume);
- aud_cfg_db_set_bool(db, "oss4", "cookedmode", oss_cfg->cookedmode);
- aud_cfg_db_close(db);
-}

audacious-plugins-3.0.3.tar.bz2/src/oss4/oss.c -> audacious-plugins-3.1.tar.bz2/src/oss4/oss.c Changed

@@ -1,6 +1,6 @@
 /*
 * OSS4 Output Plugin for Audacious
- * Copyright 2010 Michał Lipski <tallica@o2.pl>
+ * Copyright 2010-2011 Michał Lipski <tallica@o2.pl>
 *
 * I would like to thank people on #audacious, especially Tony Vroon and
 * John Lindgren and of course the authors of the previous OSS plugin.
@@ -22,15 +22,19 @@
 
 #include "oss.h"
 
-#define HARD_DEBUG 0
+static const gchar * const oss_defaults[] = {
+ "device", DEFAULT_DSP,
+ "use_alt_device", "FALSE",
+ "alt_device", DEFAULT_DSP,
+ "save_volume", "TRUE",
+ "volume", "12850", /* 0x3232 */
+ "cookedmode", "TRUE",
+ NULL};
 
 oss_data_t *oss_data;
-oss_cfg_t *oss_cfg;
-gchar *oss_message = NULL;
 static gint64 oss_time; /* microseconds */
 static gboolean oss_paused;
 static gint oss_paused_time;
-static audio_buf_info oss_buffer_info;
 static gint oss_delay; /* miliseconds */
 static gboolean oss_ioctl_vol = FALSE;
 
@@ -38,32 +42,18 @@
 {
 AUDDBG("Init.\n");
 
+ aud_config_set_defaults("oss4", oss_defaults);
 oss_data = g_new0(oss_data_t, 1);
- oss_cfg = g_new0(oss_cfg_t, 1);
 oss_data->fd = -1;
- oss_cfg->device = DEFAULT_DSP;
- oss_cfg->use_alt_device = FALSE;
- oss_cfg->alt_device = DEFAULT_DSP;
- oss_cfg->save_volume = TRUE;
- oss_cfg->volume = 0x3232;
- oss_cfg->cookedmode = TRUE;
 
- oss_config_load();
-
- if (oss_hardware_present())
- return TRUE;
- else
- return FALSE;
+ return oss_hardware_present();
 }
 
 void oss_cleanup(void)
 {
 AUDDBG("Cleanup.\n");
 
- oss_config_save();
-
 g_free(oss_data);
- g_free(oss_cfg);
 }
 
 static gboolean set_format(gint format, gint rate, gint channels)
@@ -73,41 +63,22 @@
 AUDDBG("Audio format: %s, sample rate: %dHz, number of channels: %d.\n", oss_format_to_text(format), rate, channels);
 
 /* Enable/disable format conversions made by the OSS software */
- if (ioctl(oss_data->fd, SNDCTL_DSP_COOKEDMODE, &oss_cfg->cookedmode) == -1)
- DEBUG_MSG;
+ param = aud_get_bool("oss4", "cookedmode");
+ CHECK(ioctl, oss_data->fd, SNDCTL_DSP_COOKEDMODE, &param);
 
- param = format;
+ AUDDBG("%s format conversions made by the OSS software.\n", param ? "Enabled" : "Disabled");
 
- if (ioctl(oss_data->fd, SNDCTL_DSP_SETFMT, &param) == -1)
- goto FAILED;
-
- if (param != format)
- {
- ERROR("Selected audio format is not supported by the device.\n");
- return FALSE;
- }
+ param = format;
+ CHECK_NOISY(ioctl, oss_data->fd, SNDCTL_DSP_SETFMT, &param);
+ CHECK_VAL(param == format, ERROR_NOISY, "Selected audio format is not supported by the device.\n");
 
 param = rate;
-
- if (ioctl(oss_data->fd, SNDCTL_DSP_SPEED, &param) == -1)
- goto FAILED;
-
- if (param != rate)
- {
- ERROR("Selected sample rate is not supported by the device.\n");
- return FALSE;
- }
+ CHECK_NOISY(ioctl, oss_data->fd, SNDCTL_DSP_SPEED, &param);
+ CHECK_VAL(param == rate, ERROR_NOISY, "Selected sample rate is not supported by the device.\n");
 
 param = channels;
-
- if (ioctl(oss_data->fd, SNDCTL_DSP_CHANNELS, &param) == -1)
- goto FAILED;
-
- if (param != channels)
- {
- ERROR("Selected number of channels is not supported by the device.\n");
- return FALSE;
- }
+ CHECK_NOISY(ioctl, oss_data->fd, SNDCTL_DSP_CHANNELS, &param);
+ CHECK_VAL(param == channels, ERROR_NOISY, "Selected number of channels is not supported by the device.\n");
 
 oss_data->format = format;
 oss_data->rate = rate;
@@ -116,9 +87,33 @@
 
 return TRUE;
 
- FAILED:
- ERROR_MSG;
- return FALSE;
+FAILED:
+ return FALSE;
+}
+
+static gint open_device(void)
+{
+ gint res = -1;
+ gchar *device = aud_get_string("oss4", "device");
+ gchar *alt_device = aud_get_string("oss4", "alt_device");
+
+ if (aud_get_bool("oss4", "use_alt_device") && alt_device != NULL)
+ res = open(alt_device, O_WRONLY);
+ else if (device != NULL)
+ res = open(device, O_WRONLY);
+ else
+ res = open(DEFAULT_DSP, O_WRONLY);
+
+ g_free(device);
+ g_free(alt_device);
+
+ return res;
+}
+
+static void close_device(void)
+{
+ close(oss_data->fd);
+ oss_data->fd = -1;
 }
 
 gint oss_open_audio(gint aud_format, gint rate, gint channels)
@@ -127,113 +122,68 @@
 
 gint format;
 gint vol_left, vol_right;
- gchar *device = DEFAULT_DSP;
-
- if (oss_cfg->use_alt_device && oss_cfg->alt_device != NULL)
- device = oss_cfg->alt_device;
- else if (oss_cfg->device != NULL)
- device = oss_cfg->device;
-
- oss_data->fd = open(device, O_WRONLY);
+ audio_buf_info buf_info;
 
- if (oss_data->fd == -1)
- {
- ERROR_MSG;
- goto FAILED;
- }
+ CHECK_NOISY(oss_data->fd = open_device);
 
 format = oss_convert_aud_format(aud_format);
 
 if (!set_format(format, rate, channels))
 goto FAILED;
 
- /*gint policy = 8;
- ioctl(oss_data->fd, SNDCTL_DSP_POLICY, &policy);*/
-
- if (ioctl(oss_data->fd, SNDCTL_DSP_GETOSPACE, &oss_buffer_info) == -1)
- DEBUG_MSG;
+ CHECK_NOISY(ioctl, oss_data->fd, SNDCTL_DSP_GETOSPACE, &buf_info);
 
 AUDDBG("Buffer information, fragstotal: %d, fragsize: %d, bytes: %d.\n",
- oss_buffer_info.fragstotal,
- oss_buffer_info.fragsize,
- oss_buffer_info.bytes);
+ buf_info.fragstotal,
+ buf_info.fragsize,
+ buf_info.bytes);
 
 oss_time = 0;
 oss_paused = FALSE;
 oss_paused_time = 0;
- oss_delay = oss_bytes_to_frames(oss_buffer_info.fragstotal * oss_buffer_info.fragsize) * 1000 / oss_data->rate;
+ oss_delay = oss_bytes_to_frames(buf_info.fragstotal * buf_info.fragsize) * 1000 / oss_data->rate;
 oss_ioctl_vol = TRUE;
 
 AUDDBG("Internal OSS buffer size: %dms.\n", oss_delay);
 
- if (oss_cfg->save_volume)
+ if (aud_get_bool("oss4", "save_volume"))
 {
- vol_right = (oss_cfg->volume & 0xFF00) >> 8;
- vol_left = (oss_cfg->volume & 0x00FF);
-
+ vol_right = (aud_get_int("oss4", "volume") & 0xFF00) >> 8;
+ vol_left = (aud_get_int("oss4", "volume") & 0x00FF);
 oss_set_volume(vol_left, vol_right);
 }
 
 return 1;
 
- FAILED:
- close(oss_data->fd);
- oss_data->fd = -1;
- return 0;
+FAILED:
+ close_device();
+ return 0;
 }
 
 void oss_close_audio(void)
 {
 AUDDBG ("Closing audio.\n");
 
- if (ioctl(oss_data->fd, SNDCTL_DSP_HALT_OUTPUT, NULL) == -1)
- DEBUG_MSG;
-
- if (oss_data->fd != -1)
- close(oss_data->fd);
- oss_data->fd = -1;
+ close_device();
 }
 
 void oss_write_audio(void *data, gint length)
 {
 gint written = 0, start = 0;
 
- if (oss_paused)
- return;
-
- while (1)
+ while (length > 0)
 {
- if (oss_paused)
- break;
-
 written = write(oss_data->fd, data + start, length);
 
 if (written < 0)
 {
- ERROR_MSG;
-
- if (ioctl(oss_data->fd, SNDCTL_DSP_SYNC, NULL) == -1)
- DEBUG_MSG;
-
- break;
+ DESCRIBE_ERROR;
+ return;
 }
 
- if (length >= written)
- length -= written;
-
+ length -= written;
 start += written;
 oss_time += (gint64) oss_bytes_to_frames(written) * 1000000 / oss_data->rate;
-
-#if HARD_DEBUG == 1
- ioctl(oss_data->fd, SNDCTL_DSP_GETOSPACE, &oss_buffer_info);
-
- printf("fragstotal: \t%d\tfragsize: \t%d\tbytes: \t%d\tlength: \t%d\n",
- oss_buffer_info.fragstotal,
- oss_buffer_info.fragsize,
- oss_buffer_info.bytes,
- length);
-#endif
- if (length == 0) break;
 }
 }
 
@@ -241,23 +191,23 @@
 {
 AUDDBG("Drain.\n");
 
- ioctl(oss_data->fd, SNDCTL_DSP_GETOSPACE, &oss_buffer_info);
-
- while ((oss_buffer_info.fragstotal * oss_buffer_info.fragsize) - oss_buffer_info.bytes > oss_buffer_info.fragsize)
- {
- AUDDBG("Buffer left: %d\n", (oss_buffer_info.fragstotal * oss_buffer_info.fragsize) - oss_buffer_info.bytes);
- ioctl(oss_data->fd, SNDCTL_DSP_GETOSPACE, &oss_buffer_info);
- g_usleep(20000);
- }
+ if (ioctl(oss_data->fd, SNDCTL_DSP_SYNC, NULL) == -1)
+ DESCRIBE_ERROR;
 }
 
 gint oss_buffer_free(void)
 {
+ audio_buf_info buf_info;
+
 if (oss_paused)
 return 0;
 
- ioctl(oss_data->fd, SNDCTL_DSP_GETOSPACE, &oss_buffer_info);
- return oss_buffer_info.bytes;
+ CHECK(ioctl, oss_data->fd, SNDCTL_DSP_GETOSPACE, &buf_info);
+
+ return MAX(0, buf_info.fragments - 1) * buf_info.fragsize;
+
+FAILED:
+ return 0;
 }
 
 void oss_set_written_time(gint time)
@@ -296,12 +246,9 @@
 {
 AUDDBG("Flush.\n");
 
- if (ioctl(oss_data->fd, SNDCTL_DSP_HALT_OUTPUT, NULL) == -1)
- DEBUG_MSG;
-
- if (ioctl(oss_data->fd, SNDCTL_DSP_SKIP, NULL) == -1)
- DEBUG_MSG;
+ CHECK(ioctl, oss_data->fd, SNDCTL_DSP_RESET, NULL);
 
+FAILED:
 oss_time = (gint64) time * 1000;
 oss_paused_time = time;
 }
@@ -312,19 +259,14 @@
 
 if (pause)
 {
- oss_paused = TRUE;
 oss_paused_time = real_output_time();
-
- if (ioctl(oss_data->fd, SNDCTL_DSP_SILENCE, NULL) == -1)
- DEBUG_MSG;
+ CHECK(ioctl, oss_data->fd, SNDCTL_DSP_SILENCE, NULL);
 }
 else
- {
- oss_paused = FALSE;
+ CHECK(ioctl, oss_data->fd, SNDCTL_DSP_SKIP, NULL);
 
- if (ioctl(oss_data->fd, SNDCTL_DSP_SKIP, NULL) == -1)
- DEBUG_MSG;
- }
+FAILED:
+ oss_paused = pause;
 }
 
 void oss_get_volume(gint *left, gint *right)
@@ -333,46 +275,42 @@
 
 if (oss_data->fd == -1 || !oss_ioctl_vol)
 {
- if (oss_cfg->save_volume)
+ if (aud_get_int("oss4", "save_volume"))
 {
- *right = (oss_cfg->volume & 0xFF00) >> 8;
- *left = (oss_cfg->volume & 0x00FF);
+ *right = (aud_get_int("oss4", "volume") & 0xFF00) >> 8;
+ *left = (aud_get_int("oss4", "volume") & 0x00FF);
 }
 return;
 }
 
- if (ioctl(oss_data->fd, SNDCTL_DSP_GETPLAYVOL, &vol) == -1)
- {
- if (errno == EINVAL)
- oss_ioctl_vol = FALSE;
+ CHECK(ioctl, oss_data->fd, SNDCTL_DSP_GETPLAYVOL, &vol);
 
- DEBUG_MSG;
- }
- else
- {
- *right = (vol & 0xFF00) >> 8;
- *left = (vol & 0x00FF);
- oss_cfg->volume = vol;
- }
+ *right = (vol & 0xFF00) >> 8;
+ *left = (vol & 0x00FF);
+ aud_set_int("oss4", "volume", vol);
+
+ return;
+
+FAILED:
+ if (errno == EINVAL)
+ oss_ioctl_vol = FALSE;
 }
 
 void oss_set_volume(gint left, gint right)
 {
- gint vol;
+ gint vol = (right << 8) | left;
 
- vol = (right << 8) | left;
-
- if (oss_cfg->save_volume)
- oss_cfg->volume = vol;
+ if (aud_get_int("oss4", "save_volume"))
+ aud_set_int("oss4", "volume", vol);
 
 if (oss_data->fd == -1 || !oss_ioctl_vol)
 return;
 
- if (ioctl(oss_data->fd, SNDCTL_DSP_SETPLAYVOL, &vol) == -1)
- {
- if (errno == EINVAL)
- oss_ioctl_vol = FALSE;
+ CHECK(ioctl, oss_data->fd, SNDCTL_DSP_SETPLAYVOL, &vol);
 
- DEBUG_MSG;
- }
+ return;
+
+FAILED:
+ if (errno == EINVAL)
+ oss_ioctl_vol = FALSE;
 }

audacious-plugins-3.0.3.tar.bz2/src/oss4/oss.h -> audacious-plugins-3.1.tar.bz2/src/oss4/oss.h Changed

audacious-plugins-3.0.3.tar.bz2/src/oss4/plugin.c -> audacious-plugins-3.1.tar.bz2/src/oss4/plugin.c Changed

audacious-plugins-3.0.3.tar.bz2/src/oss4/utils.c -> audacious-plugins-3.1.tar.bz2/src/oss4/utils.c Changed

audacious-plugins-3.0.3.tar.bz2/src/pls/Makefile -> audacious-plugins-3.1.tar.bz2/src/pls/Makefile Changed

audacious-plugins-3.0.3.tar.bz2/src/psf/ao.h -> audacious-plugins-3.1.tar.bz2/src/psf/ao.h Changed

audacious-plugins-3.0.3.tar.bz2/src/psf/plugin.c -> audacious-plugins-3.1.tar.bz2/src/psf/plugin.c Changed

audacious-plugins-3.0.3.tar.bz2/src/pulse_audio/pulse_audio.c -> audacious-plugins-3.1.tar.bz2/src/pulse_audio/pulse_audio.c Changed

@@ -69,18 +69,6 @@
     if (!connected) return retval; \
 } while (0);
 
-static const gchar * get_song_name (void)
-{
-    if (! aud_drct_get_playing ()) /* just probing? */
-        return "";
-
-    gchar * title = aud_drct_get_title ();
-    static gchar t[512];
-    snprintf (t, sizeof (t), "%s", title);
-    g_free (title);
-    return t;
-}
-
 static void info_cb(struct pa_context *c, const struct pa_sink_input_info *i, int is_last, void *userdata) {
     assert(c);
 
@@ -349,8 +337,6 @@
     written = time * (int64_t) bytes_per_second / 1000;
     flush_time = time;
 
-    pa_stream_set_name (stream, get_song_name (), stream_success_cb, NULL);
-
     pa_threaded_mainloop_unlock (mainloop);
 }
 
@@ -588,7 +574,7 @@
         goto unlock_and_fail;
     }
 
-    if (!(stream = pa_stream_new(context, get_song_name(), &ss, NULL))) {
+    if (!(stream = pa_stream_new(context, "Audacious", &ss, NULL))) {
         ERROR ("Failed to create stream: %s", pa_strerror(pa_context_errno(context)));
         goto unlock_and_fail;
     }
@@ -685,7 +671,7 @@
     static GtkWidget *dialog;
     audgui_simple_message(& dialog, GTK_MESSAGE_INFO,
             _("About Audacious PulseAudio Output Plugin"),
-            _("Audacious PulseAudio Output Plugin\n\n "
+            "Audacious PulseAudio Output Plugin\n\n "
             "This program is free software; you can redistribute it and/or modify\n"
             "it under the terms of the GNU General Public License as published by\n"
             "the Free Software Foundation; either version 2 of the License, or\n"
@@ -699,7 +685,7 @@
             "You should have received a copy of the GNU General Public License\n"
             "along with this program; if not, write to the Free Software\n"
             "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-            "USA."));
+            "USA.");
 }
 
 AUD_OUTPUT_PLUGIN

audacious-plugins-3.0.3.tar.bz2/src/resample/Makefile -> audacious-plugins-3.1.tar.bz2/src/resample/Makefile Changed

audacious-plugins-3.0.3.tar.bz2/src/resample/plugin.c -> audacious-plugins-3.1.tar.bz2/src/resample/plugin.c Changed

@@ -19,9 +19,9 @@
 
 #include <gtk/gtk.h>
 
-#include <audacious/configdb.h>
 #include <audacious/gtk-compat.h>
 #include <audacious/i18n.h>
+#include <audacious/misc.h>
 #include <audacious/plugin.h>
 #include <libaudgui/libaudgui.h>
 #include <libaudgui/libaudgui-gtk.h>
@@ -29,35 +29,41 @@
 #include "config.h"
 #include "resample.h"
 
-int common_rates[] = {8000, 16000, 22050, 44100, 48000, 96000, 192000};
-int n_common_rates = sizeof common_rates / sizeof common_rates[0];
-int converted_rates[] = {48000, 48000, 44100, 44100, 48000, 96000, 96000};
-int fallback_rate = 44100;
-int method = SRC_LINEAR;
+const int common_rates[] = {8000, 16000, 22050, 44100, 48000, 96000, 192000};
+const int n_common_rates = G_N_ELEMENTS (common_rates);
+
+int converted_rates[G_N_ELEMENTS (common_rates)];
+int fallback_rate;
+int method;
 
 static GtkWidget * about_window = NULL;
 static GtkWidget * config_window = NULL;
 
+static const gchar * const resample_defaults[] = {
+ "8000", "48000",
+ "16000", "48000",
+ "22050", "44100",
+ "44100", "44100",
+ "48000", "48000",
+ "96000", "96000",
+ "192000", "96000",
+ "fallback_rate", "44100",
+ "method", "4", /* SRC_LINEAR */
+ NULL};
+
 void resample_config_load (void)
 {
- mcs_handle_t * database = aud_cfg_db_open ();
- if (! database)
- return;
-
- char scratch[16];
- int count;
+ aud_config_set_defaults ("resample", resample_defaults);
 
- for (count = 0; count < n_common_rates; count ++)
+ for (int count = 0; count < n_common_rates; count ++)
 {
+ char scratch[16];
 snprintf (scratch, sizeof scratch, "%d", common_rates[count]);
- aud_cfg_db_get_int (database, "resample", scratch,
- & converted_rates[count]);
+ converted_rates[count] = aud_get_int ("resample", scratch);
 }
 
- aud_cfg_db_get_int (database, "resample", "method", & method);
- aud_cfg_db_get_int (database, "resample", "fallback_rate", & fallback_rate);
-
- aud_cfg_db_close (database);
+ fallback_rate = aud_get_int ("resample", "fallback_rate");
+ method = aud_get_int ("resample", "method");
 }
 
 void resample_config_save (void)
@@ -67,23 +73,15 @@
 if (config_window != NULL)
 gtk_widget_destroy (config_window);
 
- mcs_handle_t * database = aud_cfg_db_open ();
- if (! database)
- return;
-
- char scratch[16];
- int count;
-
- for (count = 0; count < n_common_rates; count ++)
+ for (int count = 0; count < n_common_rates; count ++)
 {
+ char scratch[16];
 snprintf (scratch, sizeof scratch, "%d", common_rates[count]);
- aud_cfg_db_set_int (database, "resample", scratch, converted_rates[count]);
+ aud_set_int ("resample", scratch, converted_rates[count]);
 }
 
- aud_cfg_db_set_int (database, "resample", "method", method);
- aud_cfg_db_set_int (database, "resample", "fallback_rate", fallback_rate);
-
- aud_cfg_db_close (database);
+ aud_set_int ("resample", "fallback_rate", fallback_rate);
+ aud_set_int ("resample", "method", method);
 }
 
 static void resample_about (void)

audacious-plugins-3.0.3.tar.bz2/src/resample/resample.h -> audacious-plugins-3.1.tar.bz2/src/resample/resample.h Changed

audacious-plugins-3.0.3.tar.bz2/src/scrobbler/configure.c -> audacious-plugins-3.1.tar.bz2/src/scrobbler/configure.c Changed

@@ -10,8 +10,8 @@
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
-#include <audacious/configdb.h>
 #include <audacious/i18n.h>
+#include <audacious/misc.h>
 #include <audacious/preferences.h>
 #include <libaudcore/md5.h>
 
@@ -43,36 +43,30 @@
 
 static void saveconfig(void)
 {
- mcs_handle_t *cfgfile;
-
 const char *uid = gtk_entry_get_text(GTK_ENTRY(entry1));
 const char *url = gtk_entry_get_text(GTK_ENTRY(entry3));
 
- if ((cfgfile = aud_cfg_db_open())) {
- aud_md5state_t md5state;
- unsigned char md5pword[16];
-
- if (pwd != NULL && pwd[0] != '\0') {
- aud_md5_init(&md5state);
- aud_md5_append(&md5state, (guchar *)pwd, strlen(pwd));
- aud_md5_finish(&md5state, md5pword);
- aud_cfg_db_set_string(cfgfile, "audioscrobbler", "password",
- hexify((gchar*)md5pword, sizeof(md5pword)));
- }
- if (uid != NULL && uid[0] != '\0') {
- aud_cfg_db_set_string(cfgfile, "audioscrobbler", "username", (gchar *)uid);
- } else {
- aud_cfg_db_set_string(cfgfile, "audioscrobbler", "username", "");
- aud_cfg_db_set_string(cfgfile, "audioscrobbler", "password", "");
- }
-
- if (url != NULL && url[0] != '\0')
- 	aud_cfg_db_set_string(cfgfile, "audioscrobbler", "sc_url", (gchar *)url);
- 	else
- 		aud_cfg_db_set_string(cfgfile, "audioscrobbler", "sc_url", LASTFM_HS_URL);
+ aud_md5state_t md5state;
+ unsigned char md5pword[16];
 
- aud_cfg_db_close(cfgfile);
+ if (pwd != NULL && pwd[0] != '\0') {
+ aud_md5_init(&md5state);
+ aud_md5_append(&md5state, (guchar *)pwd, strlen(pwd));
+ aud_md5_finish(&md5state, md5pword);
+ aud_set_string ("audioscrobbler", "password",
+ hexify ((gchar *) md5pword, sizeof md5pword));
 }
+ if (uid != NULL && uid[0] != '\0') {
+ aud_set_string ("audioscrobbler", "username", uid);
+ } else {
+ aud_set_string ("audioscrobbler", "username", "");
+ aud_set_string ("audioscrobbler", "password", "");
+ }
+
+ if (url != NULL && url[0] != '\0')
+ aud_set_string ("audioscrobbler", "sc_url", url);
+ else
+ aud_set_string ("audioscrobbler", "sc_url", LASTFM_HS_URL);
 }
 
 static gboolean apply_config_changes(gpointer data) {
@@ -134,7 +128,6 @@
 static void *
 create_cfgdlg(void)
 {
- mcs_handle_t *db;
 GtkWidget *vbox2;
 GtkWidget *table1;
 GtkWidget *label3;
@@ -222,29 +215,13 @@
 // common
 gtk_box_pack_start (GTK_BOX (vbox2), notebook1, TRUE, TRUE, 6);
 
-	gtk_entry_set_text(GTK_ENTRY(entry1), "");
-
- if ((db = aud_cfg_db_open())) {
- gchar *username = NULL;
- gchar *sc_url = NULL;
-		// last fm
- aud_cfg_db_get_string(db, "audioscrobbler", "username",
- &username);
- if (username) {
- gtk_entry_set_text(GTK_ENTRY(entry1), username);
- g_free(username);
-			username = NULL;
- }
-
-		aud_cfg_db_get_string(db, "audioscrobbler", "sc_url", &sc_url);
-		if (sc_url) {
- 		gtk_entry_set_text(GTK_ENTRY(entry3), sc_url);
- 		g_free(sc_url);
-	 	sc_url = NULL;
-		}
-
- aud_cfg_db_close(db);
- }
+ gchar * username = aud_get_string ("audioscrobbler", "username");
+ gtk_entry_set_text ((GtkEntry *) entry1, username);
+ g_free (username);
+
+ gchar * sc_url = aud_get_string ("audioscrobbler", "sc_url");
+ gtk_entry_set_text ((GtkEntry *) entry3, sc_url);
+ g_free (sc_url);
 
 g_signal_connect(entry1, "changed", G_CALLBACK(entry_changed), NULL);
 g_signal_connect(entry3, "changed", G_CALLBACK(entry_changed), NULL);
@@ -254,8 +231,7 @@
 
 /* TODO: don't use WIDGET_CUSTOM there */
 static PreferencesWidget settings[] = {
- {WIDGET_CUSTOM, NULL, NULL, NULL, NULL, FALSE, {.populate = create_cfgdlg}},
-};
+ {WIDGET_CUSTOM, .data = {.populate = create_cfgdlg}}};
 
 PluginPreferences preferences = {
 .domain = PACKAGE,

audacious-plugins-3.0.3.tar.bz2/src/scrobbler/plugin.c -> audacious-plugins-3.1.tar.bz2/src/scrobbler/plugin.c Changed

@@ -6,8 +6,8 @@
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
-#include <audacious/configdb.h>
 #include <audacious/debug.h>
+#include <audacious/misc.h>
 #include <audacious/playlist.h>
 #include <audacious/plugin.h>
 #include <audacious/preferences.h>
@@ -101,25 +101,11 @@
 }
 
 void start(void) {
-	char *username = NULL, *password = NULL, *sc_url = NULL;
-	char *ge_username = NULL, *ge_password = NULL;
-	mcs_handle_t *cfgfile;
 	sc_going = 1;
-	ge_going = 1;
-
-	if ((cfgfile = aud_cfg_db_open()) != NULL) {
-		aud_cfg_db_get_string(cfgfile, "audioscrobbler", "username",
-				&username);
-		aud_cfg_db_get_string(cfgfile, "audioscrobbler", "password",
-				&password);
-		aud_cfg_db_get_string(cfgfile, "audioscrobbler", "sc_url",
-				&sc_url);
-		aud_cfg_db_get_string(cfgfile, "audioscrobbler", "ge_username",
-				&ge_username);
-		aud_cfg_db_get_string(cfgfile, "audioscrobbler", "ge_password",
-				&ge_password);
-		aud_cfg_db_close(cfgfile);
-	}
+
+	gchar * username = aud_get_string ("audioscrobbler", "username");
+	gchar * password = aud_get_string ("audioscrobbler", "password");
+	gchar * sc_url = aud_get_string ("audioscrobbler", "sc_url");
 
 	if ((!username || !password) || (!*username || !*password))
 	{
@@ -127,13 +113,11 @@
 		sc_going = 0;
 	}
 	else
-	{
 		sc_init(username, password, sc_url);
 
-		g_free(username);
-		g_free(password);
-		g_free(sc_url);
-	}
+	g_free (username);
+	g_free (password);
+	g_free (sc_url);
 
 	m_scrobbler = g_mutex_new();
 
@@ -174,35 +158,32 @@
 
 void setup_proxy(CURL *curl)
 {
- mcs_handle_t *db;
- gboolean use_proxy = FALSE;
-
- db = aud_cfg_db_open();
- aud_cfg_db_get_bool(db, NULL, "use_proxy", &use_proxy);
- if (use_proxy == FALSE)
- {
+ if (! aud_get_bool (NULL, "use_proxy"))
 curl_easy_setopt(curl, CURLOPT_PROXY, "");
- }
 else
 {
- gchar *proxy_host = NULL, *proxy_port = NULL;
- gboolean proxy_use_auth = FALSE;
- aud_cfg_db_get_string(db, NULL, "proxy_host", &proxy_host);
- aud_cfg_db_get_string(db, NULL, "proxy_port", &proxy_port);
+ gchar * proxy_host = aud_get_string (NULL, "proxy_host");
+ gchar * proxy_port = aud_get_string (NULL, "proxy_port");
+
 curl_easy_setopt(curl, CURLOPT_PROXY, proxy_host);
 curl_easy_setopt(curl, CURLOPT_PROXYPORT, atol(proxy_port));
- aud_cfg_db_get_bool(db, NULL, "proxy_use_auth", &proxy_use_auth);
- if (proxy_use_auth != FALSE)
+
+ if (! aud_get_bool (NULL, "proxy_use_auth"))
 {
- gchar *userpwd = NULL, *user = NULL, *pass = NULL;
- aud_cfg_db_get_string(db, NULL, "proxy_user", &user);
- aud_cfg_db_get_string(db, NULL, "proxy_pass", &pass);
- userpwd = g_strdup_printf("%s:%s", user, pass);
+ gchar * user = aud_get_string (NULL, "proxy_user");
+ gchar * pass = aud_get_string (NULL, "proxy_pass");
+ gchar * userpwd = g_strdup_printf ("%s:%s", user, pass);
+
 curl_easy_setopt(curl, CURLOPT_PROXYUSERPWD, userpwd);
- g_free(userpwd);
+
+			g_free (user);
+			g_free (pass);
+ g_free (userpwd);
 }
+
+ g_free (proxy_host);
+ g_free (proxy_port);
 }
- aud_cfg_db_close(db);
 }
 
 static void about_show(void)

audacious-plugins-3.0.3.tar.bz2/src/scrobbler/scrobbler.c -> audacious-plugins-3.1.tar.bz2/src/scrobbler/scrobbler.c Changed

@@ -1,5 +1,5 @@
+#include <inttypes.h>
 #include <pthread.h>
-#include <limits.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdarg.h>
@@ -531,15 +531,15 @@
 char *auth_tmp;
 char *auth;
 
- auth_tmp = g_strdup_printf("%s%ld", sc_password, ts);
+ auth_tmp = g_strdup_printf("%s%"PRId64, sc_password, (gint64) ts);
 auth = (char *)md5_string(auth_tmp, strlen(auth_tmp));
 g_free(auth_tmp);
 hexify(auth, 16);
 auth_tmp = g_strdup(sc_response_hash);
 
- g_snprintf(buf, sizeof(buf), "%s/?hs=true&p=%s&c=%s&v=%s&u=%s&t=%ld&a=%s",
+ g_snprintf(buf, sizeof(buf), "%s/?hs=true&p=%s&c=%s&v=%s&u=%s&t=%"PRId64"&a=%s",
 sc_hs_url, SCROBBLER_VERSION,
- SCROBBLER_CLI_ID, SCROBBLER_IMPLEMENTATION, sc_username, ts,
+ SCROBBLER_CLI_ID, SCROBBLER_IMPLEMENTATION, sc_username, (gint64) ts,
 auth_tmp);
 g_free(auth_tmp);
 
@@ -914,26 +914,22 @@
 
 static void read_cache(void)
 {
- FILE *fd;
- char buf[PATH_MAX];
 int i=0;
 item_t *item;
- gchar* config_datadir;
 
- config_datadir = aud_util_get_localdir();
- g_snprintf(buf, sizeof(buf), "%s/scrobblerqueue.txt", config_datadir);
- g_free(config_datadir);
+ gchar * path = g_strconcat (aud_get_path (AUD_PATH_USER_DIR), "/scrobblerqueue.txt", NULL);
 
- if (!(fd = fopen(buf, "r")))
+ if (! g_file_test (path, G_FILE_TEST_EXISTS))
 return;
- AUDDBG("Opening %s\n", buf);
- fclose(fd);
+
+ AUDDBG ("Opening %s\n", path);
 
 gchar* cache;
 gchar** values;
 gchar** entry;
- g_file_get_contents(buf, &cache, NULL, NULL);
+ g_file_get_contents (path, & cache, NULL, NULL);
 values = g_strsplit(cache, "\n", 0);
+ g_free (path);
 
 int x;
 for (x=0; values[x] && strlen(values[x]); x++) {
@@ -992,28 +988,27 @@
 {
 FILE *fd;
 item_t *item;
- char *home, buf[PATH_MAX];
- gchar* config_datadir;
 
 /*AUDDBG("Entering dump_queue();");*/
 
+ gchar * home;
 if (!(home = getenv("HOME")))
 {
 AUDDBG("No HOME directory found. Cannot dump queue.\n");
 return;
 }
 
- config_datadir = aud_util_get_localdir();
- g_snprintf(buf, sizeof(buf), "%s/scrobblerqueue.txt", config_datadir);
- g_free(config_datadir);
+ gchar * path = g_strconcat (aud_get_path (AUD_PATH_USER_DIR), "/scrobblerqueue.txt", NULL);
 
- if (!(fd = fopen(buf, "w")))
+ if (! (fd = fopen (path, "w")))
 {
- AUDDBG("Failure opening %s\n", buf);
+ AUDDBG("Failure opening %s\n", path);
+ g_free (path);
 return;
 }
 
- AUDDBG("Opening %s\n", buf);
+ AUDDBG("Opening %s\n", path);
+ g_free (path);
 
 q_peekall(1);

audacious-plugins-3.0.3.tar.bz2/src/sdlout/sdlout.c -> audacious-plugins-3.1.tar.bz2/src/sdlout/sdlout.c Changed

audacious-plugins-3.0.3.tar.bz2/src/sid/Makefile -> audacious-plugins-3.1.tar.bz2/src/sid/Makefile Changed

audacious-plugins-3.0.3.tar.bz2/src/sid/xmms-sid.c -> audacious-plugins-3.1.tar.bz2/src/sid/xmms-sid.c Changed

audacious-plugins-3.0.3.tar.bz2/src/sid/xs_config.c -> audacious-plugins-3.1.tar.bz2/src/sid/xs_config.c Changed

@@ -20,71 +20,8 @@
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
-#include "xs_config.h"
-
-#ifdef AUDACIOUS_PLUGIN
-
-#include <audacious/configdb.h>
-#include <audacious/drct.h>
-#include <audacious/plugin.h>
-
-#define XS_CONFIG_FILE mcs_handle_t
-#define XS_CONFIG_OPEN aud_cfg_db_open
-#define XS_CONFIG_FREE aud_cfg_db_close
-
-#define XS_CFG_SET_STRING(q,z) aud_cfg_db_set_string(cfg, XS_CONFIG_IDENT, q, z)
-#define XS_CFG_SET_FLOAT(q,z) aud_cfg_db_set_float(cfg, XS_CONFIG_IDENT, q, z)
-#define XS_CFG_SET_INT(q,z) aud_cfg_db_set_int(cfg, XS_CONFIG_IDENT, q, z)
-#define XS_CFG_SET_BOOL(q,z) aud_cfg_db_set_bool(cfg, XS_CONFIG_IDENT, q, z)
-#define XS_CFG_GET_STRING(q,z) aud_cfg_db_get_string(cfg, XS_CONFIG_IDENT, q, z)
-#define XS_CFG_GET_FLOAT(q,z) aud_cfg_db_get_float(cfg, XS_CONFIG_IDENT, q, z)
-#define XS_CFG_GET_INT(q,z) aud_cfg_db_get_int(cfg, XS_CONFIG_IDENT, q, z)
-#define XS_CFG_GET_BOOL(q,z) aud_cfg_db_get_bool(cfg, XS_CONFIG_IDENT, q, z)
-#else
-#include <xmms/configfile.h>
-#define XS_CONFIG_FILE ConfigFile
-#define XS_CONFIG_OPEN xmms_cfg_open_default_file
-#define XS_CONFIG_FREE xmms_cfg_free
-
-#define XS_CFG_SET_STRING(q,z) xmms_cfg_write_string(cfg, XS_CONFIG_IDENT, q, z)
-#define XS_CFG_SET_FLOAT(q,z) xmms_cfg_write_float(cfg, XS_CONFIG_IDENT, q, z)
-#define XS_CFG_SET_INT(q,z) xmms_cfg_write_int(cfg, XS_CONFIG_IDENT, q, z)
-#define XS_CFG_SET_BOOL(q,z) xmms_cfg_write_boolean(cfg, XS_CONFIG_IDENT, q, z)
-#define XS_CFG_GET_STRING(q,z) xmms_cfg_read_string(cfg, XS_CONFIG_IDENT, q, z)
-#define XS_CFG_GET_FLOAT(q,z) xmms_cfg_read_float(cfg, XS_CONFIG_IDENT, q, z)
-#define XS_CFG_GET_INT(q,z) xmms_cfg_read_int(cfg, XS_CONFIG_IDENT, q, z)
-#define XS_CFG_GET_BOOL(q,z) xmms_cfg_read_boolean(cfg, XS_CONFIG_IDENT, q, z)
-#endif
-#include <stdio.h>
-#include <ctype.h>
-#include "xs_glade.h"
-#include "xs_interface.h"
-#include "xs_support.h"
-
-
-/*
- * Global widgets
- */
-#if 0
-static GtkWidget *xs_configwin = NULL,
- *xs_sldb_fileselector = NULL,
- *xs_stil_fileselector = NULL,
- *xs_hvsc_selector = NULL,
- *xs_filt_importselector = NULL,
- *xs_filt_exportselector = NULL;
-#endif
-
-#define LUW(x) lookup_widget(xs_configwin, x)
 
-/* Samplerates
- */
-static const gchar *xs_samplerates_table[] = {
- "8000", "11025", "22050",
- "44100", "48000", "64000",
- "96000"
-};
-
-static const gint xs_nsamplerates_table = (sizeof(xs_samplerates_table) / sizeof(xs_samplerates_table[0]));
+#include "xs_config.h"
 
 /*
 * Configuration specific stuff
@@ -92,122 +29,6 @@
 XS_MUTEX(xs_cfg);
 struct xs_cfg_t xs_cfg;
 
-static xs_cfg_item_t xs_cfgtable[] = {
-{ CTYPE_INT, &xs_cfg.audioBitsPerSample, "audioBitsPerSample" },
-{ CTYPE_INT, &xs_cfg.audioChannels, "audioChannels" },
-{ CTYPE_INT, &xs_cfg.audioFrequency, "audioFrequency" },
-
-{ CTYPE_BOOL, &xs_cfg.mos8580, "mos8580" },
-{ CTYPE_BOOL, &xs_cfg.forceModel, "forceModel" },
-{ CTYPE_BOOL, &xs_cfg.emulateFilters, "emulateFilters" },
-{ CTYPE_FLOAT, &xs_cfg.sid1Filter.fs, "filterFs" },
-{ CTYPE_FLOAT, &xs_cfg.sid1Filter.fm, "filterFm" },
-{ CTYPE_FLOAT, &xs_cfg.sid1Filter.ft, "filterFt" },
-{ CTYPE_INT, &xs_cfg.memoryMode, "memoryMode" },
-{ CTYPE_INT, &xs_cfg.clockSpeed, "clockSpeed" },
-{ CTYPE_BOOL, &xs_cfg.forceSpeed, "forceSpeed" },
-
-{ CTYPE_INT, &xs_cfg.playerEngine, "playerEngine" },
-
-{ CTYPE_INT, &xs_cfg.sid2Builder, "sid2Builder" },
-{ CTYPE_INT, &xs_cfg.sid2OptLevel, "sid2OptLevel" },
-{ CTYPE_INT, &xs_cfg.sid2NFilterPresets, "sid2NFilterPresets" },
-
-{ CTYPE_BOOL, &xs_cfg.oversampleEnable, "oversampleEnable" },
-{ CTYPE_INT, &xs_cfg.oversampleFactor, "oversampleFactor" },
-
-{ CTYPE_BOOL, &xs_cfg.playMaxTimeEnable, "playMaxTimeEnable" },
-{ CTYPE_BOOL, &xs_cfg.playMaxTimeUnknown, "playMaxTimeUnknown" },
-{ CTYPE_INT, &xs_cfg.playMaxTime, "playMaxTime" },
-{ CTYPE_BOOL, &xs_cfg.playMinTimeEnable, "playMinTimeEnable" },
-{ CTYPE_INT, &xs_cfg.playMinTime, "playMinTime" },
-{ CTYPE_BOOL, &xs_cfg.songlenDBEnable, "songlenDBEnable" },
-{ CTYPE_STR, &xs_cfg.songlenDBPath, "songlenDBPath" },
-
-{ CTYPE_BOOL, &xs_cfg.stilDBEnable, "stilDBEnable" },
-{ CTYPE_STR, &xs_cfg.stilDBPath, "stilDBPath" },
-{ CTYPE_STR, &xs_cfg.hvscPath, "hvscPath" },
-
-#ifndef AUDACIOUS_PLUGIN
-{ CTYPE_INT, &xs_cfg.subsongControl, "subsongControl" },
-{ CTYPE_BOOL, &xs_cfg.detectMagic, "detectMagic" },
-#endif
-
-{ CTYPE_BOOL, &xs_cfg.titleOverride, "titleOverride" },
-{ CTYPE_STR, &xs_cfg.titleFormat, "titleFormat" },
-
-{ CTYPE_BOOL, &xs_cfg.subAutoEnable, "subAutoEnable" },
-{ CTYPE_BOOL, &xs_cfg.subAutoMinOnly, "subAutoMinOnly" },
-{ CTYPE_INT, &xs_cfg.subAutoMinTime, "subAutoMinTime" },
-};
-
-static const gint xs_cfgtable_max = (sizeof(xs_cfgtable) / sizeof(xs_cfgtable[0]));
-
-
-static xs_wid_item_t xs_widtable[] = {
-{ WTYPE_BGROUP, CTYPE_INT, "cfg_res_16bit", &xs_cfg.audioBitsPerSample, XS_RES_16BIT },
-{ WTYPE_BGROUP, CTYPE_INT, "cfg_res_8bit", &xs_cfg.audioBitsPerSample, XS_RES_8BIT },
-{ WTYPE_BGROUP, CTYPE_INT, "cfg_chn_mono", &xs_cfg.audioChannels, XS_CHN_MONO },
-{ WTYPE_BGROUP, CTYPE_INT, "cfg_chn_stereo", &xs_cfg.audioChannels, XS_CHN_STEREO },
-{ WTYPE_BGROUP, CTYPE_INT, "cfg_chn_autopan", &xs_cfg.audioChannels, XS_CHN_AUTOPAN },
-{ WTYPE_COMBO, CTYPE_INT, "cfg_samplerate", &xs_cfg.audioFrequency, XS_AUDIO_FREQ },
-{ WTYPE_BUTTON, CTYPE_BOOL, "cfg_oversample", &xs_cfg.oversampleEnable, 0 },
-{ WTYPE_SPIN, CTYPE_INT, "cfg_oversample_factor",&xs_cfg.oversampleFactor, 0 },
-
-{ WTYPE_BGROUP, CTYPE_INT, "cfg_emu_sidplay1", &xs_cfg.playerEngine, XS_ENG_SIDPLAY1 },
-{ WTYPE_BGROUP, CTYPE_INT, "cfg_emu_sidplay2", &xs_cfg.playerEngine, XS_ENG_SIDPLAY2 },
-{ WTYPE_BGROUP, CTYPE_INT, "cfg_emu_mem_real", &xs_cfg.memoryMode, XS_MPU_REAL },
-{ WTYPE_BGROUP, CTYPE_INT, "cfg_emu_mem_banksw", &xs_cfg.memoryMode, XS_MPU_BANK_SWITCHING },
-{ WTYPE_BGROUP, CTYPE_INT, "cfg_emu_mem_transrom", &xs_cfg.memoryMode, XS_MPU_TRANSPARENT_ROM },
-{ WTYPE_BGROUP, CTYPE_INT, "cfg_emu_mem_playsid", &xs_cfg.memoryMode, XS_MPU_PLAYSID_ENVIRONMENT },
-
-{ WTYPE_BUTTON, CTYPE_BOOL, "cfg_emu_mos8580", &xs_cfg.mos8580, 0 },
-{ WTYPE_BUTTON, CTYPE_BOOL, "cfg_emu_sid_force", &xs_cfg.forceModel, 0 },
-{ WTYPE_BGROUP, CTYPE_INT, "cfg_emu_clock_ntsc", &xs_cfg.clockSpeed, XS_CLOCK_NTSC },
-{ WTYPE_BGROUP, CTYPE_INT, "cfg_emu_clock_pal", &xs_cfg.clockSpeed, XS_CLOCK_PAL },
-{ WTYPE_BUTTON, CTYPE_BOOL, "cfg_emu_clock_force", &xs_cfg.forceSpeed, 0 },
-{ WTYPE_BUTTON, CTYPE_BOOL, "cfg_emu_sp2_opt", &xs_cfg.sid2OptLevel, 0 },
-
-{ WTYPE_BGROUP, CTYPE_INT, "cfg_emu_sp2_resid", &xs_cfg.sid2Builder, XS_BLD_RESID },
-{ WTYPE_BGROUP, CTYPE_INT, "cfg_emu_sp2_hardsid", &xs_cfg.sid2Builder, XS_BLD_HARDSID },
-
-{ WTYPE_BUTTON, CTYPE_BOOL, "cfg_emu_filters", &xs_cfg.emulateFilters, 0 },
-{ WTYPE_SCALE, CTYPE_FLOAT, "cfg_sp1_filter_fs", &xs_cfg.sid1Filter.fs, 0 },
-{ WTYPE_SCALE, CTYPE_FLOAT, "cfg_sp1_filter_fm", &xs_cfg.sid1Filter.fm, 0 },
-{ WTYPE_SCALE, CTYPE_FLOAT, "cfg_sp1_filter_ft", &xs_cfg.sid1Filter.ft, 0 },
-
-{ WTYPE_BUTTON, CTYPE_BOOL, "cfg_maxtime_enable", &xs_cfg.playMaxTimeEnable, 0 },
-{ WTYPE_BUTTON, CTYPE_BOOL, "cfg_maxtime_unknown", &xs_cfg.playMaxTimeUnknown, 0 },
-{ WTYPE_SPIN, CTYPE_INT, "cfg_maxtime", &xs_cfg.playMaxTime, 0 },
-{ WTYPE_BUTTON, CTYPE_BOOL, "cfg_mintime_enable", &xs_cfg.playMinTimeEnable, 0 },
-{ WTYPE_SPIN, CTYPE_INT, "cfg_mintime", &xs_cfg.playMinTime, 0 },
-{ WTYPE_BUTTON, CTYPE_BOOL, "cfg_sld_enable", &xs_cfg.songlenDBEnable, 0 },
-{ WTYPE_TEXT, CTYPE_STR, "cfg_sld_dbpath", &xs_cfg.songlenDBPath, 0 },
-
-{ WTYPE_BUTTON, CTYPE_BOOL, "cfg_stil_enable", &xs_cfg.stilDBEnable, 0 },
-{ WTYPE_TEXT, CTYPE_STR, "cfg_stil_dbpath", &xs_cfg.stilDBPath, 0 },
-{ WTYPE_TEXT, CTYPE_STR, "cfg_hvsc_path", &xs_cfg.hvscPath, 0 },
-
-#ifndef AUDACIOUS_PLUGIN
-{ WTYPE_BGROUP, CTYPE_INT, "cfg_subctrl_none", &xs_cfg.subsongControl, XS_SSC_NONE },
-{ WTYPE_BGROUP, CTYPE_INT, "cfg_subctrl_seek", &xs_cfg.subsongControl, XS_SSC_SEEK },
-{ WTYPE_BGROUP, CTYPE_INT, "cfg_subctrl_popup", &xs_cfg.subsongControl, XS_SSC_POPUP },
-{ WTYPE_BGROUP, CTYPE_INT, "cfg_subctrl_patch", &xs_cfg.subsongControl, XS_SSC_PATCH },
-
-{ WTYPE_BUTTON, CTYPE_BOOL, "cfg_detectmagic", &xs_cfg.detectMagic, 0 },
-#endif
-
-{ WTYPE_BUTTON, CTYPE_BOOL, "cfg_ftitle_override", &xs_cfg.titleOverride, 0 },
-{ WTYPE_TEXT, CTYPE_STR, "cfg_ftitle_format", &xs_cfg.titleFormat, 0 },
-
-{ WTYPE_BUTTON, CTYPE_BOOL, "cfg_subauto_enable", &xs_cfg.subAutoEnable, 0 },
-{ WTYPE_BUTTON, CTYPE_BOOL, "cfg_subauto_min_only", &xs_cfg.subAutoMinOnly, 0 },
-{ WTYPE_SPIN, CTYPE_INT, "cfg_subauto_mintime", &xs_cfg.subAutoMinTime, 0 },
-};
-
-static const gint xs_widtable_max = (sizeof(xs_widtable) / sizeof(xs_widtable[0]));
-
-
 /* Reset/initialize the configuration
 */
 void xs_init_configuration(void)
@@ -304,1257 +125,3 @@
 /* Unlock the configuration */
 XS_MUTEX_UNLOCK(xs_cfg);
 }
-
-
-/* Filter configuration handling
- */
-#if 0
-static void xs_filters_error(const gchar *fmt, ...)
-{
- va_list ap;
-
-#ifdef AUDACIOUS_PLUGIN
- va_start(ap, fmt);
- g_logv("AUD-SID", G_LOG_LEVEL_WARNING, fmt, ap);
- va_end(ap);
-#else
- gchar *msg;
-
- va_start(ap, fmt);
- msg = g_strdup_vprintf(fmt, ap);
- va_end(ap);
- xmms_show_message(_(PACKAGE_NAME " Error"), msg, _("OK"), TRUE, NULL, NULL);
- g_free(msg);
-#endif
-}
-#endif
-
-
-static void xs_filter_free(xs_sid_filter_t *filter)
-{
- if (filter) {
- g_free(filter->name);
- filter->name = NULL;
- g_free(filter);
- }
-}
-
-
-#define XS_FITEM (4 * 2)
-
-static gboolean xs_filter_load_into(XS_CONFIG_FILE *cfg, gint nFilter, xs_sid_filter_t *filter)
-{
- gchar tmpKey[64], *tmpStr;
-
- /* Get fields from config */
- g_snprintf(tmpKey, sizeof(tmpKey), "filter%dType", nFilter);
- if (!XS_CFG_GET_INT(tmpKey, &(filter->type)))
- return FALSE;
-
- g_snprintf(tmpKey, sizeof(tmpKey), "filter%dName", nFilter);
- if (!XS_CFG_GET_STRING(tmpKey, &tmpStr))
- return FALSE;
-
- filter->name = g_strdup(tmpStr);
- if (filter->name == NULL)
- return FALSE;
-
- if (filter->type == 1) {
- gint i, j;
-
- /* Types 1 has points */
- g_snprintf(tmpKey, sizeof(tmpKey), "filter%dNPoints", nFilter);
- if (!XS_CFG_GET_INT(tmpKey, &(filter->npoints)))
- return FALSE;
-
- g_snprintf(tmpKey, sizeof(tmpKey), "filter%dPoints", nFilter);
- if (!XS_CFG_GET_STRING(tmpKey, &tmpStr))
- return FALSE;
-
- for (i = 0, j = 0; i < filter->npoints; i++, j += XS_FITEM) {
- if (sscanf(&tmpStr[j], "%4x%4x",
- &(filter->points[i].x),
- &(filter->points[i].y)) != 2)
- return FALSE;
- }
- } else if (filter->type == 3) {
- /* Type 3 has tunables */
- g_snprintf(tmpKey, sizeof(tmpKey), "filter%dData", nFilter);
- if (!XS_CFG_GET_STRING(tmpKey, &tmpStr))
- return FALSE;
-
- if (sscanf(tmpStr, "%f,%f,%f,%f", &filter->rate, &filter->point,
- &filter->voice_nonlinearity, &filter->cf_treshold) != 4)
- return FALSE;
-
- g_snprintf(tmpKey, sizeof(tmpKey), "filter%dData3", nFilter);
- if (!XS_CFG_GET_STRING(tmpKey, &tmpStr))
- return FALSE;
-
- if (sscanf(tmpStr, "%f,%f,%f,%f", &filter->baseresistance,
- &filter->offset, &filter->steepness,
- &filter->minimumfetresistance) != 4)
- return FALSE;
-
- } else if (filter->type == 4) {
- /* Type 4 has fewer tunables */
- g_snprintf(tmpKey, sizeof(tmpKey), "filter%dData4", nFilter);
- if (!XS_CFG_GET_STRING(tmpKey, &tmpStr))
- return FALSE;
-
- if (sscanf(tmpStr, "%f,%f", &filter->k, &filter->b) != 2)
- return FALSE;
- } else {
- xs_error("Unknown filter type %d for '%s' (#%d).\n", filter->type, filter->name, nFilter);
- return FALSE;
- }
-
- return TRUE;
-}
-
-
-static xs_sid_filter_t * xs_filter_load(XS_CONFIG_FILE *cfg, gint nFilter)
-{
- xs_sid_filter_t *filter;
-
- /* Allocate filter struct */
- if ((filter = g_malloc0(sizeof(xs_sid_filter_t))) == NULL)
- return NULL;
-
- if (!xs_filter_load_into(cfg, nFilter, filter)) {
- xs_error("Error loading filter %d from configuration.\n", nFilter);
- xs_filter_free(filter);
- return NULL;
- } else
- return filter;
-}
-
-
-#if 0
-static gboolean xs_filter_save(XS_CONFIG_FILE *cfg, xs_sid_filter_t *pFilter, gint nFilter)
-{
- gchar *tmpValue, tmpKey[64];
- gint i, j;
-
- /* Allocate memory for value string */
- tmpValue = g_malloc(sizeof(gchar) * XS_FITEM * (pFilter->npoints + 1));
- if (tmpValue == NULL)
- return FALSE;
-
- /* Make value string */
- for (i = 0, j = 0; i < pFilter->npoints; i++, j += XS_FITEM) {
- g_snprintf(&tmpValue[j], XS_FITEM+1, "%04x%04x",
- pFilter->points[i].x,
- pFilter->points[i].y);
- }
-
- /* Write into the configuration */
- g_snprintf(tmpKey, sizeof(tmpKey), "filter%dName", nFilter);
- XS_CFG_SET_STRING(tmpKey, pFilter->name);
-
- g_snprintf(tmpKey, sizeof(tmpKey), "filter%dNPoints", nFilter);
- XS_CFG_SET_INT(tmpKey, pFilter->npoints);
-
- g_snprintf(tmpKey, sizeof(tmpKey), "filter%dPoints", nFilter);
- XS_CFG_SET_STRING(tmpKey, tmpValue);
-
- g_free(tmpValue);
- return TRUE;
-}
-
-
-/* Filter exporting and importing. These functions export/import
- * filter settings to/from SIDPlay2 INI-type files.
- */
-static gboolean xs_fgetitem(gchar *inLine, size_t *linePos, gchar sep, gchar *tmpStr, size_t tmpMax)
-{
- size_t i;
-
- for (i = 0; i < tmpMax - 1 && inLine[*linePos] &&
- inLine[*linePos] != sep; i++, (*linePos)++)
- tmpStr[i] = inLine[*linePos];
-
- tmpStr[i] = 0;
- while (--i > 0 && isspace(tmpStr[i])) tmpStr[i] = 0;
-
- xs_findnext(inLine, linePos);
- return (inLine[*linePos] == sep);
-}
-
-
-static gboolean xs_chkf(xs_sid_filter_t *filter, const gchar *str, const gchar *name, gint type)
-{
- if (g_strncasecmp(str, name, strlen(name)))
- return FALSE;
- if (filter->type != type) {
- if (filter->type == -1) {
- filter->type = type;
- return TRUE;
- } else {
- xs_error("Unexpected key '%s' for filter type %d.\n");
- return FALSE;
- }
- } else
- return TRUE;
-}
-
-static gboolean xs_filters_import(const gchar *filename, xs_sid_filter_t **pFilters, gint *nFilters)
-{
- FILE *inFile;
- gchar inLine[XS_BUF_SIZE], tmpStr[XS_BUF_SIZE];
- gchar *sectName = NULL;
- gboolean inSection, isError = FALSE;
- size_t lineNum, i;
- xs_sid_filter_t *filter = NULL;
-
-fprintf(stderr, "xs_filters_import(%s)\n", filename);
-
- if ((inFile = fopen(filename, "ra")) == NULL) {
- xs_filters_error("");
- return FALSE;
- }
-
-fprintf(stderr, "importing...\n");
-
- inSection = FALSE;
- lineNum = 0;
- while (fgets(inLine, XS_BUF_SIZE, inFile) != NULL && !isError) {
- size_t linePos = 0;
- lineNum++;
-
- xs_findnext(inLine, &linePos);
- if (isalpha(inLine[linePos])) {
- /* A new key/value pair */
- if (!xs_fgetitem(inLine, &linePos, '=', tmpStr, XS_BUF_SIZE)) {
- xs_error("Invalid line '%s' :: expected =", inLine);
- isError = TRUE;
- } else if (inSection) {
- linePos++;
- xs_findnext(inLine, &linePos);
-
- if (xs_chkf(filter, tmpStr, "points", 1)) {
-
- } else if (xs_chkf(filter, tmpStr, "point", 1)) {
-
- } else if (!g_strncasecmp(tmpStr, "type", 4)) {
- if (filter->type != -1) {
- xs_error("Filter type %d already set for '%s'\n",
- filter->type, sectName);
- }
-
- } else {
- xs_error("Unsupported definition '%s' @ '%s'\n",
- tmpStr, sectName);
- }
- }
- } else if (inLine[linePos] == '[') {
- /* Check for existing section */
- if (inSection) {
- /* Submit definition */
- fprintf(stderr, "filter ends: %s\n", sectName);
- if ((filter = g_malloc0(sizeof(xs_sid_filter_t))) == NULL) {
- fprintf(stderr, "could not allocate ..\n");
- } else {
-
- }
- g_free(sectName);
- }
-
- /* New filter(?) section starts */
- linePos++;
- for (i = 0; i < XS_BUF_SIZE-1 && inLine[linePos] && inLine[linePos] != ']'; i++, linePos++)
- tmpStr[i] = inLine[linePos];
- tmpStr[i] = 0;
-
- if (inLine[linePos] != ']') {
- fprintf(stderr, "invalid! expected ']': %s\n", inLine);
- } else {
- if (!g_strncasecmp(tmpStr, "filter", 6)) {
- sectName = strdup(tmpStr + 6);
- fprintf(stderr, "filter: %s\n", sectName);
- inSection = TRUE;
- } else {
- fprintf(stderr, "ignoring section: %s\n", tmpStr);
- inSection = FALSE;
- }
- }
- } else if (inLine[linePos] != '#' && inLine[linePos] != ';' && inLine[linePos] != 0) {
- /* Syntax error */
- xs_error("Syntax error: '%s'\n", inLine);
- isError = TRUE;
- }
- }
-
- fclose(inFile);
- return TRUE;
-}
-
-
-static gboolean xs_filter_export(FILE *outFile, xs_sid_filter_t *filter)
-{
- fprintf(outFile,
- "[Filter%s]\n"
- "type=%d\n",
- filter->name, filter->type);
-
- if (filter->type == 1) {
- gint i;
- fprintf(outFile, "points=%d\n", filter->npoints);
-
- for (i = 0; i < filter->npoints; i++) {
- fprintf(outFile,
- "point%d=%d,%d\n",
- i + 1,
- filter->points[i].x,
- filter->points[i].y);
- }
- } else if (filter->type == 3) {
- fprintf(outFile,
- "DistortionRate = %f\n"
- "DistortionPoint = %f\n"
- "VoiceNonlinearity = %f\n"
- "DistortionCFThreshold = %f\n",
- filter->rate, filter->point,
- filter->voice_nonlinearity,
- filter->cf_treshold);
-
- fprintf(outFile,
- "Type3BaseResistance = %f\n"
- "Type3Offset = %f\n"
- "Type3Steepness = %f\n"
- "Type3MinimumFETResistance = %f\n",
- filter->baseresistance, filter->offset,
- filter->steepness, filter->minimumfetresistance);
-
- } else if (filter->type == 4) {
- fprintf(outFile,
- "Type4K=%f\n"
- "Type4B=%f\n",
- filter->k, filter->b);
- } else {
- xs_error("Filter '%s' has type %d, which is unsupported by export.\n",
- filter->name, filter->type);
- return FALSE;
- }
-
- fprintf(outFile, "\n");
- return TRUE;
-}
-
-
-static gboolean xs_filters_export(const gchar *filename, xs_sid_filter_t **filters, gint nFilters)
-{
- gboolean result = TRUE;
- FILE *outFile;
- gint n;
-
- /* Open/create the file */
- if ((outFile = fopen(filename, "wa")) == NULL) {
- xs_filters_error("Could not open '%s' for writing! Not exporting.", filename);
- return FALSE;
- }
-
- /* Header */
- fprintf(outFile,
- "; SIDPlay2 compatible filter definition file\n"
- "; Exported by " PACKAGE_STRING "\n\n");
-
- /* Write each filter spec in "INI"-style format */
- for (n = 0; n < nFilters; n++) {
- if (!xs_filter_export(outFile, filters[n])) {
- result = FALSE;
- break;
- }
- }
-
- fclose(outFile);
-
- if (!result)
- xs_filters_error("Some filters could not be exported!");
-
- return result;
-}
-#endif
-
-
-/* Get the configuration (from file or default)
- */
-void xs_read_configuration(void)
-{
- XS_CONFIG_FILE *cfg;
- gint i;
- gchar *tmpStr;
-
- /* Try to open the XMMS configuration file */
- XS_MUTEX_LOCK(xs_cfg);
- XSDEBUG("loading from config-file ...\n");
-
- cfg = XS_CONFIG_OPEN();
-
- if (cfg == NULL) {
- XSDEBUG("Could not open configuration, trying to write defaults...\n");
- xs_write_configuration();
- return;
- }
-
- /* Read the new settings from XMMS configuration file */
- for (i = 0; i < xs_cfgtable_max; i++) {
- switch (xs_cfgtable[i].itemType) {
- case CTYPE_INT:
- XS_CFG_GET_INT(xs_cfgtable[i].itemName,
- (gint *) xs_cfgtable[i].itemData);
- break;
-
- case CTYPE_BOOL:
- XS_CFG_GET_BOOL(xs_cfgtable[i].itemName,
- (gboolean *) xs_cfgtable[i].itemData);
- break;
-
- case CTYPE_FLOAT:
- XS_CFG_GET_FLOAT(xs_cfgtable[i].itemName,
- (gfloat *) xs_cfgtable[i].itemData);
- break;
-
- case CTYPE_STR:
- if (XS_CFG_GET_STRING(xs_cfgtable[i].itemName,
- (gchar **) &tmpStr)) {
- xs_pstrcpy((gchar **) xs_cfgtable[i].itemData, tmpStr);
- g_free(tmpStr);
- }
- break;
- }
- }
-
- /* Filters and presets are a special case */
- xs_filter_load_into(cfg, 0, &xs_cfg.sid2Filter);
-
- if (xs_cfg.sid2NFilterPresets > 0) {
- xs_cfg.sid2FilterPresets = g_malloc0(xs_cfg.sid2NFilterPresets * sizeof(xs_sid_filter_t *));
- if (!xs_cfg.sid2FilterPresets) {
- xs_error("Allocation of sid2FilterPresets structure failed!\n");
- } else {
- for (i = 0; i < xs_cfg.sid2NFilterPresets; i++) {
- xs_cfg.sid2FilterPresets[i] = xs_filter_load(cfg, i);
- }
- }
- }
-
- XS_CONFIG_FREE(cfg);
-
- XS_MUTEX_UNLOCK(xs_cfg);
- XSDEBUG("OK\n");
-}
-
-
-/* Write the current configuration
- */
-gint xs_write_configuration(void)
-{
- XS_CONFIG_FILE *cfg;
- gint i;
-
- XSDEBUG("writing configuration ...\n");
- XS_MUTEX_LOCK(xs_cfg);
-
- /* Try to open the XMMS configuration file */
- cfg = XS_CONFIG_OPEN();
-
-#ifndef AUDACIOUS_PLUGIN
- if (!cfg) cfg = xmms_cfg_new();
- if (!cfg) return -1;
-#endif
-
- /* Write the new settings to XMMS configuration file */
- for (i = 0; i < xs_cfgtable_max; i++) {
- switch (xs_cfgtable[i].itemType) {
- case CTYPE_INT:
- XS_CFG_SET_INT(xs_cfgtable[i].itemName,
- *(gint *) xs_cfgtable[i].itemData);
- break;
-
- case CTYPE_BOOL:
- XS_CFG_SET_BOOL(xs_cfgtable[i].itemName,
- *(gboolean *) xs_cfgtable[i].itemData);
- break;
-
- case CTYPE_FLOAT:
- XS_CFG_SET_FLOAT(xs_cfgtable[i].itemName,
- *(gfloat *) xs_cfgtable[i].itemData);
- break;
-
- case CTYPE_STR:
- XS_CFG_SET_STRING(xs_cfgtable[i].itemName,
- *(gchar **) xs_cfgtable[i].itemData);
- break;
- }
- }
-
-
-#ifndef AUDACIOUS_PLUGIN
- xmms_cfg_write_default_file(cfg);
-#endif
- XS_CONFIG_FREE(cfg);
-
- XS_MUTEX_UNLOCK(xs_cfg);
-
- return 0;
-}
-
-
-#if 0
-/* Configuration panel was canceled
- */
-XS_DEF_WINDOW_CLOSE(cfg_cancel, configwin)
-
-
-/* Configuration was accepted, save the settings
- */
-void xs_cfg_ok(void)
-{
- gint i;
- gfloat tmpValue;
- gint tmpInt;
- const gchar *tmpStr;
-
- if (aud_drct_get_playing ())
- aud_drct_stop ();
-
- /* Get lock on configuration */
- XS_MUTEX_LOCK(xs_cfg);
-
- XSDEBUG("get data from widgets to config...\n");
-
- for (i = 0; i < xs_widtable_max; i++) {
- switch (xs_widtable[i].widType) {
- case WTYPE_BGROUP:
- /* Check if toggle-button is active */
- if (GTK_TOGGLE_BUTTON(LUW(xs_widtable[i].widName))->active) {
- /* Yes, set the constant value */
- *((gint *) xs_widtable[i].itemData) = xs_widtable[i].itemSet;
- }
- break;
-
- case WTYPE_COMBO:
- /* Get text from text-widget */
- tmpStr = gtk_entry_get_text(GTK_ENTRY(LUW(xs_widtable[i].widName)));
- if (sscanf(tmpStr, "%d", &tmpInt) != 1)
- tmpInt = xs_widtable[i].itemSet;
-
- *((gint *) xs_widtable[i].itemData) = tmpInt;
- break;
-
- case WTYPE_SPIN:
- case WTYPE_SCALE:
- /* Get the value */
- switch (xs_widtable[i].widType) {
- case WTYPE_SPIN:
- tmpValue = gtk_spin_button_get_adjustment(GTK_SPIN_BUTTON(LUW(xs_widtable[i].widName)))->value;
- break;
-
- case WTYPE_SCALE:
- tmpValue = gtk_range_get_adjustment(GTK_RANGE(LUW(xs_widtable[i].widName)))->value;
- break;
-
- default:
- tmpValue = -1;
- break;
- }
-
- /* Set the value */
- switch (xs_widtable[i].itemType) {
- case CTYPE_INT:
- *((gint *) xs_widtable[i].itemData) = (gint) tmpValue;
- break;
-
- case CTYPE_FLOAT:
- *((gfloat *) xs_widtable[i].itemData) = tmpValue;
- break;
- }
- break;
-
- case WTYPE_BUTTON:
- /* Check if toggle-button is active */
- *((gboolean *) xs_widtable[i].itemData) =
- (GTK_TOGGLE_BUTTON(LUW(xs_widtable[i].widName))->active);
- break;
-
- case WTYPE_TEXT:
- /* Get text from text-widget */
- xs_pstrcpy((gchar **) xs_widtable[i].itemData,
- gtk_entry_get_text(GTK_ENTRY(LUW(xs_widtable[i].widName))));
- break;
- }
- }
-
- /* Get filter settings */
- /*
- if (!xs_curve_get_points(XS_CURVE(LUW("")), &xs_cfg.sid2Filter.points, &xs_cfg.sid2Filter.npoints)) {
- xs_error("Warning: Could not get filter curve widget points!\n");
- }
- */
-
- /* Release lock */
- XS_MUTEX_UNLOCK(xs_cfg);
-
- /* Close window */
- gtk_widget_destroy(xs_configwin);
- xs_configwin = NULL;
-
- /* Write settings */
- xs_write_configuration();
-
- /* Re-initialize */
- xs_reinit();
-}
-
-
-/* Confirmation window
- */
-gboolean xs_confirmwin_delete(GtkWidget *widget, GdkEvent *event, gpointer user_data)
-{
- (void) widget;
- (void) event;
- (void) user_data;
-
- return FALSE;
-}
-
-
-
-/* HVSC songlength-database file selector response-functions
- */
-void xs_cfg_sldb_browse(GtkButton * button, gpointer user_data)
-{
- (void) button;
- (void) user_data;
-
- if (xs_sldb_fileselector != NULL) {
- XS_WINDOW_PRESENT(xs_sldb_fileselector);
- return;
- }
-
- xs_sldb_fileselector = create_xs_sldb_fs();
- XS_MUTEX_LOCK(xs_cfg);
- gtk_file_selection_set_filename(GTK_FILE_SELECTION(xs_sldb_fileselector), xs_cfg.songlenDBPath);
- XS_MUTEX_UNLOCK(xs_cfg);
- gtk_widget_show(xs_sldb_fileselector);
-}
-
-
-void xs_sldb_fs_ok(GtkButton *button, gpointer user_data)
-{
- (void) button;
- (void) user_data;
-
- /* Selection was accepted! */
- gtk_entry_set_text(GTK_ENTRY(LUW("cfg_sld_dbpath")),
- gtk_file_selection_get_filename(GTK_FILE_SELECTION(xs_sldb_fileselector)));
-
- /* Close file selector window */
- gtk_widget_destroy(xs_sldb_fileselector);
- xs_sldb_fileselector = NULL;
-}
-
-XS_DEF_WINDOW_CLOSE(sldb_fs_cancel, sldb_fileselector)
-XS_DEF_WINDOW_DELETE(sldb_fs, sldb_fileselector)
-
-
-/* STIL-database file selector response-functions
- */
-void xs_cfg_stil_browse(GtkButton * button, gpointer user_data)
-{
- (void) button;
- (void) user_data;
-
- if (xs_stil_fileselector != NULL) {
- XS_WINDOW_PRESENT(xs_stil_fileselector);
- return;
- }
-
- xs_stil_fileselector = create_xs_stil_fs();
- XS_MUTEX_LOCK(xs_cfg);
- gtk_file_selection_set_filename(GTK_FILE_SELECTION(xs_stil_fileselector), xs_cfg.stilDBPath);
- XS_MUTEX_UNLOCK(xs_cfg);
- gtk_widget_show(xs_stil_fileselector);
-}
-
-
-void xs_stil_fs_ok(GtkButton *button, gpointer user_data)
-{
- (void) button;
- (void) user_data;
-
- /* Selection was accepted! */
- gtk_entry_set_text(GTK_ENTRY(LUW("cfg_stil_dbpath")),
- gtk_file_selection_get_filename(GTK_FILE_SELECTION(xs_stil_fileselector)));
-
- /* Close file selector window */
- gtk_widget_destroy(xs_stil_fileselector);
- xs_stil_fileselector = NULL;
-}
-
-
-XS_DEF_WINDOW_CLOSE(stil_fs_cancel, stil_fileselector)
-XS_DEF_WINDOW_DELETE(stil_fs, stil_fileselector)
-
-
-/* HVSC location selector response-functions
- */
-void xs_cfg_hvsc_browse(GtkButton * button, gpointer user_data)
-{
- (void) button;
- (void) user_data;
-
- if (xs_hvsc_selector != NULL) {
- XS_WINDOW_PRESENT(xs_hvsc_selector);
- return;
- }
-
- xs_hvsc_selector = create_xs_hvsc_fs();
- XS_MUTEX_LOCK(xs_cfg);
- gtk_file_selection_set_filename(GTK_FILE_SELECTION(xs_hvsc_selector), xs_cfg.hvscPath);
- XS_MUTEX_UNLOCK(xs_cfg);
- gtk_widget_show(xs_hvsc_selector);
-}
-
-
-void xs_hvsc_fs_ok(GtkButton *button, gpointer user_data)
-{
- (void) button;
- (void) user_data;
-
- /* Selection was accepted! */
- gtk_entry_set_text(GTK_ENTRY(LUW("cfg_hvsc_path")),
- gtk_file_selection_get_filename(GTK_FILE_SELECTION(xs_hvsc_selector)));
-
- /* Close file selector window */
- gtk_widget_destroy(xs_hvsc_selector);
- xs_hvsc_selector = NULL;
-}
-
-
-XS_DEF_WINDOW_CLOSE(hvsc_fs_cancel, hvsc_selector)
-XS_DEF_WINDOW_DELETE(hvsc_fs, hvsc_selector)
-
-
-/* Filter handling
- */
-void xs_cfg_sp1_filter_reset(GtkButton * button, gpointer user_data)
-{
- (void) button;
- (void) user_data;
-
- gtk_adjustment_set_value(gtk_range_get_adjustment(GTK_RANGE(LUW("cfg_sp1_filter_fs"))), XS_SIDPLAY1_FS);
- gtk_adjustment_set_value(gtk_range_get_adjustment(GTK_RANGE(LUW("cfg_sp1_filter_fm"))), XS_SIDPLAY1_FM);
- gtk_adjustment_set_value(gtk_range_get_adjustment(GTK_RANGE(LUW("cfg_sp1_filter_ft"))), XS_SIDPLAY1_FT);
-}
-
-
-void xs_cfg_sp2_filter_update(XSCurve *curve, xs_sid_filter_t *f)
-{
- assert(curve);
- assert(f);
-
- xs_curve_reset(curve);
- xs_curve_set_range(curve, 0,0, XS_SIDPLAY2_NFPOINTS, XS_SIDPLAY2_FMAX);
- if (!xs_curve_set_points(curve, f->points, f->npoints)) {
- // FIXME
- xs_error("Warning: Could not set filter curve widget points!\n");
- }
-}
-
-
-void xs_cfg_sp2_presets_update(void)
-{
- GList *tmpList = NULL;
- gint i;
-
- for (i = 0; i < xs_cfg.sid2NFilterPresets; i++) {
- tmpList = g_list_append(tmpList,
- (gpointer) xs_cfg.sid2FilterPresets[i]->name);
- }
-
- gtk_combo_set_popdown_strings(GTK_COMBO(LUW("cfg_sp2_filter_combo")), tmpList);
- g_list_free(tmpList);
-}
-
-
-void xs_cfg_sp2_filter_load(GtkButton *button, gpointer user_data)
-{
- const gchar *tmpStr;
- gint i, j;
-
- (void) button;
- (void) user_data;
-
- XS_MUTEX_LOCK(xs_cfg);
-
- tmpStr = gtk_entry_get_text(GTK_ENTRY(LUW("cfg_sp2_filter_combo_entry")));
- for (i = 0, j = -1; i < xs_cfg.sid2NFilterPresets; i++) {
- if (!strcmp(tmpStr, xs_cfg.sid2FilterPresets[i]->name)) {
- j = i;
- break;
- }
- }
-
- if (j != -1) {
- fprintf(stderr, "Updating from '%s'\n", tmpStr);
- xs_cfg_sp2_filter_update(
- XS_CURVE(LUW("cfg_sp2_filter_curve")),
- xs_cfg.sid2FilterPresets[i]);
- } else {
- /* error/warning: no such filter preset */
- fprintf(stderr, "No such filter preset '%s'!\n", tmpStr);
- }
-
- XS_MUTEX_UNLOCK(xs_cfg);
-}
-
-
-void xs_cfg_sp2_filter_save(GtkButton *button, gpointer user_data)
-{
- /*
- 1) check if textentry matches any current filter name
- yes) ask if saving over ok?
- no) ...
-
- 2) save current filter to the name
- */
- const gchar *tmpStr;
- gint i, j;
-
- (void) button;
- (void) user_data;
-
- XS_MUTEX_LOCK(xs_cfg);
-
- tmpStr = gtk_entry_get_text(GTK_ENTRY(LUW("cfg_sp2_filter_combo_entry")));
- for (i = 0, j = -1; i < xs_cfg.sid2NFilterPresets; i++) {
- if (!strcmp(tmpStr, xs_cfg.sid2FilterPresets[i]->name)) {
- j = i;
- break;
- }
- }
-
- if (j != -1) {
- fprintf(stderr, "Found, confirm overwrite?\n");
- }
-
- fprintf(stderr, "saving!\n");
-
- xs_cfg_sp2_presets_update();
-
- XS_MUTEX_UNLOCK(xs_cfg);
-}
-
-
-void xs_cfg_sp2_filter_delete(GtkButton *button, gpointer user_data)
-{
- (void) button;
- (void) user_data;
- /*
- 1) confirm
- 2) delete
- */
-}
-
-
-void xs_cfg_sp2_filter_import(GtkButton *button, gpointer user_data)
-{
- (void) button;
- (void) user_data;
-
- if (xs_filt_importselector != NULL) {
- XS_WINDOW_PRESENT(xs_filt_importselector);
- return;
- }
-
- xs_filt_importselector = create_xs_filter_import_fs();
- gtk_widget_show(xs_filt_importselector);
-}
-
-
-void xs_filter_import_fs_ok(GtkButton *button, gpointer user_data)
-{
- const gchar *tmpStr;
- (void) button;
- (void) user_data;
-
- XS_MUTEX_LOCK(xs_cfg);
-
- /* Selection was accepted! */
- tmpStr = gtk_file_selection_get_filename(GTK_FILE_SELECTION(xs_filt_importselector));
- xs_filters_import(tmpStr, xs_cfg.sid2FilterPresets, &xs_cfg.sid2NFilterPresets);
- xs_cfg_sp2_presets_update();
-
- /* Close file selector window */
- gtk_widget_destroy(xs_filt_importselector);
- xs_filt_importselector = NULL;
- XS_MUTEX_UNLOCK(xs_cfg);
-}
-
-
-XS_DEF_WINDOW_CLOSE(filter_import_fs_cancel, filt_importselector)
-XS_DEF_WINDOW_DELETE(filter_import_fs, filt_importselector)
-
-
-void xs_cfg_sp2_filter_export(GtkButton *button, gpointer user_data)
-{
- (void) button;
- (void) user_data;
-
- if (xs_filt_exportselector != NULL) {
- XS_WINDOW_PRESENT(xs_filt_exportselector);
- return;
- }
-
- xs_filt_exportselector = create_xs_filter_export_fs();
- gtk_widget_show(xs_filt_exportselector);
-}
-
-
-void xs_filter_export_fs_ok(GtkButton *button, gpointer user_data)
-{
- const gchar *tmpStr;
- (void) button;
- (void) user_data;
-
- XS_MUTEX_LOCK(xs_cfg);
-
- /* Selection was accepted! */
- tmpStr = gtk_file_selection_get_filename(GTK_FILE_SELECTION(xs_filt_exportselector));
- xs_filters_export(tmpStr, xs_cfg.sid2FilterPresets, xs_cfg.sid2NFilterPresets);
-
- /* Close file selector window */
- gtk_widget_destroy(xs_filt_exportselector);
- xs_filt_exportselector = NULL;
- XS_MUTEX_UNLOCK(xs_cfg);
-}
-
-
-XS_DEF_WINDOW_CLOSE(filter_export_fs_cancel, filt_exportselector)
-XS_DEF_WINDOW_DELETE(filter_export_fs, filt_exportselector)
-
-
-/* Selection toggle handlers
- */
-void xs_cfg_emu_filters_toggled(GtkToggleButton * togglebutton, gpointer user_data)
-{
- gboolean isActive = GTK_TOGGLE_BUTTON(togglebutton)->active;
-
- (void) user_data;
-
- gtk_widget_set_sensitive(LUW("cfg_filters_notebook"), isActive);
-}
-
-
-void xs_cfg_ftitle_override_toggled(GtkToggleButton * togglebutton, gpointer user_data)
-{
- gboolean isActive = GTK_TOGGLE_BUTTON(togglebutton)->active;
-
- (void) user_data;
-
- gtk_widget_set_sensitive(LUW("cfg_ftitle_box"), isActive);
-}
-
-
-void xs_cfg_emu_sidplay1_toggled(GtkToggleButton * togglebutton, gpointer user_data)
-{
- (void) togglebutton;
- (void) user_data;
-}
-
-
-void xs_cfg_emu_sidplay2_toggled(GtkToggleButton * togglebutton, gpointer user_data)
-{
- gboolean isActive = GTK_TOGGLE_BUTTON(togglebutton)->active;
-
- (void) user_data;
-
- gtk_widget_set_sensitive(LUW("cfg_emu_mem_real"), isActive);
-
- gtk_widget_set_sensitive(LUW("cfg_sidplay2_frame"), isActive);
-
-#ifdef HAVE_SIDPLAY2_DISTORTION
- /* Optimization mode removed from distortion patch */
- gtk_widget_set_sensitive(LUW("cfg_emu_sp2_opt"), FALSE);
-#else
- gtk_widget_set_sensitive(LUW("cfg_emu_sp2_opt"), isActive);
-#endif
-
- gtk_widget_set_sensitive(LUW("cfg_chn_autopan"), !isActive);
-
-#ifdef HAVE_RESID_BUILDER
- gtk_widget_set_sensitive(LUW("cfg_emu_sp2_resid"), isActive);
-#else
- gtk_widget_set_sensitive(LUW("cfg_emu_sp2_resid"), FALSE);
-#endif
-
-#ifdef HAVE_HARDSID_BUILDER
- gtk_widget_set_sensitive(LUW("cfg_emu_sp2_hardsid"), isActive);
-#else
- gtk_widget_set_sensitive(LUW("cfg_emu_sp2_hardsid"), FALSE);
-#endif
-}
-
-
-void xs_cfg_oversample_toggled(GtkToggleButton * togglebutton, gpointer user_data)
-{
- gboolean isActive = GTK_TOGGLE_BUTTON(togglebutton)->active;
-
- (void) user_data;
-
- gtk_widget_set_sensitive(LUW("cfg_oversample_box"), isActive);
-}
-
-
-void xs_cfg_mintime_enable_toggled(GtkToggleButton * togglebutton, gpointer user_data)
-{
- gboolean isActive = GTK_TOGGLE_BUTTON(togglebutton)->active;
-
- (void) user_data;
-
- gtk_widget_set_sensitive(LUW("cfg_mintime_box"), isActive);
-}
-
-
-void xs_cfg_maxtime_enable_toggled(GtkToggleButton * togglebutton, gpointer user_data)
-{
- gboolean isActive = GTK_TOGGLE_BUTTON(LUW("cfg_maxtime_enable"))->active;
-
- (void) togglebutton;
- (void) user_data;
-
- gtk_widget_set_sensitive(LUW("cfg_maxtime_unknown"), isActive);
- gtk_widget_set_sensitive(LUW("cfg_maxtime_box"), isActive);
-}
-
-
-void xs_cfg_sldb_enable_toggled(GtkToggleButton * togglebutton, gpointer user_data)
-{
- gboolean isActive = GTK_TOGGLE_BUTTON(togglebutton)->active;
-
- (void) user_data;
-
- gtk_widget_set_sensitive(LUW("cfg_sld_box"), isActive);
-}
-
-
-void xs_cfg_stil_enable_toggled(GtkToggleButton * togglebutton, gpointer user_data)
-{
- gboolean isActive = GTK_TOGGLE_BUTTON(togglebutton)->active;
-
- (void) user_data;
-
- gtk_widget_set_sensitive(LUW("cfg_stil_box1"), isActive);
- gtk_widget_set_sensitive(LUW("cfg_stil_box2"), isActive);
-}
-
-
-void xs_cfg_subauto_enable_toggled(GtkToggleButton * togglebutton, gpointer user_data)
-{
- gboolean isActive = GTK_TOGGLE_BUTTON(togglebutton)->active;
-
- (void) user_data;
-
- gtk_widget_set_sensitive(LUW("cfg_subauto_min_only"), isActive);
- gtk_widget_set_sensitive(LUW("cfg_subauto_box"), isActive);
-}
-
-
-void xs_cfg_subauto_min_only_toggled(GtkToggleButton * togglebutton, gpointer user_data)
-{
- gboolean isActive = GTK_TOGGLE_BUTTON(togglebutton)->active &&
- GTK_TOGGLE_BUTTON(LUW("cfg_subauto_enable"))->active;
-
- (void) user_data;
-
- gtk_widget_set_sensitive(LUW("cfg_subauto_box"), isActive);
-}
-
-
-void xs_cfg_mintime_changed(GtkEditable * editable, gpointer user_data)
-{
- gint tmpValue;
- GtkAdjustment *tmpAdj;
-
- (void) user_data;
-
- tmpAdj = gtk_spin_button_get_adjustment(GTK_SPIN_BUTTON(LUW("cfg_maxtime")));
-
- tmpValue = (gint) gtk_spin_button_get_adjustment(GTK_SPIN_BUTTON(editable))->value;
-
- if (tmpValue > tmpAdj->value)
- gtk_adjustment_set_value(tmpAdj, tmpValue);
-}
-
-
-void xs_cfg_maxtime_changed(GtkEditable * editable, gpointer user_data)
-{
- gint tmpValue;
- GtkAdjustment *tmpAdj;
-
- (void) user_data;
-
- tmpAdj = gtk_spin_button_get_adjustment(GTK_SPIN_BUTTON(LUW("cfg_mintime")));
-
- tmpValue = (gint) gtk_spin_button_get_adjustment(GTK_SPIN_BUTTON(editable))->value;
-
- if (tmpValue < tmpAdj->value)
- gtk_adjustment_set_value(tmpAdj, tmpValue);
-}
-
-
-XS_DEF_WINDOW_DELETE(configwin, configwin)
-
-
-/* Execute the configuration panel
- */
-void xs_configure(void)
-{
- gint i;
- gfloat tmpValue;
- gchar tmpStr[64];
- GList *tmpList = NULL;
- GtkWidget *tmpCurve;
-
- /* Check if the window already exists */
- if (xs_configwin) {
- XS_WINDOW_PRESENT(xs_configwin);
- return;
- }
-
- /* Create the window */
- xs_configwin = create_xs_configwin();
-
- /* Get lock on configuration */
- XS_MUTEX_LOCK(xs_cfg);
-
- /* Add samplerates */
- for (i = 0; i < xs_nsamplerates_table; i++) {
- tmpList = g_list_append (tmpList,
- (gpointer) xs_samplerates_table[i]);
- }
- gtk_combo_set_popdown_strings(GTK_COMBO(LUW("cfg_samplerate_combo")), tmpList);
- g_list_free(tmpList);
-
- /* Create the custom filter curve widget for libSIDPlay2 */
- xs_cfg_sp2_presets_update();
- tmpCurve = xs_curve_new();
- xs_cfg_sp2_filter_update(XS_CURVE(tmpCurve), &xs_cfg.sid2Filter);
- gtk_widget_set_name(tmpCurve, "cfg_sp2_filter_curve");
- gtk_widget_ref(tmpCurve);
- gtk_object_set_data_full(GTK_OBJECT(xs_configwin),
- "cfg_sp2_filter_curve", tmpCurve, (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show(tmpCurve);
- gtk_container_add(GTK_CONTAINER(LUW("cfg_sp2_filter_frame")), tmpCurve);
-
-
- /* Based on available optional parts, gray out options */
-#ifndef HAVE_SIDPLAY1
- gtk_widget_set_sensitive(LUW("cfg_emu_sidplay1"), FALSE);
- gtk_widget_set_sensitive(LUW("cfg_box_filter_sidplay1"), FALSE);
-#endif
-
-#ifndef HAVE_SIDPLAY2
- gtk_widget_set_sensitive(LUW("cfg_emu_sidplay2"), FALSE);
- gtk_widget_set_sensitive(LUW("cfg_box_filter_sidplay2"), FALSE);
-#endif
-
- gtk_widget_set_sensitive(LUW("cfg_resid_frame"), FALSE);
-
-#if !defined(HAVE_XMMSEXTRA) && !defined(AUDACIOUS_PLUGIN)
- gtk_widget_set_sensitive(LUW("cfg_ftitle_override"), FALSE);
- xs_cfg.titleOverride = TRUE;
-#endif
-
-#if !defined(HAVE_SONG_POSITION) && !defined(AUDACIOUS_PLUGIN)
- gtk_widget_set_sensitive(LUW("cfg_subctrl_patch"), FALSE);
-#endif
-
- xs_cfg_ftitle_override_toggled(GTK_TOGGLE_BUTTON(LUW("cfg_ftitle_override")), NULL);
- xs_cfg_emu_filters_toggled(GTK_TOGGLE_BUTTON(LUW("cfg_emu_filters")), NULL);
- xs_cfg_emu_sidplay1_toggled(GTK_TOGGLE_BUTTON(LUW("cfg_emu_sidplay1")), NULL);
- xs_cfg_emu_sidplay2_toggled(GTK_TOGGLE_BUTTON(LUW("cfg_emu_sidplay2")), NULL);
- xs_cfg_oversample_toggled(GTK_TOGGLE_BUTTON(LUW("cfg_oversample")), NULL);
- xs_cfg_mintime_enable_toggled(GTK_TOGGLE_BUTTON(LUW("cfg_mintime_enable")), NULL);
- xs_cfg_maxtime_enable_toggled(GTK_TOGGLE_BUTTON(LUW("cfg_maxtime_enable")), NULL);
- xs_cfg_sldb_enable_toggled(GTK_TOGGLE_BUTTON(LUW("cfg_sld_enable")), NULL);
- xs_cfg_stil_enable_toggled(GTK_TOGGLE_BUTTON(LUW("cfg_stil_enable")), NULL);
- xs_cfg_subauto_enable_toggled(GTK_TOGGLE_BUTTON(LUW("cfg_subauto_enable")), NULL);
- xs_cfg_subauto_min_only_toggled(GTK_TOGGLE_BUTTON(LUW("cfg_subauto_min_only")), NULL);
-
-
- /* Set current data to widgets */
- for (i = 0; i < xs_widtable_max; i++) {
- switch (xs_widtable[i].widType) {
- case WTYPE_BGROUP:
- assert(xs_widtable[i].itemType == CTYPE_INT);
- /* Check if current value matches the given one */
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(LUW(xs_widtable[i].widName)),
- (*((gint *) xs_widtable[i].itemData) == xs_widtable[i].itemSet));
- break;
-
- case WTYPE_COMBO:
- assert(xs_widtable[i].itemType == CTYPE_INT);
- g_snprintf(tmpStr, sizeof(tmpStr), "%d", *(gint *) xs_widtable[i].itemData);
- gtk_entry_set_text(GTK_ENTRY(LUW(xs_widtable[i].widName)), tmpStr);
- break;
-
- case WTYPE_SPIN:
- case WTYPE_SCALE:
- /* Get the value */
- switch (xs_widtable[i].itemType) {
- case CTYPE_INT:
- tmpValue = (gfloat) * ((gint *) xs_widtable[i].itemData);
- break;
-
- case CTYPE_FLOAT:
- tmpValue = *((gfloat *) xs_widtable[i].itemData);
- break;
-
- default:
- tmpValue = -1;
- assert(0);
- break;
- }
-
- /* Set the value */
- switch (xs_widtable[i].widType) {
- case WTYPE_SPIN:
- gtk_adjustment_set_value(gtk_spin_button_get_adjustment
- (GTK_SPIN_BUTTON(LUW(xs_widtable[i].widName))), tmpValue);
- break;
-
- case WTYPE_SCALE:
- gtk_adjustment_set_value(gtk_range_get_adjustment
- (GTK_RANGE(LUW(xs_widtable[i].widName))), tmpValue);
- break;
- }
- break;
-
- case WTYPE_BUTTON:
- assert(xs_widtable[i].itemType == CTYPE_BOOL);
- /* Set toggle-button */
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(LUW(xs_widtable[i].widName)),
- *((gboolean *) xs_widtable[i].itemData));
- break;
-
- case WTYPE_TEXT:
- assert(xs_widtable[i].itemType == CTYPE_STR);
- /* Set text to text-widget */
- if (*(gchar **) xs_widtable[i].itemData != NULL) {
- gtk_entry_set_text(GTK_ENTRY(LUW(xs_widtable[i].widName)),
- *(gchar **) xs_widtable[i].itemData);
- }
- break;
- }
- }
-
- /* Release the configuration */
- XS_MUTEX_UNLOCK(xs_cfg);
-
- /* Show the widget */
- gtk_widget_show(xs_configwin);
-}
-#endif

audacious-plugins-3.0.3.tar.bz2/src/sid/xs_config.h -> audacious-plugins-3.1.tar.bz2/src/sid/xs_config.h Changed

@@ -2,7 +2,6 @@
 #define XS_CONFIG_H
 
 #include "xmms-sid.h"
-#include "xs_curve.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -68,24 +67,29 @@
 
 
 typedef struct {
+    gint x, y;
+} xs_int_point_t;
+
+
+typedef struct {
     gchar           *name;
     gint            type;
-    
+
     /* Filter type 0 for SIDPlay 1 */
     gfloat          fs, fm, ft;
-    
+
     /* Filter type 1-2 points */
     xs_int_point_t  points[XS_SIDPLAY2_NFPOINTS];
     gint            npoints;
-    
+
     /* Distortion patch tunables */
     gfloat          rate, point, voice_nonlinearity,
                     cf_treshold;
-    
+
     /* Filter Type 3 tunables */
     gfloat          baseresistance, offset, steepness,
                     minimumfetresistance;
-    
+
     /* Filter Type 4 tunables */
     gfloat          k, b;
 } xs_sid_filter_t;
@@ -117,8 +121,8 @@
     xs_sid_filter_t    sid2Filter;  /* Current SIDPlay2 filter */
     xs_sid_filter_t    **sid2FilterPresets;
     gint        sid2NFilterPresets;
-    
-    
+
+
     /* Playing settings */
     gboolean    playMaxTimeEnable,
                 playMaxTimeUnknown; /* Use max-time only when song-length is unknown */
@@ -188,9 +192,6 @@
 /* Functions
  */
 void    xs_init_configuration(void);
-void    xs_configure(void);
-void    xs_read_configuration(void);
-gint    xs_write_configuration(void);
 
 #ifdef __cplusplus
 }

audacious-plugins-3.0.3.tar.bz2/src/sid/xs_init.c -> audacious-plugins-3.1.tar.bz2/src/sid/xs_init.c Changed

audacious-plugins-3.0.3.tar.bz2/src/skins/actions-playlist.h -> audacious-plugins-3.1.tar.bz2/src/skins/actions-playlist.h Changed

audacious-plugins-3.0.3.tar.bz2/src/skins/plugin.c -> audacious-plugins-3.1.tar.bz2/src/skins/plugin.c Changed

audacious-plugins-3.0.3.tar.bz2/src/skins/skins_cfg.c -> audacious-plugins-3.1.tar.bz2/src/skins/skins_cfg.c Changed

@@ -21,7 +21,6 @@
 
 #include <gtk/gtk.h>
 
-#include <audacious/configdb.h>
 #include <audacious/debug.h>
 #include <audacious/gtk-compat.h>
 #include <audacious/i18n.h>
@@ -42,191 +41,145 @@
 #include "ui_vis.h"
 #include "util.h"
 
-#define MAINWIN_DEFAULT_POS_X 20
-#define MAINWIN_DEFAULT_POS_Y 20
-#define EQUALIZER_DEFAULT_POS_X 20
-#define EQUALIZER_DEFAULT_POS_Y 136
-#define PLAYLISTWIN_DEFAULT_WIDTH 275
-#define PLAYLISTWIN_DEFAULT_HEIGHT 232
-#define PLAYLISTWIN_DEFAULT_POS_X 295
-#define PLAYLISTWIN_DEFAULT_POS_Y 20
-
-#define MAINWIN_DEFAULT_FONT "Sans Bold 9"
-#define PLAYLISTWIN_DEFAULT_FONT "Sans Bold 8"
+static const gchar * const skins_defaults[] = {
+ /* general */
+ "autoscroll_songname", "TRUE",
+ "mainwin_font", "Sans Bold 9",
+ "mainwin_use_bitmapfont", "TRUE",
+ "playlist_font", "Sans Bold 8",
+ "timer_mode", "0", /* TIMER_ELAPSED */
+ "twoway_scroll", "TRUE",
+
+ /* visualizer */
+ "analyzer_falloff", "3", /* FALLOFF_FAST */
+ "analyzer_mode", "0", /* ANALYZER_NORMAL */
+ "analyzer_peaks", "TRUE",
+ "analyzer_type", "1", /* ANALYZER_BARS */
+ "peaks_falloff", "1", /* FALLOFF_SLOW */
+ "scope_mode", "0", /* SCOPE_DOT */
+ "vis_type", "0", /* VIS_ANALYZER */
+ "voiceprint_mode", "0", /* VOICEPRINT_NORMAL */
+ "vu_mode", "1", /* VU_SMOOTH */
+
+ /* windows */
+ "always_on_top", "FALSE",
+ "equalizer_shaded", "FALSE",
+ "equalizer_visible", "FALSE",
+ "equalizer_x", "20",
+ "equalizer_y", "136",
+ "player_shaded", "FALSE",
+ "player_visible", "TRUE",
+ "player_x", "20",
+ "player_y", "20",
+ "playlist_shaded", "FALSE",
+ "playlist_visible", "FALSE",
+ "playlist_x", "295",
+ "playlist_y", "20",
+ "playlist_width", "275",
+ "playlist_height", "232",
+ "sticky", "FALSE",
+ NULL};
 
 skins_cfg_t config;
 
 static GtkWidget * skin_view;
 
-static skins_cfg_t skins_default_config = {
- .autoscroll = TRUE,
- .always_on_top = FALSE,
- .sticky = FALSE,
- .skin = NULL,
- .playlist_visible = FALSE,
- .equalizer_visible = FALSE,
- .player_visible = TRUE,
- .player_shaded = FALSE,
- .equalizer_shaded = FALSE,
- .playlist_shaded = FALSE,
- .timer_mode = 0,
- .vis_type = VIS_ANALYZER,
- .analyzer_mode = ANALYZER_NORMAL,
- .analyzer_type = ANALYZER_BARS,
- .scope_mode = SCOPE_DOT,
- .voiceprint_mode = VOICEPRINT_NORMAL,
- .vu_mode = VU_SMOOTH,
- .analyzer_falloff = FALLOFF_FAST,
- .peaks_falloff = FALLOFF_SLOW,
- .player_x = MAINWIN_DEFAULT_POS_X,
- .player_y = MAINWIN_DEFAULT_POS_Y,
- .equalizer_x = EQUALIZER_DEFAULT_POS_X,
- .equalizer_y = EQUALIZER_DEFAULT_POS_Y,
- .playlist_x = PLAYLISTWIN_DEFAULT_POS_X,
- .playlist_y = PLAYLISTWIN_DEFAULT_POS_Y,
- .playlist_width = PLAYLISTWIN_DEFAULT_WIDTH,
- .playlist_height = PLAYLISTWIN_DEFAULT_HEIGHT,
- .analyzer_peaks = TRUE,
- .twoway_scroll = TRUE, /* use back and forth scroll */
- .mainwin_use_bitmapfont = TRUE,
- .playlist_font = NULL,
- .mainwin_font = NULL,
-};
-
 typedef struct skins_cfg_boolent_t {
- char const *be_vname;
- gboolean *be_vloc;
- gboolean be_wrt;
+ const gchar * name;
+ gboolean * ptr;
 } skins_cfg_boolent;
 
-static skins_cfg_boolent skins_boolents[] = {
- {"always_on_top", &config.always_on_top, TRUE},
- {"sticky", &config.sticky, TRUE},
- {"autoscroll_songname", &config.autoscroll, TRUE},
- {"equalizer_visible", &config.equalizer_visible, TRUE},
- {"playlist_visible", &config.playlist_visible, TRUE},
- {"player_visible", &config.player_visible, TRUE},
- {"player_shaded", &config.player_shaded, TRUE},
- {"equalizer_shaded", &config.equalizer_shaded, TRUE},
- {"playlist_shaded", &config.playlist_shaded, TRUE},
- {"analyzer_peaks", &config.analyzer_peaks, TRUE},
- {"twoway_scroll", &config.twoway_scroll, TRUE},
- {"mainwin_use_bitmapfont", &config.mainwin_use_bitmapfont, TRUE},
-};
-
-static gint ncfgbent = G_N_ELEMENTS(skins_boolents);
+static const skins_cfg_boolent skins_boolents[] = {
+ /* general */
+ {"autoscroll_songname", & config.autoscroll},
+ {"mainwin_use_bitmapfont", & config.mainwin_use_bitmapfont},
+ {"twoway_scroll", & config.twoway_scroll},
+
+ /* visualizer */
+ {"analyzer_peaks", & config.analyzer_peaks},
+
+ /* windows */
+ {"always_on_top", & config.always_on_top},
+ {"equalizer_shaded", & config.equalizer_shaded},
+ {"equalizer_visible", & config.equalizer_visible},
+ {"player_visible", & config.player_visible},
+ {"player_shaded", & config.player_shaded},
+ {"playlist_shaded", & config.playlist_shaded},
+ {"playlist_visible", & config.playlist_visible},
+ {"sticky", & config.sticky}};
 
 typedef struct skins_cfg_nument_t {
- char const *ie_vname;
- gint *ie_vloc;
- gboolean ie_wrt;
+ const gchar * name;
+ gint * ptr;
 } skins_cfg_nument;
 
-static skins_cfg_nument skins_numents[] = {
- {"player_x", &config.player_x, TRUE},
- {"player_y", &config.player_y, TRUE},
- {"timer_mode", &config.timer_mode, TRUE},
- {"vis_type", &config.vis_type, TRUE},
- {"analyzer_mode", &config.analyzer_mode, TRUE},
- {"analyzer_type", &config.analyzer_type, TRUE},
- {"scope_mode", &config.scope_mode, TRUE},
- {"vu_mode", &config.vu_mode, TRUE},
- {"voiceprint_mode", &config.voiceprint_mode, TRUE},
- {"analyzer_falloff", &config.analyzer_falloff, TRUE},
- {"peaks_falloff", &config.peaks_falloff, TRUE},
- {"playlist_x", &config.playlist_x, TRUE},
- {"playlist_y", &config.playlist_y, TRUE},
- {"playlist_width", &config.playlist_width, TRUE},
- {"playlist_height", &config.playlist_height, TRUE},
- {"equalizer_x", &config.equalizer_x, TRUE},
- {"equalizer_y", &config.equalizer_y, TRUE},
-};
-
-static gint ncfgient = G_N_ELEMENTS(skins_numents);
+static const skins_cfg_nument skins_numents[] = {
+ /* general */
+ {"timer_mode", & config.timer_mode},
+
+ /* visualizer */
+ {"analyzer_falloff", & config.analyzer_falloff},
+ {"analyzer_mode", & config.analyzer_mode},
+ {"analyzer_type", & config.analyzer_type},
+ {"peaks_falloff", & config.peaks_falloff},
+ {"scope_mode", & config.scope_mode},
+ {"vis_type", & config.vis_type},
+ {"voiceprint_mode", & config.voiceprint_mode},
+ {"vu_mode", & config.vu_mode},
+
+ /* windows */
+ {"equalizer_x", & config.equalizer_x},
+ {"equalizer_y", & config.equalizer_y},
+ {"player_x", & config.player_x},
+ {"player_y", & config.player_y},
+ {"playlist_x", & config.playlist_x},
+ {"playlist_y", & config.playlist_y},
+ {"playlist_width", & config.playlist_width},
+ {"playlist_height", & config.playlist_height}};
 
 typedef struct skins_cfg_strent_t {
- char const *se_vname;
- char **se_vloc;
- gboolean se_wrt;
+ const gchar * name;
+ gchar * * ptr;
 } skins_cfg_strent;
 
-static skins_cfg_strent skins_strents[] = {
- {"playlist_font", &config.playlist_font, TRUE},
- {"mainwin_font", &config.mainwin_font, TRUE},
- {"skin", &config.skin, TRUE},
-};
+static const skins_cfg_strent skins_strents[] = {
+ {"skin", & config.skin},
+ {"mainwin_font", & config.mainwin_font},
+ {"playlist_font", & config.playlist_font}};
 
-static gint ncfgsent = G_N_ELEMENTS(skins_strents);
-
-void skins_cfg_free() {
- gint i;
- for (i = 0; i < ncfgsent; ++i) {
- if (*(skins_strents[i].se_vloc) != NULL) {
- g_free( *(skins_strents[i].se_vloc) );
- *(skins_strents[i].se_vloc) = NULL;
- }
+void skins_cfg_free (void)
+{
+ for (gint i = 0; i < G_N_ELEMENTS (skins_strents); i ++)
+ {
+ g_free (* skins_strents[i].ptr);
+ * skins_strents[i].ptr = NULL;
 }
 }
 
-void skins_cfg_load() {
- mcs_handle_t *cfgfile = aud_cfg_db_open();
-
- memcpy(&config, &skins_default_config, sizeof(skins_cfg_t));
- int i;
-
- for (i = 0; i < ncfgbent; ++i) {
- aud_cfg_db_get_bool(cfgfile, "skins",
- skins_boolents[i].be_vname,
- skins_boolents[i].be_vloc);
- }
-
- for (i = 0; i < ncfgient; ++i) {
- aud_cfg_db_get_int(cfgfile, "skins",
- skins_numents[i].ie_vname,
- skins_numents[i].ie_vloc);
- }
-
- for (i = 0; i < ncfgsent; ++i) {
- aud_cfg_db_get_string(cfgfile, "skins",
- skins_strents[i].se_vname,
- skins_strents[i].se_vloc);
- }
+void skins_cfg_load (void)
+{
+ aud_config_set_defaults ("skins", skins_defaults);
 
- if (!config.mainwin_font)
- config.mainwin_font = g_strdup(MAINWIN_DEFAULT_FONT);
+ for (gint i = 0; i < G_N_ELEMENTS (skins_boolents); i ++)
+ * skins_boolents[i].ptr = aud_get_bool ("skins", skins_boolents[i].name);
 
- if (!config.playlist_font)
- config.playlist_font = g_strdup(PLAYLISTWIN_DEFAULT_FONT);
+ for (gint i = 0; i < G_N_ELEMENTS (skins_numents); i ++)
+ * skins_numents[i].ptr = aud_get_int ("skins", skins_numents[i].name);
 
- aud_cfg_db_close(cfgfile);
+ for (gint i = 0; i < G_N_ELEMENTS (skins_strents); i ++)
+ * skins_strents[i].ptr = aud_get_string ("skins", skins_strents[i].name);
 }
 
+void skins_cfg_save (void)
+{
+ for (gint i = 0; i < G_N_ELEMENTS (skins_boolents); i ++)
+ aud_set_bool ("skins", skins_boolents[i].name, * skins_boolents[i].ptr);
 
-void skins_cfg_save() {
- mcs_handle_t *cfgfile = aud_cfg_db_open();
-
- int i;
-
- for (i = 0; i < ncfgsent; ++i) {
- if (skins_strents[i].se_wrt)
- aud_cfg_db_set_string(cfgfile, "skins",
- skins_strents[i].se_vname,
- *skins_strents[i].se_vloc);
- }
-
- for (i = 0; i < ncfgbent; ++i)
- if (skins_boolents[i].be_wrt)
- aud_cfg_db_set_bool(cfgfile, "skins",
- skins_boolents[i].be_vname,
- *skins_boolents[i].be_vloc);
-
- for (i = 0; i < ncfgient; ++i)
- if (skins_numents[i].ie_wrt)
- aud_cfg_db_set_int(cfgfile, "skins",
- skins_numents[i].ie_vname,
- *skins_numents[i].ie_vloc);
+ for (gint i = 0; i < G_N_ELEMENTS (skins_numents); i ++)
+ aud_set_int ("skins", skins_numents[i].name, * skins_numents[i].ptr);
 
- aud_cfg_db_close(cfgfile);
+ for (gint i = 0; i < G_N_ELEMENTS (skins_strents); i ++)
+ aud_set_string ("skins", skins_strents[i].name, * skins_strents[i].ptr);
 }
 
 static void
@@ -251,13 +204,17 @@
 }
 
 static PreferencesWidget font_table_elements[] = {
- {WIDGET_FONT_BTN, N_("_Player:"), &config.mainwin_font, G_CALLBACK(mainwin_font_set_cb), NULL, FALSE, {.font_btn = {N_("Select main player window font:")}}},
- {WIDGET_FONT_BTN, N_("_Playlist:"), &config.playlist_font, G_CALLBACK(playlist_font_set_cb), NULL, FALSE, {.font_btn = {N_("Select playlist font:")}}},
-};
+ {WIDGET_FONT_BTN, N_("_Player:"), .cfg_type = VALUE_STRING, .cfg = & config.mainwin_font,
+ .callback = mainwin_font_set_cb, .data = {.font_btn = {N_("Select main "
+ "player window font:")}}},
+ {WIDGET_FONT_BTN, N_("_Playlist:"), .cfg_type = VALUE_STRING, .cfg = & config.playlist_font,
+ .callback = playlist_font_set_cb, .data = {.font_btn = {N_("Select playlist "
+ "font:")}}}};
 
 static PreferencesWidget appearance_misc_widgets[] = {
 {WIDGET_LABEL, N_("_Fonts"), NULL, NULL, NULL, FALSE},
- {WIDGET_TABLE, NULL, NULL, NULL, NULL, TRUE, {.table = {font_table_elements, G_N_ELEMENTS(font_table_elements)}}},
+ {WIDGET_TABLE, .child = TRUE, .data = {.table = {font_table_elements,
+ G_N_ELEMENTS (font_table_elements)}}},
 {WIDGET_CHK_BTN, N_("Use bitmap fonts (supports ASCII only)"),
 .cfg_type = VALUE_BOOLEAN, .cfg = & config.mainwin_use_bitmapfont, .callback = bitmap_fonts_cb},
 {WIDGET_CHK_BTN, N_("Scroll song title in both directions"),
@@ -271,37 +228,32 @@
 guint info, guint time,
 gpointer user_data)
 {
- mcs_handle_t *db;
- gchar *path;
+ const gchar * data = (const gchar *) gtk_selection_data_get_data (selection_data);
+ g_return_if_fail (data);
 
- if (! gtk_selection_data_get_data (selection_data))
- {
- g_warning("DND data string is NULL");
- return;
- }
-
- path = (gchar *) gtk_selection_data_get_data (selection_data);
+ const gchar * end = strchr (data, '\r');
+ if (! end) end = strchr (data, '\n');
+ if (! end) end = data + strlen (data);
 
- /* FIXME: use a real URL validator/parser */
+ gchar * path = g_strndup (data, end - data);
 
- if (str_has_prefix_nocase(path, "file:///")) {
- path[strlen(path) - 2] = 0; /* Why the hell a CR&LF? */
- path += 7;
- }
- else if (str_has_prefix_nocase(path, "file:")) {
- path += 5;
+ if (strstr (path, "://"))
+ {
+ gchar * path2 = uri_to_filename (path);
+ if (path2)
+ {
+ g_free (path);
+ path = path2;
+ }
 }
 
 if (file_is_archive(path)) {
 if (! active_skin_load (path))
 return;
 skin_install_skin(path);
- skin_view_update ((GtkTreeView *) widget);
 
- /* Change skin name in the config file */
- db = aud_cfg_db_open();
- aud_cfg_db_set_string(db, "skins", "skin", path);
- aud_cfg_db_close(db);
+ if (skin_view)
+ skin_view_update ((GtkTreeView *) skin_view);
 }
 }

audacious-plugins-3.0.3.tar.bz2/src/skins/ui/mainwin.ui -> audacious-plugins-3.1.tar.bz2/src/skins/ui/mainwin.ui Changed

audacious-plugins-3.0.3.tar.bz2/src/skins/ui/playlist.ui -> audacious-plugins-3.1.tar.bz2/src/skins/ui/playlist.ui Changed

@@ -1,100 +1,100 @@
 <?xml version="1.0" standalone="yes" encoding="utf-8" ?>
 
 <ui>
-	<menubar name="playlist-menus">
-		<menu action="dummy" name="playlist-rightclick-menu">
-			<menuitem action="playlist track info" />
-			<separator />
-			<menuitem action="playlist copy"/>
-			<menuitem action="playlist cut"/>
-			<menuitem action="playlist paste"/>
-			<separator/>
-			<menuitem action="playlist remove selected" />
-			<menuitem action="playlist remove unselected" />
-			<menuitem action="playlist remove all" />
-			<separator />
-			<menuitem action="queue toggle" />
-			<separator />
-			<menuitem action="plugins-menu" />
-		</menu>
+ <menubar name="playlist-menus">
+ <menu action="dummy" name="playlist-rightclick-menu">
+ <menuitem action="playlist track info" />
+ <separator />
+ <menuitem action="playlist copy"/>
+ <menuitem action="playlist cut"/>
+ <menuitem action="playlist paste"/>
+ <separator/>
+ <menuitem action="playlist remove selected" />
+ <menuitem action="playlist remove unselected" />
+ <menuitem action="playlist remove all" />
+ <separator />
+ <menuitem action="queue toggle" />
+ <separator />
+ <menuitem action="plugins-menu" />
+ </menu>
 
-		<menu action="dummy" name="add-menu">
-			<menuitem action="plugins-menu" />
-			<separator />
-			<menuitem action="playlist add url" />
-			<menuitem action="playlist add files" />
-		</menu>
+ <menu action="dummy" name="add-menu">
+ <menuitem action="plugins-menu" />
+ <separator />
+ <menuitem action="playlist add url" />
+ <menuitem action="playlist add files" />
+ </menu>
 
-		<menu action="dummy" name="del-menu">
-			<menuitem action="plugins-menu" />
-			<separator />
-			<menuitem action="playlist remove all" />
-			<menuitem action="playlist clear queue" />
-			<separator />
-			<menuitem action="playlist remove unavailable" />
-			<menu action="playlist remove dups menu">
-				<menuitem action="playlist remove dups by title" />
-				<menuitem action="playlist remove dups by filename" />
-				<menuitem action="playlist remove dups by full path" />
-			</menu>
-			<separator />
-			<menuitem action="playlist remove unselected" />
-			<menuitem action="playlist remove selected" />
-		</menu>
+ <menu action="dummy" name="del-menu">
+ <menuitem action="plugins-menu" />
+ <separator />
+ <menuitem action="playlist remove all" />
+ <menuitem action="playlist clear queue" />
+ <separator />
+ <menuitem action="playlist remove unavailable" />
+ <menu action="playlist remove dups menu">
+ <menuitem action="playlist remove dups by title" />
+ <menuitem action="playlist remove dups by filename" />
+ <menuitem action="playlist remove dups by full path" />
+ </menu>
+ <separator />
+ <menuitem action="playlist remove unselected" />
+ <menuitem action="playlist remove selected" />
+ </menu>
 
-		<menu action="dummy" name="select-menu">
-			<menuitem action="plugins-menu" />
-			<separator />
-			<menuitem action="playlist search and select" />
-			<separator />
-			<menuitem action="playlist invert selection" />
-			<separator />
-			<menuitem action="playlist select none" />
-			<menuitem action="playlist select all" />
-		</menu>
+ <menu action="dummy" name="select-menu">
+ <menuitem action="plugins-menu" />
+ <separator />
+ <menuitem action="playlist search and select" />
+ <separator />
+ <menuitem action="playlist invert selection" />
+ <separator />
+ <menuitem action="playlist select none" />
+ <menuitem action="playlist select all" />
+ </menu>
 
-		<menu action="dummy" name="misc-menu">
-			<menuitem action="plugins-menu" />
-			<separator />
-			<menuitem action="playlist randomize list" />
-			<menuitem action="playlist reverse list" />
-			<separator />
-			<menu action="playlist sort menu">
- <menuitem action="playlist sort by title" />
- <menuitem action="playlist sort by album" />
-				<menuitem action="playlist sort by artist" />
-				<menuitem action="playlist sort by filename" />
-				<menuitem action="playlist sort by full path" />
-				<menuitem action="playlist sort by date" />
-				<menuitem action="playlist sort by track number" />
-			</menu>
- <menu action="playlist sort selected menu">
- <menuitem action="playlist sort selected by title" />
- <menuitem action="playlist sort selected by album" />
-				<menuitem action="playlist sort selected by artist" />
-				<menuitem action="playlist sort selected by filename" />
-				<menuitem action="playlist sort selected by full path" />
-				<menuitem action="playlist sort selected by date" />
-				<menuitem action="playlist sort selected by track number" />
-			</menu>
-		</menu>
+ <menu action="dummy" name="misc-menu">
+ <menuitem action="plugins-menu" />
+ <separator />
+ <menuitem action="playlist randomize list" />
+ <menuitem action="playlist reverse list" />
+ <separator />
+ <menu action="playlist sort menu">
+ <menuitem action="playlist sort by title" />
+ <menuitem action="playlist sort by album" />
+ <menuitem action="playlist sort by artist" />
+ <menuitem action="playlist sort by filename" />
+ <menuitem action="playlist sort by full path" />
+ <menuitem action="playlist sort by date" />
+ <menuitem action="playlist sort by track number" />
+ </menu>
+ <menu action="playlist sort selected menu">
+ <menuitem action="playlist sort selected by title" />
+ <menuitem action="playlist sort selected by album" />
+ <menuitem action="playlist sort selected by artist" />
+ <menuitem action="playlist sort selected by filename" />
+ <menuitem action="playlist sort selected by full path" />
+ <menuitem action="playlist sort selected by date" />
+ <menuitem action="playlist sort selected by track number" />
+ </menu>
+ </menu>
 
-		<menu action="dummy" name="playlist-menu">
-			<menuitem action="plugins-menu" />
-			<separator />
-			<menuitem action="playlist new" />
-			<menuitem action="playlist delete" />
-			<separator />
-			<menuitem action="playlist select next" />
-			<menuitem action="playlist select previous" />
-			<separator />
-			<menuitem action="playlist load" />
-			<menuitem action="playlist save" />
-			<menuitem action="playlist save all" />
-			<separator />
-			<menuitem action="playlist manager" />
-			<separator />
-			<menuitem action="playlist refresh" />
-		</menu>
-	</menubar>
+ <menu action="dummy" name="playlist-menu">
+ <menuitem action="plugins-menu" />
+ <separator />
+ <menuitem action="playlist new" />
+ <menuitem action="playlist delete" />
+ <separator />
+ <menuitem action="playlist select next" />
+ <menuitem action="playlist select previous" />
+ <separator />
+ <menuitem action="playlist load" />
+ <menuitem action="playlist save" />
+ <separator />
+ <menuitem action="playlist manager" />
+ <menuitem action="queue manager" />
+ <separator />
+ <menuitem action="playlist refresh" />
+ </menu>
+ </menubar>
 </ui>

audacious-plugins-3.0.3.tar.bz2/src/skins/ui_equalizer.c -> audacious-plugins-3.1.tar.bz2/src/skins/ui_equalizer.c Changed

@@ -25,7 +25,6 @@
 
 #include <gtk/gtk.h>
 
-#include <audacious/audconfig.h>
 #include <audacious/drct.h>
 #include <audacious/gtk-compat.h>
 #include <audacious/i18n.h>
@@ -54,7 +53,6 @@
 PRESET_VIEW_N_COLS
 };
 
-static void equalizerwin_activate (gboolean active);
 static gfloat equalizerwin_get_preamp (void);
 static gfloat equalizerwin_get_band (gint band);
 static void equalizerwin_set_preamp (gfloat preamp);
@@ -120,13 +118,13 @@
 void
 equalizerwin_eq_changed(void)
 {
- gint i;
+ aud_set_double (NULL, "equalizer_preamp", equalizerwin_get_preamp ());
 
- aud_cfg->equalizer_preamp = equalizerwin_get_preamp();
- for (i = 0; i < AUD_EQUALIZER_NBANDS; i++)
- aud_cfg->equalizer_bands[i] = equalizerwin_get_band(i);
+ double bands[AUD_EQUALIZER_NBANDS];
+ for (gint i = 0; i < AUD_EQUALIZER_NBANDS; i ++)
+ bands[i] = equalizerwin_get_band (i);
 
- hook_call("equalizer changed", NULL);
+ aud_eq_set_bands (bands);
 }
 
 static void
@@ -143,19 +141,21 @@
 }
 
 static void eq_on_cb (GtkWidget * button, GdkEventButton * event)
- {equalizerwin_activate (button_get_active (button)); }
+ {aud_set_bool (NULL, "equalizer_active", button_get_active (button)); }
 static void eq_auto_cb (GtkWidget * button, GdkEventButton * event)
- {aud_cfg->equalizer_autoload = button_get_active (equalizerwin_auto); }
+ {aud_set_bool (NULL, "equalizer_autoload", button_get_active (equalizerwin_auto)); }
 
-static void
-update_from_config(void *unused1, void *unused2)
+static void update_from_config (void * unused1, void * unused2)
 {
- gint i;
+ button_set_active (equalizerwin_on, aud_get_bool (NULL, "equalizer_active"));
+ eq_slider_set_val (equalizerwin_preamp, aud_get_double (NULL, "equalizer_preamp"));
+
+ gdouble bands[AUD_EQUALIZER_NBANDS];
+ aud_eq_get_bands (bands);
+
+ for (gint i = 0; i < AUD_EQUALIZER_NBANDS; i ++)
+ eq_slider_set_val (equalizerwin_bands[i], bands[i]);
 
- button_set_active (equalizerwin_on, aud_cfg->equalizer_active);
- eq_slider_set_val (equalizerwin_preamp, aud_cfg->equalizer_preamp);
- for (i = 0; i < AUD_EQUALIZER_NBANDS; i++)
- eq_slider_set_val (equalizerwin_bands[i], aud_cfg->equalizer_bands[i]);
 eq_graph_update (equalizerwin_graph);
 }
 
@@ -296,12 +296,12 @@
 {
 equalizerwin_on = button_new_toggle (25, 12, 10, 119, 128, 119, 69, 119, 187, 119, SKIN_EQMAIN, SKIN_EQMAIN);
 window_put_widget (equalizerwin, FALSE, equalizerwin_on, 14, 18);
- button_set_active (equalizerwin_on, aud_cfg->equalizer_active);
+ button_set_active (equalizerwin_on, aud_get_bool (NULL, "equalizer_active"));
 button_on_release (equalizerwin_on, eq_on_cb);
 
 equalizerwin_auto = button_new_toggle (33, 12, 35, 119, 153, 119, 94, 119, 212, 119, SKIN_EQMAIN, SKIN_EQMAIN);
 window_put_widget (equalizerwin, FALSE, equalizerwin_auto, 39, 18);
- button_set_active (equalizerwin_auto, aud_cfg->equalizer_autoload);
+ button_set_active (equalizerwin_auto, aud_get_bool (NULL, "equalizer_autoload"));
 button_on_release (equalizerwin_auto, eq_auto_cb);
 
 equalizerwin_presets = button_new (44, 12, 224, 164, 224, 176, SKIN_EQMAIN, SKIN_EQMAIN);
@@ -329,18 +329,19 @@
 
 equalizerwin_preamp = eq_slider_new (_("Preamp"));
 window_put_widget (equalizerwin, FALSE, equalizerwin_preamp, 21, 38);
- eq_slider_set_val (equalizerwin_preamp, aud_cfg->equalizer_preamp);
+ eq_slider_set_val (equalizerwin_preamp, aud_get_double (NULL, "equalizer_preamp"));
 
 const gchar * const bandnames[AUD_EQUALIZER_NBANDS] = {N_("31 Hz"),
 N_("63 Hz"), N_("125 Hz"), N_("250 Hz"), N_("500 Hz"), N_("1 kHz"),
 N_("2 kHz"), N_("4 kHz"), N_("8 kHz"), N_("16 kHz")};
+ gdouble bands[AUD_EQUALIZER_NBANDS];
+ aud_eq_get_bands (bands);
 
 for (gint i = 0; i < AUD_EQUALIZER_NBANDS; i ++)
 {
 equalizerwin_bands[i] = eq_slider_new (_(bandnames[i]));
- window_put_widget (equalizerwin, FALSE,
- equalizerwin_bands[i], 78 + 18 * i, 38);
- eq_slider_set_val (equalizerwin_bands[i], aud_cfg->equalizer_bands[i]);
+ window_put_widget (equalizerwin, FALSE, equalizerwin_bands[i], 78 + 18 * i, 38);
+ eq_slider_set_val (equalizerwin_bands[i], bands[i]);
 }
 
 equalizerwin_volume = hslider_new (0, 94, SKIN_EQ_EX, 97, 8, 61, 4, 3, 7, 1, 30, 1, 30);
@@ -396,6 +397,13 @@
 mainwin_keypress, 0);
 }
 
+static void equalizerwin_destroyed (void)
+{
+ hook_dissociate ("set equalizer_active", (HookFunction) update_from_config);
+ hook_dissociate ("set equalizer_bands", (HookFunction) update_from_config);
+ hook_dissociate ("set equalizer_preamp", (HookFunction) update_from_config);
+}
+
 void
 equalizerwin_create(void)
 {
@@ -409,7 +417,11 @@
 equalizerwin_create_widgets();
 window_show_all (equalizerwin);
 
- hook_associate("equalizer changed", (HookFunction) update_from_config, NULL);
+ g_signal_connect (equalizerwin, "destroy", (GCallback) equalizerwin_destroyed, NULL);
+
+ hook_associate ("set equalizer_active", (HookFunction) update_from_config, NULL);
+ hook_associate ("set equalizer_bands", (HookFunction) update_from_config, NULL);
+ hook_associate ("set equalizer_preamp", (HookFunction) update_from_config, NULL);
 }
 
 static void equalizerwin_real_show (gboolean show)
@@ -1131,12 +1143,13 @@
 
 if (songname != NULL)
 {
- gchar *eqname = g_strdup_printf("%s.%s", songname,
- aud_cfg->eqpreset_extension);
- g_free(songname);
+ gchar * ext = aud_get_string (NULL, "eqpreset_extension");
+ gchar * eqname = g_strdup_printf ("%s.%s", songname, ext);
 gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(dialog),
 eqname);
- g_free(eqname);
+ g_free (eqname);
+ g_free (ext);
+ g_free (songname);
 }
 
 gtk_widget_destroy(dialog);
@@ -1192,44 +1205,41 @@
 NULL);
 }
 
-static void equalizerwin_activate (gboolean active)
-{
- aud_cfg->equalizer_active = active;
- button_set_active (equalizerwin_on, active);
- equalizerwin_eq_changed();
-}
-
 static void load_auto_preset (const gchar * filename)
 {
- gchar * base;
-
- if (aud_cfg->eqpreset_extension != NULL)
+ gchar * ext = aud_get_string (NULL, "eqpreset_extension");
+ if (ext[0])
 {
- gchar * eq_file = g_strconcat (filename, ".",
- aud_cfg->eqpreset_extension, NULL);
+ gchar * eq_file = g_strconcat (filename, ".", ext, NULL);
 gboolean success = equalizerwin_read_aud_preset (eq_file);
-
 g_free (eq_file);
 
 if (success)
+ {
+ g_free (ext);
 return;
+ }
 }
+ g_free (ext);
 
- if (aud_cfg->eqpreset_default_file != NULL)
+ gchar * deffile = aud_get_string (NULL, "eqpreset_default_file");
+ if (deffile[0])
 {
 gchar * folder = g_path_get_dirname (filename);
- gchar * eq_file = g_build_filename (folder,
- aud_cfg->eqpreset_default_file, NULL);
+ gchar * eq_file = g_build_filename (folder, deffile, NULL);
 gboolean success = equalizerwin_read_aud_preset (eq_file);
-
 g_free (folder);
 g_free (eq_file);
 
 if (success)
+ {
+ g_free (deffile);
 return;
+ }
 }
+ g_free (deffile);
 
- base = g_path_get_basename (filename);
+ gchar * base = g_path_get_basename (filename);
 
 if (! equalizerwin_load_preset (equalizer_auto_presets, base))
 {
@@ -1245,8 +1255,8 @@
 gint playlist = GPOINTER_TO_INT (data);
 gint position = aud_playlist_get_position (playlist);
 
- if (! aud_cfg->equalizer_autoload || playlist != aud_playlist_get_playing ()
- || position == -1)
+ if (! aud_get_bool (NULL, "equalizer_autoload") || playlist !=
+ aud_playlist_get_playing () || position == -1)
 return;
 
 gchar * filename = aud_playlist_entry_get_filename (playlist, position);

audacious-plugins-3.0.3.tar.bz2/src/skins/ui_main.c -> audacious-plugins-3.1.tar.bz2/src/skins/ui_main.c Changed

@@ -29,7 +29,6 @@
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
-#include <audacious/audconfig.h>
 #include <audacious/drct.h>
 #include <audacious/gtk-compat.h>
 #include <audacious/i18n.h>
@@ -651,7 +650,7 @@
 if (str_has_suffix_nocase (data, ".wsz\r\n") || str_has_suffix_nocase
 (data, ".zip\r\n"))
 {
- on_skin_view_drag_data_received(GTK_WIDGET(user_data), context, x, y, selection_data, info, time, NULL);
+ on_skin_view_drag_data_received (0, context, x, y, selection_data, info, time, 0);
 return;
 }
 }
@@ -1074,13 +1073,15 @@
 /* Songname menu */
 
 check_set(toggleaction_group_others, "autoscroll songname", config.autoscroll);
- check_set(toggleaction_group_others, "stop after current song", aud_cfg->stopaftersong);
+ check_set (toggleaction_group_others, "stop after current song",
+ aud_get_bool (NULL, "stop_after_current_song"));
 
 /* Playback menu */
 
- check_set(toggleaction_group_others, "playback repeat", aud_cfg->repeat);
- check_set(toggleaction_group_others, "playback shuffle", aud_cfg->shuffle);
- check_set(toggleaction_group_others, "playback no playlist advance", aud_cfg->no_playlist_advance);
+ check_set (toggleaction_group_others, "playback repeat", aud_get_bool (NULL, "repeat"));
+ check_set (toggleaction_group_others, "playback shuffle", aud_get_bool (NULL, "shuffle"));
+ check_set (toggleaction_group_others, "playback no playlist advance",
+ aud_get_bool (NULL, "no_playlist_advance"));
 
 mainwin_enable_status_message (TRUE);
 
@@ -1600,15 +1601,20 @@
 
 void mainwin_update_song_info (void)
 {
- gint time, length;
-
 mainwin_update_volume ();
 
 if (! aud_drct_get_playing ())
 return;
 
- time = aud_drct_get_time ();
- length = aud_drct_get_length ();
+ gint time = 0, length = 0;
+ if (aud_drct_get_ready ())
+ {
+ time = aud_drct_get_time ();
+ length = aud_drct_get_length ();
+ }
+
+ mainwin_update_time_display (time, length);
+ mainwin_update_time_slider (time, length);
 
 /* Ugh, this does NOT belong here. -jlindgren */
 if (ab_position_a > -1 && ab_position_b > -1 && time >= ab_position_b)
@@ -1616,9 +1622,6 @@
 aud_drct_seek (ab_position_a);
 return;
 }
-
- mainwin_update_time_display (time, length);
- mainwin_update_time_slider (time, length);
 }
 
 /* toggleactionentries actions */
@@ -1639,9 +1642,9 @@
 
 void action_playback_noplaylistadvance (GtkToggleAction * action)
 {
- aud_cfg->no_playlist_advance = gtk_toggle_action_get_active( action );
+ aud_set_bool (NULL, "no_playlist_advance", gtk_toggle_action_get_active (action));
 
- if (aud_cfg->no_playlist_advance)
+ if (gtk_toggle_action_get_active (action))
 mainwin_show_status_message (_("Single mode."));
 else
 mainwin_show_status_message (_("Playlist mode."));
@@ -1649,29 +1652,28 @@
 
 void action_playback_repeat (GtkToggleAction * action)
 {
- aud_cfg->repeat = gtk_toggle_action_get_active( action );
- button_set_active (mainwin_repeat, aud_cfg->repeat);
+ aud_set_bool (NULL, "repeat", gtk_toggle_action_get_active (action));
+ button_set_active (mainwin_repeat, gtk_toggle_action_get_active (action));
 }
 
 void action_playback_shuffle (GtkToggleAction * action)
 {
- aud_cfg->shuffle = gtk_toggle_action_get_active( action );
- button_set_active (mainwin_shuffle, aud_cfg->shuffle);
+ aud_set_bool (NULL, "shuffle", gtk_toggle_action_get_active (action));
+ button_set_active (mainwin_shuffle, gtk_toggle_action_get_active (action));
 }
 
 void action_stop_after_current_song (GtkToggleAction * action)
 {
 gboolean active = gtk_toggle_action_get_active (action);
 
- if (active != aud_cfg->stopaftersong)
+ if (active != aud_get_bool (NULL, "stop_after_current_song"))
 {
 if (active)
 mainwin_show_status_message (_("Stopping after song."));
 else
 mainwin_show_status_message (_("Not stopping after song."));
 
- aud_cfg->stopaftersong = active;
- hook_call ("toggle stop after song", NULL);
+ aud_set_bool (NULL, "stop_after_current_song", active);
 }
 }

audacious-plugins-3.0.3.tar.bz2/src/skins/ui_main_evlisteners.c -> audacious-plugins-3.1.tar.bz2/src/skins/ui_main_evlisteners.c Changed

@@ -20,7 +20,6 @@
 
 #include <math.h>
 
-#include <audacious/audconfig.h>
 #include <audacious/drct.h>
 #include <audacious/misc.h>
 #include <libaudcore/hook.h>
@@ -34,17 +33,26 @@
 #include "ui_vis.h"
 #include "util.h"
 
-static void ui_main_evlistener_title_change (void * data, void * user_data)
+static void title_change (void)
 {
- gchar * title;
+ if (aud_drct_get_ready ())
+ {
+ gchar * title = aud_drct_get_title ();
+ mainwin_set_song_title (title);
+ g_free (title);
+ }
+ else
+ mainwin_set_song_title ("Buffering ...");
+}
 
- /* may be called asynchronously */
- if (! aud_drct_get_playing ())
- return;
+static void info_change (void)
+{
+ gint bitrate = 0, samplerate = 0, channels = 0;
 
- title = aud_drct_get_title ();
- mainwin_set_song_title (title);
- g_free (title);
+ if (aud_drct_get_ready ())
+ aud_drct_get_info (& bitrate, & samplerate, & channels);
+
+ mainwin_set_song_info (bitrate, samplerate, channels);
 }
 
 static void
@@ -66,14 +74,16 @@
 gtk_widget_show (mainwin_10sec_num);
 gtk_widget_show (mainwin_sec_num);
 
- if (aud_drct_get_length () > 0)
+ if (aud_drct_get_ready () && aud_drct_get_length () > 0)
 {
 gtk_widget_show (mainwin_position);
 gtk_widget_show (mainwin_sposition);
 }
 
 ui_skinned_playstatus_set_status(mainwin_playstatus, STATUS_PLAY);
- ui_main_evlistener_title_change (NULL, NULL);
+
+ title_change ();
+ info_change ();
 }
 
 static void
@@ -86,7 +96,7 @@
 {
 mainwin_enable_status_message (FALSE);
 check_set (toggleaction_group_others, "stop after current song",
- aud_cfg->stopaftersong);
+ aud_get_bool (NULL, "stop_after_current_song"));
 mainwin_enable_status_message (TRUE);
 }
 
@@ -101,36 +111,71 @@
 ui_skinned_playstatus_set_status(mainwin_playstatus, STATUS_PLAY);
 }
 
-static void vis_clear_cb (void * unused, void * another)
+static void vis_clear_cb (void)
 {
 ui_vis_clear_data (mainwin_vis);
 ui_svis_clear_data (mainwin_svis);
 }
 
-void info_change (void)
+static void render_mono_pcm (const gfloat * pcm)
 {
- gint bitrate, samplerate, channels;
+ guchar data[512];
 
- /* may be called asynchronously */
- if (! aud_drct_get_playing ())
+ if (config.vis_type != VIS_SCOPE)
 return;
 
- aud_drct_get_info (& bitrate, & samplerate, & channels);
- mainwin_set_song_info (bitrate, samplerate, channels);
+ for (gint i = 0; i < 75; i ++)
+ {
+ /* the signal is amplified by 2x */
+ /* output values are in the range 0 to 16 */
+ gint val = 8 + roundf (16 * pcm[i * 512 / 75]);
+ data[i] = CLAMP (val, 0, 16);
+ }
+
+ if (config.player_shaded)
+ ui_svis_timeout_func (mainwin_svis, data);
+ else
+ ui_vis_timeout_func (mainwin_vis, data);
 }
 
-/* calculate peak dB level, where 32767 (max of 16-bit PCM range) is 0 dB */
-static gfloat calc_peak_level (gint16 pcm[512])
+/* calculate peak dB level, where 1 is 0 dB */
+static gfloat calc_peak_level (const gfloat * pcm, gint step)
 {
- gint peak = 0;
+ gfloat peak = 0.0001; /* must be > 0, or level = -inf */
+
 for (gint i = 0; i < 512; i ++)
- peak = MAX (peak, pcm[i]);
+ {
+ peak = MAX (peak, * pcm);
+ pcm += step;
+ }
+
+ return 20 * log10 (peak);
+}
+
+static void render_multi_pcm (const gfloat * pcm, gint channels)
+{
+ /* "VU meter" */
+ if (config.vis_type != VIS_VOICEPRINT || ! config.player_shaded)
+ return;
+
+ guchar data[512];
 
- return 20 * log10 (peak / 32767.0);
+ gint level = 38 + calc_peak_level (pcm, channels);
+ data[0] = CLAMP (level, 0, 38);
+
+ if (channels >= 2)
+ {
+ level = 38 + calc_peak_level (pcm + 1, channels);
+ data[1] = CLAMP (level, 0, 38);
+ }
+ else
+ data[1] = data[0];
+
+ ui_svis_timeout_func (mainwin_svis, data);
 }
 
 /* convert linear frequency graph to logarithmic one */
-static void make_log_graph (gint16 freq[256], gint bands, gint db_range, gint
+static void make_log_graph (const gfloat * freq, gint bands, gint db_range, gint
 int_range, guchar * graph)
 {
 static gint last_bands = 0;
@@ -152,7 +197,7 @@
 including fractional parts */
 gint a = ceilf (xscale[i]);
 gint b = floorf (xscale[i + 1]);
- gint sum = 0;
+ gfloat sum = 0;
 
 if (b < a)
 sum += freq[b] * (xscale[i + 1] - xscale[i]);
@@ -170,8 +215,8 @@
 12-band one no matter how many bands there are */
 sum = sum * bands / 12;
 
- /* convert to dB, where 32767 (max of 16-bit PCM range) is 0 dB */
- gfloat val = 20 * log10 (sum / 32767.0);
+ /* convert to dB */
+ gfloat val = 20 * log10f (sum);
 
 /* scale (-db_range, 0.0) to (0.0, int_range) */
 val = (1.0 + val / db_range) * int_range;
@@ -180,111 +225,68 @@
 }
 }
 
-static void ui_main_evlistener_visualization_timeout (const VisNode * vis,
- void * user)
+static void render_freq (const gfloat * freq)
 {
- guint8 intern_vis_data[512];
- gint16 mono_freq[2][256];
- gint16 mono_pcm[2][512], stereo_pcm[2][512];
-
- if (! vis || config.vis_type == VIS_OFF)
- return;
+ guchar data[512];
 
- switch (config.vis_type)
+ if (config.vis_type == VIS_ANALYZER)
 {
- case VIS_ANALYZER:
- aud_calc_mono_freq (mono_freq, vis->data, vis->nch);
-
 if (config.analyzer_type == ANALYZER_BARS)
 {
 if (config.player_shaded)
- make_log_graph (mono_freq[0], 13, 40, 8, intern_vis_data);
+ make_log_graph (freq, 13, 40, 8, data);
 else
- make_log_graph (mono_freq[0], 19, 40, 16, intern_vis_data);
+ make_log_graph (freq, 19, 40, 16, data);
 }
 else
 {
 if (config.player_shaded)
- make_log_graph (mono_freq[0], 37, 40, 8, intern_vis_data);
- else
- make_log_graph (mono_freq[0], 75, 40, 16, intern_vis_data);
- }
-
- break;
- case VIS_VOICEPRINT:
- if (config.player_shaded) /* "VU meter" */
- {
- aud_calc_stereo_pcm (stereo_pcm, vis->data, vis->nch);
-
- gint level = 38 + calc_peak_level (stereo_pcm[0]);
- intern_vis_data[0] = CLAMP (level, 0, 38);
-
- if (vis->nch == 2)
- {
- level = 38 + calc_peak_level (stereo_pcm[1]);
- intern_vis_data[1] = CLAMP (level, 0, 38);
- }
+ make_log_graph (freq, 37, 40, 8, data);
 else
- intern_vis_data[1] = intern_vis_data[0];
- }
- else
- {
- aud_calc_mono_freq (mono_freq, vis->data, vis->nch);
- make_log_graph (mono_freq[0], 17, 40, 255, intern_vis_data);
- }
-
- break;
- default: /* VIS_SCOPE */
- aud_calc_mono_pcm (mono_pcm, vis->data, vis->nch);
-
- for (gint i = 0; i < 75; i ++)
- {
- /* the signal is amplified by 2x */
- /* output values are in the range 0 to 16 */
- gint val = 16384 + mono_pcm[0][i * vis->length / 75];
- val = CLAMP (val, 0, 32768);
- intern_vis_data[i] = (val + 1024) / 2048;
+ make_log_graph (freq, 75, 40, 16, data);
 }
-
- break;
 }
+ else if (config.vis_type == VIS_VOICEPRINT && ! config.player_shaded)
+ make_log_graph (freq, 17, 40, 255, data);
+ else
+ return;
 
 if (config.player_shaded)
- ui_svis_timeout_func(mainwin_svis, intern_vis_data);
+ ui_svis_timeout_func (mainwin_svis, data);
 else
- ui_vis_timeout_func(mainwin_vis, intern_vis_data);
+ ui_vis_timeout_func (mainwin_vis, data);
 }
 
 void
 ui_main_evlistener_init(void)
 {
- hook_associate("title change", ui_main_evlistener_title_change, NULL);
 hook_associate("hide seekbar", ui_main_evlistener_hide_seekbar, NULL);
 hook_associate("playback begin", ui_main_evlistener_playback_begin, NULL);
+ hook_associate("playback ready", ui_main_evlistener_playback_begin, NULL);
 hook_associate("playback stop", ui_main_evlistener_playback_stop, NULL);
 hook_associate("playback pause", ui_main_evlistener_playback_pause, NULL);
 hook_associate("playback unpause", ui_main_evlistener_playback_unpause, NULL);
- hook_associate ("visualization clear", vis_clear_cb, NULL);
+ hook_associate ("title change", (HookFunction) title_change, NULL);
 hook_associate ("info change", (HookFunction) info_change, NULL);
 
 hook_associate("playback seek", (HookFunction) mainwin_update_song_info, NULL);
- hook_associate ("toggle stop after song", stop_after_song_toggled, NULL);
+ hook_associate ("set stop_after_current_song", stop_after_song_toggled, NULL);
 }
 
 void
 ui_main_evlistener_dissociate(void)
 {
- hook_dissociate("title change", ui_main_evlistener_title_change);
 hook_dissociate("hide seekbar", ui_main_evlistener_hide_seekbar);
 hook_dissociate("playback begin", ui_main_evlistener_playback_begin);
+ hook_dissociate("playback ready", ui_main_evlistener_playback_begin);
 hook_dissociate("playback stop", ui_main_evlistener_playback_stop);
 hook_dissociate("playback pause", ui_main_evlistener_playback_pause);
 hook_dissociate("playback unpause", ui_main_evlistener_playback_unpause);
- hook_dissociate ("visualization clear", vis_clear_cb);
+ hook_dissociate ("title change", (HookFunction) title_change);
 hook_dissociate ("info change", (HookFunction) info_change);
 
 hook_dissociate("playback seek", (HookFunction) mainwin_update_song_info);
- hook_dissociate ("toggle stop after song", stop_after_song_toggled);
+ hook_dissociate ("set stop_after_current_song", stop_after_song_toggled);
 }
 
 void start_stop_visual (gboolean exiting)
@@ -295,7 +297,10 @@
 {
 if (! started)
 {
- aud_vis_runner_add_hook(ui_main_evlistener_visualization_timeout, NULL);
+ aud_vis_func_add (AUD_VIS_TYPE_CLEAR, (VisFunc) vis_clear_cb);
+ aud_vis_func_add (AUD_VIS_TYPE_MONO_PCM, (VisFunc) render_mono_pcm);
+ aud_vis_func_add (AUD_VIS_TYPE_MULTI_PCM, (VisFunc) render_multi_pcm);
+ aud_vis_func_add (AUD_VIS_TYPE_FREQ, (VisFunc) render_freq);
 started = 1;
 }
 }
@@ -303,7 +308,10 @@
 {
 if (started)
 {
- aud_vis_runner_remove_hook(ui_main_evlistener_visualization_timeout);
+ aud_vis_func_remove ((VisFunc) vis_clear_cb);
+ aud_vis_func_remove ((VisFunc) render_mono_pcm);
+ aud_vis_func_remove ((VisFunc) render_multi_pcm);
+ aud_vis_func_remove ((VisFunc) render_freq);
 started = 0;
 }
 }

audacious-plugins-3.0.3.tar.bz2/src/skins/ui_main_evlisteners.h -> audacious-plugins-3.1.tar.bz2/src/skins/ui_main_evlisteners.h Changed

audacious-plugins-3.0.3.tar.bz2/src/skins/ui_manager.c -> audacious-plugins-3.1.tar.bz2/src/skins/ui_manager.c Changed

@@ -226,18 +226,12 @@
 {"playlist save", GTK_STOCK_SAVE, N_("Export Playlist"), "<Shift>S",
 N_("Saves the selected playlist."), (GCallback) audgui_export_playlist},
 
- { "playlist save all", GTK_STOCK_SAVE, N_("Save All Playlists"),
- "<Alt>S", N_("Saves all the playlists that are open. Note that this "
- "is done automatically when Audacious quits."),
- action_playlist_save_all_playlists},
-
 { "playlist refresh", GTK_STOCK_REFRESH, N_("Refresh List"), "F5",
 N_("Refreshes metadata associated with a playlist entry."),
 G_CALLBACK(action_playlist_refresh_list) },
 
- { "playlist manager", AUD_STOCK_PLAYLIST , N_("List Manager"), "P",
- N_("Opens the playlist manager."), (GCallback) audgui_playlist_manager}
-};
+ {"playlist manager", AUD_STOCK_PLAYLIST, N_("Playlist Manager"), "P", NULL, (GCallback) audgui_playlist_manager},
+ {"queue manager", AUD_STOCK_QUEUETOGGLE, N_("Queue Manager"), "<Ctrl>U", NULL, (GCallback) audgui_queue_manager_show}};
 
 static GtkActionEntry action_entries_view[] = {
 {"view", NULL, N_("View")},
@@ -639,12 +633,13 @@
 ui_manager_create_menus ( void )
 {
 const gchar * data = aud_get_path (AUD_PATH_DATA_DIR);
- gchar path[PATH_MAX];
+ gchar * path;
 GError *gerr = NULL;
 
 /* attach xml menu definitions */
- snprintf (path, sizeof path, "%s/ui/mainwin.ui", data);
+ path = g_strdup_printf ("%s/ui/mainwin.ui", data);
 gtk_ui_manager_add_ui_from_file (ui_manager, path, & gerr);
+ g_free (path);
 
 if ( gerr != NULL )
 {
@@ -653,8 +648,9 @@
 return;
 }
 
- snprintf (path, sizeof path, "%s/ui/playlist.ui", data);
+ path = g_strdup_printf ("%s/ui/playlist.ui", data);
 gtk_ui_manager_add_ui_from_file (ui_manager, path, & gerr);
+ g_free (path);
 
 if ( gerr != NULL )
 {
@@ -663,8 +659,9 @@
 return;
 }
 
- snprintf (path, sizeof path, "%s/ui/equalizer.ui", data);
+ path = g_strdup_printf ("%s/ui/equalizer.ui", data);
 gtk_ui_manager_add_ui_from_file (ui_manager, path, & gerr);
+ g_free (path);
 
 if ( gerr != NULL )
 {

audacious-plugins-3.0.3.tar.bz2/src/skins/ui_playlist.c -> audacious-plugins-3.1.tar.bz2/src/skins/ui_playlist.c Changed

@@ -28,7 +28,6 @@
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
-#include <audacious/audconfig.h>
 #include <audacious/debug.h>
 #include <audacious/drct.h>
 #include <audacious/gtk-compat.h>
@@ -96,8 +95,8 @@
 gchar *text, *sel_text, *tot_text;
 gint64 selection, total;
 
- total = aud_playlist_get_total_length (active_playlist, TRUE) / 1000;
- selection = aud_playlist_get_selected_length (active_playlist, TRUE) / 1000;
+ total = aud_playlist_get_total_length (active_playlist) / 1000;
+ selection = aud_playlist_get_selected_length (active_playlist) / 1000;
 
 if (selection >= 3600)
 sel_text = g_strdup_printf ("%" PRId64 ":%02" PRId64 ":%02" PRId64,
@@ -130,12 +129,12 @@
 
 if (entry > -1)
 {
- gint length = aud_playlist_entry_get_length (playlist, entry, FALSE);
+ gint length = aud_playlist_entry_get_length (playlist, entry, TRUE);
 
- if (aud_cfg->show_numbers_in_pl)
+ if (aud_get_bool (NULL, "show_numbers_in_pl"))
 snprintf (scratch, sizeof scratch, "%d. ", 1 + entry);
 
- gchar * title = aud_playlist_entry_get_title (playlist, entry, FALSE);
+ gchar * title = aud_playlist_entry_get_title (playlist, entry, TRUE);
 snprintf (scratch + strlen (scratch), sizeof scratch - strlen (scratch),
 "%s", title);
 g_free (title);
@@ -1138,11 +1137,6 @@
 audgui_confirm_playlist_delete (active_playlist);
 }
 
-void action_playlist_save_all_playlists (void)
-{
- aud_save_playlists ();
-}
-
 void
 action_playlist_refresh_list(void)
 {

audacious-plugins-3.0.3.tar.bz2/src/skins/ui_skin.c -> audacious-plugins-3.1.tar.bz2/src/skins/ui_skin.c Changed

@@ -984,20 +984,48 @@
 return TRUE;
 }
 
-void
-skin_install_skin(const gchar * path)
+void skin_install_skin (const gchar * path)
 {
- gchar *command;
+#ifdef S_IRGRP
+ const mode_t mode = S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH;
+#else
+ const mode_t mode = S_IRWXU;
+#endif
+
+ if (g_mkdir_with_parents (skins_paths[SKINS_PATH_USER_SKIN_DIR], mode) < 0)
+ {
+ fprintf (stderr, "Failed to create %s: %s\n",
+ skins_paths[SKINS_PATH_USER_SKIN_DIR], strerror (errno));
+ return;
+ }
+
+ GError * err = 0;
+ gchar * data;
+ gsize len;
 
- g_return_if_fail(path != NULL);
+ if (! g_file_get_contents (path, & data, & len, & err))
+ {
+ fprintf (stderr, "Failed to read %s: %s\n", path, err->message);
+ g_error_free (err);
+ return;
+ }
+
+ gchar * base = g_path_get_basename (path);
+ gchar * target = g_build_filename (skins_paths[SKINS_PATH_USER_SKIN_DIR], base, NULL);
 
- command = g_strdup_printf("cp %s %s",
- path, skins_paths[SKINS_PATH_USER_SKIN_DIR]);
- if (system(command)) {
- AUDDBG("Unable to install skin (%s) into user directory (%s)\n",
- path, skins_paths[SKINS_PATH_USER_SKIN_DIR]);
+ if (! g_file_set_contents (target, data, len, & err))
+ {
+ fprintf (stderr, "Failed to write %s: %s\n", path, err->message);
+ g_error_free (err);
+ g_free (data);
+ g_free (base);
+ g_free (target);
+ return;
 }
- g_free(command);
+
+ g_free (data);
+ g_free (base);
+ g_free (target);
 }
 
 static gboolean skin_load (Skin * skin, const gchar * path)

audacious-plugins-3.0.3.tar.bz2/src/skins/ui_skinned_equalizer_graph.c -> audacious-plugins-3.1.tar.bz2/src/skins/ui_skinned_equalizer_graph.c Changed

@@ -22,28 +22,28 @@
 * along with this program; If not, see <http://www.gnu.org/licenses>.
 */
 
-#include <audacious/audconfig.h>
+#include <audacious/misc.h>
 
 #include "draw-compat.h"
 #include "ui_skin.h"
 #include "ui_skinned_equalizer_graph.h"
 
-static void init_spline (const gfloat * x, const gfloat * y, gint n, gfloat * y2)
+static void init_spline (const gdouble * x, const gdouble * y, gint n, gdouble * y2)
 {
 gint i, k;
- gfloat p, qn, sig, un, *u;
+ gdouble p, qn, sig, un, *u;
 
- u = (gfloat *) g_malloc(n * sizeof(gfloat));
+ u = (gdouble *) g_malloc(n * sizeof(gdouble));
 
 y2[0] = u[0] = 0.0;
 
 for (i = 1; i < n - 1; i++) {
- sig = ((gfloat) x[i] - x[i - 1]) / ((gfloat) x[i + 1] - x[i - 1]);
+ sig = ((gdouble) x[i] - x[i - 1]) / ((gdouble) x[i + 1] - x[i - 1]);
 p = sig * y2[i - 1] + 2.0;
 y2[i] = (sig - 1.0) / p;
 u[i] =
- (((gfloat) y[i + 1] - y[i]) / (x[i + 1] - x[i])) -
- (((gfloat) y[i] - y[i - 1]) / (x[i] - x[i - 1]));
+ (((gdouble) y[i + 1] - y[i]) / (x[i + 1] - x[i])) -
+ (((gdouble) y[i] - y[i - 1]) / (x[i] - x[i - 1]));
 u[i] = (6.0 * u[i] / (x[i + 1] - x[i - 1]) - sig * u[i - 1]) / p;
 }
 qn = un = 0.0;
@@ -54,11 +54,11 @@
 g_free(u);
 }
 
-gfloat eval_spline (const gfloat * xa, const gfloat * ya, const gfloat * y2a,
- gint n, gfloat x)
+gdouble eval_spline (const gdouble * xa, const gdouble * ya, const gdouble * y2a,
+ gint n, gdouble x)
 {
 gint klo, khi, k;
- gfloat h, b, a;
+ gdouble h, b, a;
 
 klo = 0;
 khi = n - 1;
@@ -78,24 +78,26 @@
 }
 
 DRAW_FUNC_BEGIN (eq_graph_draw)
- static const gfloat x[10] = {0, 11, 23, 35, 47, 59, 71, 83, 97, 109};
+ static const gdouble x[10] = {0, 11, 23, 35, 47, 59, 71, 83, 97, 109};
 
 skin_draw_pixbuf (cr, SKIN_EQMAIN, 0, 294, 0, 0, 113, 19);
- skin_draw_pixbuf (cr, SKIN_EQMAIN, 0, 314, 0, 9 + (aud_cfg->equalizer_preamp
- * 9 + EQUALIZER_MAX_GAIN / 2) / EQUALIZER_MAX_GAIN, 113, 1);
+ skin_draw_pixbuf (cr, SKIN_EQMAIN, 0, 314, 0, 9 + (aud_get_double (NULL,
+ "equalizer_preamp") * 9 + EQUALIZER_MAX_GAIN / 2) / EQUALIZER_MAX_GAIN, 113, 1);
 
 guint32 cols[19];
 skin_get_eq_spline_colors(active_skin, cols);
 
- gfloat yf[10];
- init_spline(x, aud_cfg->equalizer_bands, 10, yf);
+ gdouble bands[AUD_EQUALIZER_NBANDS];
+ aud_eq_get_bands (bands);
+
+ gdouble yf[10];
+ init_spline (x, bands, 10, yf);
 
 /* now draw a pixelated line with vector graphics ... -- jlindgren */
 gint py = 0;
 for (gint i = 0; i < 109; i ++)
 {
- gint y = 9.5 - eval_spline (x, aud_cfg->equalizer_bands, yf, 10, i) * 9 /
- EQUALIZER_MAX_GAIN;
+ gint y = 9.5 - eval_spline (x, bands, yf, 10, i) * 9 / EQUALIZER_MAX_GAIN;
 y = CLAMP (y, 0, 18);
 
 if (!i)

audacious-plugins-3.0.3.tar.bz2/src/skins/ui_skinned_playlist.c -> audacious-plugins-3.1.tar.bz2/src/skins/ui_skinned_playlist.c Changed

@@ -37,9 +37,9 @@
 #include "ui_skinned_playlist.h"
 #include "ui_skinned_playlist_slider.h"
 
-#include <audacious/audconfig.h>
 #include <audacious/drct.h>
 #include <audacious/gtk-compat.h>
+#include <audacious/misc.h>
 #include <audacious/playlist.h>
 #include <libaudgui/libaudgui.h>
 
@@ -182,7 +182,7 @@
 
 /* entry numbers */
 
- if (aud_cfg->show_numbers_in_pl)
+ if (aud_get_bool (NULL, "show_numbers_in_pl"))
 {
 width = 0;
 
@@ -908,8 +908,7 @@
 {
 if (position == -1 || position == active_length)
 cancel_all (list, data);
- else if (aud_cfg->show_filepopup_for_tuple && data->popup_pos !=
- position)
+ else if (aud_get_bool (NULL, "show_filepopup_for_tuple") && data->popup_pos != position)
 {
 cancel_all (list, data);
 popup_trigger (list, data, position);
@@ -948,8 +947,8 @@
 popup_hide (list, data);
 
 data->popup_pos = pos;
- data->popup_source = g_timeout_add (aud_cfg->filepopup_delay * 100,
- (GSourceFunc) popup_show, list);
+ data->popup_source = g_timeout_add (aud_get_int (NULL, "filepopup_delay") *
+ 100, (GSourceFunc) popup_show, list);
 }
 
 static void popup_hide (GtkWidget * list, PlaylistData * data)

audacious-plugins-3.0.3.tar.bz2/src/smb/Makefile -> audacious-plugins-3.1.tar.bz2/src/smb/Makefile Changed

audacious-plugins-3.0.3.tar.bz2/src/sndfile/plugin.c -> audacious-plugins-3.1.tar.bz2/src/sndfile/plugin.c Changed

audacious-plugins-3.0.3.tar.bz2/src/sndstretch/sndstretch_xmms.c -> audacious-plugins-3.1.tar.bz2/src/sndstretch/sndstretch_xmms.c Changed

@@ -5,7 +5,7 @@
 // Copyright (C) 2001 Florian Berger
 // Email: florian.berger@jk.uni-linz.ac.at
 //
-// Ported to new Audacious effect API by John Lindgren, 2009
+// Copyright (C) 2009-2011 John Lindgren
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License Version 2 as
@@ -33,9 +33,9 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <audacious/configdb.h>
 #include <audacious/gtk-compat.h>
 #include <audacious/i18n.h>
+#include <audacious/misc.h>
 #include <audacious/plugin.h>
 #include <libaudcore/audio.h>
 
@@ -256,15 +256,10 @@
 
 static gint sndstretch_config_destroy_cb(GtkWidget * w, GdkEventAny * e, gpointer data)
 {
-	mcs_handle_t *db = aud_cfg_db_open();
-	if (db)
-	{
-		aud_cfg_db_set_double (db, "sndstretch", "pitch", SS.pitch);
-		aud_cfg_db_set_double (db, "sndstretch", "speed", SS.speed);
-		aud_cfg_db_set_bool (db, "sndstretch", "short_overlap", SS.short_overlap);
-		aud_cfg_db_set_bool (db, "sndstretch", "volume_corr", SS.volume_corr);
-		aud_cfg_db_close (db);
-	}
+	aud_set_double ("sndstretch", "pitch", SS.pitch);
+	aud_set_double ("sndstretch", "speed", SS.speed);
+	aud_set_bool ("sndstretch", "short_overlap", SS.short_overlap);
+	aud_set_bool ("sndstretch", "volume_corr", SS.volume_corr);
 
 	gtk_widget_destroy(sndstretch_config_dialog);
 	sndstretch_config_dialog = NULL;
@@ -304,11 +299,11 @@
 	gtk_box_pack_end(GTK_BOX(logohbox), logobutton, FALSE, TRUE, 4);
 
 	SS.speed_adj = (GtkAdjustment *) gtk_adjustment_new (100 * log (SS.speed) /
-	 log (2), -100, 100 + 10, 2, 10, 10);
+	 log (2), -100, 100 + 10, 2, 10, 0);
 	SS.pitch_adj = (GtkAdjustment *) gtk_adjustment_new (120 * log (SS.pitch) /
-	 log (2), -120, 120 + 10, 2, 10, 10);
+	 log (2), -120, 120 + 10, 2, 10, 0);
 	SS.scale_adj = (GtkAdjustment *) gtk_adjustment_new (100 * log (SS.scale) /
-	 log (2), -100, 100 + 10, 2, 10, 10);
+	 log (2), -100, 100 + 10, 2, 10, 0);
 
 	volume_toggle = gtk_check_button_new_with_label(_("Volume corr."));
 	overlap_toggle = gtk_check_button_new_with_label(_("Short Overlap"));
@@ -386,6 +381,13 @@
 	gtk_widget_show_all(sndstretch_config_dialog);
 }
 
+static const gchar * const sndstretch_defaults[] = {
+ "pitch", "1",
+ "speed", "1",
+ "short_overlap", "FALSE",
+ "volume_corr", "FALSE",
+ NULL};
+
 gboolean sndstretch_init (void)
 {
 	SS.fragsize=0;
@@ -399,22 +401,14 @@
 	SS.bpsec=176400;
 	SS.vol_r=50;
 	SS.vol_l=50;
-	SS.pitch=1.0;
-	SS.speed=1.0;
 	SS.scale=1.0;
 
-	mcs_handle_t * db = aud_cfg_db_open ();
-	if (! db)
-		return TRUE;
-
-	gboolean b;
-	aud_cfg_db_get_double(db, "sndstretch", "pitch", &SS.pitch);
-	aud_cfg_db_get_double(db, "sndstretch", "speed", &SS.speed);
-	if (aud_cfg_db_get_bool(db, "sndstretch", "short_overlap", &b))
-		SS.short_overlap = b;
-	if (aud_cfg_db_get_bool(db, "sndstretch", "volume_corr", &b))
-		SS.volume_corr = b;
-	aud_cfg_db_close(db);
+	aud_config_set_defaults ("sndstretch", sndstretch_defaults);
+
+	SS.pitch = aud_get_double ("sndstretch", "pitch");
+	SS.speed = aud_get_double ("sndstretch", "speed");
+	SS.short_overlap = aud_get_bool ("sndstretch", "short_overlap");
+	SS.volume_corr = aud_get_bool ("sndstretch", "volume_corr");
 
 	return TRUE;
 }

audacious-plugins-3.0.3.tar.bz2/src/song_change/song_change.c -> audacious-plugins-3.1.tar.bz2/src/song_change/song_change.c Changed

@@ -15,7 +15,7 @@
 
 #include <string.h>
 
-#include <audacious/configdb.h>
+#include <audacious/misc.h>
 #include <audacious/drct.h>
 #include <audacious/i18n.h>
 #include <audacious/plugin.h>
@@ -38,8 +38,8 @@
 
 typedef struct
 {
- gchar *title;
- gchar *filename;
+ gchar *title;
+ gchar *filename;
 }
 songchange_playback_ttc_prevs_t;
 static songchange_playback_ttc_prevs_t *ttc_prevs = NULL;
@@ -53,10 +53,10 @@
 
 AUD_GENERAL_PLUGIN
 (
-	.name = "Song Change",
-	.init = init,
-	.cleanup = cleanup,
-	.settings = &preferences,
+ .name = "Song Change",
+ .init = init,
+ .cleanup = cleanup,
+ .settings = &preferences,
 )
 
 /**
@@ -65,8 +65,7 @@
 * @param string String to be escaped.
 * @return Given string with special characters escaped. Must be freed with g_free().
 */
-static gchar *
-escape_shell_chars(const gchar * string)
+static gchar *escape_shell_chars(const gchar * string)
 {
 const gchar *special = "$`\"\\"; /* Characters to escape */
 const gchar *in = string;
@@ -94,22 +93,22 @@
 
 static void bury_child(int signal)
 {
-	waitpid(-1, NULL, WNOHANG);
+ waitpid(-1, NULL, WNOHANG);
 }
 
 static void execute_command(char *cmd)
 {
-	char *argv[4] = {"/bin/sh", "-c", NULL, NULL};
-	int i;
-	argv[2] = cmd;
-	signal(SIGCHLD, bury_child);
-	if (fork() == 0)
-	{
-		/* We don't want this process to hog the audio device etc */
-		for (i = 3; i < 255; i++)
-			close(i);
-		execv("/bin/sh", argv);
-	}
+ char *argv[4] = {"/bin/sh", "-c", NULL, NULL};
+ int i;
+ argv[2] = cmd;
+ signal(SIGCHLD, bury_child);
+ if (fork() == 0)
+ {
+ /* We don't want this process to hog the audio device etc */
+ for (i = 3; i < 255; i++)
+ close(i);
+ execv("/bin/sh", argv);
+ }
 }
 
 /* Format codes:
@@ -131,297 +130,281 @@
 @cmd: command to run
 @current_file: file name of current song
 @pos: playlist_pos */
-static void
-do_command(char *cmd, const char *current_file, int pos)
+static void do_command(char *cmd, const char *current_file, int pos)
 {
-	int length;
-	char *str, *shstring = NULL, *temp, numbuf[32];
-	gboolean playing;
-	Formatter *formatter;
-
-	if (cmd && strlen(cmd) > 0)
-	{
-		formatter = formatter_new();
-		str = aud_drct_pl_get_title(pos);
-		if (str)
-		{
-			temp = escape_shell_chars(str);
-			formatter_associate(formatter, 's', temp);
-			formatter_associate(formatter, 'n', temp);
-			g_free(str);
-			g_free(temp);
-		}
-		else
-		{
-			formatter_associate(formatter, 's', "");
-			formatter_associate(formatter, 'n', "");
-		}
-
-		if (current_file)
-		{
-			temp = escape_shell_chars(current_file);
-			formatter_associate(formatter, 'f', temp);
-			g_free(temp);
-		}
-		else
-			formatter_associate(formatter, 'f', "");
-		g_snprintf(numbuf, sizeof(numbuf), "%02d", pos + 1);
-		formatter_associate(formatter, 't', numbuf);
-		length = aud_drct_pl_get_time(pos);
-		if (length != -1)
-		{
-			g_snprintf(numbuf, sizeof(numbuf), "%d", length);
-			formatter_associate(formatter, 'l', numbuf);
-		}
-		else
-			formatter_associate(formatter, 'l', "0");
-
-		playing = aud_drct_get_playing();
-		g_snprintf(numbuf, sizeof(numbuf), "%d", playing);
-		formatter_associate(formatter, 'p', numbuf);
-
-		if (playing)
-		{
-			int brate, srate, chans;
-			aud_drct_get_info (& brate, & srate, & chans);
-			snprintf (numbuf, sizeof numbuf, "%d", brate);
-			formatter_associate (formatter, 'r', numbuf);
-			snprintf (numbuf, sizeof numbuf, "%d", srate);
-			formatter_associate (formatter, 'F', numbuf);
-			snprintf (numbuf, sizeof numbuf, "%d", chans);
-			formatter_associate (formatter, 'c', numbuf);
-		}
-
-		Tuple * tuple = aud_playlist_entry_get_tuple
-		 (aud_playlist_get_active (), pos, 0);
-
-		const char *artist = tuple_get_string(tuple, FIELD_ARTIST, NULL);
-		if (artist)
-			formatter_associate(formatter, 'a', artist);
-		else
-			formatter_associate(formatter, 'a', "");
-
-		const char *album = tuple_get_string(tuple, FIELD_ALBUM, NULL);
-		if (album)
-			formatter_associate(formatter, 'b', album);
-		else
-			formatter_associate(formatter, 'b', "");
-
-		const char *title = tuple_get_string(tuple, FIELD_TITLE, NULL);
-		if (title)
-			formatter_associate(formatter, 'T', title);
-		else
-			formatter_associate(formatter, 'T', "");
-
-		if (tuple)
-			tuple_free (tuple);
-
-		shstring = formatter_format(formatter, cmd);
-		formatter_destroy(formatter);
-
-		if (shstring)
-		{
-			execute_command(shstring);
-			/* FIXME: This can possibly be freed too early */
-			g_free(shstring);
-		}
-	}
+ int length;
+ char *str, *shstring = NULL, *temp, numbuf[32];
+ gboolean playing;
+ Formatter *formatter;
+
+ if (cmd && strlen(cmd) > 0)
+ {
+ formatter = formatter_new();
+ str = aud_drct_pl_get_title(pos);
+ if (str)
+ {
+ temp = escape_shell_chars(str);
+ formatter_associate(formatter, 's', temp);
+ formatter_associate(formatter, 'n', temp);
+ g_free(str);
+ g_free(temp);
+ }
+ else
+ {
+ formatter_associate(formatter, 's', "");
+ formatter_associate(formatter, 'n', "");
+ }
+
+ if (current_file)
+ {
+ temp = escape_shell_chars(current_file);
+ formatter_associate(formatter, 'f', temp);
+ g_free(temp);
+ }
+ else
+ formatter_associate(formatter, 'f', "");
+ g_snprintf(numbuf, sizeof(numbuf), "%02d", pos + 1);
+ formatter_associate(formatter, 't', numbuf);
+ length = aud_drct_pl_get_time(pos);
+ if (length != -1)
+ {
+ g_snprintf(numbuf, sizeof(numbuf), "%d", length);
+ formatter_associate(formatter, 'l', numbuf);
+ }
+ else
+ formatter_associate(formatter, 'l', "0");
+
+ playing = aud_drct_get_playing();
+ g_snprintf(numbuf, sizeof(numbuf), "%d", playing);
+ formatter_associate(formatter, 'p', numbuf);
+
+ if (playing)
+ {
+ int brate, srate, chans;
+ aud_drct_get_info (& brate, & srate, & chans);
+ snprintf (numbuf, sizeof numbuf, "%d", brate);
+ formatter_associate (formatter, 'r', numbuf);
+ snprintf (numbuf, sizeof numbuf, "%d", srate);
+ formatter_associate (formatter, 'F', numbuf);
+ snprintf (numbuf, sizeof numbuf, "%d", chans);
+ formatter_associate (formatter, 'c', numbuf);
+ }
+
+ Tuple * tuple = aud_playlist_entry_get_tuple
+ (aud_playlist_get_active (), pos, 0);
+
+ const char *artist = tuple_get_string(tuple, FIELD_ARTIST, NULL);
+ if (artist)
+ formatter_associate(formatter, 'a', artist);
+ else
+ formatter_associate(formatter, 'a', "");
+
+ const char *album = tuple_get_string(tuple, FIELD_ALBUM, NULL);
+ if (album)
+ formatter_associate(formatter, 'b', album);
+ else
+ formatter_associate(formatter, 'b', "");
+
+ const char *title = tuple_get_string(tuple, FIELD_TITLE, NULL);
+ if (title)
+ formatter_associate(formatter, 'T', title);
+ else
+ formatter_associate(formatter, 'T', "");
+
+ if (tuple)
+ tuple_free (tuple);
+
+ shstring = formatter_format(formatter, cmd);
+ formatter_destroy(formatter);
+
+ if (shstring)
+ {
+ execute_command(shstring);
+ /* FIXME: This can possibly be freed too early */
+ g_free(shstring);
+ }
+ }
 }
 
 static void read_config(void)
 {
-	mcs_handle_t *db;
-
-	db = aud_cfg_db_open();
-	if ( !aud_cfg_db_get_string(db, "song_change", "cmd_line", &cmd_line) )
-		cmd_line = g_strdup("");
-	if ( !aud_cfg_db_get_string(db, "song_change", "cmd_line_after", &cmd_line_after) )
-		cmd_line_after = g_strdup("");
-	if ( !aud_cfg_db_get_string(db, "song_change", "cmd_line_end", &cmd_line_end) )
-		cmd_line_end = g_strdup("");
-	if ( !aud_cfg_db_get_string(db, "song_change", "cmd_line_ttc", &cmd_line_ttc) )
-		cmd_line_ttc = g_strdup("");
-	aud_cfg_db_close(db);
+ cmd_line = aud_get_string("song_change", "cmd_line");
+ cmd_line_after = aud_get_string("song_change", "cmd_line_after");
+ cmd_line_end = aud_get_string("song_change", "cmd_line_end");
+ cmd_line_ttc = aud_get_string("song_change", "cmd_line_ttc");
 }
 
 static void cleanup(void)
 {
-	hook_dissociate("playback begin", songchange_playback_begin);
-	hook_dissociate("playback end", songchange_playback_end);
-	hook_dissociate("playlist end reached", songchange_playlist_eof);
-// hook_dissociate( "playlist set info" , songchange_playback_ttc);
-
-	if ( ttc_prevs != NULL )
-	{
-		if ( ttc_prevs->title != NULL ) g_free( ttc_prevs->title );
-		if ( ttc_prevs->filename != NULL ) g_free( ttc_prevs->filename );
-		g_free( ttc_prevs );
-		ttc_prevs = NULL;
-	}
-
-	g_free(cmd_line);
-	g_free(cmd_line_after);
-	g_free(cmd_line_end);
-	g_free(cmd_line_ttc);
-	cmd_line = NULL;
-	cmd_line_after = NULL;
-	cmd_line_end = NULL;
-	cmd_line_ttc = NULL;
-	signal(SIGCHLD, SIG_DFL);
+ hook_dissociate("playback begin", songchange_playback_begin);
+ hook_dissociate("playback end", songchange_playback_end);
+ hook_dissociate("playlist end reached", songchange_playlist_eof);
+ // hook_dissociate( "playlist set info" , songchange_playback_ttc);
+
+ if ( ttc_prevs != NULL )
+ {
+ if ( ttc_prevs->title != NULL ) g_free( ttc_prevs->title );
+ if ( ttc_prevs->filename != NULL ) g_free( ttc_prevs->filename );
+ g_free( ttc_prevs );
+ ttc_prevs = NULL;
+ }
+
+ g_free(cmd_line);
+ g_free(cmd_line_after);
+ g_free(cmd_line_end);
+ g_free(cmd_line_ttc);
+ cmd_line = NULL;
+ cmd_line_after = NULL;
+ cmd_line_end = NULL;
+ cmd_line_ttc = NULL;
+ signal(SIGCHLD, SIG_DFL);
 }
 
 static void save_and_close(gchar * cmd, gchar * cmd_after, gchar * cmd_end, gchar * cmd_ttc)
 {
-	mcs_handle_t *db;
+ aud_set_string("song_change", "cmd_line", cmd);
+ aud_set_string("song_change", "cmd_line_after", cmd_after);
+ aud_set_string("song_change", "cmd_line_end", cmd_end);
+ aud_set_string("song_change", "cmd_line_ttc", cmd_ttc);
 
-	db = aud_cfg_db_open();
-	aud_cfg_db_set_string(db, "song_change", "cmd_line", cmd);
-	aud_cfg_db_set_string(db, "song_change", "cmd_line_after", cmd_after);
-	aud_cfg_db_set_string(db, "song_change", "cmd_line_end", cmd_end);
-	aud_cfg_db_set_string(db, "song_change", "cmd_line_ttc", cmd_ttc);
-	aud_cfg_db_close(db);
+ if (cmd_line != NULL)
+ g_free(cmd_line);
 
-	if (cmd_line != NULL)
-		g_free(cmd_line);
+ cmd_line = g_strdup(cmd);
 
-	cmd_line = g_strdup(cmd);
+ if (cmd_line_after != NULL)
+ g_free(cmd_line_after);
 
-	if (cmd_line_after != NULL)
-		g_free(cmd_line_after);
+ cmd_line_after = g_strdup(cmd_after);
 
-	cmd_line_after = g_strdup(cmd_after);
+ if (cmd_line_end != NULL)
+ g_free(cmd_line_end);
 
-	if (cmd_line_end != NULL)
-		g_free(cmd_line_end);
+ cmd_line_end = g_strdup(cmd_end);
 
-	cmd_line_end = g_strdup(cmd_end);
+ if (cmd_line_ttc != NULL)
+ g_free(cmd_line_ttc);
 
-	if (cmd_line_ttc != NULL)
-		g_free(cmd_line_ttc);
-
-	cmd_line_ttc = g_strdup(cmd_ttc);
+ cmd_line_ttc = g_strdup(cmd_ttc);
 }
 
 static int check_command(char *command)
 {
-	const char *dangerous = "fns";
-	char *c;
-	int qu = 0;
-
-	for (c = command; *c != '\0'; c++)
-	{
-		if (*c == '"' && (c == command || *(c - 1) != '\\'))
-			qu = !qu;
-		else if (*c == '%' && !qu && strchr(dangerous, *(c + 1)))
-			return -1;
-	}
-	return 0;
+ const char *dangerous = "fns";
+ char *c;
+ int qu = 0;
+
+ for (c = command; *c != '\0'; c++)
+ {
+ if (*c == '"' && (c == command || *(c - 1) != '\\'))
+ qu = !qu;
+ else if (*c == '%' && !qu && strchr(dangerous, *(c + 1)))
+ return -1;
+ }
+ return 0;
 }
 
 static gboolean init (void)
 {
-	read_config();
+ read_config();
 
-	hook_associate("playback begin", songchange_playback_begin, NULL);
-	hook_associate("playback end", songchange_playback_end, NULL);
-	hook_associate("playlist end reached", songchange_playlist_eof, NULL);
+ hook_associate("playback begin", songchange_playback_begin, NULL);
+ hook_associate("playback end", songchange_playback_end, NULL);
+ hook_associate("playlist end reached", songchange_playlist_eof, NULL);
 
-	ttc_prevs = g_malloc0(sizeof(songchange_playback_ttc_prevs_t));
-	ttc_prevs->title = NULL;
-	ttc_prevs->filename = NULL;
-//	hook_associate( "playlist set info" , songchange_playback_ttc , ttc_prevs );
+ ttc_prevs = g_malloc0(sizeof(songchange_playback_ttc_prevs_t));
+ ttc_prevs->title = NULL;
+ ttc_prevs->filename = NULL;
+ // hook_associate( "playlist set info" , songchange_playback_ttc , ttc_prevs );
 
-	return TRUE;
+ return TRUE;
 }
 
-static void
-songchange_playback_begin(gpointer unused, gpointer unused2)
+static void songchange_playback_begin(gpointer unused, gpointer unused2)
 {
-	int pos;
-	char *current_file;
+ int pos;
+ char *current_file;
 
-	pos = aud_drct_pl_get_pos();
-	current_file = aud_drct_pl_get_file(pos);
+ pos = aud_drct_pl_get_pos();
+ current_file = aud_drct_pl_get_file(pos);
 
-	do_command(cmd_line, current_file, pos);
+ do_command(cmd_line, current_file, pos);
 
-	g_free(current_file);
+ g_free(current_file);
 }
 
-static void
-songchange_playback_end(gpointer unused, gpointer unused2)
+static void songchange_playback_end(gpointer unused, gpointer unused2)
 {
-	int pos;
-	char *current_file;
+ int pos;
+ char *current_file;
 
-	pos = aud_drct_pl_get_pos();
-	current_file = aud_drct_pl_get_file(pos);
+ pos = aud_drct_pl_get_pos();
+ current_file = aud_drct_pl_get_file(pos);
 
-	do_command(cmd_line_after, current_file, pos);
+ do_command(cmd_line_after, current_file, pos);
 
-	g_free(current_file);
+ g_free(current_file);
 }
 
 #if 0
-static void
+ static void
 songchange_playback_ttc(gpointer plentry_gp, gpointer prevs_gp)
 {
- if ( ( aud_ip_state->playing ) && ( strcmp(cmd_line_ttc,"") ) )
- {
- songchange_playback_ttc_prevs_t *prevs = prevs_gp;
- PlaylistEntry *pl_entry = plentry_gp;
+ if ( ( aud_ip_state->playing ) && ( strcmp(cmd_line_ttc,"") ) )
+ {
+ songchange_playback_ttc_prevs_t *prevs = prevs_gp;
+ PlaylistEntry *pl_entry = plentry_gp;
 
- /* same filename but title changed, useful to detect http stream song changes */
+ /* same filename but title changed, useful to detect http stream song changes */
 
- if ( ( prevs->title != NULL ) && ( prevs->filename != NULL ) )
- {
- if ( ( pl_entry->filename != NULL ) && ( !strcmp(pl_entry->filename,prevs->filename) ) )
- {
- if ( ( pl_entry->title != NULL ) && ( strcmp(pl_entry->title,prevs->title) ) )
+ if ( ( prevs->title != NULL ) && ( prevs->filename != NULL ) )
 {
- int pos = aud_drct_pl_get_pos();
- char *current_file = aud_drct_pl_get_file(pos);
- do_command(cmd_line_ttc, current_file, pos);
- g_free(current_file);
- g_free(prevs->title);
- prevs->title = g_strdup(pl_entry->title);
+ if ( ( pl_entry->filename != NULL ) && ( !strcmp(pl_entry->filename,prevs->filename) ) )
+ {
+ if ( ( pl_entry->title != NULL ) && ( strcmp(pl_entry->title,prevs->title) ) )
+ {
+ int pos = aud_drct_pl_get_pos();
+ char *current_file = aud_drct_pl_get_file(pos);
+ do_command(cmd_line_ttc, current_file, pos);
+ g_free(current_file);
+ g_free(prevs->title);
+ prevs->title = g_strdup(pl_entry->title);
+ }
+ }
+ else
+ {
+ g_free(prevs->filename);
+ prevs->filename = g_strdup(pl_entry->filename);
+ /* if filename changes, reset title as well */
+ if ( prevs->title != NULL )
+ g_free(prevs->title);
+ prevs->title = g_strdup(pl_entry->title);
+ }
+ }
+ else
+ {
+ if ( prevs->title != NULL )
+ g_free(prevs->title);
+ prevs->title = g_strdup(pl_entry->title);
+ if ( prevs->filename != NULL )
+ g_free(prevs->filename);
+ prevs->filename = g_strdup(pl_entry->filename);
 }
- }
- else
- {
- g_free(prevs->filename);
- prevs->filename = g_strdup(pl_entry->filename);
- /* if filename changes, reset title as well */
- if ( prevs->title != NULL )
- g_free(prevs->title);
- prevs->title = g_strdup(pl_entry->title);
- }
- }
- else
- {
- if ( prevs->title != NULL )
- g_free(prevs->title);
- prevs->title = g_strdup(pl_entry->title);
- if ( prevs->filename != NULL )
- g_free(prevs->filename);
- prevs->filename = g_strdup(pl_entry->filename);
 }
- }
 }
 #endif
 
-static void
-songchange_playlist_eof(gpointer unused, gpointer unused2)
+static void songchange_playlist_eof(gpointer unused, gpointer unused2)
 {
-	gint pos;
-	gchar *current_file;
+ gint pos;
+ gchar *current_file;
 
-	pos = aud_drct_pl_get_pos();
-	current_file = aud_drct_pl_get_file(pos);
+ pos = aud_drct_pl_get_pos();
+ current_file = aud_drct_pl_get_file(pos);
 
-	do_command(cmd_line_end, current_file, pos);
+ do_command(cmd_line_end, current_file, pos);
 
-	g_free(current_file);
+ g_free(current_file);
 }
 
 typedef struct {
@@ -435,62 +418,70 @@
 
 static void configure_ok_cb()
 {
-	char *cmd, *cmd_after, *cmd_end, *cmd_ttc;
-	cmd = g_strdup(config.cmd);
-	cmd_after = g_strdup(config.cmd_after);
-	cmd_end = g_strdup(config.cmd_end);
-	cmd_ttc = g_strdup(config.cmd_ttc);
-
-	if (check_command(cmd) < 0 || check_command(cmd_after) < 0 ||
-	 check_command(cmd_end) < 0 || check_command(cmd_ttc) < 0)
-	{
-		gtk_widget_show(cmd_warn_img);
-		gtk_widget_show(cmd_warn_label);
-	}
-	else
-	{
-		gtk_widget_hide(cmd_warn_img);
-		gtk_widget_hide(cmd_warn_label);
-		save_and_close(cmd, cmd_after, cmd_end, cmd_ttc);
-	}
-
-	g_free(cmd);
-	g_free(cmd_after);
-	g_free(cmd_end);
-	g_free(cmd_ttc);
+ char *cmd, *cmd_after, *cmd_end, *cmd_ttc;
+ cmd = g_strdup(config.cmd);
+ cmd_after = g_strdup(config.cmd_after);
+ cmd_end = g_strdup(config.cmd_end);
+ cmd_ttc = g_strdup(config.cmd_ttc);
+
+ if (check_command(cmd) < 0 || check_command(cmd_after) < 0 ||
+ check_command(cmd_end) < 0 || check_command(cmd_ttc) < 0)
+ {
+ gtk_widget_show(cmd_warn_img);
+ gtk_widget_show(cmd_warn_label);
+ }
+ else
+ {
+ gtk_widget_hide(cmd_warn_img);
+ gtk_widget_hide(cmd_warn_label);
+ save_and_close(cmd, cmd_after, cmd_end, cmd_ttc);
+ }
+
+ g_free(cmd);
+ g_free(cmd_after);
+ g_free(cmd_end);
+ g_free(cmd_ttc);
 }
 
 static PreferencesWidget elements[] = {
- {WIDGET_LABEL, N_("Command to run when Audacious starts a new song."), NULL, NULL, NULL, FALSE, {.label = {.single_line = TRUE}}},
- {WIDGET_ENTRY, N_("Command:"), &config.cmd, configure_ok_cb, NULL, FALSE, {.entry = {FALSE}}, VALUE_STRING},
- {WIDGET_SEPARATOR, NULL, NULL, NULL, NULL, FALSE, {.separator = {TRUE}}},
-
- {WIDGET_LABEL, N_("Command to run toward the end of a song."), NULL, NULL, NULL, FALSE, {.label = {.single_line = TRUE}}},
- {WIDGET_ENTRY, N_("Command:"), &config.cmd_after, configure_ok_cb, NULL, FALSE, {.entry = {FALSE}}, VALUE_STRING},
- {WIDGET_SEPARATOR, NULL, NULL, NULL, NULL, FALSE, {.separator = {TRUE}}},
-
- {WIDGET_LABEL, N_("Command to run when Audacious reaches the end of the playlist."), NULL, NULL, NULL, FALSE, {.label = {.single_line = TRUE}}},
- {WIDGET_ENTRY, N_("Command:"), &config.cmd_end, configure_ok_cb, NULL, FALSE, {.entry = {FALSE}}, VALUE_STRING},
- {WIDGET_SEPARATOR, NULL, NULL, NULL, NULL, FALSE, {.separator = {TRUE}}},
-
- {WIDGET_LABEL, N_("Command to run when title changes for a song (i.e. network streams titles)."), NULL, NULL, NULL, FALSE, {.label = {.single_line = TRUE}}},
- {WIDGET_ENTRY, N_("Command:"), &config.cmd_ttc, configure_ok_cb, NULL, FALSE, {.entry = {FALSE}}, VALUE_STRING},
- {WIDGET_SEPARATOR, NULL, NULL, NULL, NULL, FALSE, {.separator = {TRUE}}},
+ {WIDGET_LABEL, N_("Command to run when Audacious starts a new song."),
+ .data = {.label = {.single_line = TRUE}}},
+ {WIDGET_ENTRY, N_("Command:"), .cfg_type = VALUE_STRING,
+ .cfg = & config.cmd, .callback = configure_ok_cb},
+ {WIDGET_SEPARATOR, .data = {.separator = {TRUE}}},
+
+ {WIDGET_LABEL, N_("Command to run toward the end of a song."),
+ .data = {.label = {.single_line = TRUE}}},
+ {WIDGET_ENTRY, N_("Command:"), .cfg_type = VALUE_STRING,
+ .cfg = & config.cmd_after, .callback = configure_ok_cb},
+ {WIDGET_SEPARATOR, .data = {.separator = {TRUE}}},
+
+ {WIDGET_LABEL, N_("Command to run when Audacious reaches the end of the "
+ "playlist."), .data = {.label = {.single_line = TRUE}}},
+ {WIDGET_ENTRY, N_("Command:"), .cfg_type = VALUE_STRING,
+ .cfg = & config.cmd_end, .callback = configure_ok_cb},
+ {WIDGET_SEPARATOR, .data = {.separator = {TRUE}}},
+
+ {WIDGET_LABEL, N_("Command to run when title changes for a song (i.e. "
+ "network streams titles)."), .data = {.label = {.single_line = TRUE}}},
+ {WIDGET_ENTRY, N_("Command:"), .cfg_type = VALUE_STRING,
+ .cfg = & config.cmd_ttc, .callback = configure_ok_cb},
+ {WIDGET_SEPARATOR, .data = {.separator = {TRUE}}},
 
 {WIDGET_LABEL, N_("You can use the following format strings which\n"
- "will be substituted before calling the command\n"
- "(not all are useful for the end-of-playlist command).\n\n"
- "%F: Frequency (in hertz)\n"
- "%c: Number of channels\n"
- "%f: filename (full path)\n"
- "%l: length (in milliseconds)\n"
- "%n or %s: Song name\n"
- "%r: Rate (in bits per second)\n"
- "%t: Playlist position (%02d)\n"
- "%p: Currently playing (1 or 0)\n"
- "%a: Artist\n"
- "%b: Album\n"
- "%T: Track title"), NULL, NULL, NULL, FALSE},
+ "will be substituted before calling the command\n"
+ "(not all are useful for the end-of-playlist command).\n\n"
+ "%F: Frequency (in hertz)\n"
+ "%c: Number of channels\n"
+ "%f: filename (full path)\n"
+ "%l: length (in milliseconds)\n"
+ "%n or %s: Song name\n"
+ "%r: Rate (in bits per second)\n"
+ "%t: Playlist position (%02d)\n"
+ "%p: Currently playing (1 or 0)\n"
+ "%a: Artist\n"
+ "%b: Album\n"
+ "%T: Track title")},
 };
 
 /* static GtkWidget * custom_warning (void) */
@@ -515,16 +506,10 @@
 }
 
 static PreferencesWidget settings[] = {
- {WIDGET_BOX, N_("Commands"), NULL, NULL, NULL, FALSE,
- {.box = {elements, G_N_ELEMENTS(elements),
- FALSE, TRUE}}},
- {WIDGET_CUSTOM, NULL, NULL, NULL, NULL, FALSE, {.populate = custom_warning}},
-/* {WIDGET_LABEL, N_("Parameters passed to the shell should be encapsulated in quotes. Doing otherwise is a security risk."),
- NULL, NULL, NULL, FALSE, {.label = {"gtk-dialog-warning"}}},*/
-};
+ {WIDGET_BOX, N_("Commands"), .data = {.box = {elements, G_N_ELEMENTS (elements), .frame = TRUE}}},
+ {WIDGET_CUSTOM, .data = {.populate = custom_warning}}};
 
-static void
-configure_init(void)
+static void configure_init(void)
 {
 read_config();
 
@@ -534,8 +519,7 @@
 config.cmd_ttc = g_strdup(cmd_line_ttc);
 }
 
-static void
-configure_cleanup(void)
+static void configure_cleanup(void)
 {
 g_free(config.cmd);
 config.cmd = NULL;
@@ -553,7 +537,7 @@
 static PluginPreferences preferences = {
 .domain = PACKAGE,
 .title = N_("Song Change"),
-/* .imgurl = DATA_DIR "/images/plugins.png", */
+ /* .imgurl = DATA_DIR "/images/plugins.png", */
 .prefs = settings,
 .n_prefs = G_N_ELEMENTS(settings),
 .init = configure_init,

audacious-plugins-3.0.3.tar.bz2/src/statusicon/config.c -> audacious-plugins-3.1.tar.bz2/src/statusicon/config.c Changed

@@ -20,42 +20,37 @@
 *
 */
 
-#include <audacious/configdb.h>
+#include <audacious/misc.h>
 
 #include "statusicon.h"
 
+static const gchar * const si_defaults[] = {
+ "rclick_menu", "0", /* SI_CFG_RCLICK_MENU_SMALL1 */
+ "scroll_action", "0", /* SI_CFG_SCROLL_ACTION_VOLUME */
+ "volume_delta", "5",
+ "disable_popup", "FALSE",
+ "close_to_tray", "FALSE",
+ NULL};
+
 si_cfg_t si_cfg;
 
-void si_cfg_load(void)
+void si_cfg_load (void)
 {
- mcs_handle_t *cfgfile = aud_cfg_db_open();
-
- if (!aud_cfg_db_get_int(cfgfile, "statusicon", "rclick_menu", &(si_cfg.rclick_menu)))
- si_cfg.rclick_menu = SI_CFG_RCLICK_MENU_SMALL1;
-
- if (!aud_cfg_db_get_int(cfgfile, "statusicon", "scroll_action", &(si_cfg.scroll_action)))
- si_cfg.scroll_action = SI_CFG_SCROLL_ACTION_VOLUME;
-
- if (!aud_cfg_db_get_int(cfgfile, "audacious", "mouse_wheel_change", &(si_cfg.volume_delta)))
- si_cfg.volume_delta = 5;
+ aud_config_set_defaults ("statusicon", si_defaults);
 
- if (!aud_cfg_db_get_bool(cfgfile, "statusicon", "disable_popup", &(si_cfg.disable_popup)))
- si_cfg.disable_popup = FALSE;
-
- if (!aud_cfg_db_get_bool(cfgfile, "statusicon", "close_to_tray", &(si_cfg.close_to_tray)))
- si_cfg.close_to_tray = FALSE;
-
- aud_cfg_db_close(cfgfile);
+ si_cfg.rclick_menu = aud_get_int ("statusicon", "rclick_menu");
+ si_cfg.scroll_action = aud_get_int ("statusicon", "scroll_action");
+ si_cfg.volume_delta = aud_get_int ("statusicon", "volume_delta");
+ si_cfg.disable_popup = aud_get_bool ("statusicon", "disable_popup");
+ si_cfg.close_to_tray = aud_get_bool ("statusicon", "close_to_tray");
 }
 
 
-void si_cfg_save(void)
+void si_cfg_save (void)
 {
- mcs_handle_t *cfgfile = aud_cfg_db_open();
-
- aud_cfg_db_set_int(cfgfile, "statusicon", "rclick_menu", si_cfg.rclick_menu);
- aud_cfg_db_set_int(cfgfile, "statusicon", "scroll_action", si_cfg.scroll_action);
- aud_cfg_db_set_bool(cfgfile, "statusicon", "disable_popup", si_cfg.disable_popup);
- aud_cfg_db_set_bool(cfgfile, "statusicon", "close_to_tray", si_cfg.close_to_tray);
- aud_cfg_db_close(cfgfile);
+ aud_set_int ("statusicon", "rclick_menu", si_cfg.rclick_menu);
+ aud_set_int ("statusicon", "scroll_action", si_cfg.scroll_action);
+ aud_set_int ("statusicon", "volume_delta", si_cfg.volume_delta);
+ aud_set_bool ("statusicon", "disable_popup", si_cfg.disable_popup);
+ aud_set_bool ("statusicon", "close_to_tray", si_cfg.close_to_tray);
 }

audacious-plugins-3.0.3.tar.bz2/src/stereo_plugin/stereo.c -> audacious-plugins-3.1.tar.bz2/src/stereo_plugin/stereo.c Changed

@@ -1,13 +1,13 @@
 /* Extra Stereo Plugin for Audacious
 * Written by Johan Levin, 1999
- * Ported to new effect API by John Lindgren, 2009 */
+ * Modified by John Lindgren, 2009-2011 */
 
 #include "config.h"
 #include <gtk/gtk.h>
 
-#include <audacious/configdb.h>
 #include <audacious/gtk-compat.h>
 #include <audacious/i18n.h>
+#include <audacious/misc.h>
 #include <audacious/plugin.h>
 #include <libaudgui/libaudgui.h>
 #include <libaudgui/libaudgui-gtk.h>
@@ -38,6 +38,10 @@
 .preserves_format = TRUE,
 )
 
+static const gchar * const stereo_defaults[] = {
+ "intensity", "2.5",
+ NULL};
+
 static const char *about_text = N_("Extra Stereo Plugin\n\n"
 "By Johan Levin 1999.");
 
@@ -46,14 +50,9 @@
 
 static gboolean init (void)
 {
-	value = 2.5;
-
-	mcs_handle_t * db = aud_cfg_db_open ();
-	if (! db)
-		return TRUE;
+	aud_config_set_defaults ("extra_stereo", stereo_defaults);
+	value = aud_get_double ("extra_stereo", "intensity");
 
-	aud_cfg_db_get_double(db, "extra_stereo", "intensity", &value);
-	aud_cfg_db_close(db);
 	return TRUE;
 }
 
@@ -68,13 +67,7 @@
 static void conf_ok_cb (GtkButton * button, GtkAdjustment * adj)
 {
 	value = gtk_adjustment_get_value (adj);
-
-	mcs_handle_t * db = aud_cfg_db_open ();
-	if (db)
-	{
-		aud_cfg_db_set_double (db, "extra_stereo", "intensity", value);
-		aud_cfg_db_close (db);
-	}
+	aud_set_double ("extra_stereo", "intensity", value);
 
 	gtk_widget_destroy(conf_dialog);
 }

audacious-plugins-3.1.tar.bz2/src/streambrowser Added

audacious-plugins-3.1.tar.bz2/src/streambrowser/Makefile Added

audacious-plugins-3.1.tar.bz2/src/streambrowser/bookmarks.c Added

@@ -0,0 +1,177 @@
+/*
+ * Audacious Streambrowser Plugin
+ *
+ * Copyright (c) 2008 Calin Crisan <ccrisan@gmail.com>
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ */
+
+
+#include <string.h>
+#include <glib.h>
+
+#include <audacious/debug.h>
+#include <audacious/plugin.h>
+
+#include "streambrowser.h"
+#include "bookmarks.h"
+
+
+static bookmark_t **bookmarks;
+static int *bookmarks_count;
+
+gboolean bookmarks_streaminfo_fetch (category_t * category,
+ streaminfo_t * streaminfo)
+{
+ // todo: implement and make use of this
+
+ return FALSE;
+}
+
+gboolean bookmarks_category_fetch (streamdir_t * streamdir,
+ category_t * category)
+{
+ AUDDBG("bookmarks: filling category '%s'\n", category->name);
+
+ /* free/remove any existing streaminfos in this category */
+ while (streaminfo_get_count (category) > 0)
+ streaminfo_remove (category, streaminfo_get_by_index (category, 0));
+
+ int i;
+ /* find bookmarks that match this category */
+ for (i = 0; i < *bookmarks_count; i++)
+ if (strcmp ((*bookmarks)[i].streamdir_name, category->name) == 0)
+ {
+ AUDDBG("bookmarks: adding stream info for '%s/%s'\n",
+ streamdir->name, category->name);
+
+ streaminfo_t *streaminfo = streaminfo_new ((*bookmarks)[i].name,
+ (*bookmarks)[i].
+ playlist_url,
+ (*bookmarks)[i].url, "");
+ streaminfo_add (category, streaminfo);
+
+ AUDDBG("bookmarks: stream info added\n");
+ }
+
+ return TRUE;
+}
+
+streamdir_t *bookmarks_streamdir_fetch (bookmark_t ** p_bookmarks,
+ int *p_bookmarks_count)
+{
+ bookmarks = p_bookmarks;
+ bookmarks_count = p_bookmarks_count;
+
+ streamdir_t *streamdir = streamdir_new (BOOKMARKS_NAME);
+
+ AUDDBG("bookmarks: creating streaming directory for bookmarks\n");
+
+ category_t *category = category_new ("Shoutcast");
+ category_add (streamdir, category);
+
+ category = category_new ("Xiph");
+ category_add (streamdir, category);
+
+ AUDDBG("bookmarks: streaming directory successfuly created\n");
+
+ return streamdir;
+}
+
+void bookmark_add (bookmark_t * bookmark)
+{
+ AUDDBG
+ ("bookmarks: adding bookmark with streamdir = '%s', name = '%s', playlist_url = '%s', url = '%s'\n",
+ bookmark->streamdir_name, bookmark->name, bookmark->playlist_url,
+ bookmark->url);
+
+ int i;
+ for (i = 0; i < *bookmarks_count; i++)
+ if (strcmp ((*bookmarks)[i].name, bookmark->name) == 0)
+ {
+ AUDDBG
+ ("bookmarks: bookmark with name = '%s' already exists, skipping\n",
+ bookmark->name);
+ return;
+ }
+
+ *bookmarks =
+ realloc (*bookmarks, sizeof (bookmark_t) * ((*bookmarks_count) + 1));
+
+ strncpy ((*bookmarks)[*bookmarks_count].streamdir_name,
+ bookmark->streamdir_name, DEF_STRING_LEN);
+ strncpy ((*bookmarks)[*bookmarks_count].name, bookmark->name,
+ DEF_STRING_LEN);
+ strncpy ((*bookmarks)[*bookmarks_count].playlist_url,
+ bookmark->playlist_url, DEF_STRING_LEN);
+ strncpy ((*bookmarks)[*bookmarks_count].url, bookmark->url, DEF_STRING_LEN);
+
+ (*bookmarks_count)++;
+
+ AUDDBG("bookmarks: bookmark added, there are now %d bookmarks\n",
+ *bookmarks_count);
+
+ /* issue a configuration save for immediately saving the new added bookmark */
+ config_save ();
+}
+
+void bookmark_remove (gchar * name)
+{
+ AUDDBG("bookmarks: searching for bookmark with name = '%s'\n", name);
+
+ int pos = -1, i;
+
+ for (i = 0; i < *bookmarks_count; i++)
+ if (strcmp ((*bookmarks)[i].name, name) == 0)
+ {
+ pos = i;
+ break;
+ }
+
+ if (pos != -1)
+ {
+ AUDDBG
+ ("bookmarks: removing bookmark with streamdir = '%s', name = '%s', playlist_url = '%s', url = '%s'\n",
+ (*bookmarks)[i].streamdir_name, (*bookmarks)[i].name,
+ (*bookmarks)[i].playlist_url, (*bookmarks)[i].url);
+
+ for (i = pos; i < (*bookmarks_count) - 1; i++)
+ {
+ /* bookmarks[i] = bookmarks[i + 1] */
+
+ strncpy ((*bookmarks)[i].streamdir_name,
+ (*bookmarks)[i + 1].streamdir_name, DEF_STRING_LEN);
+ strncpy ((*bookmarks)[i].name, (*bookmarks)[i + 1].name,
+ DEF_STRING_LEN);
+ strncpy ((*bookmarks)[i].playlist_url,
+ (*bookmarks)[i + 1].playlist_url, DEF_STRING_LEN);
+ strncpy ((*bookmarks)[i].url, (*bookmarks)[i + 1].url,
+ DEF_STRING_LEN);
+ }
+
+ (*bookmarks_count)--;
+ if (*bookmarks_count > 0)
+ *bookmarks =
+ realloc (*bookmarks, sizeof (bookmark_t) * (*bookmarks_count));
+ else
+ *bookmarks = NULL;
+
+ AUDDBG("bookmarks: bookmark removed, there are now %d bookmarks\n",
+ *bookmarks_count);
+ }
+ else
+ failure ("bookmarks: cannot find a bookmark with name = '%s'\n", name);
+
+ /* issue a configuration save for immediately saving the remaining bookmarks */
+ config_save ();
+}

audacious-plugins-3.1.tar.bz2/src/streambrowser/bookmarks.h Added

@@ -0,0 +1,52 @@
+/*
+ * Audacious Streambrowser Plugin
+ *
+ * Copyright (c) 2008 Calin Crisan <ccrisan@gmail.com>
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ */
+
+
+#ifndef BOOKMARKS_H
+#define BOOKMARKS_H
+
+#include "streambrowser.h"
+#include "streamdir.h"
+
+#define BOOKMARKS_NAME				"Bookmarks"
+#define BOOKMARKS_ICON				DATA_DIR G_DIR_SEPARATOR_S "images" G_DIR_SEPARATOR_S "bookmarks.png"
+
+
+typedef struct
+{
+ gchar streamdir_name[DEF_STRING_LEN];
+
+ gchar name[DEF_STRING_LEN];
+ gchar playlist_url[DEF_STRING_LEN];
+ gchar url[DEF_STRING_LEN];
+}
+bookmark_t;
+
+
+gboolean bookmarks_streaminfo_fetch (category_t * category,
+ streaminfo_t * streaminfo);
+gboolean bookmarks_category_fetch (streamdir_t * streamdir,
+ category_t * category);
+streamdir_t *bookmarks_streamdir_fetch (bookmark_t ** p_bookmarks,
+ int *p_bookmarks_count);
+
+void bookmark_add (bookmark_t * bookmark);
+void bookmark_remove (gchar * name);
+
+
+#endif // BOOKMARKS_H

audacious-plugins-3.1.tar.bz2/src/streambrowser/gui Added

audacious-plugins-3.1.tar.bz2/src/streambrowser/gui/streambrowser_win.c Added

@@ -0,0 +1,649 @@
+
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <glib.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+
+#include "../streambrowser.h"
+#include "streambrowser_win.h"
+#include "../bookmarks.h"
+
+
+typedef struct {
+
+	streamdir_t*	streamdir;
+	GtkWidget*		table;
+	GtkWidget*		tree_view;
+
+} streamdir_gui_t;
+
+
+void					(* update_function) (streamdir_t *streamdir, category_t *category, streaminfo_t *streaminfo, gboolean add_to_playlist);
+
+static GtkWidget*		gtk_label_new_with_icon(gchar *icon_filename, gchar *label_text);
+static GtkWidget*		gtk_streamdir_tree_view_new();
+static GtkWidget*		gtk_streamdir_table_new(GtkWidget *tree_view);
+
+static gboolean			on_notebook_switch_page(GtkNotebook *notebook, GtkWidget *page, guint page_num, gpointer data);
+static gboolean			on_tree_view_cursor_changed(GtkTreeView *tree_view, gpointer data);
+static gboolean			on_add_button_clicked(GtkButton *button, gpointer data);
+static gboolean			on_bookmark_button_clicked(GtkButton *button, gpointer data);
+static gboolean			on_search_entry_key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data);
+static gboolean			on_tree_view_key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data);
+static gboolean			on_tree_view_button_pressed(GtkWidget *widget, GdkEventButton *event, gpointer data);
+
+static streamdir_gui_t*	find_streamdir_gui_by_name(gchar *name);
+static streamdir_gui_t*	find_streamdir_gui_by_table(GtkTable *table);
+static streamdir_gui_t*	find_streamdir_gui_by_streamdir(streamdir_t *streamdir);
+static gboolean			tree_view_search_equal_func(GtkTreeModel *model, gint column, const gchar *key, GtkTreeIter *iter, gpointer data);
+
+GtkWidget*		notebook;
+static GtkWidget*		search_entry;
+static GtkWidget*		add_button;
+static GtkWidget*		bookmark_button;
+static GList*			streamdir_gui_list = NULL;
+static GtkCellRenderer*	cell_renderer_pixbuf;
+static GtkCellRenderer*	cell_renderer_text;
+
+static gboolean			tree_view_button_pressed = FALSE;
+
+static void list_cleanup (void)
+{
+ g_mutex_lock (update_streamdir_mutex);
+ 
+	GList * node;
+	for (node = streamdir_gui_list; node; node = node->next)
+	{
+		streamdir_gui_t * gui = node->data;
+		streamdir_delete (gui->streamdir);
+		memset (gui, 0, sizeof gui);
+		g_free (gui);
+	}
+
+	g_list_free (streamdir_gui_list);
+	streamdir_gui_list = NULL;
+	
+	g_mutex_unlock (update_streamdir_mutex);
+}
+
+GtkWidget *streambrowser_win_init()
+{
+	/* notebook */
+	notebook = gtk_notebook_new();
+	g_signal_connect(G_OBJECT(notebook), "switch-page", G_CALLBACK(on_notebook_switch_page), NULL);
+	gtk_widget_show_all(notebook);
+
+	GtkWidget *search_label = gtk_label_new(_("Search:"));
+	gtk_widget_show(search_label);
+
+	/* search entry */
+	search_entry = gtk_entry_new();
+	g_signal_connect(G_OBJECT(search_entry), "key-press-event", G_CALLBACK(on_search_entry_key_pressed), NULL);
+	gtk_widget_show(search_entry);
+
+	GtkWidget *hbox1 = gtk_hbox_new(FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(hbox1), search_label, FALSE, TRUE, 3);
+	gtk_box_pack_start(GTK_BOX(hbox1), search_entry, TRUE, TRUE, 3);
+	gtk_widget_show(hbox1);
+
+	/* add button */
+	add_button = gtk_button_new_from_stock(GTK_STOCK_ADD);
+	g_signal_connect(G_OBJECT(add_button), "clicked", G_CALLBACK(on_add_button_clicked), NULL);
+	gtk_widget_show(add_button);
+
+	/* bookmark button */
+	bookmark_button = gtk_button_new_with_label(_("Add Bookmark"));
+	gtk_button_set_image(GTK_BUTTON(bookmark_button), gtk_image_new_from_file(BOOKMARKS_ICON));
+	g_signal_connect(G_OBJECT(bookmark_button), "clicked", G_CALLBACK(on_bookmark_button_clicked), NULL);
+	gtk_widget_show(bookmark_button);
+
+	GtkWidget *vbox1 = gtk_vbox_new(FALSE, 4);
+	gtk_box_pack_start(GTK_BOX(vbox1), notebook, TRUE, TRUE, 0);
+	gtk_box_pack_start(GTK_BOX(vbox1), hbox1, FALSE, TRUE, 0);
+	gtk_box_pack_start(GTK_BOX(vbox1), add_button, FALSE, TRUE, 0);
+	gtk_box_pack_start(GTK_BOX(vbox1), bookmark_button, FALSE, TRUE, 0);
+	gtk_widget_show(vbox1);
+
+	/* others */
+	cell_renderer_pixbuf = gtk_cell_renderer_pixbuf_new();
+	cell_renderer_text = gtk_cell_renderer_text_new();
+
+ g_signal_connect (vbox1, "destroy", (GCallback) list_cleanup, NULL);
+	return vbox1;
+}
+
+void streambrowser_win_set_streamdir(streamdir_t *streamdir, gchar *icon_filename)
+{
+	GtkWidget *tree_view = NULL;
+
+	/* search for an old instance of this streamdir and replace it */
+	streamdir_gui_t *streamdir_gui = find_streamdir_gui_by_name(streamdir->name);
+	if (streamdir_gui != NULL) {
+		streamdir_delete(streamdir_gui->streamdir);
+		streamdir_gui->streamdir = streamdir;
+		tree_view = streamdir_gui->tree_view;
+	}
+	/* if no older instance of this streamdir has been found, we add a brand new one */
+	else {
+		streamdir_gui = g_malloc(sizeof(streamdir_gui_t));
+
+		tree_view = gtk_streamdir_tree_view_new();
+
+		GtkWidget *table = gtk_streamdir_table_new(tree_view);
+		gtk_widget_show_all(table);
+
+		GtkWidget *label = gtk_label_new_with_icon(icon_filename, streamdir->name);
+		gtk_widget_show_all(label);
+
+		streamdir_gui->streamdir = streamdir;
+		streamdir_gui->tree_view = tree_view;
+		streamdir_gui->table = table;
+
+		streamdir_gui_list = g_list_append(streamdir_gui_list, streamdir_gui);
+
+		gtk_notebook_append_page(GTK_NOTEBOOK(notebook), table, label);
+
+		gtk_widget_show_all(notebook);
+	}
+
+	/* fill the tree with categories */
+	GtkTreeIter iter;
+	GtkTreeStore *store = GTK_TREE_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(tree_view)));
+
+	gtk_tree_store_clear(store);
+
+	int i, count = category_get_count(streamdir);
+	category_t *category;
+	for (i = 0; i < count; i++) {
+		category = category_get_by_index(streamdir, i);
+
+		gtk_tree_store_append(store, &iter, NULL);
+		gtk_tree_store_set(store, &iter, 0, "gtk-directory", 1, category->name, 2, "", 3, PANGO_WEIGHT_NORMAL, -1);
+	}
+}
+
+void streambrowser_win_set_category(streamdir_t *streamdir, category_t *category)
+{
+	streamdir_gui_t *streamdir_gui = find_streamdir_gui_by_name(streamdir->name);
+	if (streamdir_gui == NULL) {
+		failure("gui: streambrowser_win_set_category() called with non-existent streamdir\n");
+		return;
+	}
+
+	GtkTreeView *tree_view = GTK_TREE_VIEW(streamdir_gui->tree_view);
+	GtkTreeStore *store = GTK_TREE_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(tree_view)));
+	GtkTreePath *path;
+	GtkTreeIter iter, new_iter;
+
+	/* clear all the previously added streaminfo in this category */
+	path = gtk_tree_path_new_from_indices(category_get_index(streamdir, category), 0, -1);
+	if (gtk_tree_model_get_iter(GTK_TREE_MODEL(store), &iter, path)) {
+		while (gtk_tree_store_remove(store, &iter))
+			;
+	}
+
+	/* find the corresponding category tree iter */
+	path = gtk_tree_path_new_from_indices(category_get_index(streamdir, category), -1);
+	if (!gtk_tree_model_get_iter(GTK_TREE_MODEL(store), &iter, path))
+		return;
+
+	/* append the new streaminfos to the current category / iter */
+	int i, count = streaminfo_get_count(category);
+	streaminfo_t *streaminfo;
+	for (i = 0; i < count; i++) {
+		streaminfo = streaminfo_get_by_index(category, i);
+
+		gtk_tree_store_append(store, &new_iter, &iter);
+		gtk_tree_store_set(store, &new_iter, 0, "gtk-media-play", 1, streaminfo->name, 2, streaminfo->current_track, 3, PANGO_WEIGHT_NORMAL, -1);
+	}
+
+	gtk_tree_path_free(path);
+}
+
+void streambrowser_win_set_streaminfo(streamdir_t *streamdir, category_t *category, streaminfo_t *streaminfo)
+{
+	streamdir_gui_t *streamdir_gui = find_streamdir_gui_by_name(streamdir->name);
+	if (streamdir_gui == NULL) {
+		failure("gui: streambrowser_win_set_category() called with non-existent streamdir\n");
+		return;
+	}
+
+	GtkTreeView *tree_view = GTK_TREE_VIEW(streamdir_gui->tree_view);
+	GtkTreeStore *store = GTK_TREE_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(tree_view)));
+	GtkTreePath *path;
+	GtkTreeIter iter;
+
+	/* find the corresponding streaminfo tree iter */
+	path = gtk_tree_path_new_from_indices(category_get_index(streamdir, category), streaminfo_get_index(category, streaminfo), -1);
+	if (!gtk_tree_model_get_iter(GTK_TREE_MODEL(store), &iter, path))
+		return;
+
+	/* update the streaminfo*/
+	gtk_tree_store_set(store, &iter, 0, "gtk-media-play", 1, streaminfo->name, 2, streaminfo->current_track, 3, PANGO_WEIGHT_NORMAL, -1);
+
+	gtk_tree_path_free(path);
+}
+
+void streambrowser_win_set_update_function(void (*function) (streamdir_t *streamdir, category_t *category, streaminfo_t *streaminfo, gboolean add_to_playlist))
+{
+	update_function = function;
+}
+
+void streambrowser_win_set_category_state(streamdir_t *streamdir, category_t *category, gboolean fetching)
+{
+	streamdir_gui_t *streamdir_gui = find_streamdir_gui_by_streamdir(streamdir);
+	if (streamdir_gui == NULL) {
+		failure("gui: streambrowser_win_set_category() called with non-existent streamdir\n");
+		return;
+	}
+
+	GtkTreeView *tree_view = GTK_TREE_VIEW(streamdir_gui->tree_view);
+	GtkTreeStore *store = GTK_TREE_STORE(gtk_tree_view_get_model(tree_view));
+	GtkTreePath *path;
+	GtkTreeIter iter;
+
+	/* find the corresponding category tree iter */
+	path = gtk_tree_path_new_from_indices(category_get_index(streamdir, category), -1);
+	if (!gtk_tree_model_get_iter(GTK_TREE_MODEL(store), &iter, path))
+		return;
+
+	if (fetching) {
+		gtk_tree_store_set(store, &iter, 0, "gtk-refresh", 1, category->name, 2, "", 3, PANGO_WEIGHT_BOLD, -1);
+	}
+	else {
+		gtk_tree_store_set(store, &iter, 0, "gtk-directory", 1, category->name, 2, "", 3, PANGO_WEIGHT_NORMAL, -1);
+
+		/* we also expand the corresponding category tree element in the treeview */
+		gtk_tree_view_expand_row(tree_view, path, FALSE);
+	}
+}
+
+void streambrowser_win_set_streaminfo_state(streamdir_t *streamdir, category_t *category, streaminfo_t *streaminfo, gboolean fetching)
+{
+	streamdir_gui_t *streamdir_gui = find_streamdir_gui_by_streamdir(streamdir);
+	GtkTreeView *tree_view = GTK_TREE_VIEW(streamdir_gui->tree_view);
+	GtkTreeStore *store = GTK_TREE_STORE(gtk_tree_view_get_model(tree_view));
+	GtkTreePath *path;
+	GtkTreeIter iter;
+
+	/* find the corresponding category tree iter */
+	path = gtk_tree_path_new_from_indices(category_get_index(streamdir, category), streaminfo_get_index(category, streaminfo), -1);
+	if (!gtk_tree_model_get_iter(GTK_TREE_MODEL(store), &iter, path))
+		return;
+
+	if (fetching) {
+		gtk_tree_store_set(store, &iter, 0, "gtk-media-play", 1, streaminfo->name, 2, streaminfo->current_track, 3, PANGO_WEIGHT_BOLD, -1);
+	}
+	else {
+		gtk_tree_store_set(store, &iter, 0, "gtk-media-play", 1, streaminfo->name, 2, streaminfo->current_track, 3, PANGO_WEIGHT_NORMAL, -1);
+	}
+}
+
+static GtkWidget* gtk_label_new_with_icon(gchar *icon_filename, gchar *label_text)
+{
+	GtkWidget *hbox = gtk_hbox_new(FALSE, 1);
+	GtkWidget *label = gtk_label_new(label_text);
+	GtkWidget *icon = gtk_image_new_from_file(icon_filename);
+
+	gtk_box_pack_start(GTK_BOX(hbox), icon, FALSE, TRUE, 0);
+	gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0);
+
+	return hbox;
+}
+
+static GtkWidget *gtk_streamdir_tree_view_new()
+{
+	GtkWidget *tree_view = gtk_tree_view_new();
+
+	GtkTreeStore *store = gtk_tree_store_new(4, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT);
+	gtk_tree_view_set_model(GTK_TREE_VIEW(tree_view), GTK_TREE_MODEL(store));
+
+	gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(tree_view), TRUE);
+#if GTK_CHECK_VERSION (2, 10, 0)
+	gtk_tree_view_set_search_entry(GTK_TREE_VIEW(tree_view), GTK_ENTRY(search_entry));
+#endif
+	gtk_tree_view_set_search_equal_func(GTK_TREE_VIEW(tree_view), tree_view_search_equal_func, NULL, NULL);
+	gtk_tree_view_set_search_column(GTK_TREE_VIEW(tree_view), 1);
+	g_signal_connect(G_OBJECT(tree_view), "key-press-event", G_CALLBACK(on_tree_view_key_pressed), NULL);
+	g_signal_connect(G_OBJECT(tree_view), "cursor-changed", G_CALLBACK(on_tree_view_cursor_changed), NULL);
+	g_signal_connect(G_OBJECT(tree_view), "button-press-event", G_CALLBACK(on_tree_view_button_pressed), NULL);
+
+	GtkTreeViewColumn *column = gtk_tree_view_column_new();
+	gtk_tree_view_column_pack_start(column, cell_renderer_pixbuf, TRUE);
+	gtk_tree_view_column_add_attribute(column, cell_renderer_pixbuf, "stock-id", 0);
+	gtk_tree_view_column_set_resizable(column, TRUE);
+	gtk_tree_view_append_column(GTK_TREE_VIEW(tree_view), column);
+
+	column = gtk_tree_view_column_new();
+	gtk_tree_view_column_pack_start(column, cell_renderer_text, TRUE);
+	gtk_tree_view_column_add_attribute(column, cell_renderer_text, "text", 1);
+	gtk_tree_view_column_add_attribute(column, cell_renderer_text, "weight", 3);
+	gtk_tree_view_column_set_resizable(column, TRUE);
+	gtk_tree_view_column_set_title(column, _("Stream name"));
+	gtk_tree_view_append_column(GTK_TREE_VIEW(tree_view), column);
+
+	column = gtk_tree_view_column_new();
+	gtk_tree_view_column_pack_start(column, cell_renderer_text, TRUE);
+	gtk_tree_view_column_add_attribute(column, cell_renderer_text, "text", 2);
+	gtk_tree_view_column_set_resizable(column, TRUE);
+	gtk_tree_view_column_set_title(column, _("Now playing"));
+	gtk_tree_view_append_column(GTK_TREE_VIEW(tree_view), column);
+
+	return tree_view;
+}
+
+static GtkWidget* gtk_streamdir_table_new(GtkWidget *tree_view)
+{
+	GtkWidget *scrolled_window = gtk_scrolled_window_new(NULL, NULL);
+	gtk_container_add(GTK_CONTAINER(scrolled_window), tree_view);
+
+	GtkWidget *table = gtk_table_new(1, 1, FALSE);
+	gtk_table_attach(GTK_TABLE(table), scrolled_window, 0, 1, 0, 1, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+
+	return table;
+}
+
+static gboolean on_notebook_switch_page(GtkNotebook *notebook, GtkWidget *page, guint page_num, gpointer data)
+{
+	/* only enable searching in the current tree (tab) */
+
+	streamdir_gui_t *streamdir_gui;
+	int i;
+
+	for (i = 0; i < g_list_length(streamdir_gui_list); i++) {
+		streamdir_gui = g_list_nth_data(streamdir_gui_list, i);
+
+		if (i == page_num)
+			gtk_tree_view_set_search_column(GTK_TREE_VIEW(streamdir_gui->tree_view), 1);
+		else
+			gtk_tree_view_set_search_column(GTK_TREE_VIEW(streamdir_gui->tree_view), -1);
+	}
+
+	/* clear the search box */
+	gtk_entry_set_text(GTK_ENTRY(search_entry), "");
+
+	/* if this is the last page, aka the bookmarks page, bookmark button has to say "Remove bookmark", instead of "Add bookmark"0 */
+	if (page_num == gtk_notebook_get_n_pages(notebook) - 1) {
+		gtk_button_set_label(GTK_BUTTON(bookmark_button), _("Remove Bookmark"));
+	}
+	else {
+		gtk_button_set_label(GTK_BUTTON(bookmark_button), _("Add Bookmark"));
+	}
+
+	return TRUE;
+}
+
+
+static gboolean on_tree_view_cursor_changed(GtkTreeView *tree_view, gpointer data)
+{
+	/* only do the refresh if this cursor change occured due to a mouse click */
+	if (!tree_view_button_pressed)
+		return FALSE;
+
+	tree_view_button_pressed = FALSE;
+
+	GtkTreePath *path;
+	GtkTreeViewColumn *focus_column;
+
+	/* get the currently selected tree view */
+	GtkWidget *table = gtk_notebook_get_nth_page(GTK_NOTEBOOK(notebook), gtk_notebook_get_current_page(GTK_NOTEBOOK(notebook)));
+	streamdir_gui_t *streamdir_gui = find_streamdir_gui_by_table(GTK_TABLE(table));
+	if (streamdir_gui == NULL)
+		return FALSE;
+
+	/* get the currently selected path in the tree */
+	gtk_tree_view_get_cursor(tree_view, &path, &focus_column);
+
+	if (path == NULL || gtk_tree_path_get_depth(path) == 0)
+		return FALSE;
+
+	gint *indices = gtk_tree_path_get_indices(path);
+	int category_index = indices[0];
+	streamdir_t *streamdir = streamdir_gui->streamdir;
+	category_t *category = category_get_by_index(streamdir_gui->streamdir, category_index);
+
+	/* if the selected item is a category */
+	if (gtk_tree_path_get_depth(path) == 1) {
+		if (!gtk_tree_view_row_expanded(tree_view, path)) {
+			gtk_entry_set_text(GTK_ENTRY(search_entry), "");
+			update_function(streamdir, category, NULL, FALSE);
+		}
+
+		gtk_tree_path_free(path);
+	}
+	/* if the selected item is a streaminfo */
+	else {
+		int streaminfo_index = indices[1];
+
+		gtk_tree_path_free(path);
+
+		/* get the currently selected stream (info) */
+		streaminfo_t *streaminfo = streaminfo_get_by_index(category, streaminfo_index);
+
+		gtk_entry_set_text(GTK_ENTRY(search_entry), "");
+		update_function(streamdir, category, streaminfo, FALSE);
+	}
+
+	return FALSE;
+}
+
+static gboolean on_tree_view_button_pressed(GtkWidget *widget, GdkEventButton *event, gpointer data)
+{
+	/* double click adds the currently selected stream to the playlist */
+	if (event->type == GDK_2BUTTON_PRESS) {
+		tree_view_button_pressed = FALSE;
+		on_add_button_clicked(NULL, NULL);
+	}
+	/* single click triggers a refresh of the selected item */
+	else {
+		tree_view_button_pressed = TRUE;
+	}
+
+	return FALSE;
+}
+
+static gboolean on_add_button_clicked(GtkButton *button, gpointer data)
+{
+	GtkTreePath *path;
+	GtkTreeViewColumn *focus_column;
+
+	/* get the currently selected tree view */
+	GtkWidget *table = gtk_notebook_get_nth_page(GTK_NOTEBOOK(notebook), gtk_notebook_get_current_page(GTK_NOTEBOOK(notebook)));
+	streamdir_gui_t *streamdir_gui = find_streamdir_gui_by_table(GTK_TABLE(table));
+	if (streamdir_gui == NULL)
+		return TRUE;
+
+	GtkTreeView *tree_view = GTK_TREE_VIEW(streamdir_gui->tree_view);
+
+	/* get the currently selected path in the tree */
+	gtk_tree_view_get_cursor(tree_view, &path, &focus_column);
+
+	if (path == NULL)
+		return TRUE;
+
+	gint *indices = gtk_tree_path_get_indices(path);
+	if (gtk_tree_path_get_depth(path) == 1) {
+		if (gtk_tree_view_row_expanded(tree_view, path))
+			gtk_tree_view_collapse_row(tree_view, path);
+		else
+			gtk_tree_view_expand_row(tree_view, path, FALSE);
+
+		gtk_tree_path_free(path);
+		return TRUE;
+	}
+
+	int category_index = indices[0];
+	int streaminfo_index = indices[1];
+
+	gtk_tree_path_free(path);
+
+	/* get the currently selected stream (info) */
+	streamdir_t *streamdir = streamdir_gui->streamdir;
+	category_t *category = category_get_by_index(streamdir_gui->streamdir, category_index);
+	streaminfo_t *streaminfo = streaminfo_get_by_index(category, streaminfo_index);
+
+	gtk_entry_set_text(GTK_ENTRY(search_entry), "");
+	update_function(streamdir, category, streaminfo, TRUE);
+
+	return TRUE;
+}
+
+static gboolean on_bookmark_button_clicked(GtkButton *button, gpointer data)
+{
+	GtkTreePath *path;
+	GtkTreeViewColumn *focus_column;
+
+	/* get the currently selected tree view */
+	GtkWidget *table = gtk_notebook_get_nth_page(GTK_NOTEBOOK(notebook), gtk_notebook_get_current_page(GTK_NOTEBOOK(notebook)));
+	streamdir_gui_t *streamdir_gui = find_streamdir_gui_by_table(GTK_TABLE(table));
+	if (streamdir_gui == NULL)
+		return TRUE;
+
+	GtkTreeView *tree_view = GTK_TREE_VIEW(streamdir_gui->tree_view);
+
+	/* get the currently selected path in the tree */
+	gtk_tree_view_get_cursor(tree_view, &path, &focus_column);
+
+	if (path == NULL)
+		return TRUE;
+
+	gint *indices = gtk_tree_path_get_indices(path);
+	if (gtk_tree_path_get_depth(path) == 1) {
+		gtk_tree_path_free(path);
+		return TRUE;
+	}
+
+	int category_index = indices[0];
+	int streaminfo_index = indices[1];
+
+	gtk_tree_path_free(path);
+
+	/* get the currently selected stream (info) */
+	streamdir_t *streamdir = streamdir_gui->streamdir;
+	category_t *category = category_get_by_index(streamdir_gui->streamdir, category_index);
+	streaminfo_t *streaminfo = streaminfo_get_by_index(category, streaminfo_index);
+
+	/* if we have the bookmarks tab focused, we remove the stream, rather than add it. otherwise we simply add it */
+	if (strcmp(streamdir->name, BOOKMARKS_NAME) == 0) {
+		bookmark_remove(streaminfo->name);
+
+		update_function(streamdir, category, NULL, FALSE);
+	}
+	else {
+		bookmark_t bookmark;
+		strncpy(bookmark.streamdir_name, streamdir->name, DEF_STRING_LEN);
+		strncpy(bookmark.name, streaminfo->name, DEF_STRING_LEN);
+		strncpy(bookmark.playlist_url, streaminfo->playlist_url, DEF_STRING_LEN);
+		strncpy(bookmark.url, streaminfo->url, DEF_STRING_LEN);
+
+		bookmark_add(&bookmark);
+
+		/* find the corresponding category (having the current streamdir name) in the bookmarks */
+		streamdir_t *bookmarks_streamdir = find_streamdir_gui_by_name(BOOKMARKS_NAME)->streamdir;
+		category_t *bookmarks_category = category_get_by_name(bookmarks_streamdir, streamdir->name);
+
+		update_function(bookmarks_streamdir, bookmarks_category, NULL, FALSE);
+	}
+
+	return TRUE;
+}
+
+static gboolean on_search_entry_key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
+{
+	if (event->keyval == GDK_KEY_Return || event->keyval == GDK_KEY_KP_Enter) {
+		on_add_button_clicked(GTK_BUTTON(add_button), NULL);
+		return TRUE;
+	}
+
+	if (event->keyval == GDK_KEY_Escape) {
+		gtk_entry_set_text(GTK_ENTRY(search_entry), "");
+		return FALSE;
+	}
+
+	return FALSE;
+}
+
+static gboolean on_tree_view_key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
+{
+	if (event->keyval == GDK_KEY_Down || event->keyval == GDK_KEY_Up)
+		return FALSE;
+	else
+		if (event->keyval == GDK_KEY_Return || event->keyval == GDK_KEY_KP_Enter) {
+			on_add_button_clicked(GTK_BUTTON(add_button), NULL);
+			return FALSE;
+		}
+
+	gtk_widget_grab_focus(search_entry);
+	on_search_entry_key_pressed(widget, event, data);
+
+	return TRUE;
+}
+
+static streamdir_gui_t *find_streamdir_gui_by_name(gchar *name)
+{
+	GList *iterator;
+	streamdir_gui_t *streamdir_gui;
+
+	for (iterator = g_list_first(streamdir_gui_list); iterator != NULL; iterator = g_list_next(iterator)) {
+		streamdir_gui = iterator->data;
+
+		if (strcmp(streamdir_gui->streamdir->name, name) == 0)
+			return streamdir_gui;
+	}
+
+	return NULL;
+}
+
+static streamdir_gui_t *find_streamdir_gui_by_table(GtkTable *table)
+{
+	GList *iterator;
+	streamdir_gui_t *streamdir_gui;
+
+	for (iterator = g_list_first(streamdir_gui_list); iterator != NULL; iterator = g_list_next(iterator)) {
+		streamdir_gui = iterator->data;
+
+		if ((void *) streamdir_gui->table == (void *) table)
+			return streamdir_gui;
+	}
+
+	return NULL;
+}
+
+static streamdir_gui_t* find_streamdir_gui_by_streamdir(streamdir_t *streamdir)
+{
+	GList *iterator;
+	streamdir_gui_t *streamdir_gui;
+
+	for (iterator = g_list_first(streamdir_gui_list); iterator != NULL; iterator = g_list_next(iterator)) {
+		streamdir_gui = iterator->data;
+
+		if ((void *) streamdir_gui->streamdir == (void *) streamdir)
+			return streamdir_gui;
+	}
+
+	return NULL;
+}
+
+static gboolean tree_view_search_equal_func(GtkTreeModel *model, gint column, const gchar *key, GtkTreeIter *iter, gpointer data)
+{
+	if (column == -1)
+		return TRUE;
+
+	GValue value = {0, };
+	gboolean ret;
+
+	gtk_tree_model_get_value(model, iter, column, &value);
+	const gchar *string = g_value_get_string(&value);
+
+	if (string == NULL || string[0] == '\0' || key == NULL || key[0] == '\0')
+		ret = TRUE;
+
+	ret = !mystrcasestr(string, key);
+
+	g_value_unset(&value);
+
+	return ret;
+}
+

audacious-plugins-3.1.tar.bz2/src/streambrowser/gui/streambrowser_win.h Added

audacious-plugins-3.1.tar.bz2/src/streambrowser/images Added

audacious-plugins-3.1.tar.bz2/src/streambrowser/images/bookmarks.png Added

audacious-plugins-3.1.tar.bz2/src/streambrowser/images/shoutcast.png Added

audacious-plugins-3.1.tar.bz2/src/streambrowser/images/streambrowser-16x16.png Added

audacious-plugins-3.1.tar.bz2/src/streambrowser/images/streambrowser-64x64.png Added

audacious-plugins-3.1.tar.bz2/src/streambrowser/images/streambrowser.svg Added

@@ -0,0 +1,251 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ version="1.1"
+ width="128px"
+ height="128px"
+ id="RSSicon"
+ viewBox="0 0 256 256"
+ sodipodi:version="0.32"
+ inkscape:version="0.46"
+ sodipodi:docname="Feed-icon.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <metadata
+ id="metadata33">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <sodipodi:namedview
+ inkscape:window-height="967"
+ inkscape:window-width="1225"
+ inkscape:pageshadow="2"
+ inkscape:pageopacity="0.0"
+ guidetolerance="10.0"
+ gridtolerance="10.0"
+ objecttolerance="10.0"
+ borderopacity="1.0"
+ bordercolor="#666666"
+ pagecolor="#ffffff"
+ id="base"
+ showgrid="false"
+ inkscape:zoom="1.9296875"
+ inkscape:cx="153.86031"
+ inkscape:cy="-44.300212"
+ inkscape:window-x="455"
+ inkscape:window-y="57"
+ inkscape:current-layer="RSSicon" />
+ <defs
+ id="defs3">
+ <linearGradient
+ id="linearGradient3744">
+ <stop
+ style="stop-color:#3c5aa0;stop-opacity:1;"
+ offset="0"
+ id="stop3746" />
+ <stop
+ id="stop3752"
+ offset="0.2962963"
+ style="stop-color:#5979c1;stop-opacity:1;" />
+ <stop
+ style="stop-color:#243660;stop-opacity:1;"
+ offset="1"
+ id="stop3748" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3210">
+ <stop
+ style="stop-color:#ff7326;stop-opacity:1;"
+ offset="0"
+ id="stop3212" />
+ <stop
+ id="stop3218"
+ offset="1"
+ style="stop-color:#ff7426;stop-opacity:1;" />
+ </linearGradient>
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 64 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="128 : 64 : 1"
+ inkscape:persp3d-origin="64 : 42.666667 : 1"
+ id="perspective35" />
+ <linearGradient
+ x1="0.085000001"
+ y1="0.085000001"
+ x2="0.91500002"
+ y2="0.91500002"
+ id="RSSg"
+ xlink:href="#linearGradient3210">
+ <stop
+ offset="0"
+ stop-color="#DE642B"
+ id="stop16"
+ style="stop-color:#768bc7;stop-opacity:1;" />
+ <stop
+ offset="1"
+ stop-color="#D95B29"
+ id="stop18"
+ style="stop-color:#3c5aa0;stop-opacity:1;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3210"
+ id="linearGradient3216"
+ x1="44"
+ y1="125.5"
+ x2="219"
+ y2="125.5"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3210"
+ id="linearGradient3226"
+ x1="44"
+ y1="155"
+ x2="160"
+ y2="155"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3210"
+ id="linearGradient3234"
+ x1="44"
+ y1="189"
+ x2="92"
+ y2="189"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3210"
+ id="linearGradient3275"
+ gradientUnits="userSpaceOnUse"
+ x1="44"
+ y1="189"
+ x2="92"
+ y2="189" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3210"
+ id="linearGradient3277"
+ gradientUnits="userSpaceOnUse"
+ x1="44"
+ y1="155"
+ x2="160"
+ y2="155" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3210"
+ id="linearGradient3279"
+ gradientUnits="userSpaceOnUse"
+ x1="44"
+ y1="125.5"
+ x2="219"
+ y2="125.5" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3744"
+ id="linearGradient3750"
+ x1="23.191692"
+ y1="29.795177"
+ x2="234.27405"
+ y2="226.20482"
+ gradientUnits="userSpaceOnUse" />
+ <filter
+ inkscape:collect="always"
+ id="filter3758">
+ <feGaussianBlur
+ inkscape:collect="always"
+ stdDeviation="4.1217132"
+ id="feGaussianBlur3760" />
+ </filter>
+ </defs>
+ <rect
+ width="256"
+ height="256"
+ rx="55"
+ ry="55"
+ x="0"
+ y="0"
+ id="rect20"
+ style="fill:#2f477d;fill-opacity:1"
+ fill="#CC5D15" />
+ <rect
+ width="246"
+ height="246"
+ rx="50"
+ ry="50"
+ x="5"
+ y="5"
+ id="rect22"
+ style="fill:#6180c6;fill-opacity:1"
+ fill="#F49C52" />
+ <rect
+ width="236"
+ height="236"
+ rx="47"
+ ry="47"
+ x="10"
+ y="10"
+ id="rect24"
+ style="fill-opacity:1.0;fill:url(#linearGradient3750)"
+ fill="url(#RSSg)" />
+ <g
+ id="g3289"
+ style="fill:#000000;fill-opacity:1;stroke:none;stroke-opacity:1;filter:url(#filter3758)"
+ transform="matrix(-0.5614008,-0.5989944,-0.5948616,0.565301,279.23409,118.24669)">
+ <circle
+ style="fill:#000000;fill-opacity:1;stroke:none;stroke-opacity:1"
+ id="circle3291"
+ r="24"
+ cy="189"
+ cx="68"
+ sodipodi:cx="68"
+ sodipodi:cy="189"
+ sodipodi:rx="24"
+ sodipodi:ry="24" />
+ <path
+ style="fill:#000000;fill-opacity:1;stroke:none;stroke-opacity:1"
+ id="path3293"
+ d="M 160,213 L 126,213 C 126,167.71265 89.287349,131 44,131 L 44,97 C 108.06503,97 160,148.93497 160,213 z" />
+ <path
+ style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-opacity:1"
+ id="path3295"
+ d="M 184,213 C 184,135.68014 121.31986,73 44,73 L 44,38 C 140.64983,38 219,116.35017 219,213 L 184,213 z" />
+ </g>
+ <g
+ id="g3236"
+ style="stroke:#000000;stroke-opacity:1"
+ transform="matrix(-0.5614008,-0.5989945,-0.5948617,0.565301,277.11073,108.90355)">
+ <circle
+ style="fill:url(#linearGradient3275);fill-opacity:1;stroke:#000000;stroke-opacity:1"
+ id="circle26"
+ r="24"
+ cy="189"
+ cx="68"
+ sodipodi:cx="68"
+ sodipodi:cy="189"
+ sodipodi:rx="24"
+ sodipodi:ry="24" />
+ <path
+ style="fill:url(#linearGradient3277);fill-opacity:1;stroke:#000000;stroke-opacity:1"
+ id="path28"
+ d="M 160,213 L 126,213 C 126,167.71265 89.287349,131 44,131 L 44,97 C 108.06503,97 160,148.93497 160,213 z" />
+ <path
+ style="opacity:1;fill:url(#linearGradient3279);fill-opacity:1.0;stroke:#000000;stroke-opacity:1"
+ id="path30"
+ d="M 184,213 C 184,135.68014 121.31986,73 44,73 L 44,38 C 140.64983,38 219,116.35017 219,213 L 184,213 z" />
+ </g>
+</svg>

audacious-plugins-3.1.tar.bz2/src/streambrowser/images/xiph.png Added

audacious-plugins-3.1.tar.bz2/src/streambrowser/shoutcast.c Added

@@ -0,0 +1,290 @@
+/*
+ * Audacious Streambrowser Plugin
+ *
+ * Copyright (c) 2008 Calin Crisan <ccrisan@gmail.com>
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ */
+
+
+#include <string.h>
+#include <glib.h>
+#include <libxml/parser.h>
+#include <libxml/tree.h>
+
+#include <audacious/debug.h>
+#include <audacious/plugin.h>
+
+#include "streambrowser.h"
+#include "shoutcast.h"
+
+
+gboolean shoutcast_streaminfo_fetch (category_t * category,
+ streaminfo_t * streaminfo)
+{
+ gchar url[DEF_STRING_LEN];
+ g_snprintf (url, DEF_STRING_LEN, SHOUTCAST_CATEGORY_URL, category->name);
+
+ /* generate a valid, temporary filename */
+ char *temp_filename = tempnam (NULL, "aud_sb");
+ if (temp_filename == NULL)
+ {
+ failure ("shoutcast: failed to create a temporary file\n");
+ return FALSE;
+ }
+
+ char temp_pathname[DEF_STRING_LEN];
+ sprintf (temp_pathname, "file://%s", temp_filename);
+
+ AUDDBG("shoutcast: fetching category file '%s'\n", url);
+ if (!fetch_remote_to_local_file (url, temp_pathname))
+ {
+ failure
+ ("shoutcast: category file '%s' could not be downloaded to '%s'\n",
+ url, temp_pathname);
+ free (temp_filename);
+ return FALSE;
+ }
+ AUDDBG("shoutcast: category file '%s' successfuly downloaded to '%s'\n",
+ url, temp_pathname);
+
+ xmlDoc *doc = xmlReadFile (temp_pathname, NULL, 0);
+ if (doc == NULL)
+ {
+ failure ("shoutcast: failed to read '%s' category file\n",
+ category->name);
+ free (temp_filename);
+ return FALSE;
+ }
+
+ xmlNode *root_node = xmlDocGetRootElement (doc);
+ xmlNode *node;
+
+ root_node = root_node->children;
+
+ for (node = root_node; node != NULL; node = node->next)
+ {
+ if (node->type == XML_ELEMENT_NODE
+ && !strcmp ((char *) node->name, "station"))
+ {
+ gchar *streaminfo_name =
+ (gchar *) xmlGetProp (node, (xmlChar *) "name");
+ gchar *streaminfo_id =
+ (gchar *) xmlGetProp (node, (xmlChar *) "id");
+ gchar streaminfo_playlist_url[DEF_STRING_LEN];
+ gchar *streaminfo_current_track =
+ (gchar *) xmlGetProp (node, (xmlChar *) "ct");
+
+ g_snprintf (streaminfo_playlist_url, DEF_STRING_LEN,
+ SHOUTCAST_STREAMINFO_URL, streaminfo_id);
+
+ if (strncmp
+ (streaminfo_playlist_url, streaminfo->playlist_url,
+ DEF_STRING_LEN) == 0)
+ {
+ AUDDBG
+ ("shoutcast: updating stream info for '%s' with id %s from '%s'\n",
+ streaminfo_name, streaminfo_id, url);
+
+ strcpy (streaminfo->name, streaminfo_name);
+ strcpy (streaminfo->playlist_url, streaminfo_playlist_url);
+ strcpy (streaminfo->current_track, streaminfo_current_track);
+
+ xmlFree (streaminfo_name);
+ xmlFree (streaminfo_id);
+ xmlFree (streaminfo_current_track);
+
+ AUDDBG("shoutcast: stream info added\n");
+
+ break;
+ }
+ }
+ }
+
+ xmlFreeDoc (doc);
+
+ if (remove (temp_filename) != 0)
+ {
+ failure ("shoutcast: cannot remove the temporary file: %s\n",
+ strerror (errno));
+ }
+ free (temp_filename);
+
+ return TRUE;
+}
+
+gboolean shoutcast_category_fetch (streamdir_t * streamdir,
+ category_t * category)
+{
+ gchar url[DEF_STRING_LEN];
+ g_snprintf (url, DEF_STRING_LEN, SHOUTCAST_CATEGORY_URL, category->name);
+
+ /* generate a valid, temporary filename */
+ char *temp_filename = tempnam (NULL, "aud_sb");
+ if (temp_filename == NULL)
+ {
+ failure ("shoutcast: failed to create a temporary file\n");
+ return FALSE;
+ }
+
+ char temp_pathname[DEF_STRING_LEN];
+ sprintf (temp_pathname, "file://%s", temp_filename);
+
+ AUDDBG("shoutcast: fetching category file '%s'\n", url);
+ if (!fetch_remote_to_local_file (url, temp_pathname))
+ {
+ failure
+ ("shoutcast: category file '%s' could not be downloaded to '%s'\n",
+ url, temp_pathname);
+ free (temp_filename);
+ return FALSE;
+ }
+ AUDDBG("shoutcast: category file '%s' successfully downloaded to '%s'\n",
+ url, temp_pathname);
+
+ xmlDoc *doc = xmlReadFile (temp_pathname, NULL, 0);
+ if (doc == NULL)
+ {
+ failure ("shoutcast: failed to read '%s' category file\n",
+ category->name);
+ free (temp_filename);
+ return FALSE;
+ }
+
+ /* free/remove any existing streaminfos in this category */
+ while (streaminfo_get_count (category) > 0)
+ streaminfo_remove (category, streaminfo_get_by_index (category, 0));
+
+ xmlNode *root_node = xmlDocGetRootElement (doc);
+ xmlNode *node;
+
+ root_node = root_node->children;
+
+ for (node = root_node; node != NULL; node = node->next)
+ {
+ if (node->type == XML_ELEMENT_NODE
+ && !strcmp ((char *) node->name, "station"))
+ {
+ gchar *streaminfo_name =
+ (gchar *) xmlGetProp (node, (xmlChar *) "name");
+ gchar *streaminfo_id =
+ (gchar *) xmlGetProp (node, (xmlChar *) "id");
+ gchar streaminfo_playlist_url[DEF_STRING_LEN];
+ gchar *streaminfo_current_track =
+ (gchar *) xmlGetProp (node, (xmlChar *) "ct");
+
+ g_snprintf (streaminfo_playlist_url, DEF_STRING_LEN,
+ SHOUTCAST_STREAMINFO_URL, streaminfo_id);
+
+ AUDDBG("shoutcast: adding stream info for '%s/%s' from '%s'\n",
+ streaminfo_name, streaminfo_id, url);
+
+ streaminfo_t *streaminfo =
+ streaminfo_new (streaminfo_name, streaminfo_playlist_url, "",
+ streaminfo_current_track);
+ streaminfo_add (category, streaminfo);
+
+ xmlFree (streaminfo_name);
+ xmlFree (streaminfo_id);
+ xmlFree (streaminfo_current_track);
+
+ AUDDBG("shoutcast: stream info added\n");
+ }
+ }
+
+ xmlFreeDoc (doc);
+
+ if (remove (temp_filename) != 0)
+ {
+ failure ("shoutcast: cannot remove the temporary file: %s\n",
+ strerror (errno));
+ }
+ free (temp_filename);
+
+ return TRUE;
+}
+
+
+streamdir_t *shoutcast_streamdir_fetch ()
+{
+ streamdir_t *streamdir = streamdir_new (SHOUTCAST_NAME);
+
+ /* generate a valid, temporary filename */
+ char *temp_filename = tempnam (NULL, "aud_sb");
+ if (temp_filename == NULL)
+ {
+ failure ("shoutcast: failed to create a temporary file\n");
+ return NULL;
+ }
+
+ char temp_pathname[DEF_STRING_LEN];
+ sprintf (temp_pathname, "file://%s", temp_filename);
+
+ AUDDBG("shoutcast: fetching streaming directory file '%s'\n",
+ SHOUTCAST_STREAMDIR_URL);
+ if (!fetch_remote_to_local_file (SHOUTCAST_STREAMDIR_URL, temp_pathname))
+ {
+ failure
+ ("shoutcast: stream directory file '%s' could not be downloaded to '%s'\n",
+ SHOUTCAST_STREAMDIR_URL, temp_pathname);
+ free (temp_filename);
+ return NULL;
+ }
+ AUDDBG
+ ("shoutcast: stream directory file '%s' successfuly downloaded to '%s'\n",
+ SHOUTCAST_STREAMDIR_URL, temp_pathname);
+
+ xmlDoc *doc = xmlReadFile (temp_pathname, NULL, 0);
+ if (doc == NULL)
+ {
+ failure ("shoutcast: failed to read stream directory file\n");
+ free (temp_filename);
+ return NULL;
+ }
+
+ xmlNode *root_node = xmlDocGetRootElement (doc);
+ xmlNode *node;
+
+ root_node = root_node->children;
+
+ for (node = root_node; node != NULL; node = node->next)
+ {
+ if (node->type == XML_ELEMENT_NODE)
+ {
+ gchar *category_name =
+ (gchar *) xmlGetProp (node, (xmlChar *) "name");
+
+ AUDDBG("shoutcast: fetching category '%s'\n", category_name);
+
+ category_t *category = category_new (category_name);
+ category_add (streamdir, category);
+
+ xmlFree (category_name);
+
+ AUDDBG("shoutcast: category added: %s.\n", category_name);
+ }
+ }
+
+ xmlFreeDoc (doc);
+
+ if (remove (temp_filename) != 0)
+ {
+ failure ("shoutcast: cannot remove the temporary file: %s\n",
+ strerror (errno));
+ }
+ free (temp_filename);
+
+ AUDDBG("shoutcast: streaming directory successfuly loaded\n");
+
+ return streamdir;
+}

audacious-plugins-3.1.tar.bz2/src/streambrowser/shoutcast.h Added

@@ -0,0 +1,40 @@
+/*
+ * Audacious Streambrowser Plugin
+ *
+ * Copyright (c) 2008 Calin Crisan <ccrisan@gmail.com>
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ */
+
+
+#ifndef SHOUTCAST_H
+#define SHOUTCAST_H
+
+#include "streambrowser.h"
+#include "streamdir.h"
+
+#define SHOUTCAST_NAME				"Shoutcast"
+#define SHOUTCAST_ICON				DATA_DIR G_DIR_SEPARATOR_S "images" G_DIR_SEPARATOR_S "shoutcast.png"
+#define SHOUTCAST_STREAMDIR_URL		"http://yp.shoutcast.com/sbin/newxml.phtml"
+#define SHOUTCAST_CATEGORY_URL		"http://yp.shoutcast.com/sbin/newxml.phtml?genre=%s"
+#define SHOUTCAST_STREAMINFO_URL	"http://yp.shoutcast.com/sbin/shoutcast-playlist.pls?rn=%s&file=filename.pls"
+
+
+gboolean shoutcast_streaminfo_fetch (category_t * category,
+ streaminfo_t * streaminfo);
+gboolean shoutcast_category_fetch (streamdir_t * streamdir,
+ category_t * category);
+streamdir_t *shoutcast_streamdir_fetch ();
+
+
+#endif // SHOUTCAST_H

audacious-plugins-3.1.tar.bz2/src/streambrowser/streambrowser.c Added

@@ -0,0 +1,777 @@
+/*
+ * Audacious Streambrowser Plugin
+ *
+ * Copyright (c) 2008 Calin Crisan <ccrisan@gmail.com>
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ */
+
+
+#include <stdlib.h>
+#include <gtk/gtk.h>
+#include <glib.h>
+
+#include <audacious/configdb.h>
+#include <audacious/debug.h>
+#include <audacious/misc.h>
+#include <audacious/playlist.h>
+#include <audacious/plugin.h>
+#include <libaudgui/libaudgui.h>
+#include <libaudgui/libaudgui-gtk.h>
+
+#include "streambrowser.h"
+#include "streamdir.h"
+#include "shoutcast.h"
+#include "xiph.h"
+#include "bookmarks.h"
+#include "gui/streambrowser_win.h"
+
+
+typedef struct
+{
+ bookmark_t *bookmarks;
+ int bookmarks_count;
+}
+streambrowser_cfg_t;
+
+typedef struct
+{
+ streamdir_t *streamdir;
+ category_t *category;
+ streaminfo_t *streaminfo;
+ gboolean add_to_playlist;
+}
+update_thread_data_t;
+
+
+static gboolean sb_init (void);
+static void sb_about ();
+static void sb_configure ();
+static void sb_cleanup ();
+
+static void gui_init ();
+static void gui_done ();
+
+static void streamdir_update (streamdir_t * streamdir, category_t * category,
+ streaminfo_t * streaminfo,
+ gboolean add_to_playlist);
+static gpointer update_thread_core (gpointer user_data);
+static void streaminfo_add_to_playlist (streaminfo_t * streaminfo);
+
+static GQueue *update_thread_data_queue = NULL;
+static GMutex *update_thread_mutex = NULL; /* used to synchronize the access to the update queue */
+GMutex *update_streamdir_mutex = NULL; /* used to synchronize the access to streamdirs */
+
+streambrowser_cfg_t streambrowser_cfg;
+
+GtkWidget *sb_gui_widget = NULL;
+
+static gpointer sb_widget ()
+{
+	return sb_gui_widget;
+}
+
+AUD_GENERAL_PLUGIN
+(
+ .name = "Stream Browser",
+ .init = sb_init,
+ .about = sb_about,
+ .configure = sb_configure,
+ .cleanup = sb_cleanup,
+ .get_widget = sb_widget,
+)
+
+void failure (const char *fmt, ...)
+{
+ va_list ap;
+ fprintf (stderr, "! streambrowser: ");
+ va_start (ap, fmt);
+ vfprintf (stderr, fmt, ap);
+ va_end (ap);
+}
+
+gboolean fetch_remote_to_local_file (gchar * remote_url, gchar * local_url)
+{
+ VFSFile *remote_file = vfs_fopen (remote_url, "r");
+ if (remote_file == NULL)
+ {
+ failure ("failed to fetch file '%s'\n", remote_url);
+ return FALSE;
+ }
+
+ VFSFile *local_file = vfs_fopen (local_url, "w");
+ if (local_file == NULL)
+ {
+ vfs_fclose (remote_file);
+
+ failure ("failed to create local file '%s'\n", local_file);
+ return FALSE;
+ }
+
+ unsigned char buff[DEF_BUFFER_SIZE];
+ int size;
+ while (!vfs_feof (remote_file))
+ {
+ size = vfs_fread (buff, 1, DEF_BUFFER_SIZE, remote_file);
+
+ // i don't know why vfs_feof() doesn't ever return TRUE
+ // so this is a workaround to properly end the loop
+ if (size == 0)
+ break;
+
+ size = vfs_fwrite (buff, 1, size, local_file);
+ if (size == 0)
+ {
+ vfs_fclose (local_file);
+ vfs_fclose (remote_file);
+
+ failure ("failed to write to local file '%s'\n", local_file);
+ return FALSE;
+ }
+ }
+
+ vfs_fclose (local_file);
+ vfs_fclose (remote_file);
+
+ return TRUE;
+}
+
+void config_load ()
+{
+ streambrowser_cfg.bookmarks = NULL;
+ streambrowser_cfg.bookmarks_count = 0;
+
+ mcs_handle_t *db;
+ if ((db = aud_cfg_db_open ()) == NULL)
+ {
+ failure ("failed to load configuration\n");
+ return;
+ }
+
+ aud_cfg_db_get_int (db, "streambrowser", "bookmarks_count",
+ &streambrowser_cfg.bookmarks_count);
+
+ if (streambrowser_cfg.bookmarks_count == 0)
+ streambrowser_cfg.bookmarks = NULL;
+ else
+ streambrowser_cfg.bookmarks =
+ g_malloc (sizeof (bookmark_t) * streambrowser_cfg.bookmarks_count);
+
+ int i;
+ gchar item[DEF_STRING_LEN];
+ gchar *value;
+ for (i = 0; i < streambrowser_cfg.bookmarks_count; i++)
+ {
+ g_snprintf (item, DEF_STRING_LEN, "bookmark%d_streamdir_name", i);
+ if (aud_cfg_db_get_string (db, "streambrowser", item, &value))
+ {
+ strncpy (streambrowser_cfg.bookmarks[i].streamdir_name, value,
+ DEF_STRING_LEN);
+ g_free (value);
+ }
+ else
+ streambrowser_cfg.bookmarks[i].streamdir_name[0] = '\0';
+
+ g_snprintf (item, DEF_STRING_LEN, "bookmark%d_name", i);
+ if (aud_cfg_db_get_string (db, "streambrowser", item, &value))
+ {
+ strncpy (streambrowser_cfg.bookmarks[i].name, value,
+ DEF_STRING_LEN);
+ g_free (value);
+ }
+ else
+ streambrowser_cfg.bookmarks[i].name[0] = '\0';
+
+ g_snprintf (item, DEF_STRING_LEN, "bookmark%d_playlist_url", i);
+ if (aud_cfg_db_get_string (db, "streambrowser", item, &value))
+ {
+ strncpy (streambrowser_cfg.bookmarks[i].playlist_url, value,
+ DEF_STRING_LEN);
+ g_free (value);
+ }
+ else
+ streambrowser_cfg.bookmarks[i].playlist_url[0] = '\0';
+
+ g_snprintf (item, DEF_STRING_LEN, "bookmark%d_url", i);
+ if (aud_cfg_db_get_string (db, "streambrowser", item, &value))
+ {
+ strncpy (streambrowser_cfg.bookmarks[i].url, value, DEF_STRING_LEN);
+ g_free (value);
+ }
+ else
+ streambrowser_cfg.bookmarks[i].url[0] = '\0';
+
+ AUDDBG
+ ("loaded a bookmark with streamdir_name = '%s', name = '%s', playlist_url = '%s', url = '%s'\n",
+ streambrowser_cfg.bookmarks[i].streamdir_name,
+ streambrowser_cfg.bookmarks[i].name,
+ streambrowser_cfg.bookmarks[i].playlist_url,
+ streambrowser_cfg.bookmarks[i].url);
+ }
+
+ AUDDBG("loaded %d bookmarks\n", streambrowser_cfg.bookmarks_count);
+
+ aud_cfg_db_close (db);
+
+ AUDDBG("configuration loaded\n");
+}
+
+void config_save ()
+{
+ mcs_handle_t *db;
+ if ((db = aud_cfg_db_open ()) == NULL)
+ {
+ failure ("failed to save configuration\n");
+ return;
+ }
+
+ int old_bookmarks_count = 0, i;
+ gchar item[DEF_STRING_LEN];
+ aud_cfg_db_get_int (db, "streambrowser", "bookmarks_count",
+ &old_bookmarks_count);
+ aud_cfg_db_set_int (db, "streambrowser", "bookmarks_count",
+ streambrowser_cfg.bookmarks_count);
+
+ for (i = 0; i < streambrowser_cfg.bookmarks_count; i++)
+ {
+ AUDDBG
+ ("saving bookmark with streamdir_name = '%s', name = '%s', playlist_url = '%s', url = '%s'\n",
+ streambrowser_cfg.bookmarks[i].streamdir_name,
+ streambrowser_cfg.bookmarks[i].name,
+ streambrowser_cfg.bookmarks[i].playlist_url,
+ streambrowser_cfg.bookmarks[i].url);
+
+ g_snprintf (item, DEF_STRING_LEN, "bookmark%d_streamdir_name", i);
+ aud_cfg_db_set_string (db, "streambrowser", item,
+ streambrowser_cfg.bookmarks[i].streamdir_name);
+
+ g_snprintf (item, DEF_STRING_LEN, "bookmark%d_name", i);
+ aud_cfg_db_set_string (db, "streambrowser", item,
+ streambrowser_cfg.bookmarks[i].name);
+
+ g_snprintf (item, DEF_STRING_LEN, "bookmark%d_playlist_url", i);
+ aud_cfg_db_set_string (db, "streambrowser", item,
+ streambrowser_cfg.bookmarks[i].playlist_url);
+
+ g_snprintf (item, DEF_STRING_LEN, "bookmark%d_url", i);
+ aud_cfg_db_set_string (db, "streambrowser", item,
+ streambrowser_cfg.bookmarks[i].url);
+ }
+
+ for (i = streambrowser_cfg.bookmarks_count; i < old_bookmarks_count; i++)
+ {
+ g_snprintf (item, DEF_STRING_LEN, "bookmark%d_streamdir_name", i);
+ aud_cfg_db_unset_key (db, "streambrowser", item);
+
+ g_snprintf (item, DEF_STRING_LEN, "bookmark%d_name", i);
+ aud_cfg_db_unset_key (db, "streambrowser", item);
+
+ g_snprintf (item, DEF_STRING_LEN, "bookmark%d_playlist_url", i);
+ aud_cfg_db_unset_key (db, "streambrowser", item);
+
+ g_snprintf (item, DEF_STRING_LEN, "bookmark%d_url", i);
+ aud_cfg_db_unset_key (db, "streambrowser", item);
+ }
+
+ aud_cfg_db_close (db);
+
+ AUDDBG("configuration saved\n");
+}
+
+gboolean mystrcasestr (const char *haystack, const char *needle)
+{
+ int len_h = strlen (haystack) + 1;
+ int len_n = strlen (needle) + 1;
+ int i;
+
+ char *upper_h = malloc (len_h);
+ char *upper_n = malloc (len_n);
+
+ for (i = 0; i < len_h; i++)
+ upper_h[i] = toupper (haystack[i]);
+ for (i = 0; i < len_n; i++)
+ upper_n[i] = toupper (needle[i]);
+
+ char *p = strstr (upper_h, upper_n);
+
+ free (upper_h);
+ free (upper_n);
+
+ if (p != NULL)
+ return TRUE;
+ else
+ return FALSE;
+}
+
+
+static gboolean sb_init (void)
+{
+ AUDDBG("sb_init()\n");
+ config_load ();
+ gui_init ();
+ return TRUE;
+}
+
+static void sb_about (void)
+{
+ static GtkWidget * about_window = NULL;
+
+ audgui_simple_message (& about_window, GTK_MESSAGE_INFO,
+ _("About Stream Browser"),
+ _("Copyright (c) 2008, by Calin Crisan <ccrisan@gmail.com> and The Audacious Team.\n\n"
+ "This is a simple stream browser that includes the most popular streaming directories.\n"
+ "Many thanks to the Streamtuner developers <http://www.nongnu.org/streamtuner>,\n"
+ "\tand of course to the whole Audacious community.\n\n"
+ "Also thank you Tony Vroon for mentoring & guiding me, again.\n\n"
+ "This was a Google Summer of Code 2008 project."));
+}
+
+static void sb_configure ()
+{
+ AUDDBG("sb_configure()\n");
+}
+
+static void sb_cleanup ()
+{
+ AUDDBG("sb_cleanup()\n");
+
+ gui_done ();
+ config_save ();
+}
+
+static void gui_init ()
+{
+ /* main streambrowser window */
+ sb_gui_widget = streambrowser_win_init ();
+ g_signal_connect (sb_gui_widget, "destroy", (GCallback) gtk_widget_destroyed, & sb_gui_widget);
+
+ streambrowser_win_set_update_function (streamdir_update);
+
+ /* others */
+ update_thread_mutex = g_mutex_new ();
+ update_thread_data_queue = g_queue_new ();
+ update_streamdir_mutex = g_mutex_new ();
+
+ AUDDBG("gui initialized\n");
+
+ streamdir_update (NULL, NULL, NULL, FALSE);
+}
+
+static void gui_done ()
+{
+ /* others */
+ g_mutex_lock (update_thread_mutex);
+ 
+ if (update_thread_data_queue)
+ g_queue_free (update_thread_data_queue);
+ update_thread_data_queue = NULL;
+ 
+ sb_gui_widget = NULL;
+ 
+ g_mutex_unlock (update_thread_mutex);
+ g_mutex_free (update_thread_mutex);
+ update_thread_mutex = NULL;
+ 
+ g_mutex_free (update_streamdir_mutex);
+ update_streamdir_mutex = NULL;
+ 
+ AUDDBG("gui destroyed\n");
+}
+
+static void streamdir_update (streamdir_t * streamdir, category_t * category,
+ streaminfo_t * streaminfo,
+ gboolean add_to_playlist)
+{
+ AUDDBG
+ ("requested streamdir update (streamdir = '%s', category = '%s', streaminfo = '%s', add_to_playlist = %d)\n",
+ streamdir == NULL ? "" : streamdir->name,
+ category == NULL ? "" : category->name,
+ streaminfo == NULL ? "" : streaminfo->name, add_to_playlist);
+
+ if (g_queue_get_length (update_thread_data_queue) >= MAX_UPDATE_THREADS)
+ {
+ AUDDBG
+ ("another %d streamdir updates are pending, this request will be dropped\n",
+ g_queue_get_length (update_thread_data_queue));
+ }
+ else
+ {
+ if (!update_thread_data_queue) {
+ AUDDBG("the plugin has been closed\n");
+
+ return;
+ }
+ 
+ g_mutex_lock (update_thread_mutex);
+
+ /* do we have a running thread? */
+ if (g_queue_get_length (update_thread_data_queue) > 0)
+ {
+ int i;
+ gboolean exists = FALSE;
+ update_thread_data_t *update_thread_data;
+
+ /* search for another identic update request */
+ for (i = 0; i < g_queue_get_length (update_thread_data_queue); i++)
+ {
+ update_thread_data =
+ g_queue_peek_nth (update_thread_data_queue, i);
+ if (update_thread_data->streamdir == streamdir
+ && update_thread_data->category == category
+ && update_thread_data->streaminfo == streaminfo
+ && update_thread_data->add_to_playlist == add_to_playlist)
+ {
+ exists = TRUE;
+ break;
+ }
+ }
+
+ /* if no other similar request exists, we enqueue it */
+ if (!exists)
+ {
+ AUDDBG
+ ("another %d streamdir updates are pending, this request will be queued\n",
+ g_queue_get_length (update_thread_data_queue));
+
+ update_thread_data = g_malloc (sizeof (update_thread_data_t));
+
+ update_thread_data->streamdir = streamdir;
+ update_thread_data->category = category;
+ update_thread_data->streaminfo = streaminfo;
+ update_thread_data->add_to_playlist = add_to_playlist;
+
+ g_queue_push_tail (update_thread_data_queue,
+ update_thread_data);
+ }
+ else
+ {
+ AUDDBG
+ ("this request is already present in the queue, dropping\n");
+ }
+ }
+ /* no thread is currently running, we start one */
+ else
+ {
+ AUDDBG
+ ("no other streamdir updates are pending, starting to process this request immediately\n");
+
+ update_thread_data_t *data =
+ g_malloc (sizeof (update_thread_data_t));
+
+ data->streamdir = streamdir;
+ data->category = category;
+ data->streaminfo = streaminfo;
+ data->add_to_playlist = add_to_playlist;
+
+ g_queue_push_tail (update_thread_data_queue, data);
+
+ g_thread_create ((GThreadFunc) update_thread_core, NULL, FALSE,
+ NULL);
+ }
+
+ g_mutex_unlock (update_thread_mutex);
+ }
+}
+
+static gpointer update_thread_core (gpointer user_data)
+{
+ AUDDBG("entering update thread core\n");
+
+ if (!update_thread_data_queue) {
+ AUDDBG("the plugin has been closed\n");
+
+ return NULL ;
+ }
+ 
+ /* get the last item in the queue */
+ g_mutex_lock (update_thread_mutex);
+ update_thread_data_t *data = NULL;
+ if (g_queue_get_length (update_thread_data_queue) > 0)
+ {
+ data = g_queue_pop_head (update_thread_data_queue);
+ }
+ g_mutex_unlock (update_thread_mutex);
+
+ /* repetitively process the queue elements, until queue is empty */
+ while (data != NULL)
+ {
+ if (data->streamdir && !streamdir_is_valid(data->streamdir)) {
+ g_free(data);
+ g_mutex_lock(update_thread_mutex);
+ /* try to get the last item in the queue */
+ if (g_queue_get_length(update_thread_data_queue) > 0)
+ data = g_queue_pop_head(update_thread_data_queue);
+ else
+ data = NULL;
+ g_mutex_unlock(update_thread_mutex);
+ continue;
+ }
+ 
+ /* update a streaminfo */
+ if (data->streaminfo != NULL)
+ {
+ gdk_threads_enter ();
+ if (sb_gui_widget)
+ streambrowser_win_set_streaminfo_state (data->streamdir, data->category, data->streaminfo, TRUE);
+ gdk_threads_leave ();
+
+ if (data->add_to_playlist)
+ streaminfo_add_to_playlist (data->streaminfo);
+ else
+ {
+ /* shoutcast */
+ if (strncmp
+ (data->streamdir->name, SHOUTCAST_NAME,
+ strlen (SHOUTCAST_NAME)) == 0)
+ {
+ g_mutex_lock (update_streamdir_mutex);
+ shoutcast_streaminfo_fetch (data->category,
+ data->streaminfo);
+ g_mutex_unlock (update_streamdir_mutex);
+ }
+ /* xiph */
+ else if (strncmp
+ (data->streamdir->name, XIPH_NAME,
+ strlen (XIPH_NAME)) == 0)
+ {
+ g_mutex_lock (update_streamdir_mutex);
+ xiph_streaminfo_fetch (data->category, data->streaminfo);
+ g_mutex_unlock (update_streamdir_mutex);
+ }
+ /* bookmarks */
+ else if (strncmp
+ (data->streamdir->name, BOOKMARKS_NAME,
+ strlen (BOOKMARKS_NAME)) == 0)
+ {
+ g_mutex_lock (update_streamdir_mutex);
+ bookmarks_streaminfo_fetch (data->category,
+ data->streaminfo);
+ g_mutex_unlock (update_streamdir_mutex);
+ }
+ }
+
+ gdk_threads_enter ();
+ if (sb_gui_widget)
+ {
+ if (! data->add_to_playlist)
+ streambrowser_win_set_streaminfo (data->streamdir, data->category, data->streaminfo);
+ streambrowser_win_set_streaminfo_state (data->streamdir, data->category, data->streaminfo, FALSE);
+ }
+ gdk_threads_leave ();
+ }
+ /* update a category */
+ else if (data->category != NULL)
+ {
+ gdk_threads_enter ();
+ if (sb_gui_widget)
+ streambrowser_win_set_category_state (data->streamdir, data->category, TRUE);
+ gdk_threads_leave ();
+
+ /* shoutcast */
+ if (strncmp
+ (data->streamdir->name, SHOUTCAST_NAME,
+ strlen (SHOUTCAST_NAME)) == 0)
+ {
+ g_mutex_lock (update_streamdir_mutex);
+ shoutcast_category_fetch (data->streamdir, data->category);
+ g_mutex_unlock (update_streamdir_mutex);
+ }
+ /* xiph */
+ else if (strncmp
+ (data->streamdir->name, XIPH_NAME,
+ strlen (XIPH_NAME)) == 0)
+ {
+ g_mutex_lock (update_streamdir_mutex);
+ xiph_category_fetch (data->streamdir, data->category);
+ g_mutex_unlock (update_streamdir_mutex);
+ }
+ /* bookmarks */
+ else if (strncmp
+ (data->streamdir->name, BOOKMARKS_NAME,
+ strlen (BOOKMARKS_NAME)) == 0)
+ {
+ g_mutex_lock (update_streamdir_mutex);
+ bookmarks_category_fetch (data->streamdir, data->category);
+ g_mutex_unlock (update_streamdir_mutex);
+ }
+
+ gdk_threads_enter ();
+ if (sb_gui_widget)
+ {
+ streambrowser_win_set_category (data->streamdir, data->category);
+ streambrowser_win_set_category_state (data->streamdir, data->category, FALSE);
+ }
+ gdk_threads_leave ();
+ }
+ /* update a streamdir */
+ else if (data->streamdir != NULL)
+ {
+ /* shoutcast */
+ if (strncmp
+ (data->streamdir->name, SHOUTCAST_NAME,
+ strlen (SHOUTCAST_NAME)) == 0)
+ {
+ g_mutex_lock (update_streamdir_mutex);
+ streamdir_t *streamdir = shoutcast_streamdir_fetch ();
+ g_mutex_unlock (update_streamdir_mutex);
+ if (streamdir != NULL)
+ {
+ gdk_threads_enter ();
+ if (sb_gui_widget)
+ streambrowser_win_set_streamdir (streamdir, SHOUTCAST_ICON);
+ gdk_threads_leave ();
+ }
+ }
+ /* xiph */
+ else if (strncmp
+ (data->streamdir->name, XIPH_NAME,
+ strlen (XIPH_NAME)) == 0)
+ {
+ g_mutex_lock (update_streamdir_mutex);
+ streamdir_t *streamdir = xiph_streamdir_fetch ();
+ g_mutex_unlock (update_streamdir_mutex);
+ if (streamdir != NULL)
+ {
+ gdk_threads_enter ();
+ if (sb_gui_widget)
+ streambrowser_win_set_streamdir (streamdir, XIPH_ICON);
+ gdk_threads_leave ();
+ }
+ }
+ /* bookmarks */
+ else if (strncmp
+ (data->streamdir->name, BOOKMARKS_NAME,
+ strlen (BOOKMARKS_NAME)) == 0)
+ {
+ g_mutex_lock (update_streamdir_mutex);
+ streamdir_t *streamdir =
+ bookmarks_streamdir_fetch (&streambrowser_cfg.bookmarks,
+ &streambrowser_cfg.bookmarks_count);
+ g_mutex_unlock (update_streamdir_mutex);
+ if (streamdir != NULL)
+ {
+ gdk_threads_enter ();
+ if (sb_gui_widget)
+ streambrowser_win_set_streamdir (streamdir, BOOKMARKS_ICON);
+ gdk_threads_leave ();
+ }
+ }
+ }
+ /* update all streamdirs */
+ else
+ {
+ /* shoutcast */
+ g_mutex_lock (update_streamdir_mutex);
+ streamdir_t *streamdir = shoutcast_streamdir_fetch ();
+ g_mutex_unlock (update_streamdir_mutex);
+ if (streamdir != NULL)
+ {
+ gdk_threads_enter ();
+ if (sb_gui_widget)
+ streambrowser_win_set_streamdir (streamdir, SHOUTCAST_ICON);
+ gdk_threads_leave ();
+ }
+ /* xiph */
+ g_mutex_lock (update_streamdir_mutex);
+ streamdir = xiph_streamdir_fetch ();
+ g_mutex_unlock (update_streamdir_mutex);
+ if (streamdir != NULL)
+ {
+ gdk_threads_enter ();
+ if (sb_gui_widget)
+ streambrowser_win_set_streamdir (streamdir, XIPH_ICON);
+ gdk_threads_leave ();
+ }
+ /* bookmarks */
+ g_mutex_lock (update_streamdir_mutex);
+ streamdir =
+ bookmarks_streamdir_fetch (&streambrowser_cfg.bookmarks,
+ &streambrowser_cfg.bookmarks_count);
+ g_mutex_unlock (update_streamdir_mutex);
+ if (streamdir != NULL)
+ {
+ gdk_threads_enter ();
+ if (sb_gui_widget)
+ streambrowser_win_set_streamdir (streamdir, BOOKMARKS_ICON);
+ gdk_threads_leave ();
+
+ int i;
+ for (i = 0; i < category_get_count (streamdir); i++)
+ streamdir_update (streamdir,
+ category_get_by_index (streamdir, i),
+ NULL, FALSE);
+ }
+ }
+ 
+ g_free (data);
+
+ if (!update_thread_data_queue) {
+ AUDDBG("the plugin has been closed\n");
+
+ break;
+ }
+ 
+ g_mutex_lock (update_thread_mutex);
+
+ /* try to get the last item in the queue */
+ if (g_queue_get_length (update_thread_data_queue) > 0)
+ data = g_queue_pop_head (update_thread_data_queue);
+ else
+ data = NULL;
+
+ g_mutex_unlock (update_thread_mutex);
+ }
+
+ AUDDBG("leaving update thread core\n");
+
+ return NULL;
+}
+
+static void streaminfo_add_to_playlist (streaminfo_t * streaminfo)
+{
+ gint playlist = aud_playlist_get_active ();
+ gchar * unix_name = g_build_filename (aud_util_get_localdir (),
+ PLAYLIST_TEMP_FILE, NULL);
+ gchar * uri_name = g_filename_to_uri (unix_name, NULL, NULL);
+
+ if (strlen (streaminfo->playlist_url) > 0)
+ {
+ AUDDBG("fetching stream playlist for station '%s' from '%s'\n",
+ streaminfo->name, streaminfo->playlist_url);
+
+ if (! fetch_remote_to_local_file (streaminfo->playlist_url, uri_name))
+ {
+ failure ("shoutcast: stream playlist '%s' could not be downloaded "
+ "to '%s'\n", streaminfo->playlist_url, uri_name);
+ goto DONE;
+ }
+
+ AUDDBG("stream playlist '%s' successfuly downloaded to '%s'\n",
+ streaminfo->playlist_url, uri_name);
+
+ aud_playlist_entry_insert (playlist, -1, g_strdup (uri_name), NULL,
+ FALSE);
+ AUDDBG("stream playlist '%s' added\n", streaminfo->playlist_url);
+ }
+
+ if (strlen (streaminfo->url) > 0)
+ {
+ aud_playlist_entry_insert (playlist, -1, g_strdup (streaminfo->url),
+ NULL, FALSE);
+ AUDDBG("stream '%s' added\n", streaminfo->url);
+ }
+
+DONE:
+ g_free (unix_name);
+ g_free (uri_name);
+}

audacious-plugins-3.1.tar.bz2/src/streambrowser/streambrowser.h Added

@@ -0,0 +1,49 @@
+/*
+ * Audacious Streambrowser Plugin
+ *
+ * Copyright (c) 2008 Calin Crisan <ccrisan@gmail.com>
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ */
+
+
+#ifndef STREAMBROWSER_H
+#define STREAMBROWSER_H
+
+#define DEF_STRING_LEN				1024
+#define DEF_BUFFER_SIZE				512
+#define MAX_UPDATE_THREADS			4
+#define PLAYLIST_TEMP_FILE			"streambrowser-playlist-temp.pls"
+#define STREAMBROWSER_ICON_SMALL	DATA_DIR G_DIR_SEPARATOR_S "images" G_DIR_SEPARATOR_S "streambrowser-16x16.png"
+#define STREAMBROWSER_ICON			DATA_DIR G_DIR_SEPARATOR_S "images" G_DIR_SEPARATOR_S "streambrowser-64x64.png"
+
+
+#include <glib.h>
+
+#include <config.h>
+#include <audacious/i18n.h>
+
+
+void failure (const char *fmt, ...);
+gboolean fetch_remote_to_local_file (gchar * remote_url, gchar * local_url);
+
+void config_load ();
+void config_save ();
+
+ /* returns true if the substring has been found, false otherwise */
+gboolean mystrcasestr (const char *haystack, const char *needle);
+
+extern GMutex *update_streamdir_mutex; /* used to synchronize the access to streamdirs */
+
+#endif // STREAMBROWSER_H
+

audacious-plugins-3.1.tar.bz2/src/streambrowser/streamdir.c Added

@@ -0,0 +1,187 @@
+/*
+ * Audacious Streambrowser Plugin
+ *
+ * Copyright (c) 2008 Calin Crisan <ccrisan@gmail.com>
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ */
+
+
+#include <string.h>
+#include <glib.h>
+
+#include "streambrowser.h"
+#include "streamdir.h"
+
+static GList *all_streamdirs = NULL;
+
+gboolean streamdir_is_valid(streamdir_t *streamdir) {
+ return (NULL != g_list_find(all_streamdirs,streamdir));
+}
+
+streamdir_t *streamdir_new (gchar * name)
+{
+ streamdir_t *streamdir = (streamdir_t *) g_malloc (sizeof (streamdir_t));
+ strncpy (streamdir->name, name, DEF_STRING_LEN);
+ streamdir->category_list = NULL;
+
+ all_streamdirs = g_list_append(all_streamdirs,streamdir);
+ return streamdir;
+}
+
+void streamdir_delete (streamdir_t * streamdir)
+{
+ GList *iterator;
+ category_t *category;
+
+ for (iterator = g_list_first (streamdir->category_list); iterator != NULL;
+ iterator = g_list_next (iterator))
+ {
+ category = iterator->data;
+ category_delete (category);
+ }
+
+ g_list_free (streamdir->category_list);
+ g_free (streamdir);
+ all_streamdirs = g_list_remove(all_streamdirs,streamdir);
+}
+
+category_t *category_new (gchar * name)
+{
+ category_t *category = (category_t *) g_malloc (sizeof (category_t));
+ strncpy (category->name, name, DEF_STRING_LEN);
+ category->streaminfo_list = NULL;
+
+ return category;
+}
+
+void category_delete (category_t * category)
+{
+ GList *iterator;
+ streaminfo_t *streaminfo;
+
+ for (iterator = g_list_first (category->streaminfo_list); iterator != NULL;
+ iterator = g_list_next (iterator))
+ {
+ streaminfo = iterator->data;
+ streaminfo_delete (streaminfo);
+ }
+
+ g_list_free (category->streaminfo_list);
+ g_free (category);
+}
+
+void category_add (streamdir_t * streamdir, category_t * category)
+{
+ streamdir->category_list =
+ g_list_append (streamdir->category_list, category);
+}
+
+void category_remove (streamdir_t * streamdir, category_t * category)
+{
+ streamdir->category_list =
+ g_list_remove (streamdir->category_list, category);
+}
+
+category_t *category_get_by_index (streamdir_t * streamdir, gint index)
+{
+ return (category_t *) g_list_nth_data (streamdir->category_list, index);
+}
+
+category_t *category_get_by_name (streamdir_t * streamdir, gchar * name)
+{
+ GList *iterator;
+ category_t *category;
+
+ for (iterator = g_list_first (streamdir->category_list); iterator != NULL;
+ iterator = g_list_next (iterator))
+ {
+ category = iterator->data;
+ if (strncasecmp (category->name, name, DEF_STRING_LEN) == 0)
+ return category;
+ }
+
+ return NULL;
+}
+
+gint category_get_count (streamdir_t * streamdir)
+{
+ return g_list_length (streamdir->category_list);
+}
+
+gint category_get_index (streamdir_t * streamdir, category_t * category)
+{
+ return g_list_index (streamdir->category_list, category);
+}
+
+
+streaminfo_t *streaminfo_new (gchar * name, gchar * playlist_url, gchar * url,
+ gchar * current_track)
+{
+ streaminfo_t *streaminfo =
+ (streaminfo_t *) g_malloc (sizeof (streaminfo_t));
+ strncpy (streaminfo->name, name, DEF_STRING_LEN);
+ strncpy (streaminfo->playlist_url, playlist_url, DEF_STRING_LEN);
+ strncpy (streaminfo->url, url, DEF_STRING_LEN);
+ strncpy (streaminfo->current_track, current_track, DEF_STRING_LEN);
+
+ return streaminfo;
+}
+
+void streaminfo_delete (streaminfo_t * streaminfo)
+{
+ g_free (streaminfo);
+}
+
+void streaminfo_add (category_t * category, streaminfo_t * streaminfo)
+{
+ category->streaminfo_list =
+ g_list_append (category->streaminfo_list, streaminfo);
+}
+
+void streaminfo_remove (category_t * category, streaminfo_t * streaminfo)
+{
+ category->streaminfo_list =
+ g_list_remove (category->streaminfo_list, streaminfo);
+}
+
+streaminfo_t *streaminfo_get_by_index (category_t * category, gint index)
+{
+ return (streaminfo_t *) g_list_nth_data (category->streaminfo_list, index);
+}
+
+streaminfo_t *streaminfo_get_by_name (category_t * category, gchar * name)
+{
+ GList *iterator;
+ streaminfo_t *streaminfo;
+
+ for (iterator = g_list_first (category->streaminfo_list); iterator != NULL;
+ iterator = g_list_next (iterator))
+ {
+ streaminfo = iterator->data;
+ if (strncasecmp (streaminfo->name, name, DEF_STRING_LEN) == 0)
+ return streaminfo;
+ }
+
+ return NULL;
+}
+
+gint streaminfo_get_count (category_t * category)
+{
+ return g_list_length (category->streaminfo_list);
+}
+
+gint streaminfo_get_index (category_t * category, streaminfo_t * streaminfo)
+{
+ return g_list_index (category->streaminfo_list, streaminfo);
+}

audacious-plugins-3.1.tar.bz2/src/streambrowser/streamdir.h Added

@@ -0,0 +1,77 @@
+/*
+ * Audacious Streambrowser Plugin
+ *
+ * Copyright (c) 2008 Calin Crisan <ccrisan@gmail.com>
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ */
+
+
+#ifndef STREAMDIR_H
+#define STREAMDIR_H
+
+#include <glib.h>
+
+#include "streambrowser.h"
+
+
+typedef struct
+{
+ gchar name[DEF_STRING_LEN];
+ gchar playlist_url[DEF_STRING_LEN];
+ gchar url[DEF_STRING_LEN];
+ gchar current_track[DEF_STRING_LEN];
+}
+streaminfo_t;
+
+typedef struct
+{
+ gchar name[DEF_STRING_LEN];
+ GList *streaminfo_list;
+}
+category_t;
+
+typedef struct
+{
+ gchar name[DEF_STRING_LEN];
+ GList *category_list;
+}
+streamdir_t;
+
+gboolean streamdir_is_valid(streamdir_t *streamdir);
+
+streamdir_t *streamdir_new (gchar * name);
+void streamdir_delete (streamdir_t * streamdir);
+
+category_t *category_new (gchar * name);
+void category_delete (category_t * category);
+void category_add (streamdir_t * streamdir, category_t * category);
+void category_remove (streamdir_t * streamdir, category_t * category);
+category_t *category_get_by_index (streamdir_t * streamdir, gint index);
+category_t *category_get_by_name (streamdir_t * streamdir, gchar * name);
+gint category_get_count (streamdir_t * streamdir);
+gint category_get_index (streamdir_t * streamdir, category_t * category);
+
+streaminfo_t *streaminfo_new (gchar * name, gchar * playlist_url, gchar * url,
+ gchar * current_track);
+void streaminfo_delete (streaminfo_t * streaminfo);
+void streaminfo_free (streaminfo_t * streaminfo);
+void streaminfo_add (category_t * category, streaminfo_t * streaminfo);
+void streaminfo_remove (category_t * category, streaminfo_t * streaminfo);
+streaminfo_t *streaminfo_get_by_index (category_t * category, gint index);
+streaminfo_t *streaminfo_get_by_name (category_t * category, gchar * name);
+gint streaminfo_get_count (category_t * category);
+gint streaminfo_get_index (category_t * category, streaminfo_t * streaminfo);
+
+
+#endif // STREAMDIR_H

audacious-plugins-3.1.tar.bz2/src/streambrowser/xiph.c Added

@@ -0,0 +1,305 @@
+/*
+ * Audacious Streambrowser Plugin
+ *
+ * Copyright (c) 2008 Calin Crisan <ccrisan@gmail.com>
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ */
+
+
+#include <string.h>
+#include <glib.h>
+#include <libxml/parser.h>
+#include <libxml/tree.h>
+
+#include <audacious/debug.h>
+#include <audacious/misc.h>
+
+#include "streambrowser.h"
+#include "xiph.h"
+
+
+typedef struct
+{
+ gchar name[DEF_STRING_LEN];
+ gchar url[DEF_STRING_LEN];
+ gchar current_song[DEF_STRING_LEN];
+ gchar genre[DEF_STRING_LEN];
+}
+xiph_entry_t;
+
+
+static xiph_entry_t *xiph_entries = NULL;
+static int xiph_entry_count = 0;
+
+typedef struct
+{
+ gchar *name;
+ gchar *match_string;
+}
+xiph_category_t;
+
+/* inspired from streamtuner's xiph plugin */
+static xiph_category_t xiph_categories[] =
+{
+ {"Alternative",
+ "alternative indie goth college industrial punk hardcore ska"},
+ {"Electronic",
+ "electronic ambient drum trance techno house downtempo breakbeat jungle garage"},
+ {"Classical", "classical opera symphonic"},
+ {"Country", "country swing"},
+ {"Hip-Hop/Rap", "hip hop rap turntable"},
+ {"Jazz", "jazz swing"},
+ {"Oldies", "oldies disco 50s 60s 70s 80s 90s"},
+ {"Rop", "top pop"},
+ {"Rock", "rock metal"},
+ {"R&B/Soul", "r&b funk soul urban"},
+ {"Spiritual", "spiritual gospel christian muslim jewish religio"},
+ {"Spoken", "spoken talk comedy"},
+ {"World", "world reggae island african european east asia"},
+ {"Other", "various mixed misc eclectic film show instrumental"}
+};
+
+
+static void refresh_streamdir (void);
+ /* returns true if any of the words in string1 is present in string2 */
+static gboolean genre_match (gchar * string1, gchar * string2);
+
+gboolean xiph_streaminfo_fetch (category_t * category,
+ streaminfo_t * streaminfo)
+{
+ gint entryno;
+
+ refresh_streamdir ();
+
+ /* find the corresponding xiph entry */
+ for (entryno = 0; entryno < xiph_entry_count; entryno++)
+ {
+ if (strcmp (xiph_entries[entryno].name, streaminfo->name) == 0)
+ {
+ strcpy (streaminfo->name, xiph_entries[entryno].name);
+ strcpy (streaminfo->url, xiph_entries[entryno].url);
+ strcpy (streaminfo->current_track,
+ xiph_entries[entryno].current_song);
+
+ break;
+ }
+ }
+
+ return TRUE;
+}
+
+gboolean xiph_category_fetch (streamdir_t * streamdir, category_t * category)
+{
+ refresh_streamdir ();
+ 
+ gint entryno, categoryno;
+ gint xiph_category_count =
+ sizeof (xiph_categories) / sizeof (xiph_category_t);
+ xiph_category_t *xiph_category = NULL;
+
+ for (categoryno = 0; categoryno < xiph_category_count; categoryno++) {
+ if (strcmp (xiph_categories[categoryno].name, category->name) == 0)
+ {
+ xiph_category = xiph_categories + categoryno;
+ break;
+ }
+ }
+
+ /* somehow we've got an invalid/unrecognized category */
+ if (xiph_category == NULL)
+ {
+ failure ("xiph: got an unrecognized category: '%s'\n", category->name);
+ return FALSE;
+ }
+
+ /* free/remove any existing streaminfos in this category */
+ while (streaminfo_get_count (category) > 0)
+ streaminfo_remove (category, streaminfo_get_by_index (category, 0));
+
+ /* see what entries match this category */
+ for (entryno = 0; entryno < xiph_entry_count; entryno++)
+ {
+ if (genre_match
+ (xiph_category->match_string, xiph_entries[entryno].genre))
+ {
+ streaminfo_t *streaminfo =
+ streaminfo_new (xiph_entries[entryno].name, "",
+ xiph_entries[entryno].url,
+ xiph_entries[entryno].current_song);
+ streaminfo_add (category, streaminfo);
+ }
+ }
+
+ /* if the requested category is the last one in the list ("other"),
+ we fill it with all the entries that don't match the rest of categories */
+ if (xiph_category == &xiph_categories[xiph_category_count - 1])
+ {
+ for (entryno = 0; entryno < xiph_entry_count; entryno++)
+ {
+ gboolean matched = FALSE;
+
+ for (categoryno = 0; categoryno < xiph_category_count; categoryno++)
+ if (genre_match
+ (xiph_entries[entryno].genre,
+ xiph_categories[categoryno].match_string))
+ {
+ matched = TRUE;
+ break;
+ }
+
+ if (!matched)
+ {
+ streaminfo_t *streaminfo =
+ streaminfo_new (xiph_entries[entryno].name, "",
+ xiph_entries[entryno].url,
+ xiph_entries[entryno].current_song);
+ streaminfo_add (category, streaminfo);
+ }
+ }
+ }
+
+ return TRUE;
+}
+
+
+streamdir_t *xiph_streamdir_fetch (void)
+{
+ streamdir_t *streamdir = streamdir_new (XIPH_NAME);
+ gint categno;
+
+ refresh_streamdir ();
+ 
+ for (categno = 0;
+ categno < sizeof (xiph_categories) / sizeof (xiph_category_t);
+ categno++)
+ {
+ category_t *category = category_new (xiph_categories[categno].name);
+ category_add (streamdir, category);
+ }
+
+ return streamdir;
+}
+
+static void refresh_streamdir (void)
+{
+ gchar * unix_name = g_build_filename (aud_util_get_localdir (),
+ XIPH_TEMP_FILENAME, NULL);
+ gchar * uri_name = g_filename_to_uri (unix_name, NULL, NULL);
+
+ /* free any previously fetched streamdir data */
+ if (xiph_entries != NULL)
+ {
+ free (xiph_entries);
+ xiph_entries = NULL;
+ }
+ xiph_entry_count = 0;
+
+ AUDDBG("xiph: fetching streaming directory file '%s'\n",
+ XIPH_STREAMDIR_URL);
+
+ if (! fetch_remote_to_local_file (XIPH_STREAMDIR_URL, uri_name))
+ {
+ failure ("xiph: stream directory file '%s' could not be downloaded to "
+ "'%s'\n", XIPH_STREAMDIR_URL, uri_name);
+ goto DONE;
+ }
+
+ AUDDBG("xiph: stream directory file '%s' successfuly downloaded to '%s'\n",
+ XIPH_STREAMDIR_URL, uri_name);
+
+ xmlDoc * doc = xmlReadFile (uri_name, NULL, 0);
+
+ if (doc == NULL)
+ {
+ failure ("xiph: failed to read stream directory file\n");
+ goto DONE;
+ }
+
+ xmlNode *root_node = xmlDocGetRootElement (doc);
+ xmlNode *node, *child;
+ gchar *content;
+
+ root_node = root_node->children;
+
+ for (node = root_node; node != NULL; node = node->next)
+ {
+ if (node->type == XML_ELEMENT_NODE)
+ {
+ xiph_entries =
+ realloc (xiph_entries,
+ sizeof (xiph_entry_t) * (xiph_entry_count + 1));
+
+ for (child = node->children; child != NULL; child = child->next)
+ {
+ if (strcmp ((gchar *) child->name, "server_name") == 0)
+ {
+ content = (gchar *) xmlNodeGetContent (child);
+ strcpy (xiph_entries[xiph_entry_count].name, content);
+ xmlFree (content);
+ }
+ else if (strcmp ((gchar *) child->name, "listen_url") == 0)
+ {
+ content = (gchar *) xmlNodeGetContent (child);
+ strcpy (xiph_entries[xiph_entry_count].url, content);
+ xmlFree (content);
+ }
+ else if (strcmp ((gchar *) child->name, "current_song") == 0)
+ {
+ content = (gchar *) xmlNodeGetContent (child);
+ strcpy (xiph_entries[xiph_entry_count].current_song,
+ content);
+ xmlFree (content);
+ }
+ else if (strcmp ((gchar *) child->name, "genre") == 0)
+ {
+ content = (gchar *) xmlNodeGetContent (child);
+ strcpy (xiph_entries[xiph_entry_count].genre, content);
+ xmlFree (content);
+ }
+ }
+
+ xiph_entry_count++;
+ }
+ }
+
+ xmlFreeDoc (doc);
+
+ AUDDBG("xiph: streaming directory successfuly loaded\n");
+
+DONE:
+ g_free (unix_name);
+ g_free (uri_name);
+}
+
+static gboolean genre_match (gchar * string1, gchar * string2)
+{
+ gchar **genres = g_strsplit (string1, " ", -1);
+ gboolean matched = FALSE;
+ gint n;
+
+ if (genres != NULL)
+ {
+ for (n = 0; genres[n] != NULL; n++)
+ {
+ if (mystrcasestr (string2, genres[n]))
+ {
+ matched = TRUE;
+ break;
+ }
+ }
+ g_strfreev (genres);
+ }
+
+ return matched;
+}

audacious-plugins-3.1.tar.bz2/src/streambrowser/xiph.h Added

@@ -0,0 +1,38 @@
+/*
+ * Audacious Streambrowser Plugin
+ *
+ * Copyright (c) 2008 Calin Crisan <ccrisan@gmail.com>
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ */
+
+
+#ifndef XIPH_H
+#define XIPH_H
+
+#include "streambrowser.h"
+#include "streamdir.h"
+
+#define XIPH_NAME				"Xiph"
+#define XIPH_ICON				DATA_DIR G_DIR_SEPARATOR_S "images" G_DIR_SEPARATOR_S "xiph.png"
+#define XIPH_STREAMDIR_URL		"http://dir.xiph.org/yp.xml"
+#define XIPH_TEMP_FILENAME		"streambrowser-xiph-temp.xml"
+
+
+gboolean xiph_streaminfo_fetch (category_t * category,
+ streaminfo_t * streaminfo);
+gboolean xiph_category_fetch (streamdir_t * streamdir, category_t * category);
+streamdir_t *xiph_streamdir_fetch ();
+
+
+#endif // SHOUTCAST_H

audacious-plugins-3.0.3.tar.bz2/src/usf/Makefile -> audacious-plugins-3.1.tar.bz2/src/usf/Makefile Changed

audacious-plugins-3.0.3.tar.bz2/src/usf/memory.c -> audacious-plugins-3.1.tar.bz2/src/usf/memory.c Changed

@@ -103,11 +103,11 @@
 		DisplayError("Failed to allocate N64MEM");
 		return 0;
 	}
-	
+
 	memset(N64MEM, 0, RdramSize);
 
 	NOMEM = mmap((uintptr_t)N64MEM + RdramSize, 0xD000, PROT_NONE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, 0, 0);
-	
+
 	if(RdramSize == 0x400000)
 	{
 	//	munmap(N64MEM + 0x400000, 0x400000);
@@ -157,15 +157,15 @@
 
 int PreAllocate_Memory(void) {
 	int i = 0;
-	
+
 	// Moved the savestate allocation here :) (for better management later)
 	savestatespace = malloc(0x80275C);
-	
+
 	if(savestatespace == 0)
 		return 0;
-	
+
 	memset(savestatespace, 0, 0x80275C);
-	
+
 	for (i = 0; i < 0x400; i++) {
 		ROMPages[i] = 0;
 	}
@@ -193,10 +193,10 @@
 	if (JumpTable != NULL) {free( JumpTable); JumpTable=NULL;}
 	if (RecompCode != NULL){munmap( RecompCode, NormalCompileBufferSize); RecompCode=NULL;}
 	if (RSPRecompCode != NULL){munmap( RSPRecompCode, RSP_RECOMPMEM_SIZE + RSP_SECRECOMPMEM_SIZE); RSPRecompCode=NULL;}
-	
+
 	if (RSPJumpTables != NULL) {free( RSPJumpTables); RSPJumpTables=NULL;}
 	if (JumpTable != NULL) {free( JumpTable); JumpTable=NULL;}
-	
+
 
 	if(savestatespace)
 		free(savestatespace);
@@ -1674,6 +1674,8 @@
 
 			 break;
 	}
+
+	return -1; /* ??? */
 }

audacious-plugins-3.0.3.tar.bz2/src/usf/rsp.c -> audacious-plugins-3.1.tar.bz2/src/usf/rsp.c Changed

audacious-plugins-3.0.3.tar.bz2/src/usf/rsp_recompiler_analysis.c -> audacious-plugins-3.1.tar.bz2/src/usf/rsp_recompiler_analysis.c Changed

audacious-plugins-3.0.3.tar.bz2/src/usf/rsp_recompiler_ops.c -> audacious-plugins-3.1.tar.bz2/src/usf/rsp_recompiler_ops.c Changed

audacious-plugins-3.0.3.tar.bz2/src/usf/usf.c -> audacious-plugins-3.1.tar.bz2/src/usf/usf.c Changed

@@ -23,7 +23,7 @@
 extern InputPlugin usf_ip;
 InputPlayback * pcontext = 0;
 
-void usf_mseek(InputPlayback * context, gulong millisecond);
+void usf_mseek (InputPlayback * context, gint millisecond);
 int8_t filename[512];
 uint32_t cpu_running = 0, use_interpreter = 0, use_audiohle = 0, is_paused = 0, cpu_stopped = 1, fake_seek_stopping = 0;
 uint32_t is_fading = 0, fade_type = 1, fade_time = 5000, is_seeking = 0, seek_backwards = 0, track_time = 180000;
@@ -266,7 +266,7 @@
 }
 
 
-void usf_mseek(InputPlayback * context, gulong millisecond)
+void usf_mseek (InputPlayback * context, gint millisecond)
 {
 	if(millisecond < play_time) {
 		is_paused = 0;
@@ -291,12 +291,9 @@
 
 gboolean usf_playing;
 
-void usf_play(InputPlayback * context, const gchar * filename,
- VFSFile * file, gint start_time, gint stop_time, gboolean pause)
+gboolean usf_play (InputPlayback * context, const gchar * filename,
+ VFSFile * file, gint start_time, gint stop_time, gboolean pause)
 {
-	if(!filename)
-		return;
-
 	// Defaults (which would be overriden by Tags / playing
 	savestatespace = NULL;
 	cpu_running = is_paused = fake_seek_stopping = 0;
@@ -321,7 +318,7 @@
 if(!LoadUSF(filename, file)) {
 	Release_Memory();
 	vfs_fclose(file);
- 	return;
+ 	return FALSE;
 }
 
 	context->set_pb_ready(context);
@@ -359,9 +356,9 @@
 	is_paused = 0;
 }
 
-void usf_pause(InputPlayback *context, gshort paused)
+void usf_pause (InputPlayback * context, gboolean paused)
 {
-	is_paused = paused;//is_paused?0:1;
+	is_paused = paused;
 }
 
 static const gchar *usf_exts [] =

audacious-plugins-3.0.3.tar.bz2/src/vorbis/Makefile -> audacious-plugins-3.1.tar.bz2/src/vorbis/Makefile Changed

audacious-plugins-3.0.3.tar.bz2/src/vorbis/vcupdate.c -> audacious-plugins-3.1.tar.bz2/src/vorbis/vcupdate.c Changed

@@ -44,14 +44,14 @@
 
 static gboolean write_and_pivot_files(vcedit_state * state);
 
-static mowgli_dictionary_t *
+static mowgli_patricia_t *
 dictionary_from_vorbis_comment(vorbis_comment * vc)
 {
- mowgli_dictionary_t *dict;
+ mowgli_patricia_t *dict;
 gint i;
 gchar *val;
 
- dict = mowgli_dictionary_create(g_ascii_strcasecmp);
+ dict = mowgli_patricia_create (NULL);
 
 for (i = 0; i < vc->comments; i++) {
 gchar **frags;
@@ -65,7 +65,7 @@
 /* No RHS? */
 val = frags[1] ? frags[1] : "";
 
- mowgli_dictionary_add(dict, frags[0], g_strdup(val));
+ mowgli_patricia_add(dict, frags[0], g_strdup(val));
 
 g_strfreev(frags); /* Don't use g_free() for string lists! --eugene */
 }
@@ -73,46 +73,44 @@
 return dict;
 }
 
-static void
-dictionary_to_vorbis_comment(vorbis_comment * vc, mowgli_dictionary_t * dict)
+static gint add_tag_cb (const gchar * key, void * field, void * vc)
 {
- mowgli_dictionary_iteration_state_t state;
- gchar *field;
+ vorbis_comment_add_tag (vc, key, field);
+ return 0;
+}
 
+static void
+dictionary_to_vorbis_comment(vorbis_comment * vc, mowgli_patricia_t * dict)
+{
 vorbis_comment_clear(vc);
-
- MOWGLI_DICTIONARY_FOREACH(field, &state, dict) {
- vorbis_comment_add_tag(vc, state.cur->key, field);
- }
+ mowgli_patricia_foreach (dict, add_tag_cb, vc);
 }
 
 static void insert_str_tuple_field_to_dictionary (const Tuple * tuple, int
- fieldn, mowgli_dictionary_t * dict, char * key)
+ fieldn, mowgli_patricia_t * dict, char * key)
 {
-
- if(mowgli_dictionary_find(dict, key) != NULL) g_free(mowgli_dictionary_delete(dict, key));
+ g_free (mowgli_patricia_delete (dict, key));
 
 gchar *tmp = (gchar*)tuple_get_string(tuple, fieldn, NULL);
- if(tmp != NULL && strlen(tmp) != 0) mowgli_dictionary_add(dict, key, g_strdup(tmp));
+ if(tmp != NULL && strlen(tmp) != 0) mowgli_patricia_add(dict, key, g_strdup(tmp));
 }
 
 static void insert_int_tuple_field_to_dictionary (const Tuple * tuple, int
- fieldn, mowgli_dictionary_t * dict, char * key)
+ fieldn, mowgli_patricia_t * dict, char * key)
 {
 int val;
 
- if(mowgli_dictionary_find(dict, key) != NULL) g_free(mowgli_dictionary_delete(dict, key));
+ g_free (mowgli_patricia_delete (dict, key));
 
 if(tuple_get_value_type(tuple, fieldn, NULL) == TUPLE_INT && (val = tuple_get_int(tuple, fieldn, NULL)) >= 0) {
 gchar *tmp = g_strdup_printf("%d", val);
- mowgli_dictionary_add(dict, key, tmp);
+ mowgli_patricia_add(dict, key, tmp);
 }
 }
 
-static void
-destroy_cb(mowgli_dictionary_elem_t *delem, void *privdata)
+static void destroy_cb (const gchar * key, void * data, void * unused)
 {
- g_free(delem->data);
+ g_free (data);
 }
 
 gboolean vorbis_update_song_tuple (const Tuple * tuple, VFSFile * fd)
@@ -120,7 +118,7 @@
 
 vcedit_state *state;
 vorbis_comment *comment;
- mowgli_dictionary_t *dict;
+ mowgli_patricia_t *dict;
 gboolean ret;
 
 if(!tuple || !fd) return FALSE;
@@ -145,7 +143,7 @@
 insert_int_tuple_field_to_dictionary(tuple, FIELD_TRACK_NUMBER, dict, "tracknumber");
 
 dictionary_to_vorbis_comment(comment, dict);
- mowgli_dictionary_destroy(dict, destroy_cb, NULL);
+ mowgli_patricia_destroy(dict, destroy_cb, NULL);
 
 ret = write_and_pivot_files(state);

audacious-plugins-3.0.3.tar.bz2/src/vorbis/vorbis.c -> audacious-plugins-3.1.tar.bz2/src/vorbis/vorbis.c Changed

@@ -38,7 +38,6 @@
 #include <vorbis/codec.h>
 #include <vorbis/vorbisfile.h>
 
-#include <audacious/configdb.h>
 #include <audacious/i18n.h>
 #include <audacious/misc.h>
 #include <audacious/plugin.h>
@@ -48,8 +47,6 @@
 
 #include "vorbis.h"
 
-extern gboolean base64_decode (const gchar * text, void * * data, gint * length);
-
 static size_t ovcb_read (void * buffer, size_t size, size_t count, void * file)
 {
 return vfs_fread (buffer, size, count, file);
@@ -89,9 +86,6 @@
 static GMutex * seek_mutex = NULL;
 static GCond * seek_cond = NULL;
 
-gchar **vorbis_tag_encoding_list = NULL;
-
-
 static gint
 vorbis_check_fd(const gchar *filename, VFSFile *stream)
 {
@@ -537,12 +531,9 @@
 if (! s)
 goto ERR;
 
- void * data2;
- gint length2;
- if (! base64_decode (s, & data2, & length2))
- goto ERR;
-
- if (length2 < 8)
+ gsize length2;
+ void * data2 = g_base64_decode (s, & length2);
+ if (! data2 || length2 < 8)
 goto PARSE_ERR;
 
 gint mime_length = GUINT32_FROM_BE (* (guint32 *) (data2 + 4));
@@ -598,99 +589,20 @@
 "Visit the Xiph.org Foundation at http://www.xiph.org/\n"));
 }
 
-static InputPlugin vorbis_ip;
-
 static gboolean vorbis_init (void)
 {
- mcs_handle_t *db;
- gchar *tmp = NULL;
-
- memset(&vorbis_cfg, 0, sizeof(vorbis_config_t));
- vorbis_cfg.http_buffer_size = 128;
- vorbis_cfg.http_prebuffer = 25;
- vorbis_cfg.proxy_port = 8080;
- vorbis_cfg.proxy_use_auth = FALSE;
- vorbis_cfg.proxy_user = NULL;
- vorbis_cfg.proxy_pass = NULL;
- vorbis_cfg.tag_override = FALSE;
- vorbis_cfg.tag_format = NULL;
-
- db = aud_cfg_db_open();
- aud_cfg_db_get_int(db, "vorbis", "http_buffer_size",
- &vorbis_cfg.http_buffer_size);
- aud_cfg_db_get_int(db, "vorbis", "http_prebuffer",
- &vorbis_cfg.http_prebuffer);
- aud_cfg_db_get_bool(db, "vorbis", "save_http_stream",
- &vorbis_cfg.save_http_stream);
- if (!aud_cfg_db_get_string(db, "vorbis", "save_http_path",
- &vorbis_cfg.save_http_path))
- vorbis_cfg.save_http_path = g_strdup(g_get_home_dir());
-
- aud_cfg_db_get_bool(db, "vorbis", "tag_override",
- &vorbis_cfg.tag_override);
- if (!aud_cfg_db_get_string(db, "vorbis", "tag_format",
- &vorbis_cfg.tag_format))
- vorbis_cfg.tag_format = g_strdup("%p - %t");
-
- aud_cfg_db_get_bool(db, NULL, "use_proxy", &vorbis_cfg.use_proxy);
- aud_cfg_db_get_string(db, NULL, "proxy_host", &vorbis_cfg.proxy_host);
- aud_cfg_db_get_string(db, NULL, "proxy_port", &tmp);
-
- if (tmp != NULL)
- vorbis_cfg.proxy_port = atoi(tmp);
-
- aud_cfg_db_get_bool(db, NULL, "proxy_use_auth", &vorbis_cfg.proxy_use_auth);
- aud_cfg_db_get_string(db, NULL, "proxy_user", &vorbis_cfg.proxy_user);
- aud_cfg_db_get_string(db, NULL, "proxy_pass", &vorbis_cfg.proxy_pass);
-
- aud_cfg_db_close(db);
-
 seek_mutex = g_mutex_new();
 seek_cond = g_cond_new();
-
 return TRUE;
 }
 
 static void
 vorbis_cleanup(void)
 {
- if (vorbis_cfg.save_http_path) {
- g_free(vorbis_cfg.save_http_path);
- vorbis_cfg.save_http_path = NULL;
- }
-
- if (vorbis_cfg.proxy_host) {
- g_free(vorbis_cfg.proxy_host);
- vorbis_cfg.proxy_host = NULL;
- }
-
- if (vorbis_cfg.proxy_user) {
- g_free(vorbis_cfg.proxy_user);
- vorbis_cfg.proxy_user = NULL;
- }
-
- if (vorbis_cfg.proxy_pass) {
- g_free(vorbis_cfg.proxy_pass);
- vorbis_cfg.proxy_pass = NULL;
- }
-
- if (vorbis_cfg.tag_format) {
- g_free(vorbis_cfg.tag_format);
- vorbis_cfg.tag_format = NULL;
- }
-
- if (vorbis_cfg.title_encoding) {
- g_free(vorbis_cfg.title_encoding);
- vorbis_cfg.title_encoding = NULL;
- }
-
- g_strfreev(vorbis_tag_encoding_list);
 g_mutex_free(seek_mutex);
 g_cond_free(seek_cond);
 }
 
-extern PluginPreferences preferences;
-
 static const gchar *vorbis_fmts[] = { "ogg", "ogm", "oga", NULL };
 static const gchar * const mimes[] = {"application/ogg", NULL};
 
@@ -699,7 +611,6 @@
 .name = "Ogg Vorbis",
 .init = vorbis_init,
 .about = vorbis_aboutbox,
- .settings = &preferences,
 .play = vorbis_play,
 .stop = vorbis_stop,
 .pause = vorbis_pause,

audacious-plugins-3.0.3.tar.bz2/src/vorbis/vorbis.h -> audacious-plugins-3.1.tar.bz2/src/vorbis/vorbis.h Changed

audacious-plugins-3.0.3.tar.bz2/src/vtx/Makefile -> audacious-plugins-3.1.tar.bz2/src/vtx/Makefile Changed

audacious-plugins-3.0.3.tar.bz2/src/vtx/vtx.c -> audacious-plugins-3.1.tar.bz2/src/vtx/vtx.c Changed

audacious-plugins-3.0.3.tar.bz2/src/xsf/ao.h -> audacious-plugins-3.1.tar.bz2/src/xsf/ao.h Changed

audacious-plugins-3.0.3.tar.bz2/src/xsf/plugin.c -> audacious-plugins-3.1.tar.bz2/src/xsf/plugin.c Changed

audacious-plugins-3.0.3.tar.bz2/src/xspf/Makefile -> audacious-plugins-3.1.tar.bz2/src/xspf/Makefile Changed

audacious-plugins-3.0.3.tar.bz2/src/xspf/xspf.c -> audacious-plugins-3.1.tar.bz2/src/xspf/xspf.c Changed

@@ -83,10 +83,8 @@
  * base, struct index * filenames, struct index * tuples)
 {
     xmlNode *nptr;
-    Tuple *tuple;
     gchar *location = NULL;
-
-    tuple = tuple_new();
+    Tuple * tuple = NULL;
 
     for (nptr = track->children; nptr != NULL; nptr = nptr->next) {
         if (nptr->type == XML_ELEMENT_NODE) {
@@ -134,10 +132,14 @@
                     xmlChar *str = xmlNodeGetContent(nptr);
                     switch (xspf_entries[i].type) {
                         case TUPLE_STRING:
+                            if (! tuple)
+                                tuple = tuple_new ();
                             tuple_associate_string(tuple, xspf_entries[i].tupleField, NULL, (gchar *)str);
                             break;
 
                         case TUPLE_INT:
+                            if (! tuple)
+                                tuple = tuple_new ();
                             tuple_associate_int(tuple, xspf_entries[i].tupleField, NULL, atol((char *)str));
                             break;
 
@@ -155,11 +157,14 @@
 
     if (location != NULL)
     {
-        tuple_set_filename(tuple, location);
+        if (tuple)
+            tuple_set_filename (tuple, location);
 
         index_append(filenames, location);
         index_append(tuples, tuple);
     }
+    else if (tuple)
+        tuple_free (tuple);
 }